mongo 2.5.1 → 2.5.2

data/lib/mongo/operation/{commands/collections_info → users_info}/result.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2017 MongoDB, Inc.
+# Copyright (C) 2014-2018 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,26 +14,27 @@
 
 module Mongo
   module Operation
-    module Commands
-      class CollectionsInfo
+    class UsersInfo
 
-        # Defines custom behaviour of results when query the system.namespaces
-        # collection.
+      # Defines custom behaviour of results when using the
+      # usersInfo command.
+      #
+      # @since 2.1.0
+      class Result < Operation::Result
+
+        # The field name for the users document in a usersInfo result.
         #
         # @since 2.1.0
-        class Result < Operation::Result
+        USERS = 'users'.freeze
+
+        def documents
+          reply.documents.first[USERS]
+        end
+
+        private
 
-          # Get the namespace for the cursor.
-          #
-          # @example Get the namespace.
-          #   result.namespace
-          #
-          # @return [ String ] The namespace.
-          #
-          # @since 2.1.0
-          def namespace
-            Database::NAMESPACES
-          end
+        def first_document
+          @first_document ||= reply.documents[0]
         end
       end
     end

data/lib/mongo/server.rb

@@ -122,11 +122,9 @@ module Mongo
     # @return [ true, false ] If the server is connectable.
     #
     # @since 2.1.0
-    def connectable?
-      with_connection do |connection|
-        connection.connectable?
-      end
-    end
+    #
+    # @deprecated No longer necessary with Server Selection specification.
+    def connectable?; end
 
     # Disconnect the server from the connection.
     #

data/lib/mongo/server/connectable.rb

@@ -52,9 +52,9 @@ module Mongo
       # @return [ true, false ] If the connection is connectable.
       #
       # @since 2.1.0
-      def connectable?
-        begin; ping; rescue; false; end
-      end
+      #
+      # @deprecated No longer necessary with Server Selection specification.
+      def connectable?; end
 
       # Determine if the connection is currently connected.
       #

data/lib/mongo/server/connection.rb

@@ -27,31 +27,43 @@ module Mongo
       # The ping command.
       #
       # @since 2.1.0
+      #
+      # @deprecated No longer necessary with Server Selection specification.
       PING = { :ping => 1 }.freeze
 
       # The ping command for an OP_MSG (server versions >= 3.6).
       #
       # @since 2.5.0
+      #
+      # @deprecated No longer necessary with Server Selection specification.
       PING_OP_MSG = { :ping => 1, '$db' => Database::ADMIN }.freeze
 
       # Ping message.
       #
       # @since 2.1.0
+      #
+      # @deprecated No longer necessary with Server Selection specification.
       PING_MESSAGE = Protocol::Query.new(Database::ADMIN, Database::COMMAND, PING, :limit => -1)
 
       # Ping message as an OP_MSG (server versions >= 3.6).
       #
       # @since 2.5.0
+      #
+      # @deprecated No longer necessary with Server Selection specification.
       PING_OP_MSG_MESSAGE = Protocol::Msg.new([:none], {}, PING_OP_MSG)
 
       # The ping message as raw bytes.
       #
       # @since 2.1.0
+      #
+      # @deprecated No longer necessary with Server Selection specification.
       PING_BYTES = PING_MESSAGE.serialize.to_s.freeze
 
       # The ping OP_MSG message as raw bytes (server versions >= 3.6).
       #
       # @since 2.5.0
+      #
+      # @deprecated No longer necessary with Server Selection specification.
       PING_OP_MSG_BYTES = PING_OP_MSG_MESSAGE.serialize.to_s.freeze
 
       # The last time the connection was checked back into a pool.
@@ -173,6 +185,8 @@ module Mongo
       # @return [ true, false ] If the server is accepting connections.
       #
       # @since 2.1.0
+      #
+      # @deprecated No longer necessary with Server Selection specification.
       def ping
         bytes = features.op_msg_enabled? ? PING_OP_MSG_BYTES : PING_BYTES
         ensure_connected do |socket|

data/lib/mongo/server_selector.rb

@@ -71,7 +71,7 @@ module Mongo
     # @since 2.0.0
     def get(preference = {})
       return preference if PREFERENCES.values.include?(preference.class)
