mongo 2.2.7 → 2.3.0

data/lib/mongo/cluster/topology.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/cluster/topology/replica_set.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/cluster/topology/sharded.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/cluster/topology/single.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/cluster/topology/unknown.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015 MongoDB, Inc.
+# Copyright (C) 2015-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/collection.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -112,8 +112,7 @@ module Mongo
     #
     # @since 2.0.0
     def read_preference
-      @read_preference ||= options[:read] ? ServerSelector.get(client.options.merge(options[:read])) :
-        database.read_preference
+      @read_preference ||= ServerSelector.get(options[:read] || database.read_preference)
     end
 
     # Get the write concern on this collection.
@@ -269,6 +268,7 @@ module Mongo
     # @option options [ Integer ] :limit The maximum number of documents to count.
     # @option options [ Integer ] :max_time_ms The maximum amount of time to allow the command to run.
     # @option options [ Integer ] :skip The number of documents to skip before counting.
+    # @option options [ Hash ] :read The read preference options.
     #
     # @return [ Integer ] The document count.
     #
@@ -287,6 +287,7 @@ module Mongo
     # @param [ Hash ] options The distinct command options.
     #
     # @option options [ Integer ] :max_time_ms The maximum amount of time to allow the command to run.
+    # @option options [ Hash ] :read The read preference options.
     #
     # @return [ Array<Object> ] The list of distinct values.
     #
@@ -343,7 +344,7 @@ module Mongo
           :bypass_document_validation => !!options[:bypass_document_validation],
           :options => options,
           :id_generator => client.options[:id_generator]
-        ).execute(next_primary.context)
+        ).execute(next_primary)
       end
     end
 

data/lib/mongo/collection/view.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -132,7 +132,7 @@ module Mongo
       def initialize(collection, filter = {}, options = {})
         validate_doc!(filter)
         @collection = collection
-        parse_parameters!(BSON::Document.new(filter.freeze), BSON::Document.new(options.freeze))
+        parse_parameters!(BSON::Document.new(filter), BSON::Document.new(options))
       end
 
       # Get a human-readable string representation of +View+.
@@ -159,8 +159,8 @@ module Mongo
       def parse_parameters!(filter, options)
         query = filter.delete(QUERY)
         modifiers = (filter || {}).merge(options.delete(MODIFIERS) || {})
-        @filter = query || filter
-        @options = Builder::Modifiers.map_driver_options(modifiers).merge!(options)
+        @filter = (query || filter).freeze
+        @options = Builder::Modifiers.map_driver_options(modifiers).merge!(options).freeze
       end
 
       def new(options)

data/lib/mongo/collection/view/aggregation.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -115,7 +115,7 @@ module Mongo
             log_warn(REROUTE)
             server = cluster.next_primary(false)
           end
-          initial_query_op.execute(server.context)
+          initial_query_op.execute(server)
         end
       end
     end

data/lib/mongo/collection/view/builder.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015 MongoDB, Inc.
+# Copyright (C) 2015-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/collection/view/builder/aggregation.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015 MongoDB, Inc.
+# Copyright (C) 2015-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/collection/view/builder/find_command.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015 MongoDB, Inc.
+# Copyright (C) 2015-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/collection/view/builder/flags.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015 MongoDB, Inc.
+# Copyright (C) 2015-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/collection/view/builder/map_reduce.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015 MongoDB, Inc.
+# Copyright (C) 2015-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/collection/view/builder/modifiers.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015 MongoDB, Inc.
+# Copyright (C) 2015-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/collection/view/builder/op_query.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015 MongoDB, Inc.
+# Copyright (C) 2015-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/collection/view/explainable.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/collection/view/immutable.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/collection/view/iterable.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -77,7 +77,7 @@ module Mongo
         end
 
         def send_initial_query(server)
-          initial_query_op(server).execute(server.context)
+          initial_query_op(server).execute(server)
         end
       end
     end

data/lib/mongo/collection/view/map_reduce.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -211,7 +211,7 @@ module Mongo
             log_warn(REROUTE)
             server = cluster.next_primary(false)
           end
-          result = initial_query_op.execute(server.context)
+          result = initial_query_op.execute(server)
           inline? ? result : send_fetch_query(server)
         end
 
