mongo 2.0.6 → 2.1.0.beta

data/lib/mongo/operation/specifiable.rb

@@ -76,6 +76,11 @@ module Mongo
       # @since 2.0.0
       INDEX_NAME = :index_name.freeze
 
+      # The operation id constant.
+      #
+      # @since 2.1.0
+      OPERATION_ID = :operation_id.freeze
+
       # The field for options.
       #
       # @since 2.0.0
@@ -287,6 +292,19 @@ module Mongo
         @spec = spec
       end
 
+      # Get the operation id for the operation. Used for linking operations in
+      # monitoring.
+      #
+      # @example Get the operation id.
+      #   specifiable.operation_id
+      #
+      # @return [ Integer ] The operation id.
+      #
+      # @since 2.1.0
+      def operation_id
+        spec[OPERATION_ID]
+      end
+
       # Get the options for the operation.
       #
       # @example Get the options.

data/lib/mongo/operation/write/bulk/bulk_delete.rb

@@ -94,7 +94,7 @@ module Mongo
         def execute_message(context)
           replies = messages.map do |m|
             context.with_connection do |connection|
-              result = LegacyResult.new(connection.dispatch([ m, gle ].compact))
+              result = LegacyResult.new(connection.dispatch([ m, gle ].compact, operation_id))
               if stop_sending?(result)
                 return result
               else

data/lib/mongo/operation/write/bulk/bulk_insert.rb

@@ -79,7 +79,7 @@ module Mongo
           replies = []
           messages.map do |m|
             context.with_connection do |connection|
-              result = LegacyResult.new(connection.dispatch([ m, gle ].compact), @ids)
+              result = LegacyResult.new(connection.dispatch([ m, gle ].compact, operation_id), @ids)
               replies << result.reply
               if stop_sending?(result)
                 return LegacyResult.new(replies, @ids)

data/lib/mongo/operation/write/bulk/bulk_mergable.rb

@@ -32,7 +32,7 @@ module Mongo
         def aggregate_write_errors(indexes)
           @replies.reduce(nil) do |errors, reply|
             if reply.documents.first['writeErrors']
-              write_errors = reply.documents.first['writeErrors'].collect do |we|
+              write_errors = reply.documents.first[Error::WRITE_ERRORS].collect do |we|
                 we.merge!('index' => indexes[we['index']])
               end
               (errors || []) << write_errors if write_errors
@@ -53,7 +53,7 @@ module Mongo
         # @since 2.0.0
         def aggregate_write_concern_errors(indexes)
           @replies.each_with_index.reduce(nil) do |errors, (reply, i)|
-            if write_concern_errors = reply.documents.first['writeConcernErrors']
+            if write_concern_errors = reply.documents.first[Error::WRITE_CONCERN_ERRORS]
               (errors || []) << write_concern_errors.reduce(nil) do |errs, wce|
                   wce.merge!('index' => indexes[wce['index']])
                   (errs || []) << write_concern_error

data/lib/mongo/operation/write/bulk/bulk_update.rb

@@ -101,7 +101,7 @@ module Mongo
         def execute_message(context)
           replies = messages.map do |m|
             context.with_connection do |connection|
-              result = LegacyResult.new(connection.dispatch([ m, gle ].compact))
+              result = LegacyResult.new(connection.dispatch([ m, gle ].compact, operation_id))
               if stop_sending?(result)
                 return result
               else

data/lib/mongo/operation/write/bulk/bulk_update/result.rb

@@ -89,10 +89,22 @@ module Mongo
             end
           end
 
+          # Get the upserted documents.
+          #
+          # @example Get upserted documents.
+          #   result.upserted
+          #
+          # @return [ Array<BSON::Document> ] The upserted document info
+          #
+          # @since 2.1.0
+          def upserted
+            reply.documents.first[UPSERTED] || []
+          end
+
           private
 
           def upsert?(reply)
-            reply.documents.first[UPSERTED]
+            upserted.any?
           end
         end
 

data/lib/mongo/protocol/delete.rb

@@ -41,27 +41,22 @@ module Mongo
       #
       #   Supported flags: +:single_remove+
       def initialize(database, collection, selector, options = {})
+        @database = database
         @namespace = "#{database}.#{collection}"
         @selector  = selector
         @flags     = options[:flags] || []
       end
 
-      # The log message for a delete operation.
+      # Return the event payload for monitoring.
       #
-      # @example Get the log message.
-      #   delete.log_message
+      # @example Return the event payload.
+      #   message.payload
       #
-      # @return [ String ] The log message
+      # @return [ Hash ] The event payload.
       #
-      # @since 2.0.0
-      def log_message
-        fields = []
-        fields << ["%s |", "DELETE"]
-        fields << ["namespace=%s", namespace]
-        fields << ["selector=%s", selector.inspect]
-        fields << ["flags=%s", flags.inspect]
-        f, v = fields.transpose
-        f.join(" ") % v
+      # @since 2.1.0
+      def payload
+        { command_name: 'delete', database_name: @database, command: selector, request_id: request_id }
       end
 
       private

