mongo 2.4.3 → 2.5.0.beta

data/lib/mongo/cursor/builder/get_more_command.rb

@@ -34,10 +34,12 @@ module Mongo
         #   GetMoreCommand.new(cursor)
         #
         # @param [ Cursor ] cursor The cursor.
+        # @param [ Session ] session The session.
         #
         # @since 2.2.0
-        def initialize(cursor)
+        def initialize(cursor, session = nil)
           @cursor = cursor
+          @session = session
         end
 
         # Get the specification.
@@ -49,7 +51,7 @@ module Mongo
         #
         # @since 2.2.0
         def specification
-          { selector: get_more_command, db_name: database.name }
+          { selector: get_more_command, db_name: database.name, session: @session }
         end
 
         private

data/lib/mongo/database.rb

@@ -66,6 +66,7 @@ module Mongo
     def_delegators :@client,
                    :cluster,
                    :read_preference,
+                   :server_selector,
                    :write_concern
 
     # @return [ Mongo::Server ] Get the primary server from the cluster.
@@ -154,11 +155,14 @@ module Mongo
     def command(operation, opts = {})
       preference = ServerSelector.get(opts[:read] || ServerSelector::PRIMARY)
       server = preference.select_server(cluster)
-      Operation::Commands::Command.new({
-        :selector => operation,
-        :db_name => name,
-        :read => preference
-      }).execute(server)
+      client.send(:with_session, opts) do |session|
+        Operation::Commands::Command.new({
+          :selector => operation.dup,
+          :db_name => name,
+          :read => preference,
+          :session => session
+        }).execute(server)
+      end
     end
 
     # Drop the database and all its associated information.
@@ -166,16 +170,23 @@ module Mongo
     # @example Drop the database.
     #   database.drop
     #
+    # @param [ Hash ] options The options for the operation.
+    #
+    # @option options [ Session ] :session The session to use for the operation.
+    #
     # @return [ Result ] The result of the command.
     #
     # @since 2.0.0
-    def drop
+    def drop(options = {})
       operation = { :dropDatabase => 1 }
-      Operation::Commands::DropDatabase.new({
-                                             selector: operation,
-                                             db_name: name,
-                                             write_concern: write_concern
-                                            }).execute(next_primary)
+      client.send(:with_session, options) do |session|
+        Operation::Commands::DropDatabase.new({
+          selector: operation,
+          db_name: name,
+          write_concern: write_concern,
+          session: session
+        }).execute(next_primary)
+      end
     end
 
     # Instantiate a new database object.

data/lib/mongo/database/view.rb

@@ -22,7 +22,7 @@ module Mongo
       extend Forwardable
       include Enumerable
 
-      def_delegators :@database, :cluster, :read_preference
+      def_delegators :@database, :cluster, :read_preference, :client
       def_delegators :cluster, :next_primary
 
       # @return [ Integer ] batch_size The size of the batch of results
@@ -52,7 +52,8 @@ module Mongo
         @batch_size = options[:batch_size]
         server = next_primary(false)
         @limit = -1 if server.features.list_collections_enabled?
-        collections_info(server).collect do |info|
+        session = client.send(:get_session, options)
+        collections_info(server, session).collect do |info|
           if server.features.list_collections_enabled?
             info[Database::NAME]
           else
@@ -71,7 +72,8 @@ module Mongo
       #
       # @since 2.0.5
       def list_collections
-        collections_info(next_primary(false))
+        session = client.send(:get_session)
+        collections_info(next_primary(false), session)
       end
 
       # Create the new database view.
@@ -91,27 +93,29 @@ module Mongo
 
       private
 
-      def collections_info(server, &block)
-        cursor = Cursor.new(self, send_initial_query(server), server).to_enum
+      def collections_info(server, session, &block)
+        cursor = Cursor.new(self, send_initial_query(server, session), server, session: session)
         cursor.each do |doc|
           yield doc
         end if block_given?
-        cursor
+        cursor.to_enum
       end
 
-      def collections_info_spec
+      def collections_info_spec(session)
         { selector: {
             listCollections: 1,
             cursor: batch_size ? { batchSize: batch_size } : {} },
-          db_name: @database.name }
+          db_name: @database.name,
+          session: session
+        }
       end
 
