lib/mongo/collection/view/readable.rb in mongo-2.5.0.beta vs lib/mongo/collection/view/readable.rb in mongo-2.5.0

@@ -136,12 +136,12 @@
           read_pref = opts[:read] || read_preference
           selector = ServerSelector.get(read_pref || server_selector)
           read_with_retry do
             server = selector.select_server(cluster, false)
             apply_collation!(cmd, server, opts)
-            with_session do |session|
-              Operation::Commands::Command.new({
+            with_session(opts) do |session|
+              Operation::Commands::Count.new({
                                                    :selector => cmd,
                                                    :db_name => database.name,
                                                    :options => {:limit => -1},
                                                    :read => read_pref,
                                                    :session => session
@@ -176,12 +176,12 @@
           read_pref = opts[:read] || read_preference
           selector = ServerSelector.get(read_pref || server_selector)
           read_with_retry do
             server = selector.select_server(cluster, false)
             apply_collation!(cmd, server, opts)
-            with_session do |session|
-              Operation::Commands::Command.new({
+            with_session(opts) do |session|
+              Operation::Commands::Distinct.new({
                                                    :selector => cmd,
                                                    :db_name => database.name,
                                                    :options => {:limit => -1},
                                                    :read => read_pref,
                                                    :session => session
@@ -229,10 +229,10 @@
         #
         # @return [ MapReduce ] The map reduce wrapper.
         #
         # @since 2.0.0
         def map_reduce(map, reduce, options = {})
-          MapReduce.new(self, map, reduce, options)
+          MapReduce.new(self, map, reduce, @options.merge(options))
         end
 
         # Set the max number of documents to scan.
         #
         # @example Set the max scan value.