data/lib/mongo/protocol/get_more.rb

@@ -37,27 +37,27 @@ module Mongo
       # @param number_to_return [Integer] The number of documents to return.
       # @param cursor_id [Integer] The cursor id returned in a reply.
       def initialize(database, collection, number_to_return, cursor_id)
+        @database = database
         @namespace = "#{database}.#{collection}"
         @number_to_return = number_to_return
         @cursor_id = cursor_id
       end
 
-      # The log message for a get more operation.
+      # Return the event payload for monitoring.
       #
-      # @example Get the log message.
-      #   get_more.log_message
+      # @example Return the event payload.
+      #   message.payload
       #
-      # @return [ String ] The log message
+      # @return [ Hash ] The event payload.
       #
-      # @since 2.0.0
-      def log_message
-        fields = []
-        fields << ["%s |", "GETMORE"]
-        fields << ["namespace=%s", namespace]
-        fields << ["number_to_return=%s", number_to_return]
-        fields << ["cursor_id=%s", cursor_id]
-        f, v = fields.transpose
-        f.join(" ") % v
+      # @since 2.1.0
+      def payload
+        {
+          command_name: 'getmore',
+          database_name: @database,
+          command: { cursor_id: cursor_id, number_to_return: number_to_return },
+          request_id: request_id
+        }
       end
 
       # Get more messages require replies from the database.

data/lib/mongo/protocol/insert.rb

@@ -49,27 +49,22 @@ module Mongo
       #
       #   Supported flags: +:continue_on_error+
       def initialize(database, collection, documents, options = {})
+        @database = database
         @namespace = "#{database}.#{collection}"
         @documents = documents
         @flags = options[:flags] || []
       end
 
-      # The log message for a insert operation.
+      # Return the event payload for monitoring.
       #
-      # @example Get the log message.
-      #   insert.log_message
+      # @example Return the event payload.
+      #   message.payload
       #
-      # @return [ String ] The log message
+      # @return [ Hash ] The event payload.
       #
-      # @since 2.0.0
-      def log_message
-        fields = []
-        fields << ["%s |", "INSERT"]
-        fields << ["namespace=%s", namespace]
-        fields << ["documents=%s", documents.inspect]
-        fields << ["flags=%s", flags.inspect]
-        f, v = fields.transpose
-        f.join(" ") % v
+      # @since 2.1.0
+      def payload
+        { command_name: 'insert', database_name: @database, command: documents, request_id: request_id }
       end
 
       private

data/lib/mongo/protocol/kill_cursors.rb

@@ -35,20 +35,16 @@ module Mongo
         @id_count   = @cursor_ids.size
       end
 
-      # The log message for a kill cursors operation.
+      # Return the event payload for monitoring.
       #
-      # @example Get the log message.
-      #   kill_cursors.log_message
+      # @example Return the event payload.
+      #   message.payload
       #
-      # @return [ String ] The log message
+      # @return [ Hash ] The event payload.
       #
-      # @since 2.0.0
-      def log_message
-        fields = []
-        fields << ["%s |", "KILLCURSORS"]
-        fields << ["cursor_ids=%s", cursor_ids.inspect]
-        f, v = fields.transpose
-        f.join(" ") % v
+      # @since 2.1.0
+      def payload
+        { command_name: 'killcursors', command: { cursor_ids: cursor_ids }, request_id: request_id }
       end
 
       private

data/lib/mongo/protocol/query.rb

@@ -64,33 +64,75 @@ module Mongo
       #   Supported flags: +:tailable_cursor+, +:slave_ok+, +:oplog_replay+,
       #   +:no_cursor_timeout+, +:await_data+, +:exhaust+, +:partial+
       def initialize(database, collection, selector, options = {})
+        @database    = database
         @namespace   = "#{database}.#{collection}"
         @selector    = selector
+        @options     = options
         @project     = options[:project]
         @skip        = options[:skip]  || 0
         @limit       = options[:limit] || 0
         @flags       = options[:flags] || []
       end
 
-      # The log message for a query operation.
+      # Return the event payload for monitoring.
       #
-      # @example Get the log message.
-      #   query.log_message
+      # @example Return the event payload.
+      #   message.payload
       #
-      # @return [ String ] The log message
+      # @return [ Hash ] The event payload.
       #
