mongo 2.9.2 → 2.10.0.rc0

data/spec/mongo/collection/view/aggregation_spec.rb

@@ -219,8 +219,6 @@ describe Mongo::Collection::View::Aggregation do
   end
 
   describe '#explain' do
-    # Broken on 4.2 - https://jira.mongodb.org/browse/RUBY-1788
-    max_server_version '4.0'
 
     it 'executes an explain' do
       expect(aggregation.explain).to_not be_empty
@@ -273,26 +271,47 @@ describe Mongo::Collection::View::Aggregation do
       context 'when the server selected supports collations' do
         min_server_fcv '3.4'
 
-        context 'when the collation key is a String' do
+        shared_examples_for 'applies the collation' do
 
-          let(:options) do
-            { 'collation' => { locale: 'en_US', strength: 2 } }
+          context 'when the collation key is a String' do
+
+            let(:options) do
+              { 'collation' => { locale: 'en_US', strength: 2 } }
+            end
+
+            it 'applies the collation' do
+              expect(result).to eq('en_US')
+            end
           end
 
-          it 'applies the collation' do
-            expect(result).to eq('en_US')
+          context 'when the collation key is a Symbol' do
+
+            let(:options) do
+              { collation: { locale: 'en_US', strength: 2 } }
+            end
+
+            it 'applies the collation' do
+              expect(result).to eq('en_US')
+            end
           end
         end
 
-        context 'when the collation key is a Symbol' do
+        context '4.0-' do
+          max_server_version '4.0'
 
-          let(:options) do
-            { collation: { locale: 'en_US', strength: 2 } }
-          end
+          it_behaves_like 'applies the collation'
+        end
 
-          it 'applies the collation' do
-            expect(result).to eq('en_US')
+        context '4.2+' do
+          min_server_fcv '4.2'
+
+          let(:result) do
+            skip 'RUBY-1827 / upgrading evergreen 4.1 server binary'
+
+            aggregation.explain['queryPlanner']['collation']['locale']
           end
+
+          it_behaves_like 'applies the collation'
         end
       end
 
@@ -596,7 +615,7 @@ describe Mongo::Collection::View::Aggregation do
 
      it 'reroutes the operation to a primary' do
        allow(aggregation).to receive(:valid_server?).and_return(false)
-       expect(Mongo::Logger.logger).to receive(:warn?).and_call_original
+       expect(Mongo::Logger.logger).to receive(:warn).and_call_original
        aggregation.to_a
      end
     end
@@ -604,7 +623,7 @@ describe Mongo::Collection::View::Aggregation do
     context 'when the server is a valid for writing' do
 
      it 'does not reroute the operation to a primary' do
-       expect(Mongo::Logger.logger).not_to receive(:warn?)
+       expect(Mongo::Logger.logger).not_to receive(:warn)
        aggregation.to_a
      end
 

data/spec/mongo/collection/view/change_stream_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mongo::Collection::View::ChangeStream do
+  require_wired_tiger
   min_server_fcv '3.6'
   require_topology :replica_set
   max_example_run_time 7
@@ -275,11 +276,11 @@ describe Mongo::Collection::View::ChangeStream do
 
       it 'does not close the cursor' do
         expect(cursor).to be_a(Mongo::Cursor)
+        expect(cursor.closed?).to be false
       end
     end
 
     context 'when provided a session' do
-      min_server_fcv '3.6'
 
       let(:options) do
         { session: session }
@@ -443,7 +444,7 @@ describe Mongo::Collection::View::ChangeStream do
       collection.insert_one(a: 1)
     end
 
-    context 'pre-4.1 server' do
+    context 'pre-4.2 server' do
       max_server_version '4.0'
 
       it 'driver raises an exception and closes the cursor' do
@@ -454,7 +455,7 @@ describe Mongo::Collection::View::ChangeStream do
       end
     end
 
-    context '4.1+ server' do
+    context '4.2+ server' do
       min_server_fcv '4.2'
 
       it 'server errors, driver closes the cursor' do