@@ -232,7 +232,7 @@ module Mongo
         end
 
         def send_fetch_query(server)
-          fetch_query_op(server).execute(server.context)
+          fetch_query_op(server).execute(server)
         end
       end
     end

data/lib/mongo/collection/view/readable.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -120,6 +120,7 @@ module Mongo
         # @option options :limit [ Integer ] Max number of docs to return.
         # @option options :max_time_ms [ Integer ] The maximum amount of time to allow the
         #   command to run.
+        # @option options [ Hash ] :read The read preference options.
         #
         # @return [ Integer ] The document count.
         #
@@ -132,6 +133,7 @@ module Mongo
           cmd[:maxTimeMS] = options[:max_time_ms] if options[:max_time_ms]
           cmd[:readConcern] = collection.read_concern if collection.read_concern
           read_with_retry do
+            options = options.merge(read: read) unless options[:read]
             database.command(cmd, options).n.to_i
           end
         end
@@ -146,7 +148,7 @@ module Mongo
         #
         # @option options :max_time_ms [ Integer ] The maximum amount of time to allow the
         #   command to run.
-        # @option options :read [ Hash ] The read preference for this command.
+        # @option options [ Hash ] :read The read preference options.
         #
         # @return [ Array<Object> ] The list of distinct values.
         #
@@ -158,6 +160,7 @@ module Mongo
           cmd[:maxTimeMS] = options[:max_time_ms] if options[:max_time_ms]
           cmd[:readConcern] = collection.read_concern if collection.read_concern
           read_with_retry do
+            options = options.merge(read: read) unless options[:read]
             database.command(cmd, options).first['values']
           end
         end
@@ -293,7 +296,7 @@ module Mongo
         # @since 2.0.0
         def read(value = nil)
           return default_read if value.nil?
-          selector = value.is_a?(Hash) ? ServerSelector.get(client.options.merge(value)) : value
+          selector = ServerSelector.get(value)
           configure(:read, selector)
         end
 
@@ -416,6 +419,20 @@ module Mongo
           configure(:max_time_ms, max)
         end
 
+        # The type of cursor to use. Can be :tailable or :tailable_await.
+        #
+        # @example Set the cursor type.
+        #   view.cursor_type(:tailable)
+        #
+        # @param [ :tailable, :tailable_await ] type The cursor type.
+        #
+        # @return [ :tailable, :tailable_await, View ] Either the cursor type setting or a new +View+.
+        #
+        # @since 2.3.0
+        def cursor_type(type = nil)
+          configure(:cursor_type, type)
+        end
+
         private
 
         def default_read
@@ -429,19 +446,19 @@ module Mongo
             :db_name => database.name,
             :cursor_count => cursor_count,
             :read_concern => collection.read_concern
-          ).execute(server.context).cursor_ids.map do |cursor_id|
+          ).execute(server).cursor_ids.map do |cursor_id|
             result = if server.features.find_command_enabled?
               Operation::Commands::GetMore.new({
                   :selector => { :getMore => cursor_id, :collection => collection.name },
                   :db_name  => database.name
-                }).execute(server.context)
+                }).execute(server)
             else
               Operation::Read::GetMore.new({
                   :to_return => 0,
                   :cursor_id => cursor_id,
                   :db_name   => database.name,
                   :coll_name => collection.name
-                }).execute(server.context)
+                }).execute(server)
             end
             Cursor.new(self, result, server)
           end

data/lib/mongo/collection/view/writable.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -191,7 +191,7 @@ module Mongo
               :db_name => collection.database.name,
               :coll_name => collection.name,
               :write_concern => collection.write_concern
-            ).execute(next_primary.context)
+            ).execute(next_primary)
           end
         end
 
@@ -206,7 +206,7 @@ module Mongo
               :coll_name => collection.name,
               :write_concern => collection.write_concern,
               :bypass_document_validation => !!opts[:bypass_document_validation]
-            ).execute(next_primary.context)
+            ).execute(next_primary)
           end
         end
       end

data/lib/mongo/cursor.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -57,6 +57,31 @@ module Mongo
       @server = server
       @initial_result = result
       @remaining = limit if limited?