-      PREFERENCES.fetch(preference[:mode] || :primary).new(preference)
+      PREFERENCES.fetch((preference[:mode] || :primary).to_sym).new(preference)
     end
   end
 end

data/lib/mongo/server_selector/selectable.rb

@@ -94,7 +94,7 @@ module Mongo
       # @return [ Mongo::Server ] A server matching the server preference.
       #
       # @since 2.0.0
-      def select_server(cluster, ping = true)
+      def select_server(cluster, ping = nil)
         @local_threshold = cluster.options[:local_threshold] || LOCAL_THRESHOLD
         @server_selection_timeout = cluster.options[:server_selection_timeout] || SERVER_SELECTION_TIMEOUT
         deadline = Time.now + server_selection_timeout
@@ -102,17 +102,8 @@ module Mongo
           servers = candidates(cluster)
           if servers && !servers.compact.empty?
             server = servers.first
-            # There is no point pinging a standalone as the subsequent scan is
-            # not going to change anything about the cluster.
-            if ping && !cluster.single?
-              if server.connectable?
-                server.check_driver_support!
-                return server
-              end
-            else
-              server.check_driver_support!
-              return server
-            end
+            server.check_driver_support!
+            return server
           end
           cluster.scan!
         end

data/lib/mongo/session.rb

@@ -252,7 +252,19 @@ module Mongo
     #
     # @since 2.5.1
     def implicit?
-      @implicit_session ||= !!(@options.key?(:implicit) && @options[:implicit] == true)
+      @implicit ||= !!(@options.key?(:implicit) && @options[:implicit] == true)
+    end
+
+    # Is this session an explicit one (i.e. user-created).
+    #
+    # @example Is the session explicit?
+    #   session.explicit?
+    #
+    # @return [ true, false ] Whether this session is explicit.
+    #
+    # @since 2.5.2
+    def explicit?
+      @explicit ||= !implicit?
     end
 
     private

data/lib/mongo/session/session_pool.rb

@@ -113,7 +113,7 @@ module Mongo
       def end_sessions
         while !@queue.empty?
           server = ServerSelector.get(mode: :primary_preferred).select_server(@cluster)
-          Operation::Commands::Command.new(
+          Operation::Command.new(
               :selector => {endSessions: @queue.shift(10_000).collect { |s| s.session_id }},
               :db_name => Database::ADMIN).execute(server)
         end

data/lib/mongo/version.rb

@@ -17,5 +17,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.5.1'.freeze
+  VERSION = '2.5.2'.freeze
 end

data/spec/mongo/client_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 describe Mongo::Client do
 
+  after do
+    begin; client.close; rescue; end
+  end
+
   describe '#==' do
 
     let(:client) do
@@ -12,12 +16,12 @@ describe Mongo::Client do
       )
     end
 
-    after do
-      client.close
-    end
-
     context 'when the other is a client' do
 
+      after do
+        other.close
+      end
+
       context 'when the options and cluster are equal' do
 
         let(:other) do
@@ -105,6 +109,10 @@ describe Mongo::Client do
 
     context 'when the other is a client' do
 
+      after do
+        other.close
+      end
+
       context 'when the options and cluster are equal' do
 
         let(:other) do
@@ -228,10 +236,6 @@ describe Mongo::Client do
           described_class.new([default_address.seed], authorized_client.options.merge(options))
         end
 
-        after do
-          client.close
-        end
-
         it 'sets the option' do
           expect(client.options['retry_writes']).to eq(options[:retry_writes])
         end
@@ -243,10 +247,6 @@ describe Mongo::Client do
           described_class.new([default_address.seed], authorized_client.options.merge(options))
         end
 
-        after do
-          client.close
-        end
-
         context 'when the compressor is supported' do
 
           let(:options) do
@@ -456,10 +456,6 @@ describe Mongo::Client do
           authorized_client.with(logger: logger)
         end
 
-        after do
-          client.close
-        end
-
         it 'does not use the global logger' do
           expect(client.cluster.logger).to_not eq(Mongo::Logger.logger)
         end
@@ -1123,7 +1119,7 @@ describe Mongo::Client do
       end
 
       let(:new_options) do
