mongo 2.22.0 → 2.24.0

data/lib/mongo/collection/view/writable.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -18,16 +17,14 @@
 module Mongo
   class Collection
     class View
-
       # Defines write related behavior for collection view.
       #
       # @since 2.0.0
       module Writable
-
         # The array filters field constant.
         #
         # @since 2.5.0
-        ARRAY_FILTERS = 'array_filters'.freeze
+        ARRAY_FILTERS = 'array_filters'
 
         # Finds a single document in the database via findAndModify and deletes
         # it, returning the original document.
@@ -64,10 +61,10 @@ module Mongo
         def find_one_and_delete(opts = {})
           with_session(opts) do |session|
             write_concern = if opts[:write_concern]
-              WriteConcern.get(opts[:write_concern])
-            else
-              write_concern_with_session(session)
-            end
+                              WriteConcern.get(opts[:write_concern])
+                            else
+                              write_concern_with_session(session)
+                            end
 
             QueryCache.clear_namespace(collection.namespace)
 
@@ -101,7 +98,7 @@ module Mongo
                 db_name: database.name,
                 write_concern: write_concern,
                 session: session,
-                txn_num: txn_num,
+                txn_num: txn_num
               ).execute_with_connection(connection, context: context)
             end
           end.first&.fetch('value', nil)
@@ -182,10 +179,10 @@ module Mongo
         def find_one_and_update(document, opts = {})
           value = with_session(opts) do |session|
             write_concern = if opts[:write_concern]
-              WriteConcern.get(opts[:write_concern])
-            else
-              write_concern_with_session(session)
-            end
+                              WriteConcern.get(opts[:write_concern])
+                            else
+                              write_concern_with_session(session)
+                            end
 
             QueryCache.clear_namespace(collection.namespace)
 
@@ -211,22 +208,25 @@ module Mongo
               session: session,
               operation_timeouts: operation_timeouts(opts)
             )
-            write_with_retry(write_concern, context: context) do |connection, txn_num, context|
-              gte_4_4 = connection.server.description.server_version_gte?('4.4')
-              if !gte_4_4 && opts[:hint] && write_concern && !write_concern.acknowledged?
-                raise Error::UnsupportedOption.hint_error(unacknowledged_write: true)
-              end
+            operation = Operation::WriteCommand.new(
+              selector: cmd,
+              db_name: database.name,
+              write_concern: write_concern,
+              session: session
+            )
+            value = tracer.trace_operation(operation, context, op_name: 'findOneAndUpdate') do
+              write_with_retry(write_concern, context: context) do |connection, txn_num, context|
+                gte_4_4 = connection.server.description.server_version_gte?('4.4')
+                if !gte_4_4 && opts[:hint] && write_concern && !write_concern.acknowledged?
+                  raise Error::UnsupportedOption.hint_error(unacknowledged_write: true)
+                end
 
-              Operation::WriteCommand.new(
-                selector: cmd,
-                db_name: database.name,
-                write_concern: write_concern,
-                session: session,
-                txn_num: txn_num,
-              ).execute_with_connection(connection, context: context)
-            end
-          end.first&.fetch('value', nil)
-          value unless value.nil? || value.empty?
+                operation.txn_num = txn_num
+                operation.execute_with_connection(connection, context: context)
+              end
+            end.first&.fetch('value', nil)
+            value unless value.nil? || value.empty?
+          end
         end
 
         # Remove documents from the collection.
@@ -257,10 +257,10 @@ module Mongo
         def delete_many(opts = {})
           with_session(opts) do |session|
             write_concern = if opts[:write_concern]
-              WriteConcern.get(opts[:write_concern])
-            else
-              write_concern_with_session(session)
-            end
+                              WriteConcern.get(opts[:write_concern])
+                            else
+                              write_concern_with_session(session)
+                            end
 
             QueryCache.clear_namespace(collection.namespace)
 
@@ -275,22 +275,25 @@ module Mongo
               session: session,
               operation_timeouts: operation_timeouts(opts)
             )
-            nro_write_with_retry(write_concern, context: context) do |connection, txn_num, context|
-              gte_4_4 = connection.server.description.server_version_gte?('4.4')
-              if !gte_4_4 && opts[:hint] && write_concern && !write_concern.acknowledged?
-                raise Error::UnsupportedOption.hint_error(unacknowledged_write: true)
-              end
+            operation = Operation::Delete.new(
+              deletes: [ delete_doc ],
+              db_name: collection.database.name,
+              coll_name: collection.name,
+              write_concern: write_concern,
+              bypass_document_validation: !!opts[:bypass_document_validation],
+              session: session,
+              let: opts[:let],
+              comment: opts[:comment]
+            )
+            tracer.trace_operation(operation, context, op_name: 'deleteMany') do
+              nro_write_with_retry(write_concern, context: context) do |connection, _txn_num, context|
+                gte_4_4 = connection.server.description.server_version_gte?('4.4')
+                if !gte_4_4 && opts[:hint] && write_concern && !write_concern.acknowledged?
+                  raise Error::UnsupportedOption.hint_error(unacknowledged_write: true)
+                end
 
