mongo 2.11.2 → 2.13.0.beta1

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

@@ -372,7 +372,7 @@ describe Mongo::Collection::View::ChangeStream do
     context 'when documents have not been retrieved and the stream is closed' do
 
       before do
-        expect(cursor).to receive(:kill_cursors)
+        expect(cursor).to receive(:close).and_call_original
         change_stream.close
       end
 
@@ -448,7 +448,7 @@ describe Mongo::Collection::View::ChangeStream do
       max_server_version '4.0'
 
       it 'driver raises an exception and closes the cursor' do
-        expect(cursor).to receive(:kill_cursors).and_call_original
+        expect(cursor).to receive(:close).and_call_original
         expect {
           change_stream.to_enum.next
         }.to raise_exception(Mongo::Error::MissingResumeToken)
@@ -459,7 +459,7 @@ describe Mongo::Collection::View::ChangeStream do
       min_server_fcv '4.2'
 
       it 'server errors, driver closes the cursor' do
-        expect(cursor).to receive(:kill_cursors).and_call_original
+        expect(cursor).to receive(:close).and_call_original
         expect {
           change_stream.to_enum.next
         }.to raise_exception(Mongo::Error::OperationFailure, /Encountered an event whose _id field, which contains the resume token, was modified by the pipeline. Modifying the _id field of an event makes it impossible to resume the stream from that point. Only transformations that retain the unmodified _id field are allowed./)
@@ -467,324 +467,6 @@ describe Mongo::Collection::View::ChangeStream do
     end
   end
 
-  context 'when an error is encountered the first time the command is run' do
-    include PrimarySocket
-
-    before do
-      expect(primary_socket).to receive(:write).and_raise(error).once
-    end
-
-    let(:document) do
-      change_stream.to_enum.next
-    end
-
-    shared_examples_for 'a resumable change stream' do
-
-      before do
-        expect(view.send(:server_selector)).to receive(:select_server).twice.and_call_original
-        change_stream
-        collection.insert_one(a: 1)
-      end
-
-      it 'runs the command again while using the same read preference and caches the resume token' do
-        expect(document[:fullDocument][:a]).to eq(1)
-        expect(change_stream_document[:resumeAfter]).to eq(document[:_id])
-      end
-
-      context 'when provided a session' do
-
-        let(:options) do
-          { session: session}
-        end
-
-        let(:session) do
-          client.start_session
-        end
-
-        before do
-          change_stream.to_enum.next
-        end
-
-        it 'does not close the session' do
-          expect(session.ended?).to be(false)
-        end
-      end
-    end
-
-    shared_examples_for 'a non-resumed change stream' do
-      it 'does not run the command again and instead raises the error' do
-        expect do
-          document
-        end.to raise_exception(error)
-      end
-    end
-
-    context 'when the error is a resumable error' do
-
-      context 'when the error is a SocketError' do
-
-        let(:error) do
-          Mongo::Error::SocketError
-        end
-
-        it_behaves_like 'a non-resumed change stream'
-      end
-
-      context 'when the error is a SocketTimeoutError' do
-
-        let(:error) do
-          Mongo::Error::SocketTimeoutError
-        end
-
-        it_behaves_like 'a non-resumed change stream'
-      end
-
-      context "when the error is a 'not master' error" do
-
-        let(:error) do
-          Mongo::Error::OperationFailure.new('not master')
-        end
-
-        it_behaves_like 'a non-resumed change stream'
-      end
-
-      context "when the error is a 'node is recovering' error" do
-
-        let(:error) do
-          Mongo::Error::OperationFailure.new('node is recovering')
-        end
-
-        it_behaves_like 'a non-resumed change stream'
-      end
-    end
-
-    context 'when the error is another server error' do
-
-      let(:error) do
-        Mongo::Error::MissingResumeToken
-      end
-
-      before do
-        expect(view.send(:server_selector)).to receive(:select_server).and_call_original
-      end
-
-      it_behaves_like 'a non-resumed change stream'
-
-      context 'when provided a session' do
-
-        let(:options) do
-          { session: session}
-        end
-
-        let(:session) do
-          client.start_session
-        end
-
-        before do
-          expect do
-            change_stream
-          end.to raise_error(error)
-        end
-
-        it 'does not close the session' do
-          expect(session.ended?).to be(false)
-        end
-      end
-    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
-
-    context 'when the error is a resumable error' do
-
-      shared_examples_for 'a change stream that encounters an error from a getMore' do
-
-        before do
-          change_stream
-          collection.insert_one(a: 1)
-          enum.next
-          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
-
-        let(:enum) do
-          change_stream.to_enum
-        end
-
-        let(:document) do
-          enum.next
-        end
-
-        it 'runs the command again while using the same read preference and caching the resume token' do
-          expect(document[:fullDocument][:a]).to eq(2)
-          expect(change_stream_document[:resumeAfter]).to eq(document[:_id])
-        end
-
-        context 'when provided a session' do
-
-          let(:options) do
-            { session: session}
-          end
-
-          let(:session) do
-            client.start_session
-          end
-
-          before do
-            enum.next
-          end
-
-          it 'does not close the session' do
-            expect(session.ended?).to be(false)
-          end
-        end
-      end
-
-      context 'when the error is a SocketError' do
-
-        let(:error) do
-          Mongo::Error::SocketError
-        end
-
-        it_behaves_like 'a change stream that encounters an error from a getMore'
-      end
-
-      context 'when the error is a SocketTimeoutError' do
-
-        let(:error) do
-          Mongo::Error::SocketTimeoutError
-        end
-
-        it_behaves_like 'a change stream that encounters an error from a getMore'
-      end
-
-      context "when the error is 'not master'" do
-
-        let(:error) do
-          Mongo::Error::OperationFailure.new('not master',
-            Mongo::Operation::GetMore::Result.new([]))
-        end
-
-        it_behaves_like 'a change stream that encounters an error from a getMore'
-      end
-
-      context "when the error is 'node is recovering'" do
-
-        let(:error) do
-          Mongo::Error::OperationFailure.new('node is recovering',
-            Mongo::Operation::GetMore::Result.new([]))
-        end
-
-        it_behaves_like 'a change stream that encounters an error from a getMore'
-      end
-    end
-
-    context 'when the error is another server error' do
-
-      before do
-        change_stream
-        collection.insert_one(a: 1)
-        enum.next
-        collection.insert_one(a: 2)
-        expect(cursor).to receive(:get_more).and_raise(Mongo::Error::MissingResumeToken)
-        expect(cursor).to receive(:kill_cursors).and_call_original
-        expect(Mongo::Operation::Aggregate).not_to receive(:new)
-      end
-
-      let(:enum) do
-        change_stream.to_enum
-      end
-
-      it 'does not run the command again and instead raises the error' do
-        expect {
-          enum.next
-        }.to raise_exception(Mongo::Error::MissingResumeToken)
-      end
-
-      context 'when provided a session' do
-
-        let(:options) do
-          { session: session}
-        end
-
-        let(:session) do
-          client.start_session
-        end
-
-        before do
-          expect do
-            enum.next
-          end.to raise_error(Mongo::Error::MissingResumeToken)
-        end
-
-        it 'does not close the session' do
-          expect(session.ended?).to be(false)
-        end
-      end
-    end
-  end
-
   describe '#inspect' do
 
     it 'includes the Ruby object_id in the formatted string' do

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

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe Mongo::Collection::View::Iterable do
+  let(:selector) do
+    {}
+  end
+
+  let(:options) do
+    {}
+  end
+
+  let(:view) do
+    Mongo::Collection::View.new(authorized_collection, selector, options)
+  end
+
+  before do
+    authorized_collection.drop
+  end
+
+  describe '#each' do
+    context 'when allow_disk_use is provided' do
+      let(:options) { { allow_disk_use: true } }
+
+      # Other cases are adequately covered by spec tests.
+      context 'on server versions < 3.2' do
+        max_server_fcv '3.0'
+
+        it 'raises an exception' do
+          expect do
+            view.each do |document|
+              #Do nothing
+            end
+          end.to raise_error(Mongo::Error::UnsupportedOption, /The MongoDB server handling this request does not support the allow_disk_use option on this command/)
+        end
+      end
+    end
+  end
+end

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

