mongo 2.5.1 → 2.5.2

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

@@ -0,0 +1,39 @@
+# Copyright (C) 2015-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
+  module Operation
+
+    # Custom behavior for operations that support write concern.
+    #
+    # @since 2.5.2
+    module WriteConcernSupported
+
+      private
+
+      def write_concern_supported?(server); true; end
+
+      def command(server)
+        add_write_concern!(super, server)
+      end
+
+      def add_write_concern!(sel, server)
+        if write_concern && write_concern_supported?(server)
+          sel[:writeConcern] = write_concern.options
+        end
+        sel
+      end
+    end
+  end
+end

data/lib/mongo/operation/update.rb

@@ -0,0 +1,38 @@
+# 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.
+# 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.
+
+require 'mongo/operation/update/command'
+require 'mongo/operation/update/op_msg'
+require 'mongo/operation/update/legacy'
+require 'mongo/operation/update/result'
+require 'mongo/operation/update/bulk_result'
+
+module Mongo
+  module Operation
+
+    # A MongoDB update operation.
+    #
+    # @api private
+    #
+    # @since 2.0.0
+    class Update
+      include Specifiable
+      include Write
+
+      private
+
+      IDENTIFIER = 'updates'.freeze
+    end
+  end
+end

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

@@ -0,0 +1,126 @@
+# 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.
+# 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
+    class Update
+
+      # Defines custom behaviour of results for an udpate when sent as part of a bulk write.
+      #
+      # @since 2.0.0
+      class BulkResult < Operation::Result
+        include Aggregatable
+
+        # The number of modified docs field in the result.
+        #
+        # @since 2.0.0
+        MODIFIED = 'nModified'.freeze
+
+        # The upserted docs field in the result.
+        #
+        # @since 2.0.0
+        UPSERTED = 'upserted'.freeze
+
+        # Gets the number of documents upserted.
+        #
+        # @example Get the upserted count.
+        #   result.n_upserted
+        #
+        # @return [ Integer ] The number of documents upserted.
+        #
+        # @since 2.0.0
+        def n_upserted
+          return 0 unless acknowledged?
+          @replies.reduce(0) do |n, reply|
+            if upsert?(reply)
+              n += reply.documents.first[UPSERTED].size
+            else
+              n
+            end
+          end
+        end
+
+        # Gets the number of documents matched.
+        #
+        # @example Get the matched count.
+        #   result.n_matched
+        #
+        # @return [ Integer ] The number of documents matched.
+        #
+        # @since 2.0.0
+        def n_matched
+          return 0 unless acknowledged?
+          @replies.reduce(0) do |n, reply|
+            if upsert?(reply)
+              reply.documents.first[N] - n_upserted
+            else
+              if reply.documents.first[N]
+                n += reply.documents.first[N]
+              else
+                n
+              end
+            end
+          end
+        end
+
+        # Gets the number of documents modified.
+        # Not that in a mixed sharded cluster a call to
+        # update could return nModified (>= 2.6) or not (<= 2.4).
+        # If any call does not return nModified we can't report
+        # a valid final count so set the field to nil.
+        #
+        # @example Get the modified count.
+        #   result.n_modified
+        #
+        # @return [ Integer ] The number of documents modified.
+        #
+        # @since 2.0.0
+        def n_modified
+          return 0 unless acknowledged?
+          @replies.reduce(0) do |n, reply|
+            if n && reply.documents.first[MODIFIED]
+              n += reply.documents.first[MODIFIED]
+            else
+              0
+            end
+          end
+        end
+
+        # Get the upserted documents.
+        #
+        # @example Get upserted documents.
+        #   result.upserted
+        #
+        # @return [ Array<BSON::Document> ] The upserted document info
+        #
+        # @since 2.1.0
+        def upserted
+          return [] unless acknowledged?
+          @replies.reduce([]) do |ids, reply|
+            if upserted_ids = reply.documents.first[UPSERTED]
+              ids += upserted_ids
+            end
+            ids
+          end
+        end
+
+        private
+
+        def upsert?(reply)
+          upserted.any?
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,60 @@
+# Copyright (C) 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.
+# 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
+    class Update
+
+      # A MongoDB update operation sent as a command message.
+      #
+      # @api private
+      #
+      # @since 2.5.2
+      class Command
+        include Specifiable
+        include Executable
+        include Limited
+        include WriteConcernSupported
+        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)
+        end
+
+        private
+
+        def selector(server)
+          { update: coll_name,
+            updates: send(IDENTIFIER),
+            ordered: ordered? }
+        end
+
+        def message(server)
+          Protocol::Query.new(db_name, Database::COMMAND, command(server), options)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,80 @@
+# Copyright (C) 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.
+# 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.
+
+require 'mongo/operation/update/legacy/result'
+
+module Mongo
+  module Operation
+    class Update
+
+      # A MongoDB update operation sent as a legacy wire protocol message.
+      #
+      # @api private
+      #
+      # @since 2.5.2
+      class Legacy
+        include Specifiable
+        include Executable
+
+        # 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)
+          result.validate!
+        end
+
+        private
+
+        def selector
+          send(IDENTIFIER).first
+        end
+
+        def message(server)
+          flags = []
+          flags << :multi_update if selector[Operation::MULTI]
+          flags << :upsert if selector[Operation::UPSERT]
+
+          Protocol::Update.new(
+              db_name,
+              coll_name,
+              selector[Operation::Q],
+              selector[Operation::U],
+              flags.empty? ? {} : { flags: flags }
+          )
+        end
+
+        def gle
+          wc = write_concern ||  WriteConcern.get(WriteConcern::DEFAULT)
+          if gle_message = wc.get_last_error
+            Protocol::Query.new(
+                db_name,
+                Database::COMMAND,
+                gle_message,
+                options.merge(limit: -1)
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongo/operation/{write/update → update/legacy}/result.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-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.
@@ -14,92 +14,14 @@
 
 module Mongo
   module Operation
-    module Write
-      class Update
-
-        # Defines custom behaviour of results for an update.
-        #
-        # @since 2.0.0
-        class Result < Operation::Result
-
-          # The number of modified docs field in the result.
-          #
-          # @since 2.0.0
-          MODIFIED = 'nModified'.freeze
-
-          # The upserted docs field in the result.
-          #
-          # @since 2.0.0
-          UPSERTED = 'upserted'.freeze
-
-          # Get the number of documents matched.
-          #
-          # @example Get the matched count.
-          #   result.matched_count
-          #
-          # @return [ Integer ] The matched count.
-          #
-          # @since 2.0.0
-          def matched_count
-            return 0 unless acknowledged?
-            if upsert?
-              0
-            else
-              n
-            end
-          end
-
-          # Get the number of documents modified.
-          #
-          # @example Get the modified count.
-          #   result.modified_count
-          #
-          # @return [ Integer ] The modified count.
-          #
-          # @since 2.0.0
-          def modified_count
-            return 0 unless acknowledged?
-            first[MODIFIED]
-          end
-
-          # The identifier of the inserted document if an upsert
-          #   took place.
-          #
-          # @example Get the upserted document's identifier.
-          #   result.upserted_id
-          #
-          # @return [ Object ] The upserted id.
-          #
-          # @since 2.0.0
-          def upserted_id
-            return nil unless upsert?
-            upsert?.first['_id']
-          end
-
-          # Returns the number of documents upserted.
-          #
-          # @example Get the number of upserted documents.
-          #   result.upserted_count
-          #
-          # @return [ Integer ] The number upserted.
-          #
-          # @since 2.4.2
-          def upserted_count
-            upsert? ? n : 0
-          end
-
-          private
-
-          def upsert?
-            first[UPSERTED]
-          end
-        end
+    class Update
+      class Legacy
 
         # Defines custom behaviour of results for an update on server
         # version <= 2.4.
         #
         # @since 2.0.0
-        class LegacyResult < Operation::Result
+        class Result < Operation::Result
 
           # Whether an existing document was updated.
           #