-              Operation::Delete.new(
-                deletes: [ delete_doc ],
-                db_name: collection.database.name,
-                coll_name: collection.name,
-                write_concern: write_concern,
-                bypass_document_validation: !!opts[:bypass_document_validation],
-                session: session,
-                let: opts[:let],
-                comment: opts[:comment],
-              ).execute_with_connection(connection, context: context)
+                operation.execute_with_connection(connection, context: context)
+              end
             end
           end
         end
@@ -323,10 +326,10 @@ module Mongo
         def delete_one(opts = {})
           with_session(opts) do |session|
             write_concern = if opts[:write_concern]
-              WriteConcern.get(opts[:write_concern])
-            else
-              write_concern_with_session(session)
-            end
+                              WriteConcern.get(opts[:write_concern])
+                            else
+                              write_concern_with_session(session)
+                            end
 
             QueryCache.clear_namespace(collection.namespace)
 
@@ -357,7 +360,7 @@ module Mongo
                 session: session,
                 txn_num: txn_num,
                 let: opts[:let],
-                comment: opts[:comment],
+                comment: opts[:comment]
               ).execute_with_connection(connection, context: context)
             end
           end
@@ -401,10 +404,10 @@ module Mongo
         def replace_one(replacement, opts = {})
           with_session(opts) do |session|
             write_concern = if opts[:write_concern]
-              WriteConcern.get(opts[:write_concern])
-            else
-              write_concern_with_session(session)
-            end
+                              WriteConcern.get(opts[:write_concern])
+                            else
+                              write_concern_with_session(session)
+                            end
             validate_replacement_documents!(replacement)
 
             QueryCache.clear_namespace(collection.namespace)
@@ -417,9 +420,7 @@ module Mongo
               collation: opts[:collation] || opts['collation'] || collation,
               sort: opts[:sort] || opts['sort'],
             }.compact
-            if opts[:upsert]
-              update_doc['upsert'] = true
-            end
+            update_doc['upsert'] = true if opts[:upsert]
 
             context = Operation::Context.new(
               client: client,
@@ -441,7 +442,7 @@ module Mongo
                 session: session,
                 txn_num: txn_num,
                 let: opts[:let],
-                comment: opts[:comment],
+                comment: opts[:comment]
               ).execute_with_connection(connection, context: context)
             end
           end
@@ -482,10 +483,10 @@ module Mongo
         def update_many(spec, opts = {})
           with_session(opts) do |session|
             write_concern = if opts[:write_concern]
-              WriteConcern.get(opts[:write_concern])
-            else
-              write_concern_with_session(session)
-            end
+                              WriteConcern.get(opts[:write_concern])
+                            else
+                              write_concern_with_session(session)
+                            end
             validate_update_documents!(spec)
 
             QueryCache.clear_namespace(collection.namespace)
@@ -498,16 +499,14 @@ module Mongo
               hint: opts[:hint],
               collation: opts[:collation] || opts['collation'] || collation,
             }.compact
-            if opts[:upsert]
-              update_doc['upsert'] = true
-            end
+            update_doc['upsert'] = true if opts[:upsert]
 
             context = Operation::Context.new(
               client: client,
               session: session,
               operation_timeouts: operation_timeouts(opts)
             )
-            nro_write_with_retry(write_concern, context: context) do |connection, txn_num, context|
+            nro_write_with_retry(write_concern, context: context) do |connection, _txn_num, context|
               gte_4_2 = connection.server.description.server_version_gte?('4.2')
               if !gte_4_2 && opts[:hint] && write_concern && !write_concern.acknowledged?
                 raise Error::UnsupportedOption.hint_error(unacknowledged_write: true)
@@ -521,7 +520,7 @@ module Mongo
                 bypass_document_validation: !!opts[:bypass_document_validation],
                 session: session,
                 let: opts[:let],
-                comment: opts[:comment],
+                comment: opts[:comment]
               ).execute_with_connection(connection, context: context)
             end
           end
@@ -567,10 +566,10 @@ module Mongo
         def update_one(spec, opts = {})
           with_session(opts) do |session|
             write_concern = if opts[:write_concern]
-              WriteConcern.get(opts[:write_concern])
-            else
-              write_concern_with_session(session)
-            end
+                              WriteConcern.get(opts[:write_concern])
+                            else
+                              write_concern_with_session(session)
+                            end
             validate_update_documents!(spec)
 
             QueryCache.clear_namespace(collection.namespace)
@@ -583,32 +582,33 @@ module Mongo
               collation: opts[:collation] || opts['collation'] || collation,
               sort: opts[:sort] || opts['sort'],
             }.compact
-            if opts[:upsert]
-              update_doc['upsert'] = true
-            end
+            update_doc['upsert'] = true if opts[:upsert]
 
             context = Operation::Context.new(
               client: client,
               session: session,
               operation_timeouts: operation_timeouts(opts)
             )
