mongo 2.14.1 → 2.15.0.alpha

data/spec/mongo/operation/insert/bulk_spec.rb

@@ -2,6 +2,9 @@ require 'spec_helper'
 
 describe Mongo::Operation::Insert do
   require_no_multi_shard
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   before do
     begin
@@ -100,7 +103,7 @@ describe Mongo::Operation::Insert do
 
       let(:inserted_ids) do
         authorized_primary.with_connection do |connection|
-          op.bulk_execute(connection, client: nil).inserted_ids
+          op.bulk_execute(connection, context: context).inserted_ids
         end
       end
 
@@ -131,7 +134,7 @@ describe Mongo::Operation::Insert do
 
         let(:response) do
           authorized_primary.with_connection do |connection|
-            op.bulk_execute(connection, client: nil)
+            op.bulk_execute(connection, context: context)
           end
         end
 
@@ -151,7 +154,7 @@ describe Mongo::Operation::Insert do
 
         let(:response) do
           authorized_primary.with_connection do |connection|
-            op.bulk_execute(connection, client: nil)
+            op.bulk_execute(connection, context: context)
           end
         end
 
@@ -190,7 +193,7 @@ describe Mongo::Operation::Insert do
 
           it 'aborts after first error' do
             authorized_primary.with_connection do |connection|
-              failing_insert.bulk_execute(connection, client: nil)
+              failing_insert.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find.count).to eq(1)
           end
@@ -206,7 +209,7 @@ describe Mongo::Operation::Insert do
 
           it 'aborts after first error' do
             authorized_primary.with_connection do |connection|
-              failing_insert.bulk_execute(connection, client: nil)
+              failing_insert.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find.count).to eq(1)
           end
@@ -239,7 +242,7 @@ describe Mongo::Operation::Insert do
 
           it 'does not abort after first error' do
             authorized_primary.with_connection do |connection|
-              failing_insert.bulk_execute(connection, client: nil)
+              failing_insert.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find.count).to eq(2)
           end
@@ -256,7 +259,7 @@ describe Mongo::Operation::Insert do
 
           it 'does not after first error' do
             authorized_primary.with_connection do |connection|
-              failing_insert.bulk_execute(connection, client: nil)
+              failing_insert.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find.count).to eq(2)
           end

