mongo 2.4.3 → 2.5.0.beta

data/lib/mongo/grid/stream/read.rb

@@ -133,7 +133,7 @@ module Mongo
           #
           # @since 2.1.0
           def read_preference
-            @read_preference ||= ServerSelector.get(@options[:read] || fs.read_preference)
+            @read_preference ||= options[:read] || fs.read_preference
           end
 
           # Get the files collection file information document for the file being read.
@@ -167,7 +167,8 @@ module Mongo
           end
 
           def view
-            @view ||= fs.chunks_collection.find({ :files_id => file_id }, options).read(read_preference).sort(:n => 1)
+            @view ||= (opts = options.merge(read: read_preference) if read_preference
+                         fs.chunks_collection.find({ :files_id => file_id }, opts || options).sort(:n => 1))
           end
 
           def validate!(index, num_chunks, chunk, length_read)

data/lib/mongo/grid/stream/write.rb

@@ -103,7 +103,7 @@ module Mongo
           def close
             ensure_open!
             update_length
-            files_collection.insert_one(file_info)
+            files_collection.insert_one(file_info, @options)
             @open = false
             file_id
           end
@@ -142,7 +142,7 @@ module Mongo
           #
           # @since 2.1.0
           def abort
-            fs.chunks_collection.find(:files_id => file_id).delete_many
+            fs.chunks_collection.find({ :files_id => file_id }, @options).delete_many
             @open = false || true
           end
 

data/lib/mongo/index/view.rb

@@ -29,7 +29,7 @@ module Mongo
       #   when sending the listIndexes command.
       attr_reader :batch_size
 
-      def_delegators :@collection, :cluster, :database, :read_preference, :write_concern
+      def_delegators :@collection, :cluster, :database, :read_preference, :write_concern, :client
       def_delegators :cluster, :next_primary
 
       # The index key field.
@@ -149,14 +149,16 @@ module Mongo
       # @since 2.0.0
       def create_many(*models)
         server = next_primary
-        spec = {
-                indexes: normalize_models(models.flatten, server),
-                db_name: database.name,
-                coll_name: collection.name
-               }
-
-        spec[:write_concern] = write_concern if server.features.collation_enabled?
-        Operation::Write::CreateIndex.new(spec).execute(server)
+        client.send(:with_session, @options) do |session|
+          spec = {
+                  indexes: normalize_models(models.flatten, server),
+                  db_name: database.name,
+                  coll_name: collection.name,
+                  session: session
+                 }
+          spec[:write_concern] = write_concern if server.features.collation_enabled?
+          Operation::Write::CreateIndex.new(spec).execute(server)
+        end
       end
 
       # Convenience method for getting index information by a specific name or
@@ -189,11 +191,13 @@ module Mongo
       # @since 2.0.0
       def each(&block)
         server = next_primary(false)
-        cursor = Cursor.new(self, send_initial_query(server), server).to_enum
+        session = client.send(:get_session, @options)
+        result = send_initial_query(server, session)
+        cursor = Cursor.new(self, result, server, session: session)
         cursor.each do |doc|
           yield doc
         end if block_given?
-        cursor
+        cursor.to_enum
       end
 
       # Create the new index view.
@@ -213,35 +217,41 @@ module Mongo
       def initialize(collection, options = {})
         @collection = collection
         @batch_size = options[:batch_size]
+        @options = options
       end
 
       private
 
       def drop_by_name(name)
-        spec = {
-                 db_name: database.name,
-                 coll_name: collection.name,
-                 index_name: name
-               }
-        server = next_primary
-        spec[:write_concern] = write_concern if server.features.collation_enabled?
-        Operation::Write::DropIndex.new(spec).execute(server)
+        client.send(:with_session, @options) do |session|
+          spec = {
+                   db_name: database.name,
+                   coll_name: collection.name,
+                   index_name: name,
+                   session: session
+                 }
+          server = next_primary
+          spec[:write_concern] = write_concern if server.features.collation_enabled?
+          Operation::Write::DropIndex.new(spec).execute(server)
+        end
       end
 
       def index_name(spec)
         spec.to_a.join('_')
       end
 
-      def indexes_spec
+      def indexes_spec(session)
         { selector: {
             listIndexes: collection.name,
             cursor: batch_size ? { batchSize: batch_size } : {} },
           coll_name: collection.name,
-          db_name: database.name }
+          db_name: database.name,
+          session: session
+        }
       end
 
-      def initial_query_op
-        Operation::Commands::Indexes.new(indexes_spec)
+      def initial_query_op(session)
+        Operation::Commands::Indexes.new(indexes_spec(session))
       end
 
       def limit; -1; end
@@ -257,8 +267,8 @@ module Mongo
         end
       end
 