-      # @since 2.0.0
-      def log_message
-        fields = []
-        fields << ["%s |", query_type]
-        fields << ["namespace=%s", namespace]
-        fields << ["selector=%s", formatted_selector]
-        fields << ["flags=%s", flags.inspect]
-        fields << ["limit=%s", limit.inspect]
-        fields << ["skip=%s", skip.inspect]
-        fields << ["project=%s", project.inspect]
-        f, v = fields.transpose
-        f.join(" ") % v
+      # @since 2.1.0
+      def payload
+        {
+          command_name: command_name,
+          database_name: @database,
+          command: arguments,
+          request_id: request_id
+        }
+      end
+
+      # If the message a command?
+      #
+      # @example Is the message a command?
+      #   message.command?
+      #
+      # @return [ true, false ] If the message is a command.
+      #
+      # @since 2.1.0
+      def command?
+        namespace.include?(Database::COMMAND)
+      end
+
+      # Returns the name of the command.
+      #
+      # @example Get the command name.
+      #   message.command_name
+      #
+      # @return [ String ] The name of the command, or 'find' if a query.
+      #
+      # @since 2.1.0
+      def command_name
+        if command?
+          selector.keys.first
+        else
+          'find'
+        end
+      end
+
+      # Get the command arguments.
+      #
+      # @example Get the command arguments.
+      #   message.arguments
+      #
+      # @return [ Hash ] The command arguments.
+      #
+      # @since 2.1.0
+      def arguments
+        if command?
+          selector
+        else
+          { filter: selector }.merge(@options)
+        end
       end
 
       # Query messages require replies from the database.
@@ -113,10 +155,6 @@ module Mongo
         2004
       end
 
-      def query_type
-        namespace.include?(Database::COMMAND) ? 'COMMAND' : 'QUERY'
-      end
-
       def formatted_selector
         ( (str = selector.inspect).length > LOG_STRING_LIMIT ) ?
           "#{str[0..LOG_STRING_LIMIT]}..." : str

data/lib/mongo/protocol/reply.rb

@@ -38,6 +38,18 @@ module Mongo
         flags.include?(:query_failure)
       end
 
+      # Return the event payload for monitoring.
+      #
+      # @example Return the event payload.
+      #   message.payload
+      #
+      # @return [ Hash ] The event payload.
+      #
+      # @since 2.1.0
+      def payload
+        { reply: documents, request_id: request_id }
+      end
+
       private
 
       # The operation code required to specify a Reply message.

data/lib/mongo/protocol/update.rb

@@ -52,29 +52,28 @@ module Mongo
       #
       #   Supported flags: +:upsert+, +:multi_update+
       def initialize(database, collection, selector, update, options = {})
+        @database    = database
         @namespace   = "#{database}.#{collection}"
         @selector    = selector
         @update      = update
         @flags       = options[:flags] || []
       end
 
-      # The log message for an update operation.
+      # Return the event payload for monitoring.
       #
-      # @example Get the log message.
-      #   update.log_message
+      # @example Return the event payload.
+      #   message.payload
       #
-      # @return [ String ] The log message
+      # @return [ Hash ] The event payload.
       #
-      # @since 2.0.0
-      def log_message
-        fields = []
-        fields << ["%s |", "UPDATE"]
-        fields << ["namespace=%s", namespace]
-        fields << ["selector=%s", selector.inspect]
-        fields << ["udpdate=%s", update.inspect]
-        fields << ["flags=%s", flags.inspect]
-        f, v = fields.transpose
-        f.join(" ") % v
+      # @since 2.1.0
+      def payload
+        {
+          command_name: 'update',
+          database_name: @database,
+          command: { filter: selector, update: update },
+          request_id: request_id
+        }
       end
 
       private

data/lib/mongo/server.rb

@@ -40,6 +40,9 @@ module Mongo
     # @return [ Hash ] The options hash.
     attr_reader :options
 
+    # @return [ Monitoring ] monitoring The monitoring.
+    attr_reader :monitoring
+
     # Get the description from the monitor and scan on monitor.
     def_delegators :monitor, :description, :scan!
 
@@ -107,18 +110,24 @@ module Mongo
     # Instantiate a new server object. Will start the background refresh and
     # subscribe to the appropriate events.
     #
+    # @api private
+    #
     # @example Initialize the server.
-    #   Mongo::Server.new('127.0.0.1:27017', cluster, listeners)
+    #   Mongo::Server.new('127.0.0.1:27017', cluster, monitoring, listeners)
+    #
+    # @note Server must never be directly instantiated outside of a Cluster.
     #
     # @param [ Address ] address The host:port address to connect to.
     # @param [ Cluster ] cluster  The cluster the server belongs to.
+    # @param [ Monitoring ] monitoring The monitoring.
     # @param [ Event::Listeners ] event_listeners The event listeners.
     # @param [ Hash ] options The server options.
     #
     # @since 2.0.0
-    def initialize(address, cluster, event_listeners, options = {})
+    def initialize(address, cluster, monitoring, event_listeners, options = {})
       @address = address
       @cluster = cluster
+      @monitoring = monitoring
       @options = options.freeze
       @monitor = Monitor.new(address, event_listeners, options)
       monitor.scan!
@@ -164,5 +173,17 @@ module Mongo
         tags[k] && tags[k] == tag_set[k]
       end
     end
+
+    # Restart the server monitor.
+    #
+    # @example Restart the server monitor.
+    #   server.reconnect!
+    #
+    # @return [ true ] Always true.
+    #
+    # @since 2.1.0
+    def reconnect!
+      monitor.restart! and true
+    end
   end
 end