-        { app_name: 'reports' }
+        { app_name: 'client_test' }
       end
 
       let!(:new_client) do
@@ -1373,10 +1369,6 @@ describe Mongo::Client do
         client.list_databases({}, true)
       end
 
-      after do
-        client.close
-      end
-
       it 'sends the command with the nameOnly flag set to true' do
         expect(command[:nameOnly]).to be(true)
       end
@@ -1429,7 +1421,8 @@ describe Mongo::Client do
     end
 
     before do
-      expect(client.cluster).to receive(:disconnect!).and_call_original
+      # note that disconnect! is called also in the after block
+      expect(client.cluster).to receive(:disconnect!).twice.and_call_original
     end
 
     it 'disconnects the cluster and returns true' do

data/spec/mongo/cluster/app_metadata_spec.rb

@@ -14,18 +14,34 @@ describe Mongo::Cluster::AppMetadata do
 
     context 'when the cluster has an app name option set' do
 
+      let(:client) do
+        authorized_client.with(app_name: :app_metadata_test)
+      end
+
       let(:cluster) do
-        authorized_client.with(app_name: :reports).cluster
+        client.cluster
+      end
+
+      after do
+        client.close
       end
 
       it 'sets the app name' do
-        expect(app_metadata.send(:full_client_document)[:application][:name]).to eq(:reports)
+        expect(app_metadata.send(:full_client_document)[:application][:name]).to eq('app_metadata_test')
       end
 
       context 'when the app name exceeds the max length of 128' do
 
+        let(:client) do
+          authorized_client.with(app_name: "\u3042"*43)
+        end
+
         let(:cluster) do
-          authorized_client.with(app_name: "\u3042"*43).cluster
+          client.cluster
+        end
+
+        after do
+          client.close
         end
 
         it 'raises an error' do

data/spec/mongo/cluster/cursor_reaper_spec.rb

@@ -143,4 +143,41 @@ describe Mongo::Cluster::CursorReaper do
       end
     end
   end
+
+  context 'when a non-exhausted cursor goes out of scope' do
+
+    let(:docs) do
+      103.times.collect { |i| { a: i } }
+    end
+
+    let(:periodic_executor) do
+      cluster.instance_variable_get(:@periodic_executor)
+    end
+
+    let(:cluster) do
+      authorized_client.cluster
+    end
+
+    let(:cursor) do
+      view = authorized_collection.find
+      view.to_enum.next
+      cursor = view.instance_variable_get(:@cursor)
+    end
+
+    around do |example|
+      authorized_collection.insert_many(docs)
+      periodic_executor.stop!
+      cluster.schedule_kill_cursor(cursor.id, cursor.send(:kill_cursors_op_spec),
+                                   cursor.instance_variable_get(:@server))
+      periodic_executor.flush
+      example.run
+      periodic_executor.run!
+    end
+
+    it 'schedules the kill cursor op' do
+      expect {
+        cursor.to_a
+      }.to raise_exception(Mongo::Error::OperationFailure)
+    end
+  end
 end

data/spec/mongo/cluster_spec.rb

@@ -491,11 +491,11 @@ describe Mongo::Cluster do
     context 'when the client has an app_name set' do
 
       let(:cluster) do
-        authorized_client.with(app_name: 'reports').cluster
+        authorized_client.with(app_name: 'cluster_test').cluster
       end
 
       it 'constructs an AppMetadata object with the app_name' do
-        expect(cluster.app_metadata.send(:full_client_document)[:application]).to eq('name' => 'reports')
+        expect(cluster.app_metadata.send(:full_client_document)[:application]).to eq('name' => 'cluster_test')
       end
     end
 

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

@@ -567,7 +567,7 @@ describe Mongo::Collection::View::ChangeStream, if: test_change_streams? do
           authorized_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(Mongo::Operation::Commands::Aggregate).to receive(:new).and_call_original
+          expect(Mongo::Operation::Aggregate).to receive(:new).and_call_original
         end
 
         let(:enum) do
@@ -649,7 +649,7 @@ describe Mongo::Collection::View::ChangeStream, if: test_change_streams? do
         authorized_collection.insert_one(a: 2)
         expect(cursor).to receive(:get_more).and_raise(Mongo::Error::OperationFailure)
         expect(cursor).to receive(:kill_cursors).and_call_original