@@ -592,6 +593,63 @@ describe Mongo::Collection::View::ChangeStream do
     end
   end
 
+  context 'when a killCursors command is issued for the cursor' do
+    context 'using Enumerable' do
+      only_mri
+
+      before do
+        change_stream
+        collection.insert_one(a:1)
+        enum.next
+        collection.insert_one(a:2)
+      end
+
+      let(:enum) do
+        change_stream.to_enum
+      end
+
+      it 'should create a new cursor and resume' do
+        original_cursor_id = cursor.id
+
+        client.use(:admin).command({
+          killCursors: collection.name,
+          cursors: [cursor.id]
+        })
+
+        document = enum.next
+        expect(document[:fullDocument][:a]).to eq(2)
+
+        new_cursor_id = change_stream.instance_variable_get(:@cursor).id
+        expect(new_cursor_id).not_to eq(original_cursor_id)
+      end
+    end
+
+    context 'using try_next' do
+      before do
+        change_stream
+        collection.insert_one(a:1)
+        expect(change_stream.try_next).to be_a(BSON::Document)
+        collection.insert_one(a:2)
+      end
+
+      it 'should create a new cursor and resume' do
+        original_cursor_id = cursor.id
+
+        client.use(:admin).command({
+          killCursors: collection.name,
+          cursors: [cursor.id]
+        })
+
+        document = change_stream.try_next
+        expect(document).to be_a(BSON::Document)
+        expect(document[:fullDocument][:a]).to eq(2)
+
+        new_cursor_id = change_stream.instance_variable_get(:@cursor).id
+        expect(new_cursor_id).not_to eq(original_cursor_id)
+      end
+    end
+  end
+
   context 'when a server error is encountered during a getMore' do
     fails_on_jruby
 
@@ -606,6 +664,7 @@ describe Mongo::Collection::View::ChangeStream do
           collection.insert_one(a: 2)
           expect(cursor).to receive(:get_more).once.and_raise(error)
           expect(cursor).to receive(:kill_cursors).and_call_original
+          expect(view.send(:server_selector)).to receive(:select_server).once.and_call_original
           expect(Mongo::Operation::Aggregate).to receive(:new).and_call_original
         end
 