@@ -66,7 +66,7 @@ describe Mongo::Collection::View::MapReduce do
 
   describe '#reduce_function' do
 
-    it 'returns the map function' do
+    it 'returns the reduce function' do
       expect(map_reduce.reduce_function).to eq(reduce)
     end
   end
@@ -80,7 +80,7 @@ describe Mongo::Collection::View::MapReduce do
     end
 
     it 'calls the Enumerable method' do
-      expect(results).to eq(map_reduce.to_a)
+      expect(results.sort_by { |d| d['_id'] }).to eq(map_reduce.to_a.sort_by { |d| d['_id'] })
     end
   end
 
@@ -186,7 +186,7 @@ describe Mongo::Collection::View::MapReduce do
         end
 
         it 'executes the map reduce' do
-          expect(map_reduce.to_a).to eq(new_map_reduce.to_a)
+          expect(new_map_reduce.to_a.sort_by { |d| d['_id'] }).to eq(map_reduce.to_a.sort_by { |d| d['_id'] })
         end
       end
 
@@ -239,12 +239,16 @@ describe Mongo::Collection::View::MapReduce do
             Mongo::Collection::View.new(client[TEST_COLL], selector, view_options)
           end
 
+          let(:subscriber) { EventSubscriber.new }
+
           let(:client) do
-            subscribed_client
+            authorized_client.tap do |client|
+              client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+            end
           end
 
           let(:find_command) do
-            EventSubscriber.started_events[-1].command
+            subscriber.started_events[-1].command
           end
 
           before do

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

@@ -68,6 +68,20 @@ describe Mongo::Collection::View::Readable do
     end
   end
 
+  describe '#allow_disk_use' do
+    let(:new_view) do
+      view.allow_disk_use
+    end
+
+    it 'sets the flag' do
+      expect(new_view.options[:allow_disk_use]).to be true
+    end
+
+    it 'returns the new View' do
+      expect(new_view).not_to be(view)
+    end
+  end
+
   describe '#aggregate' do
 
      let(:documents) do
@@ -192,7 +206,7 @@ describe Mongo::Collection::View::Readable do
 
       let(:command) do
         operation
-        EventSubscriber.started_events.find { |cmd| cmd.command_name == 'mapReduce' }.command
+        subscriber.started_events.find { |cmd| cmd.command_name == 'mapReduce' }.command
       end
 
       it_behaves_like 'an operation supporting causally consistent reads'