mongo 2.18.1 → 2.18.3

data/lib/mongo/operation/create.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/create/command'
 require 'mongo/operation/create/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.0.0
     class Create
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/create_index.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/create_index/command'
 require 'mongo/operation/create_index/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.0.0
     class CreateIndex
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/create_user.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/create_user/command'
 require 'mongo/operation/create_user/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.0.0
     class CreateUser
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/delete.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/delete/command'
 require 'mongo/operation/delete/op_msg'
 require 'mongo/operation/delete/result'
 require 'mongo/operation/delete/bulk_result'

data/lib/mongo/operation/distinct.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/distinct/command'
 require 'mongo/operation/distinct/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.5.0
     class Distinct
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/drop.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/drop/command'
 require 'mongo/operation/drop/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.4.0
     class Drop
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/drop_database.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/drop_database/command'
 require 'mongo/operation/drop_database/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.4.0
     class DropDatabase
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/drop_index.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/drop_index/command'
 require 'mongo/operation/drop_index/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.0.0
     class DropIndex
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/explain.rb

@@ -17,8 +17,6 @@
 
 require 'mongo/operation/explain/result'
 require 'mongo/operation/explain/op_msg'
-require 'mongo/operation/explain/command'
-require 'mongo/operation/explain/legacy'
 
 module Mongo
   module Operation
@@ -30,7 +28,7 @@ module Mongo
     # @since 2.5.0
     class Explain
       include Specifiable
-      include OpMsgOrFindCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/find/builder.rb

@@ -17,5 +17,4 @@
 
 require 'mongo/operation/find/builder/command'
 require 'mongo/operation/find/builder/flags'
-require 'mongo/operation/find/builder/legacy'
 require 'mongo/operation/find/builder/modifiers'

data/lib/mongo/operation/find.rb

@@ -15,9 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/find/command'
 require 'mongo/operation/find/op_msg'
-require 'mongo/operation/find/legacy'
 require 'mongo/operation/find/result'
 require 'mongo/operation/find/builder'
 
@@ -31,7 +29,7 @@ module Mongo
     # @since 2.0.0
     class Find
       include Specifiable
-      include OpMsgOrFindCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/get_more.rb

@@ -16,9 +16,7 @@
 # limitations under the License.
 
 require 'mongo/operation/get_more/command_builder'
-require 'mongo/operation/get_more/command'
 require 'mongo/operation/get_more/op_msg'
-require 'mongo/operation/get_more/legacy'
 require 'mongo/operation/get_more/result'
 
 module Mongo
@@ -31,7 +29,7 @@ module Mongo
     # @since 2.5.0
     class GetMore
       include Specifiable
-      include OpMsgOrFindCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/indexes.rb

@@ -15,9 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/indexes/command'
 require 'mongo/operation/indexes/op_msg'
-require 'mongo/operation/indexes/legacy'
 require 'mongo/operation/indexes/result'
 
 module Mongo
@@ -30,21 +28,7 @@ module Mongo
     # @since 2.0.0
     class Indexes
       include Specifiable
-      include PolymorphicOperation
-      include PolymorphicLookup
-
-      private
-
-      def final_operation(connection)
-        cls = if connection.features.op_msg_enabled?
-          polymorphic_class(self.class.name, :OpMsg)
-        elsif connection.features.list_indexes_enabled?
-          polymorphic_class(self.class.name, :Command)
-        else
-          polymorphic_class(self.class.name, :Legacy)
-        end
-        cls.new(spec)
-      end
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/insert.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/insert/command'
 require 'mongo/operation/insert/op_msg'
 require 'mongo/operation/insert/result'
 require 'mongo/operation/insert/bulk_result'

data/lib/mongo/operation/kill_cursors.rb

@@ -16,7 +16,6 @@
 # limitations under the License.
 
 require 'mongo/operation/kill_cursors/command_builder'
-require 'mongo/operation/kill_cursors/command'
 require 'mongo/operation/kill_cursors/op_msg'
 
 module Mongo
@@ -29,7 +28,7 @@ module Mongo
     # @since 2.0.0
     class KillCursors
       include Specifiable
-      include OpMsgOrFindCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/list_collections.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/list_collections/command'
 require 'mongo/operation/list_collections/op_msg'
 require 'mongo/operation/list_collections/result'
 
@@ -29,7 +28,7 @@ module Mongo
     # @since 2.0.0
     class ListCollections
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/map_reduce.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/map_reduce/command'
 require 'mongo/operation/map_reduce/op_msg'
 require 'mongo/operation/map_reduce/result'
 
@@ -29,7 +28,7 @@ module Mongo
     # @since 2.5.0
     class MapReduce
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/parallel_scan.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/parallel_scan/command'
 require 'mongo/operation/parallel_scan/op_msg'
 require 'mongo/operation/parallel_scan/result'
 