-            write_with_retry(write_concern, context: context) do |connection, txn_num, context|
-              gte_4_2 = connection.server.description.server_version_gte?('4.2')
-              if !gte_4_2 && opts[:hint] && write_concern && !write_concern.acknowledged?
-                raise Error::UnsupportedOption.hint_error(unacknowledged_write: true)
-              end
+            operation = Operation::Update.new(
+              updates: [ update_doc ],
+              db_name: collection.database.name,
+              coll_name: collection.name,
+              write_concern: write_concern,
+              bypass_document_validation: !!opts[:bypass_document_validation],
+              session: session,
+              let: opts[:let],
+              comment: opts[:comment]
+            )
+            tracer.trace_operation(operation, context) do
+              write_with_retry(write_concern, context: context) do |connection, txn_num, context|
+                gte_4_2 = connection.server.description.server_version_gte?('4.2')
+                if !gte_4_2 && opts[:hint] && write_concern && !write_concern.acknowledged?
+                  raise Error::UnsupportedOption.hint_error(unacknowledged_write: true)
+                end
 
-              Operation::Update.new(
-                updates: [ update_doc ],
-                db_name: collection.database.name,
-                coll_name: collection.name,
-                write_concern: write_concern,
-                bypass_document_validation: !!opts[:bypass_document_validation],
-                session: session,
-                txn_num: txn_num,
-                let: opts[:let],
-                comment: opts[:comment],
-              ).execute_with_connection(connection, context: context)
+                operation.txn_num = txn_num
+                operation.execute_with_connection(connection, context: context)
+              end
             end
           end
         end
@@ -624,17 +624,12 @@ module Mongo
         # @raise [ Error::InvalidUpdateDocument ] if the first key in the
         #   document does not start with a $.
         def validate_update_documents!(spec)
-          if update = spec.is_a?(Array) ? spec&.first : spec
-            if key = update.keys&.first
-              unless key.to_s.start_with?("$")
-                if Mongo.validate_update_replace
-                  raise Error::InvalidUpdateDocument.new(key: key)
-                else
-                  Error::InvalidUpdateDocument.warn(Logger.logger, key)
-                end
-              end
-            end
-          end
+          return unless update = spec.is_a?(Array) ? spec&.first : spec
+          return unless key = update.keys&.first
+          return if key.to_s.start_with?('$')
+          raise Error::InvalidUpdateDocument.new(key: key) if Mongo.validate_update_replace
+
+          Error::InvalidUpdateDocument.warn(Logger.logger, key)
         end
 
         # Check the replacement documents to make sure they don't have atomic
@@ -646,17 +641,12 @@ module Mongo
         # @raise [ Error::InvalidUpdateDocument ] if the first key in the
         #   document does not start with a $.
         def validate_replacement_documents!(spec)
-          if replace = spec.is_a?(Array) ? spec&.first : spec
-            if key = replace.keys&.first
-              if key.to_s.start_with?("$")
-                if Mongo.validate_update_replace
-                  raise Error::InvalidReplacementDocument.new(key: key)
-                else
-                  Error::InvalidReplacementDocument.warn(Logger.logger, key)
-                end
-              end
-            end
-          end
+          return unless replace = spec.is_a?(Array) ? spec&.first : spec
+          return unless key = replace.keys&.first
+          return unless key.to_s.start_with?('$')
+          raise Error::InvalidReplacementDocument.new(key: key) if Mongo.validate_update_replace
+
+          Error::InvalidReplacementDocument.warn(Logger.logger, key)
         end
       end
     end

data/lib/mongo/collection/view.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -27,7 +26,6 @@ require 'mongo/collection/view/writable'
 
 module Mongo
   class Collection
-
     # Representation of a query and options producing a result set of documents.
     #
     # A +View+ can be modified using helpers. Helpers can be chained,
@@ -72,7 +70,9 @@ module Mongo
       # Delegate to the cluster for the next primary.
       def_delegators :cluster, :next_primary
 
-      alias :selector :filter
+      def_delegators :client, :tracer
+
+      alias selector filter
 
       # @return [ Integer | nil | The timeout_ms value that was passed as an
       #   option to the view.
@@ -91,11 +91,12 @@ module Mongo
       # @since 2.0.0
       def ==(other)
         return false unless other.is_a?(View)
+
         collection == other.collection &&
-            filter == other.filter &&
-            options == other.options
+          filter == other.filter &&
+          options == other.options
       end
-      alias_method :eql?, :==
+      alias eql? ==
 
       # A hash value for the +View+ composed of the collection namespace,
       # hash of the options and hash of the filter.
@@ -206,7 +207,7 @@ module Mongo
       # @since 2.0.0
       def inspect
         "#<Mongo::Collection::View:0x#{object_id} namespace='#{collection.namespace}'" +
-            " @filter=#{filter.to_s} @options=#{options.to_s}>"
+          " @filter=#{filter} @options=#{options}>"
       end
 
       # Get the write concern on this +View+.
@@ -248,7 +249,9 @@ module Mongo
         View.new(collection, filter, options)
       end
 
-      def view; self; end
+      def view
+        self
+      end
 
       def with_session(opts = {}, &block)
         client.with_session(@options.merge(opts), &block)