mongo 2.6.4 → 2.7.0.rc0

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

@@ -0,0 +1,45 @@
+# Copyright (C) 2018-2019 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
+  module Operation
+
+    # Shared behavior of executing the operation as an OpMsg when supported,
+    # as a Command when find command is supported by the server, and as
+    # Legacy otherwise.
+    #
+    # @api private
+    module OpMsgOrFindCommand
+      include PolymorphicLookup
+
+      def execute(server)
+        operation = final_operation(server)
+        operation.execute(server)
+      end
+
+      private
+
+      def final_operation(server)
+        cls = if server.features.op_msg_enabled?
+          polymorphic_class(self.class.name, :OpMsg)
+        elsif server.features.find_command_enabled?
+          polymorphic_class(self.class.name, :Command)
+        else
+          polymorphic_class(self.class.name, :Legacy)
+        end
+        cls.new(spec)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+# Copyright (C) 2018-2019 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
+  module Operation
+
+    # Shared behavior of executing the operation as an OpMsg when supported,
+    # as a Command when list indxes command is supported by the server, and as
+    # Legacy otherwise.
+    #
+    # @api private
+    module OpMsgOrListIndexesCommand
+      include PolymorphicLookup
+
+      def execute(server)
+        operation = final_operation(server)
+        operation.execute(server)
+      end
+
+      private
+
+      def final_operation(server)
+        cls = if server.features.op_msg_enabled?
+          polymorphic_class(self.class.name, :OpMsg)
+        elsif server.features.list_indexes_enabled?
+          polymorphic_class(self.class.name, :Command)
+        else
+          polymorphic_class(self.class.name, :Legacy)
+        end
+        cls.new(spec)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# Copyright (C) 2018-2019 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
+  module Operation
+
+    # Shared behavior of looking up a class based on the name of
+    # the receiver's class.
+    #
+    # @api private
+    module PolymorphicLookup
+      private
+
+      def polymorphic_class(base, name)
+        bits = (base + "::#{name}").split('::')
+        bits.reduce(Object) do |cls, name|
+          cls.const_get(name)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+# Copyright (C) 2018-2019 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
+  module Operation
+
+    # Shared behavior of instantiating a result class matching the
+    # operation class.
+    #
+    # @api private
+    module PolymorphicResult
+      include PolymorphicLookup
+
+      private
+
+      def result_class
+        polymorphic_class(self.class.name.sub(/::[^:]*$/, ''), :Result)
+      end
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018 MongoDB, Inc.
+# Copyright (C) 2015-2019 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/shared/result/aggregatable.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB, Inc.
+# Copyright (C) 2014-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ module Mongo
   module Operation
     class Result
 
-      # Defines custom behaviour of bulk write results
+      # Defines custom behavior of bulk write results
       #
       # @since 2.0.0
       module Aggregatable

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018 MongoDB, Inc.
+# Copyright (C) 2015-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -38,17 +38,37 @@ module Mongo
         :parallelCollectionScan
       ].freeze
 
+      # Adds causal consistency document to the selector, if one can be
+      # constructed and the selector is for a startTransaction command.
+      #
+      # When operations are performed in a transaction, only the first
+      # operation (the one which starts the transaction via startTransaction)
+      # is allowed to have a read concern, and with it the causal consistency
+      # document, specified.
       def apply_causal_consistency!(selector, server)
         return unless selector[:startTransaction]
 
+        apply_causal_consistency_if_possible(selector, server)
+      end
+
+      # Adds causal consistency document to the selector, if one can be
+      # constructed.
+      #
+      # In order for the causal consistency document to be constructed,
+      # causal consistency must be enabled for the session and the session
+      # must have the current operation time. Also, topology must be
+      # replica set or sharded cluster.
+      def apply_causal_consistency_if_possible(selector, server)
         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
+          cc_doc = session.send(:causal_consistency_doc)
+          if cc_doc
+            selector[:readConcern] = (selector[:readConcern] || read_concern || {}).merge(cc_doc)
+          end
         end
       end
 
       def flags