-      def send_initial_query(server)
-        initial_query_op.execute(server)
+      def send_initial_query(server, session)
+        initial_query_op(session).execute(server)
       end
 
       def with_generated_names(models, server)

data/lib/mongo/monitoring/event/secure.rb

@@ -52,6 +52,20 @@ module Mongo
         def redacted(command_name, document)
           REDACTED_COMMANDS.include?(command_name.to_s) ? BSON::Document.new : document
         end
+
+        # Is compression allowed for a given command message.
+        #
+        # @example Determine if compression is allowed for a given command.
+        #   secure.compression_allowed?(selector)
+        #
+        # @param [ String, Symbol ] command_name The command name.
+        #
+        # @return [ true, false ] Whether compression can be used.
+        #
+        # @since 2.5.0
+        def compression_allowed?(command_name)
+          @compression_allowed ||= !REDACTED_COMMANDS.include?(command_name.to_s)
+        end
       end
     end
   end

data/lib/mongo/operation.rb

@@ -17,6 +17,7 @@ require 'mongo/operation/executable'
 require 'mongo/operation/specifiable'
 require 'mongo/operation/limited'
 require 'mongo/operation/object_id_generator'
+require 'mongo/operation/uses_command_op_msg'
 require 'mongo/operation/read_preference'
 require 'mongo/operation/takes_write_concern'
 require 'mongo/operation/read'
@@ -56,5 +57,20 @@ module Mongo
     #
     # @since 2.4.0
     COLLATION = 'collation'.freeze
+
+    # The array filters field constant.
+    #
+    # @since 2.5.0
+    ARRAY_FILTERS = 'arrayFilters'.freeze
+
+    # The operation time field constant.
+    #
+    # @since 2.5.0
+    OPERATION_TIME = 'operationTime'.freeze
+
+    # The cluster time field constant.
+    #
+    # @since 2.5.0
+    CLUSTER_TIME = '$clusterTime'.freeze
   end
 end

data/lib/mongo/operation/commands.rb

@@ -14,6 +14,7 @@
 
 require 'mongo/operation/commands/command'
 require 'mongo/operation/commands/find'
+require 'mongo/operation/commands/explain'
 require 'mongo/operation/commands/get_more'
 require 'mongo/operation/commands/parallel_scan'
 require 'mongo/operation/commands/aggregate'

data/lib/mongo/operation/commands/aggregate.rb

@@ -18,7 +18,7 @@ module Mongo
 
       # A MongoDB aggregate operation.
       #
-      # @note An aggregate operation can behave like a read and return a 
+      # @note An aggregate operation can behave like a read and return a
       #   result set, or can behave like a write operation and
       #   output results to a user-specified collection.
       #
@@ -50,11 +50,15 @@ module Mongo
         end
 
         def message(server)
-          sel = update_selector_for_read_pref(selector, server)
-          sel = filter_cursor_from_selector(sel, server)
+          sel = filter_cursor_from_selector(selector, server)
           sel = update_selector_for_write_concern(sel, server)
-          opts = update_options_for_slave_ok(options, server)
-          Protocol::Query.new(db_name, query_coll, sel, opts)
+          if server.features.op_msg_enabled?
+            command_op_msg(server, sel, options)
+          else
+            sel = update_selector_for_read_pref(sel, server)
+            opts = update_options_for_slave_ok(options, server)
+            Protocol::Query.new(db_name, query_coll, sel, opts)
+          end
         end
       end
     end

data/lib/mongo/operation/commands/aggregate/result.rb

@@ -50,7 +50,7 @@ module Mongo
           #
           # @since 2.0.0
           def cursor_id
-            cursor_document ? cursor_document[CURSOR_ID] : super
+            cursor_document ? cursor_document[CURSOR_ID] : 0
           end
 
           # Get the documents for the aggregation result. This is either the

data/lib/mongo/operation/commands/collections_info.rb

@@ -18,16 +18,16 @@ module Mongo
   module Operation
     module Commands
 
-      # A MongoDB operation to get a list of collection names in a database.
+      # A MongoDB operation to get a list of collections info in a database.
       #
-      # @example Create the collection names operation.
-      #   Read::CollectionNames.new(:db_name => 'test-db')
+      # @example Create the collections info operation.
+      #   CollectionsInfo.new(:db_name => 'test-db')
       #
       # Initialization:
-      #   param [ Hash ] spec The specifications for the collection names operation.
+      #   param [ Hash ] spec The specifications for the collections info operation.
       #
-      #   option spec :db_name [ String ] The name of the database whose collection
-      #     names is requested.
+      #   option spec :db_name [ String ] The name of the database whose collections
+      #     info is requested.
       #   option spec :options [ Hash ] Options for the operation.
       #
       # @since 2.0.0

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