+      @cursor_id = result.cursor_id
+      register
+      ObjectSpace.define_finalizer(self, self.class.finalize(result.cursor_id,
+                                                             cluster,
+                                                             kill_cursors_op_spec,
+                                                             server))
+    end
+
+
+    # Finalize the cursor for garbage collection. Schedules this cursor to be included
+    # in a killCursors operation executed by the Cluster's CursorReaper.
+    #
+    # @example Finalize the cursor.
+    #   Cursor.finalize(id, cluster, op, server)
+    #
+    # @param [ Integer ] cursor_id The cursor's id.
+    # @param [ Mongo::Cluster ] cluster The cluster associated with this cursor and its server.
+    # @param [ Hash ] op_spec The killCursors operation specification.
+    # @param [ Mongo::Server ] server The server to send the killCursors operation to.
+    #
+    # @return [ Proc ] The Finalizer.
+    #
+    # @since 2.3.0
+    def self.finalize(cursor_id, cluster, op_spec, server)
+      proc { cluster.schedule_kill_cursor(cursor_id, op_spec, server) }
     end
 
     # Get a human-readable string representation of +Cursor+.
@@ -160,7 +185,7 @@ module Mongo
 
     def get_more
       read_with_retry do
-        process(get_more_operation.execute(@server.context))
+        process(get_more_operation.execute(@server))
       end
     end
 
@@ -173,16 +198,25 @@ module Mongo
     end
 
     def kill_cursors
-      read_with_retry do
-        kill_cursors_operation.execute(@server.context)
+      unregister
+      read_with_one_retry do
+        kill_cursors_operation.execute(@server)
       end
     end
 
     def kill_cursors_operation
       if @server.features.find_command_enabled?
-        Operation::Commands::Command.new(Builder::KillCursorsCommand.new(self).specification)
+        Operation::Commands::Command.new(kill_cursors_op_spec)
+      else
+        Operation::KillCursors.new(kill_cursors_op_spec)
+      end
+    end
+
+    def kill_cursors_op_spec
+      if @server.features.find_command_enabled?
+        Builder::KillCursorsCommand.new(self).specification
       else
-        Operation::KillCursors.new(Builder::OpKillCursors.new(self).specification)
+        Builder::OpKillCursors.new(self).specification
       end
     end
 
@@ -196,13 +230,22 @@ module Mongo
 
     def process(result)
       @remaining -= result.returned_count if limited?
-      @cursor_id = result.cursor_id
       @coll_name ||= result.namespace.sub("#{database.name}.", '') if result.namespace
+      unregister if result.cursor_id == 0
+      @cursor_id = result.cursor_id
       result.documents
     end
 
     def use_limit?
       limited? && batch_size >= @remaining
     end
+
+    def register
+      cluster.register_cursor(@cursor_id)
+    end
+
+    def unregister
+      cluster.unregister_cursor(@cursor_id)
+    end
   end
 end

data/lib/mongo/cursor/builder.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015 MongoDB, Inc.
+# Copyright (C) 2015-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/cursor/builder/get_more_command.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015 MongoDB, Inc.
+# Copyright (C) 2015-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/cursor/builder/kill_cursors_command.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015 MongoDB, Inc.
+# Copyright (C) 2015-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -56,6 +56,34 @@ module Mongo
         def kill_cursors_command
           { :killCursors => collection_name, :cursors => [ cursor.id ] }
         end
+
+        class << self
+
+          # Update a specification's list of cursor ids.
+          #
+          # @example Update a specification's list of cursor ids.
+          #   KillCursorsCommand.update_cursors(spec, ids)
+          #
+          # @return [ Hash ] The specification.
+          # @return [ Array ] The ids to update with.
+          #
+          # @since 2.3.0
+          def update_cursors(spec, ids)
+            spec[:selector].merge!(cursors: spec[:selector][:cursors] & ids)
+          end
+
+          # Get the list of cursor ids from a spec generated by this Builder.
+          #
+          # @example Get the list of cursor ids.
+          #   KillCursorsCommand.cursors(spec)
+          #
+          # @return [ Hash ] The specification.
+          #
+          # @since 2.3.0
+          def get_cursors_list(spec)
+            spec[:selector][:cursors]
+          end
+        end
       end
     end
   end