-        expect(Mongo::Operation::Commands::Aggregate).not_to receive(:new)
+        expect(Mongo::Operation::Aggregate).not_to receive(:new)
       end
 
       let(:enum) do

data/spec/mongo/collection_spec.rb

@@ -1113,7 +1113,7 @@ describe Mongo::Collection do
       it_behaves_like 'a failed operation using a session'
     end
 
-    context 'when unacknowledged writes is used' do
+    context 'when unacknowledged writes is used with an explicit session' do
 
       let(:collection_with_unacknowledged_write_concern) do
         authorized_collection.with(write: { w: 0 })
@@ -1123,7 +1123,20 @@ describe Mongo::Collection do
         collection_with_unacknowledged_write_concern.insert_many([{ name: 'test1' }, { name: 'test2' }], session: session)
       end
 
-      it_behaves_like 'a causally consistent client session with an unacknowledged write'
+      it_behaves_like 'an explicit session with an unacknowledged write'
+    end
+
+    context 'when unacknowledged writes is used with an implicit session' do
+
+      let(:collection_with_unacknowledged_write_concern) do
+        subscribed_client.with(write: { w: 0 })[TEST_COLL]
+      end
+
+      let(:operation) do
+        collection_with_unacknowledged_write_concern.insert_many([{ name: 'test1' }, { name: 'test2' }])
+      end
+
+      it_behaves_like 'an implicit session with an unacknowledged write'
     end
 
     context 'when a document contains invalid keys' do
@@ -1345,7 +1358,7 @@ describe Mongo::Collection do
       it_behaves_like 'a failed operation using a session'
     end
 
-    context 'when unacknowledged writes is used' do
+    context 'when unacknowledged writes is used with an explicit session' do
 
       let(:collection_with_unacknowledged_write_concern) do
         authorized_collection.with(write: { w: 0 })
@@ -1355,7 +1368,20 @@ describe Mongo::Collection do
         collection_with_unacknowledged_write_concern.insert_one({ name: 'testing' }, session: session)
       end
 
-      it_behaves_like 'a causally consistent client session with an unacknowledged write'
+      it_behaves_like 'an explicit session with an unacknowledged write'
+    end
+
+    context 'when unacknowledged writes is used with an implicit session' do
+
+      let(:collection_with_unacknowledged_write_concern) do
+        subscribed_client.with(write: { w: 0 })[TEST_COLL]
+      end
+
+      let(:operation) do
+        collection_with_unacknowledged_write_concern.insert_one({ name: 'testing' })
+      end
+
+      it_behaves_like 'an implicit session with an unacknowledged write'
     end
 
     context 'when the document contains invalid keys' do
@@ -1993,7 +2019,20 @@ describe Mongo::Collection do
         collection_with_unacknowledged_write_concern.delete_one({}, session: session)
       end
 
-      it_behaves_like 'a causally consistent client session with an unacknowledged write'
+      it_behaves_like 'an explicit session with an unacknowledged write'
+    end
+
+    context 'when unacknowledged writes is used with an implicit session' do
+
+      let(:collection_with_unacknowledged_write_concern) do
+        subscribed_client.with(write: { w: 0 })[TEST_COLL]
+      end
+
+      let(:operation) do
+        collection_with_unacknowledged_write_concern.delete_one
+      end
+
+      it_behaves_like 'an implicit session with an unacknowledged write'
     end
 
     context 'when a collation is provided' do
@@ -2155,7 +2194,7 @@ describe Mongo::Collection do
       it_behaves_like 'a failed operation using a session'
     end
 
-    context 'when unacknowledged writes is used' do
+    context 'when unacknowledged writes is used with an explicit session' do
 
       let(:collection_with_unacknowledged_write_concern) do
         authorized_collection.with(write: { w: 0 })
@@ -2165,7 +2204,20 @@ describe Mongo::Collection do
         collection_with_unacknowledged_write_concern.delete_many({ '$._id' => 1}, session: session)
       end
 