-      def initial_query_op
-        Operation::Commands::CollectionsInfo.new(collections_info_spec)
+      def initial_query_op(session)
+        Operation::Commands::CollectionsInfo.new(collections_info_spec(session))
       end
 
-      def send_initial_query(server)
-        initial_query_op.execute(server)
+      def send_initial_query(server, session)
+        initial_query_op(session).execute(server)
       end
     end
   end

data/lib/mongo/error.rb

@@ -88,6 +88,7 @@ require 'mongo/error/invalid_application_name'
 require 'mongo/error/invalid_nonce'
 require 'mongo/error/invalid_replacement_document'
 require 'mongo/error/invalid_server_preference'
+require 'mongo/error/invalid_session'
 require 'mongo/error/invalid_signature'
 require 'mongo/error/invalid_update_document'
 require 'mongo/error/invalid_uri'
@@ -103,5 +104,9 @@ require 'mongo/error/unchangeable_collection_option'
 require 'mongo/error/unexpected_chunk_length'
 require 'mongo/error/unexpected_response'
 require 'mongo/error/missing_file_chunk'
+require 'mongo/error/missing_resume_token'
+require 'mongo/error/unsupported_array_filters'
+require 'mongo/error/unknown_payload_type'
 require 'mongo/error/unsupported_collation'
 require 'mongo/error/unsupported_features'
+require 'mongo/error/unsupported_message_type'

data/lib/mongo/error/invalid_session.rb

@@ -0,0 +1,36 @@
+# Copyright (C) 2017 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  class Error
+
+    # This exception is raised when a session is attempted to be used and it is invalid.
+    #
+    # @since 2.5.0
+    class InvalidSession < Error
+
+      # Create the new exception.
+      #
+      # @example Create the new exception.
+      #   InvalidSession.new(message)
+      #
+      # @param [ String ] message The error message.
+      #
+      # @since 2.5.0
+      def initialize(message)
+        super(message)
+      end
+    end
+  end
+end

data/lib/mongo/error/missing_resume_token.rb

@@ -0,0 +1,39 @@
+# Copyright (C) 2017 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  class Error
+
+    # Raised if a change stream document is returned without a resume token.
+    #
+    # @since 2.5.0
+    class MissingResumeToken < Error
+
+      # The error message.
+      #
+      # @since 2.5.0
+      MESSAGE = 'Cannot provide resume functionality when the resume token is missing'.freeze
+
+      # Create the new exception.
+      #
+      # @example Create the new exception.
+      #   Mongo::Error::MissingResumeToken.new
+      #
+      # @since 2.5.0
+      def initialize
+        super(MESSAGE)
+      end
+    end
+  end
+end

data/lib/mongo/error/operation_failure.rb

@@ -19,6 +19,7 @@ module Mongo
     #
     # @since 2.0.0
     class OperationFailure < Error
+      extend Forwardable
 
       # These are magic error messages that could indicate a master change.
       #
@@ -49,6 +50,8 @@ module Mongo
         'dbclient error communicating with server'
       ].freeze
 
+      def_delegators :@result, :operation_time
+
       # Can the read operation that caused the error be retried?
       #
       # @example Is the error retryable?
@@ -72,6 +75,20 @@ module Mongo
       def write_retryable?
         WRITE_RETRY_MESSAGES.any? { |m| message.include?(m) }
       end
+
+      # Create the operation failure.
+      #
+      # @example Create the error object
+      #   OperationFailure.new(message, result)
+      #
+      # param [ String ] message The error message.
+      # param [ Operation::Result ] result The result object.
+      #
+      # @since 2.5.0
+      def initialize(message = nil, result = nil)
+        @result = result
+        super(message)
+      end
     end
   end
 end

data/lib/mongo/error/parser.rb

@@ -27,7 +27,7 @@ module Mongo
       # @return [ String ] message The error message parsed from the document.
       attr_reader :message
 
-      # @return [ Array<Protocol::Reply> ] replies The message replies.
+      # @return [ Array<Protocol::Message> ] replies The message replies.
       attr_reader :replies
 
       # Create the new parser with the returned document.
