mongo 2.6.4 → 2.7.0.rc0

data/lib/mongo/operation/op_msg_base.rb

@@ -0,0 +1,30 @@
+# 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
+    # @api private
+    class OpMsgBase
+      include Specifiable
+      include Executable
+      include SessionsSupported
+
+      private
+
+      def message(server)
+        Protocol::Msg.new(flags, options, command(server))
+      end
+    end
+  end
+end

data/lib/mongo/operation/parallel_scan.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.
@@ -26,24 +26,7 @@ module Mongo
     # @since 2.0.0
     class ParallelScan
       include Specifiable
-
-      # Execute the operation.
-      #
-      # @example
-      #   operation.execute(server)
-      #
-      # @param [ Mongo::Server ] server The server to send the operation to.
-      #
-      # @return [ Mongo::Operation::ParallelScan::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/parallel_scan/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/parallel_scan/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,30 +21,10 @@ module Mongo
       # @api private
       #
       # @since 2.5.2
-      class OpMsg
-        include Specifiable
-        include Executable
-        include SessionsSupported
+      class OpMsg < OpMsgBase
         include CausalConsistencySupported
-
-        # Execute the operation.
-        #
-        # @example
-        #   operation.execute(server)
-        #
-        # @param [ Mongo::Server ] server The server to send the operation to.
-        #
-        # @return [ Mongo::Operation::ParallelScan::Result ] The operation result.
-        #
-        # @since 2.5.2
-        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
+        include ExecutableTransactionLabel
+        include PolymorphicResult
 
         private
 
@@ -54,10 +34,6 @@ module Mongo
           sel[:readConcern] = read_concern if read_concern
           sel
         end
-
-        def message(server)
-          Protocol::Msg.new(flags, options, command(server))
-        end
       end
     end
   end

data/lib/mongo/operation/parallel_scan/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.
@@ -16,7 +16,7 @@ module Mongo
   module Operation
     class ParallelScan
 
-      # Defines custom behaviour of results in a parallel scan.
+      # Defines custom behavior of results in a parallel scan.
       #
       # @since 2.0.0
       class Result < Operation::Result

data/lib/mongo/operation/remove_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 RemoveUser
       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/remove_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/remove_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)
           { :dropUser => user_name }
         end
-
-        def message(server)
-          Protocol::Msg.new(flags, options, command(server))
-        end
       end
     end
   end

data/lib/mongo/operation/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.
@@ -267,7 +267,7 @@ module Mongo
         raise Error::OperationFailure.new(
           parser.message,
           self,
-          :code => parser.code, :code_name => parser.code_name)
+          :code => parser.code, :code_name => parser.code_name, :labels => parser.labels)
       end
       private :raise_operation_failure
 
@@ -312,6 +312,18 @@ module Mongo
         first_document && first_document[CLUSTER_TIME]
       end
 
+      # Gets the set of error labels associated with the result.
+      #
+      # @example Get the labels.
+      #   result.labels
+      #
+      # @return [ Array ] labels The set of labels.
+      #
+      # @since 2.7.0
+      def labels
+        @labels ||= parser.labels
+      end
+
       private
 
       def aggregate_returned_count

data/lib/mongo/operation/shared/bypass_document_validation.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/causal_consistency_supported.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.
@@ -15,18 +15,26 @@
 module Mongo
   module Operation
 
-    # Custom behavior for operations that support the causally consistency.
+    # Custom behavior for operations that support causal consistency.
     #
     # @since 2.5.2
     module CausalConsistencySupported
 
       private
 
+      # Adds causal consistency document to the selector, if one can be
+      # constructed.
+      #
+      # This method overrides the causal consistency addition logic of
+      # SessionsSupported and is meant to be used with operations classified
+      # as "read operations accepting a read concern", as these are defined
+      # in the causal consistency spec.
+      #
+      # In order for the override to work correctly the
+      # CausalConsistencySupported module must be included after
+      # SessionsSupported module in target classes.
       def apply_causal_consistency!(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
-        end
+        apply_causal_consistency_if_possible(selector, server)
       end
     end
   end

data/lib/mongo/operation/shared/executable.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.
@@ -21,13 +21,21 @@ module Mongo
     module Executable
 
       def execute(server)
-        result = Result.new(dispatch_message(server))
+        result = get_result(server)
         process_result(result, server)
         result.validate!
       end
 
       private
 
+      def result_class
+        Result
+      end
+
+      def get_result(server)
+        result_class.new(dispatch_message(server))
+      end
+
       # Returns a Protocol::Message or nil
       def dispatch_message(server)
         server.with_connection do |connection|
@@ -43,4 +51,3 @@ module Mongo
     end
   end
 end
-

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

@@ -0,0 +1,30 @@
+# 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 executable behavior of operations for operations
+    # whose result should not be validated.
+    #
+    # @api private
+    module ExecutableNoValidate
+
+      def execute(server)
+        result = get_result(server)
+        process_result(result, server)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+# 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 applying transaction error label to execution result.
+    #
+    # @note This module should be included after ExecutableNoValidate,
+    #   if both are included in a class.
+    #
+    # @api private
+    module ExecutableTransactionLabel
+
+      def execute(server)
+        super
+      rescue Mongo::Error::SocketError => e
+        e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+        raise e
+      end
+    end
+  end
+end

data/lib/mongo/operation/shared/idable.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/limited.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/object_id_generator.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/op_msg_or_command.rb

@@ -0,0 +1,42 @@
+# 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
+    # or as a Command otherwise.
+    #
+    # @api private
+    module OpMsgOrCommand
+      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)
+        else
+          polymorphic_class(self.class.name, :Command)
+        end
+        cls.new(spec)
+      end
+    end
+  end
+end