mongo 2.12.4 → 2.13.0.beta1

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2019 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.
@@ -36,24 +36,28 @@ module Mongo
       #
       # @since 2.5.2
       def execute(server, client:)
-        validate!
-        op = if server.features.op_msg_enabled?
-            self.class::OpMsg.new(spec)
-          elsif !acknowledged_write?
-            self.class::Legacy.new(spec)
-          else
-            self.class::Command.new(spec)
-          end
-        result = op.execute(server, client: client)
-        validate_result(result, server)
+        server.with_connection do |connection|
+          validate!(connection)
+          op = if connection.features.op_msg_enabled?
+              self.class::OpMsg.new(spec)
+            elsif !acknowledged_write?
+              self.class::Legacy.new(spec)
+            else
+              self.class::Command.new(spec)
+            end
+
+          result = op.execute(connection, client: client)
+          validate_result(result, client, connection)
+        end
       end
 
       # Execute the bulk write operation.
       #
       # @example
-      #   operation.bulk_execute(server, client: nil)
+      #   operation.bulk_execute(connection, client: nil)
       #
-      # @param [ Mongo::Server ] server The server to send the operation to.
+      # @param [ Mongo::Server::Connection ] connection The connection over
+      #   which to send the operation.
       # @param [ Mongo::Client ] client The client that will be used to
       #   perform auto-encryption if it is necessary to encrypt the command
       #   being executed (optional).
@@ -63,23 +67,25 @@ module Mongo
       #           Mongo::Operation::Update::BulkResult ] The bulk result.
       #
       # @since 2.5.2
-      def bulk_execute(server, client:)
-        if server.features.op_msg_enabled?
-          self.class::OpMsg.new(spec).execute(server, client: client).bulk_result
+      def bulk_execute(connection, client:)
+        Lint.assert_type(connection, Server::Connection)
+
+        if connection.features.op_msg_enabled?
+          self.class::OpMsg.new(spec).execute(connection, client: client).bulk_result
         else
-          self.class::Command.new(spec).execute(server, client: client).bulk_result
+          self.class::Command.new(spec).execute(connection, client: client).bulk_result
         end
       end
 
       private
 
-      def validate!
+      def validate!(connection)
         if !acknowledged_write?
           if collation
             raise Error::UnsupportedCollation.new(
                 Error::UnsupportedCollation::UNACKNOWLEDGED_WRITES_MESSAGE)
           end
-          if array_filters
+          if array_filters(connection)
             raise Error::UnsupportedArrayFilters.new(
                 Error::UnsupportedArrayFilters::UNACKNOWLEDGED_WRITES_MESSAGE)
           end

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2019 MongoDB, Inc.
+# Copyright (C) 2015-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.
@@ -22,14 +22,14 @@ module Mongo
 
       private
 
-      def write_concern_supported?(server); true; end
+      def write_concern_supported?(connection); true; end
 
-      def command(server)
-        add_write_concern!(super, server)
+      def command(connection)
+        add_write_concern!(super, connection)
       end
 
-      def add_write_concern!(sel, server)
-        if write_concern && write_concern_supported?(server)
+      def add_write_concern!(sel, connection)
+        if write_concern && write_concern_supported?(connection)
           sel[:writeConcern] = write_concern.options
         end
         sel

data/lib/mongo/operation/update.rb

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

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

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

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2019 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.
@@ -32,14 +32,14 @@ module Mongo
 
         private
 
-        def selector(server)
+        def selector(connection)
           { update: coll_name,
             updates: send(IDENTIFIER),
             ordered: ordered? }
         end
 
-        def message(server)
-          Protocol::Query.new(db_name, Database::COMMAND, command(server), options)
+        def message(connection)
+          Protocol::Query.new(db_name, Database::COMMAND, command(connection), options(connection))
         end
       end
     end

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2019 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.
@@ -34,7 +34,7 @@ module Mongo
           send(IDENTIFIER).first
         end
 
-        def message(server)
+        def message(connection)
           flags = []
           flags << :multi_update if selector[Operation::MULTI]
           flags << :upsert if selector[Operation::UPSERT]

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

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

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2019 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.
@@ -29,15 +29,15 @@ module Mongo
 
         private
 
-        def selector(server)
+        def selector(connection)
           { update: coll_name,
             Protocol::Msg::DATABASE_IDENTIFIER => db_name,
             ordered: ordered? }
         end
 
-        def message(server)
+        def message(connection)
           section = Protocol::Msg::Section1.new(IDENTIFIER, send(IDENTIFIER))
-          Protocol::Msg.new(flags, {}, command(server), section)
+          Protocol::Msg.new(flags, {}, command(connection), section)
         end
       end
     end

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019 MongoDB, Inc.
+# Copyright (C) 2014-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.
@@ -88,7 +88,7 @@ module Mongo
         end
 
         def bulk_result
-          BulkResult.new(@replies)
+          BulkResult.new(@replies, connection_description)
         end
 
         private

data/lib/mongo/operation/update_user.rb

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

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2019 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.
@@ -29,12 +29,12 @@ module Mongo
 
         private
 
-        def selector(server)
+        def selector(connection)
           { :updateUser => user.name }.merge(user.spec)
         end
 
-        def message(server)
-          Protocol::Query.new(db_name, Database::COMMAND, command(server), options)
+        def message(connection)
+          Protocol::Query.new(db_name, Database::COMMAND, command(connection), options(connection))
         end
       end
     end

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2019 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.
@@ -26,7 +26,7 @@ module Mongo
 
         private
 