@@ -72,7 +72,8 @@ module Mongo
       end
 
       def parse_flag(message)
-        if replies && replies.first && replies.first.cursor_not_found?
+        if replies && replies.first &&
+            (replies.first.respond_to?(:cursor_not_found?)) && replies.first.cursor_not_found?
           append(message, CURSOR_NOT_FOUND)
         end
       end

data/lib/mongo/error/unknown_payload_type.rb

@@ -0,0 +1,41 @@
+# Copyright (C) 2017 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  class Error
+
+    # Raised if an unknown payload type is encountered when an OP_MSG is created or read.
+    #
+    # @since 2.5.0
+    class UnknownPayloadType < Error
+
+      # The error message.
+      #
+      # @since 2.5.0
+      MESSAGE = 'Unknown payload type (%s) encountered when creating or reading an OP_MSG wire protocol message.'
+
+      # Create the new exception.
+      #
+      # @example Create the new exception.
+      #   Mongo::Error::UnknownPayloadType.new(byte)
+      #
+      # @param [ String ] byte The unknown payload type.
+      #
+      # @since 2.5.0
+      def initialize(byte)
+        super(MESSAGE % byte.inspect)
+      end
+    end
+  end
+end

data/lib/mongo/error/unsupported_array_filters.rb

@@ -0,0 +1,51 @@
+# Copyright (C) 2014-2017 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  class Error
+
+    # Raised if the array filters option is specified for an operation but the server
+    # selected does not support array filters.
+    #
+    # @since 2.5.0
+    class UnsupportedArrayFilters < Error
+
+      # The default error message describing that array filters are not supported.
+      #
+      # @return [ String ] A default message describing that array filters are not supported by the server.
+      #
+      # @since 2.5.0
+      DEFAULT_MESSAGE = "The array_filters option is not a supported feature of the server handling this operation. " +
+          "Operation results may be unexpected.".freeze
+
+      # The error message describing that array filters cannot be used when write concern is unacknowledged.
+      #
+      # @return [ String ] A message describing that array filters cannot be used when write concern is unacknowledged.
+      #
+      # @since 2.5.0
+      UNACKNOWLEDGED_WRITES_MESSAGE = "The array_filters option cannot be specified when using unacknowledged writes. " +
+        "Either remove the array_filters option or use acknowledged writes (w >= 1).".freeze
+
+      # Create the new exception.
+      #
+      # @example Create the new exception.
+      #   Mongo::Error::UnsupportedArrayFilters.new
+      #
+      # @since 2.5.0
+      def initialize(message = nil)
+        super(message || DEFAULT_MESSAGE)
+      end
+    end
+  end
+end

data/lib/mongo/error/unsupported_message_type.rb

@@ -0,0 +1,23 @@
+# Copyright (C) 2014-2017 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  class Error
+
+    # Raised when trying to get a message type from the registry that doesn't exist.
+    #
+    # @since 2.5.0
+    class UnsupportedMessageType < Error; end
+  end
+end

data/lib/mongo/grid/fs_bucket.rb

@@ -84,7 +84,8 @@ module Mongo
       #
       # @since 2.1.0
       def find(selector = nil, options = {})
-        files_collection.find(selector, options.merge(read: read_preference))
+        opts = options.merge(read: read_preference) if read_preference
+        files_collection.find(selector, opts || options)
       end
 
       # Find a file in the GridFS.
@@ -194,8 +195,8 @@ module Mongo
       #
       # @since 2.1.0
       def delete(id)
-        result = files_collection.find(:_id => id).delete_one
-        chunks_collection.find(:files_id => id).delete_many
+        result = files_collection.find({ :_id => id }, @options).delete_one
+        chunks_collection.find({ :files_id => id }, @options).delete_many
         raise Error::FileNotFound.new(id, :id) if result.n == 0
         result
       end
@@ -409,7 +410,7 @@ module Mongo
       #
       # @since 2.1.0
       def read_preference
-        @read_preference ||= ServerSelector.get(@options[:read] || database.read_preference)
+        @read_preference ||= options[:read] || database.read_preference
       end
 
       # Get the write concern.