RUBY-1028: Improve performance of 2.4 monitoring

durran · durran · commit a3c48fcd07be · 2015-09-10T16:20:22.000+02:00
diff --git a/lib/mongo/bulk_write/transformable.rb b/lib/mongo/bulk_write/transformable.rb
@@ -56,14 +56,14 @@ module Transformable
       #
       # @since 2.1.0
       DELETE_MANY_TRANSFORM = ->(doc){
-        { q: doc[:filter], limit: 0 }
+        { Operation::Q => doc[:filter], Operation::LIMIT => 0 }
       }
 
       # Proc to transform delete one ops.
       #
       # @since 2.1.0
       DELETE_ONE_TRANSFORM = ->(doc){
-        { q: doc[:filter], limit: 1 }
+        { Operation::Q => doc[:filter], Operation::LIMIT => 1 }
       }
 
       # Proc to transform insert one ops.
@@ -77,21 +77,36 @@ module Transformable
       #
       # @since 2.1.0
       REPLACE_ONE_TRANSFORM = ->(doc){
-        { q: doc[:filter], u: doc[:replacement], multi: false, upsert: doc.fetch(:upsert, false) }
+        {
+          Operation::Q => doc[:filter],
+          Operation::U => doc[:replacement],
+          Operation::MULTI => false,
+          Operation::UPSERT => doc.fetch(:upsert, false)
+        }
       }
 
       # Proc to transform update many ops.
       #
       # @since 2.1.0
       UPDATE_MANY_TRANSFORM = ->(doc){
-        { q: doc[:filter], u: doc[:update], multi: true, upsert: doc.fetch(:upsert, false) }
+        {
+          Operation::Q => doc[:filter],
+          Operation::U => doc[:update],
+          Operation::MULTI => true,
+          Operation::UPSERT => doc.fetch(:upsert, false)
+        }
       }
 
       # Proc to transform update one ops.
       #
       # @since 2.1.0
       UPDATE_ONE_TRANSFORM = ->(doc){
-        { q: doc[:filter], u: doc[:update], multi: false, upsert: doc.fetch(:upsert, false) }
+        {
+          Operation::Q => doc[:filter],
+          Operation::U => doc[:update],
+          Operation::MULTI => false,
+          Operation::UPSERT => doc.fetch(:upsert, false)
+        }
       }
 
       # Document mappers from the bulk api input into proper commands.
