Slight optimization in upconverters

Author: durran

lib/mongo/protocol/delete.rb

@@ -99,6 +99,16 @@ def op_code
       # @since 2.1.0
       class Upconverter
 
+        # The delete command constant.
+        #
+        # @since 2.2.0
+        DELETE = 'delete'.freeze
+
+        # The deletes command constant.
+        #
+        # @since 2.2.0
+        DELETES = 'deletes'.freeze
+
         # @return [ String ] collection The name of the collection.
         attr_reader :collection
 
@@ -132,11 +142,11 @@ def initialize(collection, filter, options)
         #
         # @since 2.1.0
         def command
-          BSON::Document.new(
-            delete: collection,
-            deletes: [ BSON::Document.new(q: filter, limit: limit) ],
-            ordered: true
-          )
+          document = BSON::Document.new
+          document.store(DELETE => collection)
+          document.store(DELETES => [ BSON::Document.new(Message::Q => filter, Message::LIMIT => limit) ])
+          document.store(Message::ORDERED => true)
+          document
         end
 
         private

lib/mongo/protocol/get_more.rb

@@ -104,6 +104,11 @@ def op_code
       # @since 2.1.0
       class Upconverter
 
+        # The get more constant.
+        #
+        # @since 2.2.0
+        GET_MORE = 'getMore'.freeze
+
         # @return [ String ] collection The name of the collection.
         attr_reader :collection
 
@@ -139,11 +144,11 @@ def initialize(collection, cursor_id, number_to_return)
         #
         # @since 2.1.0
         def command
-          BSON::Document.new(
-            getMore: cursor_id,
-            batchSize: number_to_return,
-            collection: collection
-          )
+          document = BSON::Document.new
+          document.store(GET_MORE => cursor_id)
+          document.store(Message::BATCH_SIZE => number_to_return)
+          document.store(Message::COLLECTION => collection)
+          document
         end
       end
     end

lib/mongo/protocol/insert.rb

@@ -114,11 +114,6 @@ class Upconverter
         # @since 2.1.0
         DOCUMENTS = 'documents'.freeze
 
-        # Ordered field constant.
-        #
-        # @since 2.1.0
-        ORDERED = 'ordered'.freeze
-
         # Write concern field constant.
         #
         # @since 2.1.0
@@ -161,7 +156,7 @@ def command
           document = BSON::Document.new
           document.store(INSERT, collection)
           document.store(DOCUMENTS, documents)
-          document.store(ORDERED, options.fetch(:ordered, true))
+          document.store(Message::ORDERED, options.fetch(:ordered, true))
           document.merge!(WRITE_CONCERN => options[:write_concern].options) if options[:write_concern]
           document
         end

lib/mongo/protocol/kill_cursors.rb

@@ -82,6 +82,16 @@ def op_code
       # @since 2.1.0
       class Upconverter
 
+        # The kill cursors constant.
+        #
+        # @since 2.2.0
+        KILL_CURSORS = 'killCursors'.freeze
+
+        # The cursors constant.
+        #
+        # @since 2.2.0
+        CURSORS = 'cursors'.freeze
+
         # @return [ String ] collection The name of the collection.
         attr_reader :collection
 
@@ -111,7 +121,10 @@ def initialize(collection, cursor_ids)
         #
         # @since 2.1.0
         def command
-          BSON::Document.new(killCursors: collection, cursors: cursor_ids)
+          document = BSON::Document.new
+          document.store(KILL_CURSORS => collection)
+          document.store(CURSORS => cursor_ids)
+          document
         end
       end
     end

lib/mongo/protocol/message.rb

@@ -42,6 +42,31 @@ module Protocol
     class Message
       include Serializers
 
+      # The batch size constant.
+      #
+      # @since 2.2.0
+      BATCH_SIZE = 'batchSize'.freeze
+
+      # The collection constant.
+      #
+      # @since 2.2.0
+      COLLECTION = 'collection'.freeze
+
+      # The limit constant.
+      #
+      # @since 2.2.0
+      LIMIT = 'limit'.freeze
+
+      # The ordered constant.
+      #
+      # @since 2.2.0
+      ORDERED = 'ordered'.freeze
+
+      # The q constant.
+      #
+      # @since 2.2.0
+      Q = 'q'.freeze
+
       # Returns the request id for the message
       #
       # @return [Fixnum] The request id for this message

lib/mongo/protocol/update.rb

@@ -116,6 +116,31 @@ def op_code
       # @since 2.1.0
       class Upconverter
 
+        # The multi constant.
+        #
+        # @since 2.2.0
+        MULTI = 'multi'.freeze
+
+        # The u constant.
+        #
+        # @since 2.2.0
+        U = 'u'.freeze
+
+        # The update constant.
+        #
+        # @since 2.2.0
+        UPDATE = 'update'.freeze
+
+        # The updates constant.
+        #
+        # @since 2.2.0
+        UPDATES = 'updates'.freeze
+
+        # The upsert constant.
+        #
+        # @since 2.2.0
+        UPSERT = 'upsert'.freeze
+
         # @return [ String ] collection The name of the collection.
         attr_reader :collection
 
@@ -160,18 +185,16 @@ def initialize(collection, filter, update, flags)
         #
         # @since 2.1.0
         def command
-          BSON::Document.new(
-            update: collection,
-            ordered: true,
-            updates: [
-              BSON::Document.new(
-                q: filter,
-                u: update,
-                multi: flags.include?(:multi_update),
-                upsert: flags.include?(:upsert),
-              )
-            ]
-          )
+          document = BSON::Document.new
+          updates = BSON::Document.new
+          updates.store(Message::Q => filter)
+          updates.store(U => update)
+          updates.store(MULTI => flags.include?(:multi_update))
+          updates.store(UPSERT => flags.include?(:upsert))
+          document.store(UPDATE => collection)
+          document.store(Message::ORDERED => true)
+          document.store(UPDATES => [ updates ])
+          document
         end
       end
     end