-        def selector(server)
+        def selector(connection)
           { :updateUser => user.name }.merge(user.spec)
         end
       end

data/lib/mongo/operation/users_info.rb

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

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2019 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.
@@ -30,12 +30,12 @@ module Mongo
 
         private
 
-        def selector(server)
+        def selector(connection)
           { :usersInfo => user_name }
         end
 
-        def message(server)
-          Protocol::Query.new(db_name, Database::COMMAND, command(server), options(server))
+        def message(connection)
+          Protocol::Query.new(db_name, Database::COMMAND, command(connection), options(connection))
         end
       end
     end

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2019 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.
@@ -27,7 +27,7 @@ module Mongo
 
         private
 
-        def selector(server)
+        def selector(connection)
           { :usersInfo => user_name }
         end
       end

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

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

data/lib/mongo/options.rb

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

data/lib/mongo/options/mapper.rb

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

data/lib/mongo/options/redacted.rb

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

data/lib/mongo/protocol/bit_vector.rb

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

data/lib/mongo/protocol/compressed.rb

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

data/lib/mongo/protocol/delete.rb

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

data/lib/mongo/protocol/get_more.rb

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

data/lib/mongo/protocol/insert.rb

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

data/lib/mongo/protocol/kill_cursors.rb

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

data/lib/mongo/protocol/message.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019 MongoDB, Inc.
+# Copyright (C) 2014-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.
@@ -177,19 +177,10 @@ module Mongo
       #
       # @param buffer [String] buffer where the message should be inserted
       # @return [String] buffer containing the serialized message
-      def serialize(buffer = BSON::ByteBuffer.new, max_bson_size = nil, bson_overhead = nil)
-        max_size =
-          if max_bson_size && bson_overhead
-            max_bson_size + bson_overhead
-          elsif max_bson_size
-            max_bson_size
-          else
-            nil
-          end
-
+      def serialize(buffer = BSON::ByteBuffer.new, max_bson_size = nil)
         start = buffer.length
         serialize_header(buffer)
-        serialize_fields(buffer, max_size)
+        serialize_fields(buffer, max_bson_size)
         buffer.replace_int32(start, buffer.length - start)
       end
 
@@ -383,7 +374,7 @@ module Mongo
       #   each of the elements in this array using BSON types wherever possible.
       #
       # @return [Message] Message with deserialized array.
-      def self.deserialize_array(message, io, field, options = {})
+      def self.deserialize_array(message, io, field, options)
         elements = []
         count = message.instance_variable_get(field[:multi])
         count.times { elements << field[:type].deserialize(io, options) }
@@ -401,7 +392,7 @@ module Mongo
       #   this field using BSON types wherever possible.
       #
       # @return [Message] Message with deserialized field.
-      def self.deserialize_field(message, io, field, options = {})
+      def self.deserialize_field(message, io, field, options)
         message.instance_variable_set(
           field[:name],
           field[:type].deserialize(io, options)

data/lib/mongo/protocol/msg.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 MongoDB, Inc.
+# Copyright (C) 2017-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.
@@ -139,9 +139,7 @@ module Mongo
       # @return [ BSON::ByteBuffer ] buffer containing the serialized message.
       #
       # @since 2.5.0
-      def serialize(buffer = BSON::ByteBuffer.new, max_bson_size = nil, bson_overhead = nil)
-        validate_document_size!(max_bson_size)
-
+      def serialize(buffer = BSON::ByteBuffer.new, max_bson_size = nil)
         super
         add_check_sum(buffer)
         buffer
@@ -197,15 +195,15 @@ module Mongo
       #
       # @return [ Mongo::Protocol::Msg ] The encrypted message, or the original
       #   message if encryption was not possible or necessary.
-      def maybe_encrypt(server, client)
+      def maybe_encrypt(connection, client)
         # TODO verify compression happens later, i.e. when this method runs
         # the message is not compressed.
         if client && client.encrypter && client.encrypter.encrypt?
-          if server.max_wire_version < 8
+          if connection.description.max_wire_version < 8
             raise Error::CryptError.new(
               "Cannot perform encryption against a MongoDB server older than " +
               "4.2 (wire version less than 8). Currently connected to server " +
-              "with max wire version #{server.max_wire_version}} " +
+              "with max wire version #{connection.description.max_wire_version}} " +
               "(Auto-encryption requires a minimum MongoDB version of 4.2)"
             )
           end
@@ -270,23 +268,6 @@ module Mongo
 
       private
 
-      # Validate that the documents in this message are all smaller than the
-      # maxBsonObjectSize. If not, raise an exception.
-      def validate_document_size!(max_bson_size)
-        max_bson_size ||= Mongo::Server::ConnectionBase::DEFAULT_MAX_BSON_OBJECT_SIZE
-
-        contains_too_large_document = @sections.any? do |section|
-          section[:type] == 1 &&
-            section[:payload][:sequence].any? do |document|
-              document.to_bson.length > max_bson_size
-            end
-        end
-
-        if contains_too_large_document
-          raise Error::MaxBSONSize.new('The document exceeds maximum allowed BSON object size after serialization')
-        end
-      end
-
       def command
         @command ||= if @main_document
           @main_document.dup.tap do |cmd|