RUBY-1580 Deduplicate code across OP_MSG operation classes (#1155)

Author: p-mongo

lib/mongo/operation.rb

@@ -2,6 +2,9 @@
 require 'mongo/operation/result'
 
 require 'mongo/operation/shared/executable'
+require 'mongo/operation/shared/executable_no_validate'
+require 'mongo/operation/shared/executable_transaction_label'
+require 'mongo/operation/shared/polymorphic_result'
 require 'mongo/operation/shared/read_preference_supported'
 require 'mongo/operation/shared/bypass_document_validation'
 require 'mongo/operation/shared/write_concern_supported'
@@ -13,6 +16,7 @@
 require 'mongo/operation/shared/specifiable'
 require 'mongo/operation/shared/object_id_generator'
 
+require 'mongo/operation/op_msg_base'
 require 'mongo/operation/command'
 require 'mongo/operation/aggregate'
 require 'mongo/operation/result'

lib/mongo/operation/aggregate/op_msg.rb

@@ -21,36 +21,10 @@ class Aggregate
       # @api private
       #
       # @since 2.5.2
-      class OpMsg
-        include Specifiable
-        include Executable
-        include SessionsSupported
+      class OpMsg < OpMsgBase
         include CausalConsistencySupported
-
-        # Execute the operation.
-        #
-        # @example
-        #   operation.execute(server)
-        #
-        # @param [ Mongo::Server ] server The server to send the operation to.
-        #
-        # @return [ Mongo::Operation::Aggregate::Result ] The operation result.
-        #
-        # @since 2.5.2
-        def execute(server)
-          result = Result.new(dispatch_message(server))
-          process_result(result, server)
-          result.validate!
-        rescue Mongo::Error::SocketError => e
-          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
-          raise e
-        end
-
-        private
-
-        def message(server)
-          Protocol::Msg.new(flags, options, command(server))
-        end
+        include PolymorphicResult
+        include ExecutableTransactionLabel
       end
     end
   end

lib/mongo/operation/command/op_msg.rb

@@ -21,32 +21,7 @@ class Command
       # @api private
       #
       # @since 2.5.2
-      class OpMsg
-        include Specifiable
-        include Executable
-        include SessionsSupported
-
-        # Execute the operation.
-        #
-        # @example
-        #   operation.execute(server)
-        #
-        # @param [ Mongo::Server ] server The server to send the operation to.
-        #
-        # @return [ Mongo::Operation::Result ] The operation result.
-        #
-        # @since 2.5.2
-        def execute(server)
-          result = Result.new(dispatch_message(server))
-          process_result(result, server)
-          result.validate!
-        end
-
-        private
-
-        def message(server)
-          Protocol::Msg.new(flags, options, command(server))
-        end
+      class OpMsg < OpMsgBase
       end
     end
   end

lib/mongo/operation/count/op_msg.rb

@@ -21,17 +21,8 @@ class Count
       # @api private
       #
       # @since 2.5.2
-      class OpMsg
-        include Specifiable
-        include Executable
-        include SessionsSupported
+      class OpMsg < OpMsgBase
         include CausalConsistencySupported
-
-        private
-
-        def message(server)
-          Protocol::Msg.new(flags, options, command(server))
-        end
       end
     end
   end

lib/mongo/operation/create/op_msg.rb

@@ -21,25 +21,8 @@ class Create
       # @api private
       #
       # @since 2.5.2
-      class OpMsg
-        include Specifiable
-        include Executable
-        include SessionsSupported
-
-        def execute(server)
-          result = Result.new(dispatch_message(server))
-          process_result(result, server)
-          result.validate!
-        rescue Mongo::Error::SocketError => e
-          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
-          raise e
-        end
-
-        private
-
-        def message(server)
-          Protocol::Msg.new(flags, options, command(server))
-        end
+      class OpMsg < OpMsgBase
+        include ExecutableTransactionLabel
       end
     end
   end

lib/mongo/operation/create_index/op_msg.rb

@@ -21,29 +21,14 @@ class CreateIndex
       # @api private
       #
       # @since 2.5.2
-      class OpMsg
-        include Specifiable
-        include Executable
-        include SessionsSupported
-
-        def execute(server)
-          result = Result.new(dispatch_message(server))
-          process_result(result, server)
-          result.validate!
-        rescue Mongo::Error::SocketError => e
-          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
-          raise e
-        end
+      class OpMsg < OpMsgBase
+        include ExecutableTransactionLabel
 
         private
 
         def selector(server)
           { :createIndexes => coll_name, :indexes => indexes }
         end
-
-        def message(server)
-          Protocol::Msg.new(flags, options, command(server))
-        end
       end
     end
   end

lib/mongo/operation/create_user/op_msg.rb

@@ -21,29 +21,14 @@ class CreateUser
       # @api private
       #
       # @since 2.5.2
-      class OpMsg
-        include Specifiable
-        include Executable
-        include SessionsSupported
-
-        def execute(server)
-          result = Result.new(dispatch_message(server))
-          process_result(result, server)
-          result.validate!
-        rescue Mongo::Error::SocketError => e
-          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
-          raise e
-        end
+      class OpMsg < OpMsgBase
+        include ExecutableTransactionLabel
 
         private
 
         def selector(server)
           { :createUser => user.name }.merge(user.spec)
         end
-
-        def message(server)
-          Protocol::Msg.new(flags, options, command(server))
-        end
       end
     end
   end

lib/mongo/operation/delete/op_msg.rb

@@ -21,29 +21,11 @@ class Delete
       # @api private
       #
       # @since 2.5.2
-      class OpMsg
-        include Specifiable
-        include Executable
-        include SessionsSupported
+      class OpMsg < OpMsgBase
         include BypassDocumentValidation
-
-        # Execute the operation.
-        #
-        # @example
-        #   operation.execute(server)
-        #
-        # @param [ Mongo::Server ] server The server to send the operation to.
-        #
-        # @return [ Mongo::Operation::Delete::Result ] The operation result.
-        #
-        # @since 2.5.2
-        def execute(server)
-          result = Result.new(dispatch_message(server))
-          process_result(result, server)
-        rescue Mongo::Error::SocketError => e
-          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
-          raise e
-        end
+        include ExecutableNoValidate
+        include ExecutableTransactionLabel
+        include PolymorphicResult
 
         private
 

lib/mongo/operation/distinct/op_msg.rb

@@ -21,26 +21,9 @@ class Distinct
       # @api private
       #
       # @since 2.5.2
-      class OpMsg
-        include Specifiable
-        include Executable
-        include SessionsSupported
+      class OpMsg < OpMsgBase
         include CausalConsistencySupported
-
-        def execute(server)
-          result = Result.new(dispatch_message(server))
-          process_result(result, server)
-          result.validate!
-        rescue Mongo::Error::SocketError => e
-          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
-          raise e
-        end
-
-        private
-
-        def message(server)
-          Protocol::Msg.new(flags, options, command(server))
-        end
+        include ExecutableTransactionLabel
       end
     end
   end

lib/mongo/operation/drop/op_msg.rb

@@ -21,25 +21,8 @@ class Drop
       # @api private
       #
       # @since 2.5.2
-      class OpMsg
-        include Specifiable
-        include Executable
-        include SessionsSupported
-
-        def execute(server)
-          result = Result.new(dispatch_message(server))
-          process_result(result, server)
-          result.validate!
-        rescue Mongo::Error::SocketError => e
-          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
-          raise e
-        end
-
-        private
-
-        def message(server)
-          Protocol::Msg.new(flags, options, command(server))
-        end
+      class OpMsg < OpMsgBase
+        include ExecutableTransactionLabel
       end
     end
   end