@@ -29,7 +28,7 @@ module Mongo
     # @since 2.0.0
     class ParallelScan
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/remove_user.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/remove_user/command'
 require 'mongo/operation/remove_user/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.0.0
     class RemoveUser
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/shared/{polymorphic_operation.rb → op_msg_executable.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
-# Copyright (C) 2021 MongoDB Inc.
+# Copyright (C) 2018-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,11 +18,11 @@
 module Mongo
   module Operation
 
-    # Shared behavior of implementing an operation differently based on
-    # the server that will be executing the operation.
+    # Shared behavior of executing the operation as an OpMsg.
     #
     # @api private
-    module PolymorphicOperation
+    module OpMsgExecutable
+      include PolymorphicLookup
 
       # Execute the operation.
       #
@@ -46,8 +46,13 @@ module Mongo
       #
       # @return [ Mongo::Operation::Result ] The operation result.
       def execute_with_connection(connection, context:, options: {})
-        operation = final_operation(connection)
-        operation.execute(connection, context: context, options: options)
+        final_operation.execute(connection, context: context, options: options)
+      end
+
+      private
+
+      def final_operation
+        polymorphic_class(self.class.name, :OpMsg).new(spec)
       end
     end
   end

data/lib/mongo/operation/update.rb

@@ -15,7 +15,6 @@
 # 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/result'
 require 'mongo/operation/update/bulk_result'

data/lib/mongo/operation/update_user.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/update_user/command'
 require 'mongo/operation/update_user/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.0.0
     class UpdateUser
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/users_info.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/users_info/command'
 require 'mongo/operation/users_info/op_msg'
 require 'mongo/operation/users_info/result'
 
@@ -29,7 +28,7 @@ module Mongo
     # @since 2.0.0
     class UsersInfo
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/write_command.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/write_command/command'
 require 'mongo/operation/write_command/op_msg'
 
 module Mongo
@@ -26,7 +25,7 @@ module Mongo
     # @api private
     class WriteCommand
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation.rb

@@ -9,7 +9,6 @@ require 'mongo/operation/shared/executable'
 require 'mongo/operation/shared/executable_no_validate'
 require 'mongo/operation/shared/executable_transaction_label'
 require 'mongo/operation/shared/polymorphic_lookup'
-require 'mongo/operation/shared/polymorphic_operation'
 require 'mongo/operation/shared/polymorphic_result'
 require 'mongo/operation/shared/read_preference_supported'
 require 'mongo/operation/shared/bypass_document_validation'
@@ -22,8 +21,7 @@ require 'mongo/operation/shared/idable'
 require 'mongo/operation/shared/specifiable'
 require 'mongo/operation/shared/validatable'
 require 'mongo/operation/shared/object_id_generator'
-require 'mongo/operation/shared/op_msg_or_command'
-require 'mongo/operation/shared/op_msg_or_find_command'
+require 'mongo/operation/shared/op_msg_executable'
 
 require 'mongo/operation/op_msg_base'
 require 'mongo/operation/command'

data/lib/mongo/protocol/bit_vector.rb

@@ -39,9 +39,11 @@ module Mongo
         #
         # @param buffer [ String ] Buffer to receive the serialized vector
         # @param value [ Array<Symbol> ] Array of flags to encode
+        # @param [ true, false ] validating_keys Whether keys should be validated when serializing.
+        #   This option is deprecated and will not be used. It will removed in version 3.0.
         #
         # @return [ String ] Buffer that received the serialized vector
-        def serialize(buffer, value, validating_keys = BSON::Config.validating_keys?)
+        def serialize(buffer, value, validating_keys = nil)
           bits = 0
           value.each { |flag| bits |= (@masks[flag] || 0) }
           buffer.put_int32(bits)

data/lib/mongo/protocol/caching_hash.rb

@@ -38,32 +38,15 @@ module Mongo
       #
       # @param [ BSON::ByteBuffer ] buffer The encoded BSON buffer to append to.
       # @param [ true, false ] validating_keys Whether keys should be validated when serializing.
+      #   This option is deprecated and will not be used. It will removed in version 3.0.
       #
       # @return [ BSON::ByteBuffer ] The buffer with the encoded object.
-      def to_bson(buffer = BSON::ByteBuffer.new, validating_keys = BSON::Config.validating_keys?)
+      def to_bson(buffer = BSON::ByteBuffer.new, validating_keys = nil)
         if !@bytes
-          @bytes = @hash.to_bson(BSON::ByteBuffer.new, validating_keys).to_s
-        elsif needs_validation?(validating_keys)
-          @validated = true
-          return @hash.to_bson(buffer, validating_keys)
+          @bytes = @hash.to_bson(BSON::ByteBuffer.new).to_s
         end
-        @validated ||= validating_keys
         buffer.put_bytes(@bytes)
       end
-
-      private
-
-      # Checks the current value for validating keys, and whether or not this
-      # bson has been validated in the past, and decides if we need to recalculate
-      # the to_bson to check the validations.
-      #
-      # @param [ true, false ] validating_keys Whether keys should be validated when serializing.
-      #
-      # @return [ true, false ] Whether or not the bson needs to be recalculated
-      #   with validation.
-      def needs_validation?(validating_keys)
-        !@validated && validating_keys
-      end
     end
   end
 end

data/lib/mongo/protocol/message.rb

@@ -354,16 +354,16 @@ module Mongo
           if field[:multi]
             value.each do |item|
               if field[:type].respond_to?(:size_limited?)
-                field[:type].serialize(buffer, item, max_bson_size, validating_keys?)
+                field[:type].serialize(buffer, item, max_bson_size)
               else
-                field[:type].serialize(buffer, item, validating_keys?)
+                field[:type].serialize(buffer, item)
               end
             end
           else
             if field[:type].respond_to?(:size_limited?)
-              field[:type].serialize(buffer, value, max_bson_size, validating_keys?)
+              field[:type].serialize(buffer, value, max_bson_size)
             else
-              field[:type].serialize(buffer, value, validating_keys?)
+              field[:type].serialize(buffer, value)
             end
           end
         end
@@ -456,10 +456,6 @@ module Mongo
           field[:type].deserialize(io, options)
         )
       end
-
-      def validating_keys?
-        @options[:validating_keys] if @options
-      end
     end
   end
 end

data/lib/mongo/protocol/msg.rb

@@ -58,6 +58,7 @@ module Mongo
       # @option options [ true, false ] validating_keys Whether keys should be
       #   validated for being valid document keys (i.e. not begin with $ and
       #   not contain dots).
+      #   This option is deprecated and will not be used. It will removed in version 3.0.
       #
       # @api private
       #