lib/mongo/collection/view/readable.rb in mongo-2.10.5 vs lib/mongo/collection/view/readable.rb in mongo-2.11.0.rc0

@@ -183,13 +183,11 @@
           pipeline = [:'$match' => filter]
           pipeline << { :'$skip' => opts[:skip] } if opts[:skip]
           pipeline << { :'$limit' => opts[:limit] } if opts[:limit]
           pipeline << { :'$group' => { _id: 1, n: { :'$sum' => 1 } } }
 
-          opts = opts.select { |k, _| [:hint, :max_time_ms, :read, :collation, :session].include?(k) }
-          opts[:collation] ||= collation
-
+          opts.select! { |k, _| [:hint, :max_time_ms, :read, :collation, :session].include?(k) }
           first = aggregate(pipeline, opts).first
           return 0 unless first
           first['n'].to_i
         end
 
@@ -602,18 +600,18 @@
                   :session => session,
                 }.merge!(options))
           cmd.execute(server).cursor_ids.map do |cursor_id|
             result = if server.features.find_command_enabled?
               Operation::GetMore.new({
-                :selector => {:getMore => BSON::Int64.new(cursor_id),
+                :selector => {:getMore => cursor_id,
                              :collection => collection.name},
                 :db_name => database.name,
                 :session => session,
               }).execute(server)
              else
               Operation::GetMore.new({
                 :to_return => 0,
-                :cursor_id => BSON::Int64.new(cursor_id),
+                :cursor_id => cursor_id,
                 :db_name => database.name,
                 :coll_name => collection.name
               }).execute(server)
             end
             Cursor.new(self, result, server, session: session)