diff --git a/lib/mongo/collection/view/writable.rb b/lib/mongo/collection/view/writable.rb
@@ -172,7 +172,7 @@ def update_one(spec, opts = {})
         def remove(value)
           write_with_retry do
             Operation::Write::Delete.new(
-              :delete => { q: selector, limit: value },
+              :delete => { Operation::Q => selector, Operation::LIMIT => value },
               :db_name => collection.database.name,
               :coll_name => collection.name,
               :write_concern => collection.write_concern
@@ -183,10 +183,10 @@ def remove(value)
         def update(spec, multi, opts)
           write_with_retry do
             Operation::Write::Update.new(
-              :update => { q: selector,
-                           u: spec,
-                           multi: multi,
-                           upsert: !!opts[:upsert] },
+              :update => { Operation::Q => selector,
+                           Operation::U => spec,
+                           Operation::MULTI => multi,
+                           Operation::UPSERT => !!opts[:upsert] },
               :db_name => collection.database.name,
               :coll_name => collection.name,
               :write_concern => collection.write_concern
diff --git a/lib/mongo/operation.rb b/lib/mongo/operation.rb
@@ -20,4 +20,34 @@
 require 'mongo/operation/read'
 require 'mongo/operation/write'
 require 'mongo/operation/commands'
-require 'mongo/operation/kill_cursors'
+require 'mongo/operation/kill_cursors'
+
+module Mongo
+  module Operation
+
+    # The q field constant.
+    #
+    # @since 2.1.0
+    Q = 'q'.freeze
+
+    # The u field constant.
+    #
+    # @since 2.1.0
+    U = 'u'.freeze
+
+    # The limit field constant.
+    #
+    # @since 2.1.0
+    LIMIT = 'limit'.freeze
+
+    # The multi field constant.
+    #
+    # @since 2.1.0
+    MULTI = 'multi'.freeze
+
+    # The upsert field constant.
+    #
+    # @since 2.1.0
+    UPSERT = 'upsert'.freeze
+  end
+end
diff --git a/lib/mongo/operation/write/bulk/delete.rb b/lib/mongo/operation/write/bulk/delete.rb
@@ -60,8 +60,8 @@ def execute_write_command(context)
 
           def messages
             deletes.collect do |del|
-              opts = ( del[:limit] || 0 ) <= 0 ? {} : { :flags => [ :single_remove ] }
-              Protocol::Delete.new(db_name, coll_name, del[:q], opts)
+              opts = ( del[Operation::LIMIT] || 0 ) <= 0 ? {} : { :flags => [ :single_remove ] }
+              Protocol::Delete.new(db_name, coll_name, del[Operation::Q], opts)
             end
           end
         end
diff --git a/lib/mongo/operation/write/bulk/update.rb b/lib/mongo/operation/write/bulk/update.rb
@@ -69,9 +69,9 @@ def execute_write_command(context)
           def messages
             updates.collect do |u|
               opts = { :flags => [] }
-              opts[:flags] << :multi_update if !!u[:multi]
-              opts[:flags] << :upsert if !!u[:upsert]
-              Protocol::Update.new(db_name, coll_name, u[:q], u[:u], opts)
+              opts[:flags] << :multi_update if !!u[Operation::MULTI]
+              opts[:flags] << :upsert if !!u[Operation::UPSERT]
+              Protocol::Update.new(db_name, coll_name, u[Operation::Q], u[Operation::U], opts)
             end
           end
         end
diff --git a/lib/mongo/operation/write/delete.rb b/lib/mongo/operation/write/delete.rb
@@ -61,8 +61,8 @@ def write_command_op
         end
 
         def message
-          selector = delete[:q]
-          opts     = (delete[:limit] || 0) <= 0 ? {} : { :flags => [ :single_remove ] }
+          selector = delete[Operation::Q]
+          opts     = (delete[Operation::LIMIT] || 0) <= 0 ? {} : { :flags => [ :single_remove ] }
           Protocol::Delete.new(db_name, coll_name, selector, opts)
         end
       end
diff --git a/lib/mongo/operation/write/update.rb b/lib/mongo/operation/write/update.rb
@@ -65,10 +65,15 @@ def write_command_op
 
         def message
           flags = []
-          flags << :multi_update if update[:multi]
-          flags << :upsert if update[:upsert]
-          Protocol::Update.new(db_name, coll_name, update[:q], update[:u],
-                               flags.empty? ? {} : { flags: flags })
+          flags << :multi_update if update[Operation::MULTI]
+          flags << :upsert if update[Operation::UPSERT]
+          Protocol::Update.new(
+            db_name,
+            coll_name,
+            update[Operation::Q],
+            update[Operation::U],
+            flags.empty? ? {} : { flags: flags }
+          )
         end
       end
     end
diff --git a/lib/mongo/protocol/query.rb b/lib/mongo/protocol/query.rb
@@ -262,7 +262,11 @@ def command?
         end
 
         def op_command
-          BSON::Document.new(filter)
+          document = BSON::Document.new
+          filter.each do |field, value|
+            document.store(field.to_s, value)
+          end
+          document
         end
 
         def find_command
diff --git a/spec/mongo/bulk_write/ordered_combiner_spec.rb b/spec/mongo/bulk_write/ordered_combiner_spec.rb
@@ -24,8 +24,8 @@
             [
               {
                 delete_one: [
-                  { q: { _id: 0 }, limit: 1 },
-                  { q: { _id: 1 }, limit: 1 }
+                  { 'q' => { _id: 0 }, 'limit' => 1 },
+                  { 'q' => { _id: 1 }, 'limit' => 1 }
                 ]
               }
             ]
@@ -66,8 +66,8 @@
             [
               {
                 delete_many: [
-                  { q: { _id: 0 }, limit: 0 },
-                  { q: { _id: 1 }, limit: 0 }
+                  { 'q' => { _id: 0 }, 'limit' => 0 },
+                  { 'q' => { _id: 1 }, 'limit' => 0 }
                 ]
               }
             ]
@@ -137,8 +137,8 @@
             [
               {
                 replace_one: [
-                  { q: { _id: 0 }, u: { name: 'test' }, multi: false, upsert: false },
-                  { q: { _id: 1 }, u: { name: 'test' }, multi: false, upsert: false }
+                  { 'q' => { _id: 0 }, 'u' => { name: 'test' }, 'multi' => false, 'upsert' => false },
+                  { 'q' => { _id: 1 }, 'u' => { name: 'test' }, 'multi' => false, 'upsert' => false }
                 ]
               }
             ]
@@ -179,8 +179,8 @@
             [
               {
                 update_one: [
-                  { q: { _id: 0 }, u: { '$set' => { name: 'test' }}, multi: false, upsert: false },
-                  { q: { _id: 1 }, u: { '$set' => { name: 'test' }}, multi: false, upsert: false }
+                  { 'q' => { _id: 0 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => false, 'upsert' => false },
+                  { 'q' => { _id: 1 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => false, 'upsert' => false }
                 ]
               }
             ]
@@ -221,8 +221,8 @@
             [
               {
                 update_many: [
-                  { q: { _id: 0 }, u: { '$set' => { name: 'test' }}, multi: true, upsert: false },
-                  { q: { _id: 1 }, u: { '$set' => { name: 'test' }}, multi: true, upsert: false }
+                  { 'q' => { _id: 0 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => true, 'upsert' => false },
+                  { 'q' => { _id: 1 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => true, 'upsert' => false }
                 ]
               }
             ]
@@ -261,7 +261,7 @@
         expect(combiner.combine).to eq(
           [
             { insert_one: [{ _id: 0 }]},
-            { delete_one: [{ q: { _id: 0 }, limit: 1 }]},
+            { delete_one: [{ 'q' => { _id: 0 }, 'limit' => 1 }]},
             { insert_one: [{ _id: 1 }]}
           ]
         )
diff --git a/spec/mongo/bulk_write/unordered_combiner_spec.rb b/spec/mongo/bulk_write/unordered_combiner_spec.rb
@@ -24,8 +24,8 @@
             [
               {
                 delete_one: [
-                  { q: { _id: 0 }, limit: 1 },
-                  { q: { _id: 1 }, limit: 1 }
+                  { 'q' => { _id: 0 }, 'limit' => 1 },
+                  { 'q' => { _id: 1 }, 'limit' => 1 }
                 ]
               }
             ]
@@ -66,8 +66,8 @@
             [
               {
                 delete_many: [
-                  { q: { _id: 0 }, limit: 0 },
-                  { q: { _id: 1 }, limit: 0 }
+                  { 'q' => { _id: 0 }, 'limit' => 0 },
+                  { 'q' => { _id: 1 }, 'limit' => 0 }
                 ]
               }
             ]
@@ -137,8 +137,8 @@
             [
               {
                 update_one: [
-                  { q: { _id: 0 }, u: { '$set' => { name: 'test' }}, multi: false, upsert: false },
-                  { q: { _id: 1 }, u: { '$set' => { name: 'test' }}, multi: false, upsert: false }
+                  { 'q' => { _id: 0 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => false, 'upsert' => false },
+                  { 'q' => { _id: 1 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => false, 'upsert' => false }
                 ]
               }
             ]
@@ -179,8 +179,8 @@
             [
               {
                 update_many: [
-                  { q: { _id: 0 }, u: { '$set' => { name: 'test' }}, multi: true, upsert: false },
-                  { q: { _id: 1 }, u: { '$set' => { name: 'test' }}, multi: true, upsert: false }
+                  { 'q' => { _id: 0 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => true, 'upsert' => false },
+                  { 'q' => { _id: 1 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => true, 'upsert' => false }
                 ]
               }
             ]
@@ -227,8 +227,8 @@
             },
             {
               delete_one: [
-                { q: { _id: 0 }, limit: 1 },
-                { q: { _id: 1 }, limit: 1 }
+                { 'q' => { _id: 0 }, 'limit' => 1 },
+                { 'q' => { _id: 1 }, 'limit' => 1 }
               ]
             }
           ]
diff --git a/spec/mongo/operation/write/bulk/delete_spec.rb b/spec/mongo/operation/write/bulk/delete_spec.rb
diff --git a/spec/mongo/operation/write/bulk/update_spec.rb b/spec/mongo/operation/write/bulk/update_spec.rb
diff --git a/spec/mongo/operation/write/delete_spec.rb b/spec/mongo/operation/write/delete_spec.rb
diff --git a/spec/mongo/operation/write/update_spec.rb b/spec/mongo/operation/write/update_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -56,14 +56,14 @@ module Transformable`
`56`	`56`	`#`
`57`	`57`	`# @since 2.1.0`
`58`	`58`	`DELETE_MANY_TRANSFORM = ->(doc){`
`59`		`- { q: doc[:filter], limit: 0 }`
	`59`	`+ { Operation::Q => doc[:filter], Operation::LIMIT => 0 }`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`# Proc to transform delete one ops.`
`63`	`63`	`#`
`64`	`64`	`# @since 2.1.0`
`65`	`65`	`DELETE_ONE_TRANSFORM = ->(doc){`
`66`		`- { q: doc[:filter], limit: 1 }`
	`66`	`+ { Operation::Q => doc[:filter], Operation::LIMIT => 1 }`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`# Proc to transform insert one ops.`
`@@ -77,21 +77,36 @@ module Transformable`
`77`	`77`	`#`
`78`	`78`	`# @since 2.1.0`
`79`	`79`	`REPLACE_ONE_TRANSFORM = ->(doc){`
`80`		`- { q: doc[:filter], u: doc[:replacement], multi: false, upsert: doc.fetch(:upsert, false) }`
	`80`	`+ {`
	`81`	`+ Operation::Q => doc[:filter],`
	`82`	`+ Operation::U => doc[:replacement],`
	`83`	`+ Operation::MULTI => false,`
	`84`	`+ Operation::UPSERT => doc.fetch(:upsert, false)`
	`85`	`+ }`
`81`	`86`	`}`
`82`	`87`
`83`	`88`	`# Proc to transform update many ops.`
`84`	`89`	`#`
`85`	`90`	`# @since 2.1.0`
`86`	`91`	`UPDATE_MANY_TRANSFORM = ->(doc){`
`87`		`- { q: doc[:filter], u: doc[:update], multi: true, upsert: doc.fetch(:upsert, false) }`
	`92`	`+ {`
	`93`	`+ Operation::Q => doc[:filter],`
	`94`	`+ Operation::U => doc[:update],`
	`95`	`+ Operation::MULTI => true,`
	`96`	`+ Operation::UPSERT => doc.fetch(:upsert, false)`
	`97`	`+ }`
`88`	`98`	`}`
`89`	`99`
`90`	`100`	`# Proc to transform update one ops.`
`91`	`101`	`#`
`92`	`102`	`# @since 2.1.0`
`93`	`103`	`UPDATE_ONE_TRANSFORM = ->(doc){`
`94`		`- { q: doc[:filter], u: doc[:update], multi: false, upsert: doc.fetch(:upsert, false) }`
	`104`	`+ {`
	`105`	`+ Operation::Q => doc[:filter],`
	`106`	`+ Operation::U => doc[:update],`
	`107`	`+ Operation::MULTI => false,`
	`108`	`+ Operation::UPSERT => doc.fetch(:upsert, false)`
	`109`	`+ }`
`95`	`110`	`}`
`96`	`111`
`97`	`112`	`# Document mappers from the bulk api input into proper commands.`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@`
`24`	`24`	`[`
`25`	`25`	`{`
`26`	`26`	`delete_one: [`
`27`		`- { q: { _id: 0 }, limit: 1 },`
`28`		`- { q: { _id: 1 }, limit: 1 }`
	`27`	`+ { 'q' => { _id: 0 }, 'limit' => 1 },`
	`28`	`+ { 'q' => { _id: 1 }, 'limit' => 1 }`
`29`	`29`	`]`
`30`	`30`	`}`
`31`	`31`	`]`
`@@ -66,8 +66,8 @@`
`66`	`66`	`[`
`67`	`67`	`{`
`68`	`68`	`delete_many: [`
`69`		`- { q: { _id: 0 }, limit: 0 },`
`70`		`- { q: { _id: 1 }, limit: 0 }`
	`69`	`+ { 'q' => { _id: 0 }, 'limit' => 0 },`
	`70`	`+ { 'q' => { _id: 1 }, 'limit' => 0 }`
`71`	`71`	`]`
`72`	`72`	`}`
`73`	`73`	`]`
`@@ -137,8 +137,8 @@`
`137`	`137`	`[`
`138`	`138`	`{`
`139`	`139`	`replace_one: [`
`140`		`- { q: { _id: 0 }, u: { name: 'test' }, multi: false, upsert: false },`
`141`		`- { q: { _id: 1 }, u: { name: 'test' }, multi: false, upsert: false }`
	`140`	`+ { 'q' => { _id: 0 }, 'u' => { name: 'test' }, 'multi' => false, 'upsert' => false },`
	`141`	`+ { 'q' => { _id: 1 }, 'u' => { name: 'test' }, 'multi' => false, 'upsert' => false }`
`142`	`142`	`]`
`143`	`143`	`}`
`144`	`144`	`]`
`@@ -179,8 +179,8 @@`
`179`	`179`	`[`
`180`	`180`	`{`
`181`	`181`	`update_one: [`
`182`		`- { q: { _id: 0 }, u: { '$set' => { name: 'test' }}, multi: false, upsert: false },`
`183`		`- { q: { _id: 1 }, u: { '$set' => { name: 'test' }}, multi: false, upsert: false }`
	`182`	`+ { 'q' => { _id: 0 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => false, 'upsert' => false },`
	`183`	`+ { 'q' => { _id: 1 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => false, 'upsert' => false }`
`184`	`184`	`]`
`185`	`185`	`}`
`186`	`186`	`]`
`@@ -221,8 +221,8 @@`
`221`	`221`	`[`
`222`	`222`	`{`
`223`	`223`	`update_many: [`
`224`		`- { q: { _id: 0 }, u: { '$set' => { name: 'test' }}, multi: true, upsert: false },`
`225`		`- { q: { _id: 1 }, u: { '$set' => { name: 'test' }}, multi: true, upsert: false }`
	`224`	`+ { 'q' => { _id: 0 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => true, 'upsert' => false },`
	`225`	`+ { 'q' => { _id: 1 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => true, 'upsert' => false }`
`226`	`226`	`]`
`227`	`227`	`}`
`228`	`228`	`]`
`@@ -261,7 +261,7 @@`
`261`	`261`	`expect(combiner.combine).to eq(`
`262`	`262`	`[`
`263`	`263`	`{ insert_one: [{ _id: 0 }]},`
`264`		`- { delete_one: [{ q: { _id: 0 }, limit: 1 }]},`
	`264`	`+ { delete_one: [{ 'q' => { _id: 0 }, 'limit' => 1 }]},`
`265`	`265`	`{ insert_one: [{ _id: 1 }]}`
`266`	`266`	`]`
`267`	`267`	`)`