@@ -19,7 +19,7 @@ module Mongo
       # A MongoDB command operation.
       #
       # @example Create the command operation.
-      #   Mongo::Operation::Command.new({ :selector => { :isMaster => 1 } })
+      #   Command.new({ :selector => { :isMaster => 1 } })
       #
       # Initialization:
       #   param [ Hash ] spec The specifications for the command.
@@ -35,6 +35,7 @@ module Mongo
         include Limited
         include ReadPreference
         include Executable
+        include UsesCommandOpMsg
 
         private
 

data/lib/mongo/operation/commands/create.rb

@@ -19,7 +19,7 @@ module Mongo
       # A MongoDB create collection operation.
       #
       # @example Instantiate the operation.
-      #   Commands::Create.new(selector: { create: 'test' }, :db_name => 'test')
+      #   Create.new(selector: { create: 'test' }, :db_name => 'test')
       #
       # Initialization:
       #   param [ Hash ] spec The specifications for the operation.
@@ -37,7 +37,11 @@ module Mongo
 
         def message(server)
           sel = update_selector_for_write_concern(selector, server)
-          Protocol::Query.new(db_name, query_coll, sel, options)
+          if server.features.op_msg_enabled?
+            command_op_msg(server, sel, options)
+          else
+            Protocol::Query.new(db_name, query_coll, sel, options)
+          end
         end
       end
     end

data/lib/mongo/operation/commands/drop.rb

@@ -19,7 +19,7 @@ module Mongo
       # A MongoDB drop collection operation.
       #
       # @example Instantiate the operation.
-      #   Commands::Drop.new(selector: { drop: 'test' }, :db_name => 'test')
+      #   Drop.new(selector: { drop: 'test' }, :db_name => 'test')
       #
       # Initialization:
       #   param [ Hash ] spec The specifications for the operation.
@@ -37,7 +37,11 @@ module Mongo
 
         def message(server)
           sel = update_selector_for_write_concern(selector, server)
-          Protocol::Query.new(db_name, query_coll, sel, options)
+          if server.features.op_msg_enabled?
+            command_op_msg(server, sel, options)
+          else
+            Protocol::Query.new(db_name, query_coll, sel, options)
+          end
         end
       end
     end

data/lib/mongo/operation/commands/drop_database.rb

@@ -19,7 +19,7 @@ module Mongo
       # A MongoDB drop database operation.
       #
       # @example Instantiate the operation.
-      #   Commands::Drop.new(selector: { dropDatabase: 'test' }, :db_name => 'test')
+      #   Drop.new(selector: { dropDatabase: 'test' }, :db_name => 'test')
       #
       # Initialization:
       #   param [ Hash ] spec The specifications for the operation.
@@ -37,7 +37,11 @@ module Mongo
 
         def message(server)
           sel = update_selector_for_write_concern(selector, server)
-          Protocol::Query.new(db_name, query_coll, sel, options)
+          if server.features.op_msg_enabled?
+            command_op_msg(server, sel, options)
+          else
+            Protocol::Query.new(db_name, query_coll, sel, options)
+          end
         end
       end
     end

data/lib/mongo/operation/commands/explain.rb

@@ -0,0 +1,27 @@
+# Copyright (C) 2017 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  module Operation
+    module Commands
+
+      # Encapsulates behaviour for executing a find command with explain.
+      #
+      # @since 2.5.0
+      class Explain < Command; end
+    end
+  end
+end
+
+require 'mongo/operation/commands/explain/result'

data/lib/mongo/operation/commands/explain/result.rb

@@ -0,0 +1,52 @@
+# Copyright (C) 2017 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  module Operation
+    module Commands
+      class Explain
+
+        # Defines custom behaviour of results in find command with explain.
+        #
+        # @since 2.5.0
+        class Result < Operation::Result
+
+          # Get the cursor id.
+          #
+          # @example Get the cursor id.
+          #   result.cursor_id
+          #
+          # @return [ 0 ] Always 0 because explain doesn't return a cursor.
+          #
+          # @since 2.5.0
+          def cursor_id
+            0
+          end
+
+          # Get the documents in the result.
+          #
+          # @example Get the documents.
+          #   result.documents
+          #
+          # @return [ Array<BSON::Document> ] The documents.
+          #
+          # @since 2.5.0
+          def documents
+            reply.documents
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongo/operation/commands/indexes.rb

@@ -21,7 +21,7 @@ module Mongo
       # Initialize the get indexes operation.
       #
       # @example Instantiate the operation.
-      #   Read::Indexes.new(:db_name => 'test', :coll_name => 'test_coll')
+      #   Indexes.new(:db_name => 'test', :coll_name => 'test_coll')
       #
       # Initialization:
       #   param [ Hash ] spec The specifications for the insert.