data/spec/mongo/operation/insert_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Insert do
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   let(:documents) do
     [{ '_id' => 1,
@@ -83,7 +86,7 @@ describe Mongo::Operation::Insert do
       end
 
       let(:inserted_ids) do
-        insert.execute(authorized_primary, client: nil).inserted_ids
+        insert.execute(authorized_primary, context: context).inserted_ids
       end
 
       let(:collection_ids) do
@@ -112,7 +115,7 @@ describe Mongo::Operation::Insert do
       context 'when the insert succeeds' do
 
         let!(:response) do
-          insert.execute(authorized_primary, client: nil)
+          insert.execute(authorized_primary, context: context)
         end
 
         it 'reports the correct written count' do
@@ -144,8 +147,8 @@ describe Mongo::Operation::Insert do
 
         it 'raises an error' do
           expect {
-            failing_insert.execute(authorized_primary, client: nil)
-            failing_insert.execute(authorized_primary, client: nil)
+            failing_insert.execute(authorized_primary, context: context)
+            failing_insert.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::OperationFailure)
         end
       end
@@ -163,7 +166,7 @@ describe Mongo::Operation::Insert do
         end
 
         let!(:response) do
-          insert.execute(authorized_primary, client: nil)
+          insert.execute(authorized_primary, context: context)
         end
 
         it 'reports the correct written count' do
@@ -195,8 +198,8 @@ describe Mongo::Operation::Insert do
 
         it 'raises an error' do
           expect {
-            failing_insert.execute(authorized_primary, client: nil)
-            failing_insert.execute(authorized_primary, client: nil)
+            failing_insert.execute(authorized_primary, context: context)
+            failing_insert.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::OperationFailure)
         end
       end
@@ -221,8 +224,8 @@ describe Mongo::Operation::Insert do
 
         it 'raises an error' do
           expect {
-            failing_insert.execute(authorized_primary, client: nil)
-            failing_insert.execute(authorized_primary, client: nil)
+            failing_insert.execute(authorized_primary, context: context)
+            failing_insert.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::OperationFailure)
         end
 
@@ -236,13 +239,13 @@ describe Mongo::Operation::Insert do
 
         it 'raises an error' do
           expect {
-            insert.execute(authorized_primary, client: nil)
+            insert.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::MaxBSONSize)
         end
 
         it 'does not insert the document' do
           expect {
-            insert.execute(authorized_primary, client: nil)
+            insert.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::MaxBSONSize)
           expect(authorized_collection.find.count).to eq(0)
         end
@@ -273,7 +276,7 @@ describe Mongo::Operation::Insert do
       end
 
       let(:response) do
-        op.execute(authorized_primary, client: nil)
+        op.execute(authorized_primary, context: context)
       end
 
       it 'uses op codes instead of write commands' do

data/spec/mongo/operation/map_reduce_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Mongo::Operation::MapReduce do
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   let(:map) do
   %Q{
@@ -97,7 +100,7 @@ describe Mongo::Operation::MapReduce do
     context 'when the map/reduce succeeds' do
 
       let(:response) do
-        op.execute(authorized_primary, client: nil)
+        op.execute(authorized_primary, context: context)
       end
 
       it 'returns the response' do
@@ -117,7 +120,7 @@ describe Mongo::Operation::MapReduce do
 
       it 'raises an exception' do
         expect {
-          op.execute(authorized_primary, client: nil)
+          op.execute(authorized_primary, context: context)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end

data/spec/mongo/operation/read_preference_legacy_spec.rb

@@ -46,10 +46,10 @@ describe Mongo::Operation::ReadPreferenceSupported do
     end
   end
 
-  describe '#add_slave_ok_flag?' do
+  describe '#add_slave_ok_flag_maybe' do
 
     let(:actual) do
-      operation.send(:add_slave_ok_flag?, connection)
+      operation.send(:add_slave_ok_flag_maybe, operation.send(:options), connection)
     end
 
     shared_examples_for 'sets the slave_ok flag as expected' do
@@ -60,7 +60,9 @@ describe Mongo::Operation::ReadPreferenceSupported do
 
     shared_examples_for 'never sets slave_ok' do
 
-      let(:expected) { false }
+      let(:expected) do
+        { }
+      end
 
       context 'when no read preference is specified' do
         let(:read_pref) { Mongo::ServerSelector.get }
@@ -83,7 +85,9 @@ describe Mongo::Operation::ReadPreferenceSupported do
 
     shared_examples_for 'always sets slave_ok' do
 
-      let(:expected) { true }
+      let(:expected) do
+        { :flags => [ :slave_ok ] }
+      end
 
       context 'when no read preference is specified' do
         let(:read_pref) { Mongo::ServerSelector.get }
@@ -110,7 +114,9 @@ describe Mongo::Operation::ReadPreferenceSupported do
 
         let(:read_pref) { Mongo::ServerSelector.get }
 
-        let(:expected) { false }
+        let(:expected) do
+          { }
+        end
 
         it_behaves_like 'sets the slave_ok flag as expected'
       end
@@ -121,7 +127,9 @@ describe Mongo::Operation::ReadPreferenceSupported do
 
           let(:read_pref) { Mongo::ServerSelector.get(:mode => :secondary) }
 
-          let(:expected) { true }
+          let(:expected) do
+            { :flags => [ :slave_ok ] }
+          end
 
           it_behaves_like 'sets the slave_ok flag as expected'
         end
@@ -130,7 +138,9 @@ describe Mongo::Operation::ReadPreferenceSupported do
 
           let(:read_pref) { Mongo::ServerSelector.get(:mode => :primary) }
 
-          let(:expected) { false }
+          let(:expected) do
+            { }
+          end
 
           it_behaves_like 'sets the slave_ok flag as expected'
         end
@@ -196,7 +206,7 @@ describe Mongo::Operation::ReadPreferenceSupported do
     end
   end
 
-  describe '#add_read_preference_legacy' do
+  describe '#update_selector_for_read_pref' do
 
     let(:read_pref) do
       Mongo::ServerSelector.get(:mode => mode)
@@ -205,7 +215,7 @@ describe Mongo::Operation::ReadPreferenceSupported do
     # Behavior of sending $readPreference is the same regardless of topology.
     shared_examples_for '$readPreference in the command' do
       let(:actual) do
-        operation.send(:add_read_preference_legacy, operation.send(:selector), connection)
+        operation.send(:update_selector_for_read_pref, operation.send(:selector), connection)
       end
 
       let(:expected_read_preference) do

data/spec/mongo/operation/read_preference_op_msg_spec.rb

@@ -175,13 +175,13 @@ describe Mongo::Operation::SessionsSupported do
         let(:tag_sets) { nil }
 
         context 'without tag_sets specified' do
-          it_behaves_like 'adds read preference'
+          it_behaves_like 'does not modify selector'
         end
 
         context 'with empty tag_sets' do
           let(:tag_sets) { [] }
 
-          it_behaves_like 'adds read preference'
+          it_behaves_like 'does not modify selector'
         end
 
         context 'with tag_sets specified' do
@@ -256,7 +256,7 @@ describe Mongo::Operation::SessionsSupported do
           let(:hedge) { nil }
 
           context 'when tag_sets and hedge are not specified' do
-            it_behaves_like 'adds read preference'
+            it_behaves_like 'does not modify selector'
           end
 
           context 'when tag_sets are specified' do

data/spec/mongo/operation/remove_user_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Mongo::Operation::RemoveUser do
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   describe '#execute' do
 
@@ -22,7 +25,7 @@ describe Mongo::Operation::RemoveUser do
     context 'when user removal was successful' do
 
       let!(:response) do
-        operation.execute(root_authorized_primary, client: nil)
+        operation.execute(root_authorized_primary, context: context)
       end
 
       it 'removes the user from the database' do
@@ -33,12 +36,12 @@ describe Mongo::Operation::RemoveUser do
     context 'when removal was not successful' do
 
       before do
-        operation.execute(root_authorized_primary, client: nil)
+        operation.execute(root_authorized_primary, context: context)
       end
 
       it 'raises an exception' do
         expect {
-          operation.execute(root_authorized_primary, client: nil)
+          operation.execute(root_authorized_primary, context: context)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end

data/spec/mongo/operation/result_spec.rb

@@ -337,7 +337,7 @@ describe Mongo::Operation::Result do
       it 'raises OperationFailure' do
         expect do
           result.validate!
-        end.to raise_error(Mongo::Error::OperationFailure, /Replication is being shut down \(91\)/)
+        end.to raise_error(Mongo::Error::OperationFailure, /\[91\]: Replication is being shut down/)
       end
     end
   end

data/spec/mongo/operation/update/bulk_spec.rb

@@ -2,6 +2,9 @@ require 'spec_helper'
 
 describe Mongo::Operation::Update do
   require_no_multi_shard
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   let(:documents) do
     [{ :q => { :foo => 1 },
@@ -99,7 +102,7 @@ describe Mongo::Operation::Update do
 
         it 'updates the document' do
           authorized_primary.with_connection do |connection|
-            op.bulk_execute(connection, client: nil)
+            op.bulk_execute(connection, context: context)
           end
           expect(authorized_collection.find(field: 'blah').count).to eq(1)
         end
@@ -125,7 +128,7 @@ describe Mongo::Operation::Update do
 
         it 'updates the documents' do
           authorized_primary.with_connection do |connection|
-            op.bulk_execute(connection, client: nil)
+            op.bulk_execute(connection, context: context)
           end
           expect(authorized_collection.find(field: 'blah').count).to eq(2)
         end
@@ -159,7 +162,7 @@ describe Mongo::Operation::Update do
 
           it 'aborts after first error' do
             authorized_primary.with_connection do |connection|
-              failing_update.bulk_execute(connection, client: nil)
+              failing_update.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find(other: 'blah').count).to eq(0)
           end
@@ -173,7 +176,7 @@ describe Mongo::Operation::Update do
 
           it 'aborts after first error' do
             authorized_primary.with_connection do |connection|
-              failing_update.bulk_execute(connection, client: nil)
+              failing_update.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find(other: 'blah').count).to eq(0)
           end
@@ -208,7 +211,7 @@ describe Mongo::Operation::Update do
 
           it 'does not abort after first error' do
             authorized_primary.with_connection do |connection|
-              failing_update.bulk_execute(connection, client: nil)
+              failing_update.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find(other: 'blah').count).to eq(1)
           end
@@ -222,7 +225,7 @@ describe Mongo::Operation::Update do
 
           it 'does not abort after first error' do
             authorized_primary.with_connection do |connection|
-              failing_update.bulk_execute(connection, client: nil)
+              failing_update.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find(other: 'blah').count).to eq(1)
           end

data/spec/mongo/operation/update_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Update do
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   let(:document) do
     { :q => { :foo => 1 },
@@ -100,7 +103,7 @@ describe Mongo::Operation::Update do
         end
 
         let(:result) do
-          update.execute(authorized_primary, client: nil)
+          update.execute(authorized_primary, context: context)
         end
 
         it 'updates the document' do
@@ -128,7 +131,7 @@ describe Mongo::Operation::Update do
 
         it 'raises an exception' do
           expect {
-            update.execute(authorized_primary, client: nil)
+            update.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::OperationFailure)
         end
       end
@@ -152,7 +155,7 @@ describe Mongo::Operation::Update do
         end
 
         let(:result) do
-          update.execute(authorized_primary, client: nil)
+          update.execute(authorized_primary, context: context)
         end
 
         it 'updates the documents' do
@@ -180,7 +183,7 @@ describe Mongo::Operation::Update do
 
         it 'raises an exception' do
           expect {
-            update.execute(authorized_primary, client: nil)
+            update.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::OperationFailure)
         end
       end
@@ -193,7 +196,7 @@ describe Mongo::Operation::Update do
 
         it 'raises an error' do
           expect {
-            update.execute(authorized_primary, client: nil)
+            update.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::MaxBSONSize)
         end
       end
@@ -205,7 +208,7 @@ describe Mongo::Operation::Update do
         end
 
         let(:result) do
-          update.execute(authorized_primary, client: nil)
+          update.execute(authorized_primary, context: context)
         end
 
         it 'inserts the document' do
@@ -243,7 +246,7 @@ describe Mongo::Operation::Update do
       end
 
       let(:result) do
-        update.execute(authorized_primary, client: nil)
+        update.execute(authorized_primary, context: context)
       end
 
       before do

data/spec/mongo/operation/update_user_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Mongo::Operation::UpdateUser do
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   describe '#execute' do
 
@@ -35,7 +38,7 @@ describe Mongo::Operation::UpdateUser do
     context 'when user update was successful' do
 
       let!(:response) do
-        operation.execute(root_authorized_primary, client: nil)
+        operation.execute(root_authorized_primary, context: context)
       end
 
       it 'updates the user in the database' do

data/spec/mongo/protocol/compressed_spec.rb

@@ -1,4 +1,4 @@
-require 'lite_spec_helper'
+require 'spec_helper'
 
 describe Mongo::Protocol::Compressed do
 
@@ -10,15 +10,35 @@ describe Mongo::Protocol::Compressed do
     described_class.new(original_message, compressor, level)
   end
 
+  let(:original_message_bytes) do
+    buf = BSON::ByteBuffer.new
+    original_message.send(:serialize_fields, buf)
+    buf.to_s
+  end
+
   describe '#serialize' do
 
-    context 'when zlib compression level is not provided' do
+    context "when using the snappy compressor" do
+      require_snappy_compression
+      let(:compressor) { 'snappy' }
+
+      it "uses snappy" do
+        expect(Snappy).to receive(:deflate).with(original_message_bytes).and_call_original
+        message.serialize
+      end
+    end
 
-      let(:original_message_bytes) do
-        buf = BSON::ByteBuffer.new
-        original_message.send(:serialize_fields, buf)
-        buf.to_s
+    context "when using the zstd compressor" do
+      require_zstd_compression
+      let(:compressor) { 'zstd' }
+
+      it "uses zstd with default compression level" do
+        expect(Zstd).to receive(:compress).with(original_message_bytes).and_call_original
+        message.serialize
       end
+    end
+
+    context 'when zlib compression level is not provided' do
 
       it 'does not set a compression level' do
         expect(Zlib::Deflate).to receive(:deflate).with(original_message_bytes, nil).and_call_original
@@ -30,12 +50,6 @@ describe Mongo::Protocol::Compressed do
 
       let(:level) { 1 }
 
-      let(:original_message_bytes) do
-        buf = BSON::ByteBuffer.new
-        original_message.send(:serialize_fields, buf)
-        buf.to_s
-      end
-
       it 'uses the compression level' do
         expect(Zlib::Deflate).to receive(:deflate).with(original_message_bytes, 1).and_call_original
         message.serialize

data/spec/mongo/query_cache_middleware_spec.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require "spec_helper"
+
+describe Mongo::QueryCache::Middleware do
+
+  let :middleware do
+    described_class.new(app)
+  end
+
+  context "when not touching query cache in the app" do
+
+    let(:app) do
+      lambda do |env|
+        @enabled = Mongo::QueryCache.enabled?
+        [200, env, "app"]
+      end
+    end
+
+    it "returns success" do
+      code, _ = middleware.call({})
+      expect(code).to eq(200)
+    end
+
+    it "enables the query cache" do
+      middleware.call({})
+      expect(@enabled).to be true
+    end
+  end
+
+  context "when querying in the app" do
+
+    before do
+      authorized_client['test'].insert_one(test: 1)
+    end
+
+    let(:app) do
+      lambda do |env|
+        authorized_client['test'].find
+        [200, env, "app"]
+      end
+    end
+
+    it "returns success" do
+      code, _ = middleware.call({})
+      expect(code).to eq(200)
+    end
+
+    it "cleans the query cache after it responds" do
+      middleware.call({})
+      expect(Mongo::QueryCache.send(:cache_table)).to be_empty
+    end
+  end
+end

data/spec/mongo/retryable_spec.rb

@@ -574,8 +574,9 @@ describe Mongo::Retryable do
     context 'when an error due to using an unsupported storage engine occurs' do
       before do
         expect(operation).to receive(:execute).and_raise(
-          Mongo::Error::OperationFailure.new('Transaction numbers are only allowed on...',
-            nil, :code=>20)).ordered
+          Mongo::Error::OperationFailure.new('message which is not checked',
+            nil, code: 20, server_message: 'Transaction numbers are only allowed on...',
+        )).ordered
       end
 
       it 'raises an exception with the correct error message' do

data/spec/mongo/server/app_metadata_shared.rb

@@ -8,40 +8,14 @@ shared_examples 'app metadata document' do
     document[:client][:driver][:version].should == Mongo::VERSION
   end
 
-  context 'linux' do
-    before(:all) do
-      unless SpecConfig.instance.linux?
-        skip "Linux required, we have #{RbConfig::CONFIG['host_os']}"
-      end
-    end
-
-    it 'includes operating system information' do
-      document[:client][:os][:type].should == 'linux'
-      if BSON::Environment.jruby? || RUBY_VERSION >= '3.0'
-        document[:client][:os][:name].should == 'linux'
-      else
-        document[:client][:os][:name].should == 'linux-gnu'
-      end
-      document[:client][:os][:architecture].should == 'x86_64'
-    end
-  end
-
-  context 'macos' do
-    before(:all) do
-      unless SpecConfig.instance.macos?
-        skip "MacOS required, we have #{RbConfig::CONFIG['host_os']}"
-      end
-    end
-
-    it 'includes operating system information' do
-      document[:client][:os][:type].should == 'darwin'
-      if BSON::Environment.jruby?
-        document[:client][:os][:name].should == 'darwin'
-      else
-        document[:client][:os][:name].should =~ /darwin\d+/
-      end
-      document[:client][:os][:architecture].should == 'x86_64'
+  it 'includes operating system information' do
+    document[:client][:os][:type].should == 'linux'
+    if BSON::Environment.jruby? || RUBY_VERSION >= '3.0'
+      document[:client][:os][:name].should == 'linux'
+    else
+      document[:client][:os][:name].should == 'linux-gnu'
     end
+    document[:client][:os][:architecture].should == 'x86_64'
   end
 
   context 'mri' do