mongo 2.5.3 → 2.6.0

data/lib/mongo/operation/shared/sessions_supported.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2017 MongoDB, Inc.
+# Copyright (C) 2015-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.
@@ -26,7 +26,28 @@ module Mongo
 
       READ_PREFERENCE = '$readPreference'.freeze
 
-      def apply_causal_consistency!(selector, server); end
+      READ_COMMANDS = [
+        :aggregate,
+        :collStats,
+        :count,
+        :dbStats,
+        :distinct,
+        :find,
+        :geoNear,
+        :geoSearch,
+        :group,
+        :mapReduce,
+        :parallelCollectionScan
+      ].freeze
+
+      def apply_causal_consistency!(selector, server)
+        return unless selector[:startTransaction]
+
+        if !server.standalone?
+          full_read_concern_doc = session.send(:causal_consistency_doc, selector[:readConcern] || read_concern)
+          selector[:readConcern] = full_read_concern_doc if full_read_concern_doc
+        end
+      end
 
       def flags
         acknowledged_write? ? [:none] : [:more_to_come]
@@ -44,34 +65,84 @@ module Mongo
         end
       end
 
+      def read_command?(sel)
+        READ_COMMANDS.any? { |c| sel[c] }
+      end
+
       def add_write_concern!(sel)
-        if write_concern
-          sel[:writeConcern] = write_concern.options
-        end
+        sel[:writeConcern] = write_concern.options if write_concern
+      end
+
+      def apply_autocommit!(selector)
+        session.add_autocommit!(selector)
       end
 
       def apply_session_id!(selector)
         session.add_id!(selector)
       end
 
+      def apply_start_transaction!(selector)
+        session.add_start_transaction!(selector)
+      end
+
+      def apply_txn_num!(selector)
+        session.add_txn_num!(selector)
+      end
+
+      def apply_read_pref!(selector)
+        session.apply_read_pref!(selector) if read_command?(selector)
+      end
+
+      def apply_txn_opts!(selector)
+        session.add_txn_opts!(selector, read_command?(selector))
+      end
+
+      def suppress_read_write_concern!(selector)
+        session.suppress_read_write_concern!(selector)
+      end
+
+      def validate_read_pref!(selector)
+        session.validate_read_pref!(selector) if read_command?(selector)
+      end
+
+      def update_session_state!
+        session.update_state!
+      end
+
       def command(server)
         sel = selector(server)
-        sel[:writeConcern] = write_concern.options if write_concern
+        add_write_concern!(sel)
         sel[Protocol::Msg::DATABASE_IDENTIFIER] = db_name
         sel[READ_PREFERENCE] = read.to_doc if read
+
         if server.features.sessions_enabled?
           apply_cluster_time!(sel, server)
-          if acknowledged_write? && session
+          if session && (acknowledged_write? || session.in_transaction?)
             sel[:txnNumber] = BSON::Int64.new(txn_num) if txn_num
             apply_session_id!(sel)
+            apply_start_transaction!(sel)
             apply_causal_consistency!(sel, server)
+            apply_autocommit!(sel)
+            apply_txn_opts!(sel)
+            suppress_read_write_concern!(sel)
+            validate_read_pref!(sel)
+            update_session_state!
+            apply_txn_num!(sel)
           end
         elsif session && session.explicit?
           apply_cluster_time!(sel, server)
           sel[:txnNumber] = BSON::Int64.new(txn_num) if txn_num
           apply_session_id!(sel)
+          apply_start_transaction!(sel)
           apply_causal_consistency!(sel, server)
+          apply_autocommit!(sel)
+          apply_txn_opts!(sel)
+          suppress_read_write_concern!(sel)
+          validate_read_pref!(sel)
+          update_session_state!
+          apply_txn_num!(sel)
         end
+
         sel
       end
     end

data/lib/mongo/operation/shared/specifiable.rb

@@ -101,6 +101,11 @@ module Mongo
       # @since 2.0.0
       SELECTOR = :selector.freeze
 
+      # The startTransaction option
+      #
+      # @since 2.6.0
+      START_TRANSACTION = :start_transaction.freeze
+
       # The field for number to return.
       #
       # @since 2.0.0