-        acknowledged_write? ? [:none] : [:more_to_come]
+        acknowledged_write? ? [] : [:more_to_come]
       end
 
       def apply_cluster_time!(selector, server)

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB, Inc.
+# Copyright (C) 2014-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -342,12 +342,14 @@ module Mongo
         spec[OPTIONS] || {}
       end
 
-      # Get the read concern from the spec.
+      # Get the read concern document from the spec.
+      #
+      # @note The document may include afterClusterTime.
       #
       # @example Get the read concern.
       #   specifiable.read_concern
       #
-      # @return [ Hash ] The read concern.
+      # @return [ Hash ] The read concern document.
       #
       # @since 2.2.0
       def read_concern

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2018 MongoDB, Inc.
+# Copyright (C) 2018-2019 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/shared/write_concern_supported.rb

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

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB, Inc.
+# Copyright (C) 2014-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ module Mongo
   module Operation
     class Update
 
-      # Defines custom behaviour of results for an udpate when sent as part of a bulk write.
+      # Defines custom behavior of results for an udpate when sent as part of a bulk write.
       #
       # @since 2.0.0
       class BulkResult < Operation::Result

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2018 MongoDB, Inc.
+# Copyright (C) 2018-2019 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/legacy.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2018 MongoDB, Inc.
+# Copyright (C) 2018-2019 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/legacy/result.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018 MongoDB, Inc.
+# Copyright (C) 2015-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ module Mongo
     class Update
       class Legacy
 
-        # Defines custom behaviour of results for an update on server
+        # Defines custom behavior of results for an update on server
         # version <= 2.4.
         #
         # @since 2.0.0

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2018 MongoDB, Inc.
+# Copyright (C) 2018-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,29 +21,11 @@ module Mongo
       # @api private
       #
       # @since 2.5.2
-      class OpMsg
-        include Specifiable
-        include Executable
-        include SessionsSupported
+      class OpMsg < OpMsgBase
         include BypassDocumentValidation
-
-        # Execute the operation.
-        #
-        # @example
-        #   operation.execute(server)
-        #
-        # @param [ Mongo::Server ] server The server to send the operation to.
-        #
-        # @return [ Mongo::Operation::Update::Result ] The operation result.
-        #
-        # @since 2.5.2
-        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
+        include ExecutableNoValidate
+        include ExecutableTransactionLabel
+        include PolymorphicResult
 
         private
 

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB, Inc.
+# Copyright (C) 2014-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ module Mongo
   module Operation
     class Update
 
-      # Defines custom behaviour of results for an update.
+      # Defines custom behavior of results for an update.
       #
       # @since 2.0.0
       class Result < Operation::Result

data/lib/mongo/operation/update_user.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018 MongoDB, Inc.
+# Copyright (C) 2015-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,24 +25,7 @@ module Mongo
     # @since 2.0.0
     class UpdateUser
       include Specifiable
-
-      # Execute the operation.
-      #
-      # @example
-      #   operation.execute(server)
-      #
-      # @param [ Mongo::Server ] server The server to send the operation to.
-      #
-      # @return [ Mongo::Operation::Result ] The operation result.
-      #
-      # @since 2.0.0
-      def execute(server)
-        if server.features.op_msg_enabled?
-          OpMsg.new(spec).execute(server)
-        else
-          Command.new(spec).execute(server)
-        end
-      end
+      include OpMsgOrCommand
     end
   end
 end

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2018 MongoDB, Inc.
+# Copyright (C) 2018-2019 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_user/op_msg.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2018 MongoDB, Inc.
+# Copyright (C) 2018-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,29 +21,14 @@ module Mongo
       # @api private
       #
       # @since 2.5.2
-      class OpMsg
-        include Specifiable
-        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
+      class OpMsg < OpMsgBase
+        include ExecutableTransactionLabel
 
         private
 
         def selector(server)
           { :updateUser => user.name }.merge(user.spec)
         end
-
-        def message(server)
-          Protocol::Msg.new(flags, options, command(server))
-        end
       end
     end
   end