-      it_behaves_like 'a causally consistent client session with an unacknowledged write'
+      it_behaves_like 'an explicit session with an unacknowledged write'
+    end
+
+    context 'when unacknowledged writes is used with an implicit session' do
+
+      let(:collection_with_unacknowledged_write_concern) do
+        subscribed_client.with(write: { w: 0 })[TEST_COLL]
+      end
+
+      let(:operation) do
+        collection_with_unacknowledged_write_concern.delete_many({ '$._id' => 1 })
+      end
+
+      it_behaves_like 'an implicit session with an unacknowledged write'
     end
 
     context 'when a collation is specified' do
@@ -2714,7 +2766,7 @@ describe Mongo::Collection do
       it_behaves_like 'a failed operation using a session'
     end
 
-    context 'when unacknowledged writes is used' do
+    context 'when unacknowledged writes is used with an explicit session' do
 
       let(:collection_with_unacknowledged_write_concern) do
         authorized_collection.with(write: { w: 0 })
@@ -2724,7 +2776,20 @@ describe Mongo::Collection do
         collection_with_unacknowledged_write_concern.replace_one({ a: 1 }, { x: 5 }, session: session)
       end
 
-      it_behaves_like 'a causally consistent client session with an unacknowledged write'
+      it_behaves_like 'an explicit session with an unacknowledged write'
+    end
+
+    context 'when unacknowledged writes is used with an implicit session' do
+
+      let(:collection_with_unacknowledged_write_concern) do
+        subscribed_client.with(write: { w: 0 })[TEST_COLL]
+      end
+
+      let(:operation) do
+        collection_with_unacknowledged_write_concern.replace_one({ a: 1 }, { x: 5 })
+      end
+
+      it_behaves_like 'an implicit session with an unacknowledged write'
     end
   end
 
@@ -3118,7 +3183,7 @@ describe Mongo::Collection do
       it_behaves_like 'a failed operation using a session'
     end
 
-    context 'when unacknowledged writes is used' do
+    context 'when unacknowledged writes is used with an explicit session' do
 
       let(:collection_with_unacknowledged_write_concern) do
         authorized_collection.with(write: { w: 0 })
@@ -3128,7 +3193,20 @@ describe Mongo::Collection do
         collection_with_unacknowledged_write_concern.update_many({a: 1}, { '$set' => {x: 1} }, session: session)
       end
 
-      it_behaves_like 'a causally consistent client session with an unacknowledged write'
+      it_behaves_like 'an explicit session with an unacknowledged write'
+    end
+
+    context 'when unacknowledged writes is used with an implicit session' do
+
+      let(:collection_with_unacknowledged_write_concern) do
+        subscribed_client.with(write: { w: 0 })[TEST_COLL]
+      end
+
+      let(:operation) do
+        collection_with_unacknowledged_write_concern.update_many({a: 1}, {'$set' => {x: 1}})
+      end
+
+      it_behaves_like 'an implicit session with an unacknowledged write'
     end
   end
 
@@ -3525,17 +3603,30 @@ describe Mongo::Collection do
       it_behaves_like 'a failed operation using a session'
     end
 
-    context 'when unacknowledged writes is used' do
+    context 'when unacknowledged writes is used with an explicit session' do
 
       let(:collection_with_unacknowledged_write_concern) do
         authorized_collection.with(write: { w: 0 })
       end
 
       let(:operation) do
-        collection_with_unacknowledged_write_concern.update_one({a: 1}, { '$set' => {x: 1} }, session: session)
+        collection_with_unacknowledged_write_concern.update_one({ a: 1 }, { '$set' => { x: 1 } }, session: session)
+      end
+
+      it_behaves_like 'an explicit session with an unacknowledged write'
+    end
+
+    context 'when unacknowledged writes is used with an implicit session' do
+
+      let(:collection_with_unacknowledged_write_concern) do
+        subscribed_client.with(write: { w: 0 })[TEST_COLL]
+      end
+
+      let(:operation) do
+        collection_with_unacknowledged_write_concern.update_one({ a: 1 }, { '$set' => { x: 1 }})
       end
 
-      it_behaves_like 'a causally consistent client session with an unacknowledged write'
+      it_behaves_like 'an implicit session with an unacknowledged write'
     end
   end