@@ -551,12 +556,23 @@ module Mongo
         selector[Operation::ARRAY_FILTERS] if selector
       end
 
+      # The startTransaction option.
+      #
+      # @example Get the startTransaction option.
+      #   specifiable.start_transaction
+      #
+      # @return  [ Boolean ] The startTransaction option.
+      #
+      def start_transaction
+        @spec[START_TRANSACTION]
+      end
+
       # Does the operation have an acknowledged write concern.
       #
-      # @example Determine whether the operation has an acknoweldged write.
+      # @example Determine whether the operation has an acknowledged write.
       #   specifiable.array_filters
       #
-      # @return [ Hash ] The array filters.
+      # @return [ Boolean ] Whether or not the operation has an acknowledged write concern.
       #
       # @since 2.5.2
       def acknowledged_write?

data/lib/mongo/operation/shared/write_concern_supported.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2017 MongoDB, Inc.
+# Copyright (C) 2015-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.

data/lib/mongo/operation/update/op_msg.rb

@@ -40,6 +40,9 @@ module Mongo
         def execute(server)
           result = Result.new(dispatch_message(server))
           process_result(result, server)
+        rescue Mongo::Error::SocketError => e
+          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+          raise e
         end
 
         private

data/lib/mongo/operation/update_user/command.rb

@@ -29,7 +29,7 @@ module Mongo
         private
 
         def selector(server)
-          { :updateUser => user.name, :digestPassword => false }.merge(user.spec)
+          { :updateUser => user.name }.merge(user.spec)
         end
 
         def message(server)

data/lib/mongo/operation/update_user/op_msg.rb

@@ -26,10 +26,19 @@ module Mongo
         include Executable
         include SessionsSupported
 
+        def execute(server)
+          result = Result.new(dispatch_message(server))
+          process_result(result, server)
+          result.validate!
+        rescue Mongo::Error::SocketError => e
+          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+          raise e
+        end
+
         private
 
         def selector(server)
-          { :updateUser => user.name, :digestPassword => false }.merge(user.spec)
+          { :updateUser => user.name }.merge(user.spec)
         end
 
         def message(server)

data/lib/mongo/operation/users_info/op_msg.rb

@@ -40,6 +40,9 @@ module Mongo
           result = Result.new(dispatch_message(server))
           process_result(result, server)
           result.validate!
+        rescue Mongo::Error::SocketError => e
+          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+          raise e
         end
 
         private

data/lib/mongo/options.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015 MongoDB, Inc.
+# Copyright (C) 2015-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.

data/lib/mongo/options/mapper.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015 MongoDB, Inc.
+# Copyright (C) 2015-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.

data/lib/mongo/options/redacted.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015 MongoDB, Inc.
+# Copyright (C) 2015-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.

data/lib/mongo/protocol/bit_vector.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.

data/lib/mongo/protocol/compressed.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017 MongoDB, Inc.
+# Copyright (C) 2017-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.

data/lib/mongo/protocol/delete.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.

data/lib/mongo/protocol/get_more.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.
@@ -15,7 +15,7 @@
 module Mongo
   module Protocol
 
-    # MongoDB Wire protocol GetMore message.
+    # MongoDB Wire protocol getMore message.
     #
     # This is a client request message that is sent to the server in order
     # to retrieve additional documents from a cursor that has already been
@@ -27,7 +27,7 @@ module Mongo
     # @api semipublic
     class GetMore < Message
 
-      # Creates a new GetMore message
+      # Creates a new getMore message
       #
       # @example Get 15 additional documents from cursor 123 in 'xgen.users'.
       #   GetMore.new('xgen', 'users', 15, 123)
@@ -80,7 +80,7 @@ module Mongo
 
       private
 
-      # The operation code required to specify a GetMore message.
+      # The operation code required to specify a getMore message.
       # @return [Fixnum] the operation code.
       #
       # @since 2.5.0
@@ -90,18 +90,18 @@ module Mongo
       field :zero, Zero
 
       # @!attribute
-      # @return [String] The namespace for this GetMore message.
+      # @return [String] The namespace for this getMore message.
       field :namespace, CString
 
       # @!attribute