data/spec/mongo/collection/view/map_reduce_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mongo::Collection::View::MapReduce do
+  clean_slate_on_evergreen
 
   let(:map) do
   %Q{
@@ -578,7 +579,9 @@ describe Mongo::Collection::View::MapReduce do
 
         it 'reroutes the operation to a primary' do
           allow(map_reduce).to receive(:valid_server?).and_return(false)
-          expect(Mongo::Logger.logger).to receive(:warn?).and_call_original
+          expect(Mongo::Logger.logger).to receive(:warn).once do |msg|
+            expect(msg).to include('Rerouting the MapReduce operation to the primary server')
+          end
           map_reduce.to_a
         end
 
@@ -650,13 +653,12 @@ describe Mongo::Collection::View::MapReduce do
           # We are inspecting server state - kill monitor threads so that
           # server state is not changed in background due to intermittent
           # connectivity issues in Evergreen
-          authorized_collection.client.cluster.servers_list.map do |server|
-            server.monitor.stop!
-          end
+          ClientRegistry.instance.close_all_clients
+          authorized_collection.client.cluster.disconnect!
         end
 
         it 'does not reroute the operation to a primary' do
-          expect(Mongo::Logger.logger).not_to receive(:warn?)
+          expect(Mongo::Logger.logger).not_to receive(:warn)
           map_reduce.to_a
         end
       end

data/spec/mongo/collection/view/readable_spec.rb

@@ -369,7 +369,7 @@ describe Mongo::Collection::View::Readable do
     context 'when the collection has a read preference set' do
 
       after do
-        client.close
+        client.close(true)
       end
 
       let(:client) do
@@ -438,7 +438,7 @@ describe Mongo::Collection::View::Readable do
         require_topology :single, :replica_set
 
         after do
-          client.close
+          client.close(true)
         end
 
         let(:client) do
@@ -756,7 +756,7 @@ describe Mongo::Collection::View::Readable do
       end
 
       after do
-        client.close
+        client.close(true)
       end
 
       let(:client) do
@@ -819,7 +819,7 @@ describe Mongo::Collection::View::Readable do
         end
 
         after do
-          client.close
+          client.close(true)
         end
 
         let(:client) do

data/spec/mongo/collection_spec.rb

@@ -98,10 +98,108 @@ describe Mongo::Collection do
     end
   end
 
+  describe '#initialize' do
+
+    let(:client) do
+      new_local_client(SpecConfig.instance.addresses,
+        SpecConfig.instance.test_options.merge(monitoring_io: false))
+    end
+
+    let(:database) { client.database }
+
+    context 'write concern given in :write option' do
+      let(:collection) do
+        Mongo::Collection.new(database, 'foo', write: {w: 1})
+      end
+
+      it 'stores write concern' do
+        expect(collection.write_concern).to be_a(Mongo::WriteConcern::Acknowledged)
+        expect(collection.write_concern.options).to eq(w: 1)
+      end
+
+      it 'stores write concern under :write' do
+        expect(collection.options[:write]).to eq(w: 1)
+        expect(collection.options[:write_concern]).to be nil
+      end
+    end
+
+    context 'write concern given in :write_concern option' do
+      let(:collection) do
+        Mongo::Collection.new(database, 'foo', write_concern: {w: 1})
+      end
+
+      it 'stores write concern' do
+        expect(collection.write_concern).to be_a(Mongo::WriteConcern::Acknowledged)
+        expect(collection.write_concern.options).to eq(w: 1)
+      end
+
+      it 'stores write concern under :write_concern' do
+        expect(collection.options[:write_concern]).to eq(w: 1)
+        expect(collection.options[:write]).to be nil
+      end
+    end
+
+    context 'write concern given in both :write and :write_concern options' do
+      context 'identical values' do
+
+        let(:collection) do
+          Mongo::Collection.new(database, 'foo',
+            write: {w: 1}, write_concern: {w: 1})
+        end
+
+        it 'stores write concern' do
+          expect(collection.write_concern).to be_a(Mongo::WriteConcern::Acknowledged)
+          expect(collection.write_concern.options).to eq(w: 1)
+        end
+
+        it 'stores write concern under both options' do
+          expect(collection.options[:write]).to eq(w: 1)
+          expect(collection.options[:write_concern]).to eq(w: 1)
+        end
+      end
+
+      context 'different values' do
+
+        let(:collection) do
+          Mongo::Collection.new(database, 'foo',
+            write: {w: 1}, write_concern: {w: 2})
+        end
+
+        it 'raises an exception' do
+          expect do
+            collection
+          end.to raise_error(ArgumentError, /If :write and :write_concern are both given, they must be identical/)
+        end
+      end
+    end
+
+=begin WriteConcern object support
+    context 'when write concern is provided via a WriteConcern object' do
+
+      let(:collection) do
+        Mongo::Collection.new(database, 'foo', write_concern: wc)
+      end
+
+      let(:wc) { Mongo::WriteConcern.get(w: 2) }
+
+      it 'stores write concern options in collection options' do
+        expect(collection.options[:write_concern]).to eq(w: 2)
+      end
+
+      it 'caches write concern object' do
+        expect(collection.write_concern).to be wc
+      end
+    end
+=end
+  end
+
   describe '#with' do
 
     let(:client) do
-      new_local_client(SpecConfig.instance.addresses, SpecConfig.instance.test_options)
+      new_local_client_nmio(SpecConfig.instance.addresses,
+        SpecConfig.instance.test_options.merge(
+          SpecConfig.instance.auth_options
+      ))
     end
 
     let(:database) do
@@ -133,7 +231,8 @@ describe Mongo::Collection do
       context 'when the client has a server selection timeout setting' do
 
         let(:client) do
-          new_local_client(SpecConfig.instance.addresses, SpecConfig.instance.test_options.merge(server_selection_timeout: 2))
+          new_local_client(SpecConfig.instance.addresses,
+            SpecConfig.instance.test_options.merge(server_selection_timeout: 2, monitoring_io: false))
         end
 
         it 'passes the the server_selection_timeout to the cluster' do
@@ -142,21 +241,113 @@ describe Mongo::Collection do
       end
 
       context 'when the client has a read preference set' do
+        clean_slate_on_evergreen
 
         let(:client) do
-          new_local_client(SpecConfig.instance.addresses, SpecConfig.instance.test_options.merge(read: { mode: :primary_preferred }))
+          authorized_client.with(SpecConfig.instance.auth_options.merge(
+            client_options
+          )).tap do |client|
+            expect(client.options[:read]).to eq(Mongo::Options::Redacted.new(
+              mode: :primary_preferred))
+          end
+        end
+
+        let(:client_options) do
+          {
+            read: { mode: :primary_preferred },
+            monitoring_io: false,
+          }
+        end
+
+        let(:new_options) do
+          { read: { mode: :secondary } }
         end
 
         it 'sets the new read options on the new collection' do
-          expect(new_collection.read_preference).to eq(new_options[:read])
-          expect(new_collection.read_preference).not_to eq(client.read_preference)
+          # This is strictly a Hash, not a BSON::Document like the client's
+          # read preference.
+          expect(new_collection.read_preference).to eq(mode: :secondary)
+        end
+
+        it 'duplicates the read option' do
+          expect(new_collection.read_preference).not_to eql(client.read_preference)
+        end
+
+        context 'when reading from collection' do
+          # Since we are requesting a secondary read, we need a replica set.
+          require_topology :replica_set
+
+          let(:client_options) do
+            {
+              read: { mode: :primary_preferred },
+            }
+          end
+
+          let(:subscriber) { EventSubscriber.new }
+
+          before do
+            client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+          end
+
+          shared_examples_for "uses collection's read preference when reading" do
+            it "uses collection's read preference when reading" do
+              expect do
+                new_collection.find.to_a.count
+              end.not_to raise_error
+
+              event = subscriber.started_events.detect do |event|
+                event.command['find']
+              end
+              actual_rp = event.command['$readPreference']
+              expect(actual_rp).to eq(expected_read_preference)
+            end
+          end
+
+          context 'post-OP_MSG server' do
+            min_server_fcv '3.6'
+
+            context 'standalone' do
+              require_topology :single
+
+              let(:expected_read_preference) do
+                nil
+              end
+
+              it_behaves_like "uses collection's read preference when reading"
+            end
+
+            context 'RS, sharded' do
+              require_topology :replica_set, :sharded
+
+              let(:expected_read_preference) do
+                {'mode' => 'secondary'}
+              end
+
+              it_behaves_like "uses collection's read preference when reading"
+            end
+          end
+
+          context 'pre-OP-MSG server' do
+            max_server_version '3.4'
+
+            let(:expected_read_preference) do
+              nil
+            end
+
+            it_behaves_like "uses collection's read preference when reading"
+          end
         end
       end
 
       context 'when the client has a read preference and server selection timeout set' do
 
         let(:client) do
-          new_local_client(SpecConfig.instance.addresses, SpecConfig.instance.test_options.merge(read: { mode: :primary_preferred }, server_selection_timeout: 2))
+          new_local_client(SpecConfig.instance.addresses,
+            SpecConfig.instance.test_options.merge(
+              read: { mode: :primary_preferred },
+              server_selection_timeout: 2,
+              monitoring_io: false
+          ))
         end
 
         it 'sets the new read options on the new collection' do
@@ -186,12 +377,116 @@ describe Mongo::Collection do
       context 'when the client has a write concern set' do
 
         let(:client) do
-          new_local_client(SpecConfig.instance.addresses, SpecConfig.instance.test_options.merge(write: INVALID_WRITE_CONCERN))
+          new_local_client(SpecConfig.instance.addresses,
+            SpecConfig.instance.test_options.merge(
+              write: INVALID_WRITE_CONCERN,
+              monitoring_io: false,
+          ))
         end
 
         it 'sets the new write options on the new collection' do
           expect(new_collection.write_concern.options).to eq(Mongo::WriteConcern.get(new_options[:write]).options)
         end
+
+        context 'when client uses :write_concern and collection uses :write' do
+
+          let(:client) do
+            new_local_client(SpecConfig.instance.addresses,
+              SpecConfig.instance.test_options.merge(
+                write_concern: {w: 1},
+                monitoring_io: false,
+            ))
+          end
+
+          it 'uses :write from collection options only' do
+            expect(new_collection.options[:write]).to eq(w: 5)
+            expect(new_collection.options[:write_concern]).to be nil
+          end
+        end
+
+        context 'when client uses :write and collection uses :write_concern' do
+
+          let(:client) do
+            new_local_client(SpecConfig.instance.addresses,
+              SpecConfig.instance.test_options.merge(
+                write: {w: 1},
+                monitoring_io: false,
+            ))
+          end
+
+          let(:new_options) do
+            { write_concern: { w: 5 } }
+          end
+
+          it 'uses :write_concern from collection options only' do
+            expect(new_collection.options[:write_concern]).to eq(w: 5)
+            expect(new_collection.options[:write]).to be nil
+          end
+        end
+
+        context 'when collection previously had :wrte_concern and :write is used with a different value' do
+
+          let(:collection) do
+            database.collection(:users, write_concern: {w: 2})
+          end
+
+          let(:new_options) do
+            { write: { w: 5 } }
+          end
+
+          it 'uses the new option' do
+            expect(new_collection.options[:write]).to eq(w: 5)
+            expect(new_collection.options[:write_concern]).to be nil
+          end
+        end
+
+        context 'when collection previously had :wrte and :write_concern is used with a different value' do
+
+          let(:collection) do
+            database.collection(:users, write: {w: 2})
+          end
+
+          let(:new_options) do
+            { write_concern: { w: 5 } }
+          end
+
+          it 'uses the new option' do
+            expect(new_collection.options[:write_concern]).to eq(w: 5)
+            expect(new_collection.options[:write]).to be nil
+          end
+        end
+
+        context 'when collection previously had :wrte_concern and :write is used with the same value' do
+
+          let(:collection) do
+            database.collection(:users, write_concern: {w: 2})
+          end
+
+          let(:new_options) do
+            { write: { w: 2 } }
+          end
+
+          it 'uses the new option' do
+            expect(new_collection.options[:write]).to eq(w: 2)
+            expect(new_collection.options[:write_concern]).to be nil
+          end
+        end
+
+        context 'when collection previously had :wrte and :write_concern is used with the same value' do
+
+          let(:collection) do
+            database.collection(:users, write: {w: 2})
+          end
+
+          let(:new_options) do
+            { write_concern: { w: 2 } }
+          end
+
+          it 'uses the new option' do
+            expect(new_collection.options[:write]).to be nil
+            expect(new_collection.options[:write_concern]).to eq(w: 2)
+          end
+        end
       end
     end
 
@@ -219,7 +514,11 @@ describe Mongo::Collection do
       context 'when the client has a server selection timeout setting' do
 
         let(:client) do
-          new_local_client(SpecConfig.instance.addresses, SpecConfig.instance.test_options.merge(server_selection_timeout: 2))
+          new_local_client(SpecConfig.instance.addresses,
+            SpecConfig.instance.test_options.merge(
+              server_selection_timeout: 2,
+              monitoring_io: false,
+          ))
         end
 
         it 'passes the server_selection_timeout setting to the cluster' do
@@ -230,7 +529,11 @@ describe Mongo::Collection do
       context 'when the client has a read preference set' do
 
         let(:client) do
-          new_local_client(SpecConfig.instance.addresses, SpecConfig.instance.test_options.merge(read: { mode: :primary_preferred }))
+          new_local_client(SpecConfig.instance.addresses,
+            SpecConfig.instance.test_options.merge(
+              read: { mode: :primary_preferred },
+              monitoring_io: false,
+          ))
         end
 
         it 'sets the new read options on the new collection' do
@@ -877,6 +1180,7 @@ describe Mongo::Collection do
     context 'when provided options' do
 
       context 'when a session is provided' do
+        require_wired_tiger
 
         let(:operation) do
           authorized_collection.find({}, session: session).to_a
@@ -901,6 +1205,7 @@ describe Mongo::Collection do
       context 'session id' do
         min_server_fcv '3.6'
         require_topology :replica_set, :sharded
+        require_wired_tiger
 
         let(:options) do
           { session: session }
@@ -929,6 +1234,7 @@ describe Mongo::Collection do
       end
 
       context 'when a session supporting causal consistency is used' do
+        require_wired_tiger
 
         let(:operation) do
           collection.find({}, session: session).to_a
@@ -1184,7 +1490,7 @@ describe Mongo::Collection do
       end
 
       after do
-        custom_client.close
+        custom_client.close(true)
       end
 
       it 'inserts with the custom id' do
@@ -1235,7 +1541,7 @@ describe Mongo::Collection do
       end
 
       after do
-        client.close
+        client.close(true)
       end
 
       let(:insert_events) do
@@ -1448,7 +1754,7 @@ describe Mongo::Collection do
       end
 
       after do
-        custom_client.close
+        custom_client.close(true)
       end
 
       it 'inserts with the custom id' do
@@ -1541,6 +1847,7 @@ describe Mongo::Collection do
     end
 
     context 'when a session is provided' do
+      require_wired_tiger
 
       let(:session) do
         authorized_client.start_session
@@ -1592,6 +1899,7 @@ describe Mongo::Collection do
     end
 
     context 'when a session supporting causal consistency is used' do
+      require_wired_tiger
 
       let(:operation) do
         collection.aggregate([], session: session).first
@@ -1717,6 +2025,7 @@ describe Mongo::Collection do
 
   describe '#count_documents' do
     context 'when transactions are enabled' do
+      require_wired_tiger
       require_transaction_support
 
       before do
@@ -1772,6 +2081,7 @@ describe Mongo::Collection do
       end
 
       context 'when a session is provided' do
+        require_wired_tiger
 
         let(:session) do
           authorized_client.start_session
@@ -1794,6 +2104,7 @@ describe Mongo::Collection do
       end
 
       context 'when a session supporting causal consistency is used' do
+        require_wired_tiger
 
         let(:operation) do
           collection.count({}, session: session)
@@ -1887,6 +2198,7 @@ describe Mongo::Collection do
       end
 
       context 'when a session is provided' do
+        require_wired_tiger
 
         let(:session) do
           authorized_client.start_session
@@ -1910,6 +2222,7 @@ describe Mongo::Collection do
     end
 
     context 'when a session supporting causal consistency is used' do
+      require_wired_tiger
 
       let(:operation) do
         collection.distinct(:field, {}, session: session)
@@ -2412,6 +2725,7 @@ describe Mongo::Collection do
     end
 
     context 'when a session is provided' do
+      require_wired_tiger
 
       let(:cursors) do
         authorized_collection.parallel_scan(2, session: session)
@@ -2461,6 +2775,7 @@ describe Mongo::Collection do
     end
 
     context 'when a session supporting causal consistency is used' do
+      require_wired_tiger
 
       let(:cursors) do
         collection.parallel_scan(2, session: session)
@@ -2481,6 +2796,7 @@ describe Mongo::Collection do
     end
 
     context 'when a read concern is provided' do
+      require_wired_tiger
       min_server_fcv '3.2'
 
       let(:result) do
@@ -2520,7 +2836,7 @@ describe Mongo::Collection do
       end
 
       after do
-        client.close
+        client.close(true)
       end
 
       let(:client) do
@@ -3672,7 +3988,7 @@ describe Mongo::Collection do
       end
 
       after do
-        client.close
+        client.close(true)
       end
 
       let(:update_events) do
@@ -4691,6 +5007,7 @@ describe Mongo::Collection do
   describe '#watch' do
 
     context 'when change streams can be tested' do
+      require_wired_tiger
       min_server_fcv '3.6'
       require_topology :replica_set