mongo 2.5.1 → 2.5.2

data/spec/mongo/cursor_spec.rb

@@ -239,11 +239,15 @@ describe Mongo::Cursor do
         (1..3).map{ |i| { field: "test#{i}" }}
       end
 
+      let(:cluster) do
+        authorized_client.cluster
+      end
+
       before do
         authorized_collection.insert_many(documents)
-        cursor_reaper.schedule_kill_cursor(cursor.id,
-                                            cursor.send(:kill_cursors_op_spec),
-                                            cursor.instance_variable_get(:@server))
+        cluster.schedule_kill_cursor(cursor.id,
+                                     cursor.send(:kill_cursors_op_spec),
+                                     cursor.instance_variable_get(:@server))
       end
 
       after do
@@ -263,12 +267,8 @@ describe Mongo::Cursor do
         view.instance_variable_get(:@cursor)
       end
 
-      let(:cursor_reaper) do
-        authorized_client.cluster.instance_variable_get(:@cursor_reaper)
-      end
-
-      it 'schedules a kill cursors op', unless: sessions_enabled? do
-        sleep(Mongo::Cluster::PeriodicExecutor::FREQUENCY)
+      it 'schedules a kill cursors op' do
+        cluster.instance_variable_get(:@periodic_executor).flush
         expect {
           cursor.to_a
         }.to raise_exception(Mongo::Error::OperationFailure)
@@ -277,7 +277,7 @@ describe Mongo::Cursor do
       context 'when the cursor is unregistered before the kill cursors operations are executed' do
 
         it 'does not send a kill cursors operation for the unregistered cursor' do
-          cursor_reaper.unregister_cursor(cursor.id)
+          cluster.unregister_cursor(cursor.id)
           expect(cursor.to_a.size).to eq(documents.size)
         end
       end
@@ -416,7 +416,7 @@ describe Mongo::Cursor do
     end
 
     let(:reply) do
-      Mongo::Operation::Read::Query.new(query_spec)
+      Mongo::Operation::Find.new(query_spec)
     end
 
     let(:cursor) do

data/spec/mongo/grid/fs_bucket_spec.rb

@@ -1101,6 +1101,11 @@ describe Mongo::Grid::FSBucket do
               fs.upload_from_stream(filename, file)
             }.to raise_exception(IOError)
           end
+
+          it 'closes the stream' do
+            begin; fs.upload_from_stream(filename, file); rescue; end
+            expect(stream.closed?).to be(true)
+          end
         end
 
         context 'when stream#abort raises an OperationFailure' do

data/spec/mongo/max_staleness_spec.rb

@@ -67,7 +67,9 @@ describe 'Max Staleness Spec' do
 
       let(:in_latency_window) do
         spec.in_latency_window.collect do |server|
-          Mongo::Server.new(Mongo::Address.new(server['address']), cluster, monitoring, listeners, options)
+          s = Mongo::Server.new(Mongo::Address.new(server['address']), cluster, monitoring, listeners, options)
+          s.monitor.stop!
+          s
         end
       end
 

data/spec/mongo/operation/{commands/aggregate → aggregate}/result_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Commands::Aggregate::Result do
+describe Mongo::Operation::Aggregate::Result do
 
   let(:result) do
     described_class.new(reply)