-      # @return [Fixnum] The number to return for this GetMore message.
+      # @return [Fixnum] The number to return for this getMore message.
       field :number_to_return, Int32
 
       # @!attribute
       # @return [Fixnum] The cursor id to get more documents from.
       field :cursor_id, Int64
 
-      # Converts legacy getmore messages to the appropriare OP_COMMAND style
+      # Converts legacy getMore messages to the appropriare OP_COMMAND style
       # message.
       #
       # @since 2.1.0

data/lib/mongo/protocol/insert.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.

data/lib/mongo/protocol/kill_cursors.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.

data/lib/mongo/protocol/message.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.
@@ -72,15 +72,15 @@ module Mongo
       # @since 2.2.1
       MAX_MESSAGE_SIZE = 50331648.freeze
 
+      def initialize(*args) # :nodoc:
+        @request_id = nil
+      end
+
       # Returns the request id for the message
       #
       # @return [Fixnum] The request id for this message
       attr_reader :request_id
 
-      def initialize(*args) # :nodoc:
-        @request_id = nil
-      end
-
       # The default for messages is not to require a reply after sending a
       # message to the server.
       #

data/lib/mongo/protocol/msg.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017 MongoDB, Inc.
+# Copyright (C) 2017-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.
@@ -15,7 +15,8 @@
 module Mongo
   module Protocol
 
-    # MongoDB Wire protocol Msg message (OP_MSG), a bi-directional wire protocol opcode.
+    # MongoDB Wire protocol Msg message (OP_MSG), a bi-directional wire
+    # protocol opcode.
     #
     # OP_MSG is only available in MongoDB 3.6 (maxWireVersion >= 6) and later.
     #
@@ -36,11 +37,12 @@ module Mongo
       #   Msg.new([:more_to_come], {}, { ismaster: 1 },
       #           { type: 1, payload: { identifier: 'documents', sequence: [..] } })
       #
-      # @param [ Array<Symbol> ] flags The flag bits. Current supported values are
-      #  :more_to_come and :checksum_present.
-      # @param [ Hash ] options The options. There are currently no supported options, this is a
-      #   place-holder for the future.
-      # @param [ BSON::Document, Hash ] global_args The global arguments, becomes a section of payload type 0.
+      # @param [ Array<Symbol> ] flags The flag bits. Current supported values
+      # are :more_to_come and :checksum_present.
+      # @param [ Hash ] options The options. There are currently no supported
+      #   options, this is a placeholder for the future.
+      # @param [ BSON::Document, Hash ] global_args The global arguments,
+      #   becomes a section of payload type 0.
       # @param [ BSON::Document, Hash ] sections Zero or more sections, in the format
       #   { type: 1, payload: { identifier: <String>, sequence: <Array<BSON::Document, Hash>> } } or
       #   { type: 0, payload: <BSON::Document, Hash> }

data/lib/mongo/protocol/query.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.

data/lib/mongo/protocol/registry.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2017 MongoDB Inc.
+# Copyright (C) 2009-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.

data/lib/mongo/protocol/reply.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.
@@ -136,15 +136,6 @@ module Mongo
         # @since 2.1.0
         ID = 'id'.freeze
 
-        # @return [ Array<BSON::Document> ] documents The documents.
-        attr_reader :documents
-
-        # @return [ Integer ] cursor_id The cursor id.
-        attr_reader :cursor_id
-
-        # @return [ Integer ] starting_from The starting point in the cursor.
-        attr_reader :starting_from
-
         # Initialize the new upconverter.
         #
         # @example Create the upconverter.
@@ -161,6 +152,15 @@ module Mongo
           @starting_from = starting_from
         end
 
+        # @return [ Array<BSON::Document> ] documents The documents.
+        attr_reader :documents
+
+        # @return [ Integer ] cursor_id The cursor id.
+        attr_reader :cursor_id
+
+        # @return [ Integer ] starting_from The starting point in the cursor.
+        attr_reader :starting_from
+
         # Get the upconverted command.
         #
         # @example Get the command.

data/lib/mongo/protocol/serializers.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.