data/spec/mongo/operation/{commands/aggregate_spec.rb → aggregate_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Commands::Aggregate do
+describe Mongo::Operation::Aggregate do
 
   let(:options) do
     {}

data/spec/mongo/operation/{commands/collections_info_spec.rb → collections_info_spec.rb}

@@ -1,9 +1,11 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Commands::CollectionsInfo do
+describe Mongo::Operation::CollectionsInfo do
 
   let(:spec) do
-    { :db_name => TEST_DB }
+    { selector: { listCollections: 1 },
+      db_name: TEST_DB
+    }
   end
 
   let(:names) do

data/spec/mongo/operation/{commands/command_spec.rb → command_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Commands::Command do
+describe Mongo::Operation::Command do
 
   let(:selector) { { :ismaster => 1 } }
   let(:options) { { :limit => -1 } }

data/spec/mongo/operation/{write/command/create_index_spec.rb → create_index_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::Command::CreateIndex do
+describe Mongo::Operation::CreateIndex do
 
   describe '#execute' do
 

data/spec/mongo/operation/{write/create_user_spec.rb → create_user_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::Command::CreateUser do
+describe Mongo::Operation::CreateUser do
 
   describe '#execute' do
 

data/spec/mongo/operation/{write/bulk/delete_spec.rb → delete/bulk_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::Bulk::Delete do
+describe Mongo::Operation::Delete do
 
   let(:documents) do
     [ { 'q' => { foo: 1 }, 'limit' => 1 } ]
@@ -61,7 +61,7 @@ describe Mongo::Operation::Write::Bulk::Delete do
     end
   end
 
-  describe '#execute' do
+  describe '#bulk_execute' do
 
     before do
       authorized_collection.insert_many([
@@ -92,7 +92,7 @@ describe Mongo::Operation::Write::Bulk::Delete do
         end
 
         it 'deletes the document from the database' do
-          op.execute(authorized_primary)
+          op.bulk_execute(authorized_primary)
           expect(authorized_collection.find.count).to eq(1)
         end
       end
@@ -116,7 +116,7 @@ describe Mongo::Operation::Write::Bulk::Delete do
         end
 
         it 'deletes the documents from the database' do
-          op.execute(authorized_primary)
+          op.bulk_execute(authorized_primary)
           expect(authorized_collection.find.count).to eq(0)
         end
       end
@@ -152,7 +152,7 @@ describe Mongo::Operation::Write::Bulk::Delete do
           end
 
           it 'aborts after first error' do
-            failing_delete.execute(authorized_primary)
+            failing_delete.bulk_execute(authorized_primary)
             expect(authorized_collection.find.count).to eq(2)
           end
         end
@@ -164,7 +164,7 @@ describe Mongo::Operation::Write::Bulk::Delete do
           end
 
           it 'aborts after first error' do
-            failing_delete.execute(authorized_primary)
+            failing_delete.bulk_execute(authorized_primary)
             expect(authorized_collection.find.count).to eq(2)
           end
         end
@@ -201,7 +201,7 @@ describe Mongo::Operation::Write::Bulk::Delete do
           end
 
           it 'does not abort after first error' do
-            failing_delete.execute(authorized_primary)
+            failing_delete.bulk_execute(authorized_primary)
             expect(authorized_collection.find.count).to eq(1)
           end
         end
@@ -213,7 +213,7 @@ describe Mongo::Operation::Write::Bulk::Delete do
           end
 
           it 'does not abort after first error' do
-            failing_delete.execute(authorized_primary)
+            failing_delete.bulk_execute(authorized_primary)
             expect(authorized_collection.find.count).to eq(1)
           end
         end

data/spec/mongo/operation/delete/command_spec.rb

@@ -0,0 +1,111 @@
+require 'spec_helper'
+
+describe Mongo::Operation::Delete::Command do
+
+  let(:write_concern) do
+    Mongo::WriteConcern.get(WRITE_CONCERN)
+  end
+
+  let(:session) { nil }
+  let(:deletes) { [{:q => { :foo => 1 }, :limit => 1}] }
+  let(:spec) do
+    { :deletes       => deletes,
+      :db_name       => authorized_collection.database.name,
+      :coll_name     => authorized_collection.name,
+      :write_concern => write_concern,
+      :ordered       => true,
+      :session       => session
+    }
+  end
+
+  let(:op) { described_class.new(spec) }
+
+  describe '#initialize' do
+
+    context 'spec' do
+
+      it 'sets the spec' do
+        expect(op.spec).to eq(spec)
+      end
+    end
+  end
+
+  describe '#==' do
+
+    context 'spec' do
+
+      context 'when two ops have the same specs' do
+        let(:other) { described_class.new(spec) }
+
+        it 'returns true' do
+          expect(op).to eq(other)
+        end
+      end
+
+      context 'when two ops have different specs' do
+        let(:other_deletes) { [{:q => { :bar => 1 }, :limit => 1}] }
+        let(:other_spec) do
+          { :deletes       => other_deletes,
+            :db_name       => authorized_collection.database.name,
+            :coll_name     => authorized_collection.name,
+            :write_concern => write_concern,
+            :ordered       => true
+          }
+        end
+        let(:other) { described_class.new(other_spec) }
+
+        it 'returns false' do
+          expect(op).not_to eq(other)
+        end
+      end
+    end
+  end
+
+  describe 'write concern' do
+
+    context 'when write concern is not specified' do
+
+      let(:spec) do
+        { :deletes       => deletes,
+          :db_name       => authorized_collection.database.name,
+          :coll_name     => authorized_collection.name,
+          :ordered       => true
+        }
+      end
+
+      it 'does not include write concern in the selector' do
+        expect(op.send(:command, double('server'))[:writeConcern]).to be_nil
+      end
+    end
+
+    context 'when write concern is specified' do
+
+      it 'includes write concern in the selector' do
+        expect(op.send(:command, double('server'))[:writeConcern]).to eq(write_concern.options)
+      end
+    end
+  end
+
+  describe '#message' do
+
+    context 'when the server does not support OP_MSG' do
+
+      let(:expected_selector) do
+        {
+            :delete        => authorized_collection.name,
+            :deletes       => deletes,
+            :writeConcern => write_concern.options,
+            :ordered       => true
+        }
+      end
+
+      it 'creates the correct query wire protocol message', unless: op_msg_enabled? do
+        expect(Mongo::Protocol::Query).to receive(:new).with(authorized_collection.database.name,
+                                                             '$cmd',
+                                                             expected_selector,
+                                                             { limit: -1 } )
+        op.send(:message, authorized_primary)
+      end
+    end
+  end
+end

data/spec/mongo/operation/{write/command/delete_spec.rb → delete/op_msg_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::Command::Delete do
+describe Mongo::Operation::Delete::OpMsg do
 
   let(:write_concern) do
     Mongo::WriteConcern.get(WRITE_CONCERN)
@@ -74,14 +74,14 @@ describe Mongo::Operation::Write::Command::Delete do
       end
 
       it 'does not include write concern in the selector' do
-        expect(op.send(:selector)[:writeConcern]).to be_nil
+        expect(op.send(:command, authorized_primary)[:writeConcern]).to be_nil
       end
     end
 
     context 'when write concern is specified' do
 
       it 'includes write concern in the selector' do
-        expect(op.send(:selector)[:writeConcern]).to eq(write_concern.options)
+        expect(op.send(:command, authorized_primary)[:writeConcern]).to eq(write_concern.options)
       end
     end
   end
@@ -164,28 +164,54 @@ describe Mongo::Operation::Write::Command::Delete do
           Mongo::WriteConcern.get(w: 0)
         end
 
-        context 'when the topology is replica set or sharded', if: (replica_set? || sharded?) && op_msg_enabled? do
+        context 'when the session is implicit' do
 
-          let(:expected_global_args) do
-            global_args.delete(:lsid)
-            global_args.merge!(Mongo::Operation::CLUSTER_TIME => authorized_client.cluster.cluster_time)
+          let(:session) do
+            # Use client#get_session so the session is implicit
+            authorized_client.send(:get_session)
           end
 
-          it 'creates the correct OP_MSG message' do
-            authorized_client.command(ping:1)
-            expect(Mongo::Protocol::Msg).to receive(:new).with([:more_to_come], {}, expected_global_args, expected_payload_1)
-            op.send(:message, authorized_primary)
+          context 'when the topology is replica set or sharded', if: test_sessions? do
+
+            let(:expected_global_args) do
+              global_args.delete(:lsid)
+              global_args.merge!(Mongo::Operation::CLUSTER_TIME => authorized_client.cluster.cluster_time)
+            end
+
+            it 'does not send a session id in the command' do
+              authorized_client.command(ping:1)
+              expect(Mongo::Protocol::Msg).to receive(:new).with([:more_to_come], {}, expected_global_args, expected_payload_1)
+              op.send(:message, authorized_primary)
+            end
+          end
+
+          context 'when the topology is standalone', if: standalone? && sessions_enabled? do
+
+            let(:expected_global_args) do
+              global_args.delete(:lsid)
+              global_args
+            end
+
+            it 'creates the correct OP_MSG message' do
+              authorized_client.command(ping:1)
+              expect(Mongo::Protocol::Msg).to receive(:new).with([:more_to_come], {}, expected_global_args, expected_payload_1)
+              op.send(:message, authorized_primary)
+            end
           end
         end
 
-        context 'when the topology is standalone', if: standalone? && op_msg_enabled? do
+        context 'when the session is explicit', if: test_sessions? do
+
+          let(:session) do
+            authorized_client.start_session
+          end
 
           let(:expected_global_args) do
             global_args.delete(:lsid)
-            global_args
+            global_args.merge!(Mongo::Operation::CLUSTER_TIME => authorized_client.cluster.cluster_time)
           end
 
-          it 'creates the correct OP_MSG message' do
+          it 'does not send a session id in the command' do
             authorized_client.command(ping:1)
             expect(Mongo::Protocol::Msg).to receive(:new).with([:more_to_come], {}, expected_global_args, expected_payload_1)
             op.send(:message, authorized_primary)
@@ -193,25 +219,5 @@ describe Mongo::Operation::Write::Command::Delete do
         end
       end
     end
-
-    context 'when the server does not support OP_MSG' do
-
-      let(:expected_selector) do
-        {
-            :delete        => authorized_collection.name,
-            :deletes       => deletes,
-            :writeConcern => write_concern.options,
-            :ordered       => true
-        }
-      end
-
-      it 'creates the correct query wire protocol message', unless: op_msg_enabled? do
-        expect(Mongo::Protocol::Query).to receive(:new).with(authorized_collection.database.name,
-                                                             '$cmd',
-                                                             expected_selector,
-                                                             { limit: -1 } )
-        op.send(:message, authorized_primary)
-      end
-    end
   end
 end

data/spec/mongo/operation/{write/delete_spec.rb → delete_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::Delete do
+describe Mongo::Operation::Delete do
 
   let(:document) do
     {
@@ -10,7 +10,7 @@ describe Mongo::Operation::Write::Delete do
   end
 
   let(:spec) do
-    { :delete        => document,
+    { :deletes        => [ document ],
       :db_name       => TEST_DB,
       :coll_name     => TEST_COLL,
       :write_concern => Mongo::WriteConcern.get(WRITE_CONCERN),
@@ -46,7 +46,7 @@ describe Mongo::Operation::Write::Delete do
         let(:other_doc) { { :q => { :bar => 1 }, :limit => 1 } }
 
         let(:other_spec) do
-          { :delete        => other_doc,
+          { :deletes        => [ other_doc ],
             :db_name       => TEST_DB,
             :coll_name     => TEST_COLL,
             :write_concern => Mongo::WriteConcern.get(WRITE_CONCERN),
@@ -79,7 +79,7 @@ describe Mongo::Operation::Write::Delete do
 
       let(:delete) do
         described_class.new({
-          delete: document,
+          deletes: [ document ],
           db_name: TEST_DB,
           coll_name: TEST_COLL,
           write_concern: Mongo::WriteConcern.get(WRITE_CONCERN)
@@ -123,7 +123,7 @@ describe Mongo::Operation::Write::Delete do
 
       let(:delete) do
         described_class.new({
-          delete: document,
+          deletes: [ document ],
           db_name: TEST_DB,
           coll_name: TEST_COLL,
           write_concern: Mongo::WriteConcern.get(WRITE_CONCERN)
@@ -187,7 +187,7 @@ describe Mongo::Operation::Write::Delete do
 
       let(:delete) do
         described_class.new({
-                              delete: document,
+                              deletes: [ document ],
                               db_name: TEST_DB,
                               coll_name: TEST_COLL,
                               write_concern: Mongo::WriteConcern.get(:w => 0)
@@ -204,7 +204,7 @@ describe Mongo::Operation::Write::Delete do
       end
 
       before do
-        expect(delete).to receive(:execute_message).and_call_original
+        expect(Mongo::Operation::Delete::Legacy).to receive(:new).and_call_original
       end
 
       it 'uses op codes instead of write commands' do