mongo 2.13.0.beta1 → 2.13.0.rc1

data/lib/mongo/cluster/sdam_flow.rb

@@ -25,12 +25,13 @@ class Mongo::Cluster
   class SdamFlow
     extend Forwardable
 
-    def initialize(cluster, previous_desc, updated_desc)
+    def initialize(cluster, previous_desc, updated_desc, awaited: false)
       @cluster = cluster
       @topology = cluster.topology
       @original_desc = @previous_desc = previous_desc
       @updated_desc = updated_desc
       @servers_to_disconnect = []
+      @awaited = !!awaited
     end
 
     attr_reader :cluster
@@ -51,6 +52,10 @@ class Mongo::Cluster
     attr_reader :updated_desc
     attr_reader :original_desc
 
+    def awaited?
+      @awaited
+    end
+
     def_delegators :topology, :replica_set_name
 
     # Updates descriptions on all servers whose address matches
@@ -431,15 +436,12 @@ class Mongo::Cluster
       # the server - in case of a stale primary, the server reported itself
       # as being a primary but updated_desc here will be unknown.
 
-      # We do not notify on unknown -> unknown changes.
-      # This can also be important for tests which have real i/o
-      # happening against bogus addresses which yield unknown responses
-      # and that also mock responses with the resulting race condition,
-      # though tests should avoid performing real i/o with monitoring_io: false
-      # option.
-      if updated_desc.unknown? && previous_desc.unknown?
-        return
-      end
+      # We used to not notify on Unknown -> Unknown server changes.
+      # Technically these are valid state changes (or at least as valid as
+      # other server description changes when the description has not
+      # changed meaningfully but the events are still published).
+      # The current version of the driver notifies on Unknown -> Unknown
+      # transitions.
 
       # Avoid dispatching events when updated description is the same as
       # previous description. This allows this method to be called multiple
@@ -456,6 +458,7 @@ class Mongo::Cluster
           topology,
           previous_desc,
           updated_desc,
+          awaited: awaited?,
         )
       )
       @previous_desc = updated_desc

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

@@ -73,8 +73,9 @@ module Mongo
         # @return [ true, false ] If a readable server is present.
         #
         # @since 2.4.0
+        # @deprecated
         def has_readable_server?(cluster, server_selector = nil)
-          (server_selector || ServerSelector.primary).candidates(cluster).any?
+          !(server_selector || ServerSelector.primary).try_select_server(cluster).nil?
         end
 
         # Determine if the topology would select a writable server for the
@@ -89,7 +90,7 @@ module Mongo
         #
         # @since 2.4.0
         def has_writable_server?(cluster)
-          cluster.servers.any?{ |server| server.primary? }
+          !ServerSelector.primary.try_select_server(cluster).nil?
         end
 
         # A replica set topology is a replica set.

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

@@ -97,7 +97,7 @@ module Mongo
         #
         # @since 2.0.0
         def servers(servers)
-          servers.select{ |server| server.mongos? }
+          servers.select { |server| server.mongos? }
         end
 
         # A sharded topology is sharded.

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

@@ -96,7 +96,7 @@ module Mongo
         #
         # @since 2.0.0
         def servers(servers, name = nil)
-          [ servers.detect { |server| !server.unknown? } ]
+          servers.reject { |server| server.unknown? }
         end
 
         # A single topology is not sharded.

data/lib/mongo/collection.rb

@@ -429,7 +429,7 @@ module Mongo
       View.new(self, filter || {}, options).count(options)
     end
 
-    # Gets the number of of matching documents in the collection. Unlike the deprecated #count
+    # Gets the number of matching documents in the collection. Unlike the deprecated #count
     # method, this will return the exact number of documents matching the filter rather than the estimate.
     #
     # @example Get the number of documents in the collection.
@@ -450,7 +450,7 @@ module Mongo
     # @return [ Integer ] The document count.
     #
     # @since 2.6.0
-    def count_documents(filter, options = {})
+    def count_documents(filter = {}, options = {})
       View.new(self, filter, options).count_documents(options)
     end
 
@@ -537,19 +537,23 @@ module Mongo
     # @since 2.0.0
     def insert_one(document, opts = {})
       client.send(:with_session, opts) do |session|
-        write_concern = write_concern_with_session(session)
+        write_concern = if opts[:write_concern]
+          WriteConcern.get(opts[:write_concern])
+        else
+          write_concern_with_session(session)
+        end
         write_with_retry(session, write_concern) do |server, txn_num|
           Operation::Insert.new(
-              :documents => [ document ],
-              :db_name => database.name,
-              :coll_name => name,
-              :write_concern => write_concern,
-              :bypass_document_validation => !!opts[:bypass_document_validation],
-              :options => opts,
-              :id_generator => client.options[:id_generator],
-              :session => session,
-              :txn_num => txn_num
-           ).execute(server, client: client)
+            :documents => [ document ],
+            :db_name => database.name,
+            :coll_name => name,
+            :write_concern => write_concern,
+            :bypass_document_validation => !!opts[:bypass_document_validation],
+            :options => opts,
+            :id_generator => client.options[:id_generator],
+            :session => session,
+            :txn_num => txn_num
+          ).execute(server, client: client)
         end
       end
     end

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

@@ -193,7 +193,9 @@ module Mongo
           pipeline << { :'$limit' => opts[:limit] } if opts[:limit]
           pipeline << { :'$group' => { _id: 1, n: { :'$sum' => 1 } } }
 
-          opts.select! { |k, _| [:hint, :max_time_ms, :read, :collation, :session].include?(k) }
+          opts = opts.select { |k, _| [:hint, :max_time_ms, :read, :collation, :session].include?(k) }
+          opts[:collation] ||= collation
+
           first = aggregate(pipeline, opts).first
           return 0 unless first
           first['n'].to_i

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

@@ -52,6 +52,9 @@ module Mongo
           cmd[:fields] = projection if projection
           cmd[:sort] = sort if sort
           cmd[:maxTimeMS] = max_time_ms if max_time_ms
+          if opts[:bypass_document_validation]
+            cmd[:bypassDocumentValidation] = true
+          end
 
           with_session(opts) do |session|
             applied_write_concern = applied_write_concern(session)
@@ -165,6 +168,8 @@ module Mongo
         # @option opts [ Session ] :session The session to use.
         # @option opts [ Hash | String ] :hint The index to use for this operation.
         #   May be specified as a Hash (e.g. { _id: 1 }) or a String (e.g. "_id_").
+        # @option opts [ Hash ] :write_concern The write concern options.
+        #   Can be :w => Integer, :fsync => Boolean, :j => Boolean.
         #
         # @return [ Result ] The response from the database.
         #
@@ -172,7 +177,11 @@ module Mongo
         def delete_many(opts = {})
           delete_doc = { Operation::Q => filter, Operation::LIMIT => 0 }
           with_session(opts) do |session|
-            write_concern = write_concern_with_session(session)
+            write_concern = if opts[:write_concern]
+              WriteConcern.get(opts[:write_concern])
+            else
+              write_concern_with_session(session)
+            end
             nro_write_with_retry(session, write_concern) do |server|
               apply_collation!(delete_doc, server, opts)
               apply_hint!(delete_doc, server, opts.merge(write_concern: write_concern))
@@ -182,6 +191,7 @@ module Mongo
                   :db_name => collection.database.name,
                   :coll_name => collection.name,
                   :write_concern => write_concern,
+                  :bypass_document_validation => !!opts[:bypass_document_validation], 
                   :session => session
               ).execute(server, client: client)
             end
@@ -199,6 +209,8 @@ module Mongo
         # @option opts [ Session ] :session The session to use.
         # @option opts [ Hash | String ] :hint The index to use for this operation.
         #   May be specified as a Hash (e.g. { _id: 1 }) or a String (e.g. "_id_").
+        # @option opts [ Hash ] :write_concern The write concern options.
+        #   Can be :w => Integer, :fsync => Boolean, :j => Boolean.
         #
         # @return [ Result ] The response from the database.
         #
@@ -206,7 +218,11 @@ module Mongo
         def delete_one(opts = {})
           delete_doc = { Operation::Q => filter, Operation::LIMIT => 1 }
           with_session(opts) do |session|
-            write_concern = write_concern_with_session(session)
+            write_concern = if opts[:write_concern]
+              WriteConcern.get(opts[:write_concern])
+            else
+              write_concern_with_session(session)
+            end
             write_with_retry(session, write_concern) do |server, txn_num|
               apply_collation!(delete_doc, server, opts)
               apply_hint!(delete_doc, server, opts.merge(write_concern: write_concern))
@@ -216,6 +232,7 @@ module Mongo
                   :db_name => collection.database.name,
                   :coll_name => collection.name,
                   :write_concern => write_concern,
+                  :bypass_document_validation => !!opts[:bypass_document_validation],
                   :session => session,
                   :txn_num => txn_num
               ).execute(server, client: client)
@@ -239,6 +256,8 @@ module Mongo
         # @option opts [ Session ] :session The session to use.
         # @option opts [ Hash | String ] :hint The index to use for this operation.
         #   May be specified as a Hash (e.g. { _id: 1 }) or a String (e.g. "_id_").
+        # @option opts [ Hash ] :write_concern The write concern options.
+        #   Can be :w => Integer, :fsync => Boolean, :j => Boolean.
         #
         # @return [ Result ] The response from the database.
         #
@@ -251,7 +270,12 @@ module Mongo
             update_doc['upsert'] = true
           end
           with_session(opts) do |session|
-            write_concern = write_concern_with_session(session)
+            write_concern = if opts[:write_concern]
+              WriteConcern.get(opts[:write_concern])
+            else
+              write_concern_with_session(session)
+            end
+
             write_with_retry(session, write_concern) do |server, txn_num|
               apply_collation!(update_doc, server, opts)
               apply_array_filters!(update_doc, server, opts)
@@ -288,6 +312,8 @@ module Mongo
         # @option opts [ Session ] :session The session to use.
         # @option opts [ Hash | String ] :hint The index to use for this operation.
         #   May be specified as a Hash (e.g. { _id: 1 }) or a String (e.g. "_id_").
+        # @option opts [ Hash ] :write_concern The write concern options.
+        #   Can be :w => Integer, :fsync => Boolean, :j => Boolean.
         #
         # @return [ Result ] The response from the database.
         #
@@ -301,7 +327,11 @@ module Mongo
             update_doc['upsert'] = true
           end
           with_session(opts) do |session|
-            write_concern = write_concern_with_session(session)
+            write_concern = if opts[:write_concern]
+              WriteConcern.get(opts[:write_concern])
+            else
+              write_concern_with_session(session)
+            end
             nro_write_with_retry(session, write_concern) do |server|
               apply_collation!(update_doc, server, opts)
               apply_array_filters!(update_doc, server, opts)
@@ -337,6 +367,8 @@ module Mongo
         # @option opts [ Session ] :session The session to use.
         # @option opts [ Hash | String ] :hint The index to use for this operation.
         #   May be specified as a Hash (e.g. { _id: 1 }) or a String (e.g. "_id_").
+        # @option opts [ Hash ] :write_concern The write concern options.
+        #   Can be :w => Integer, :fsync => Boolean, :j => Boolean.
         #
         # @return [ Result ] The response from the database.
         #
@@ -349,7 +381,11 @@ module Mongo
             update_doc['upsert'] = true
           end
           with_session(opts) do |session|
-            write_concern = write_concern_with_session(session)
+            write_concern = if opts[:write_concern]
+              WriteConcern.get(opts[:write_concern])
+            else
+              write_concern_with_session(session)
+            end
             write_with_retry(session, write_concern) do |server, txn_num|
               apply_collation!(update_doc, server, opts)
               apply_array_filters!(update_doc, server, opts)

data/lib/mongo/database.rb

@@ -113,6 +113,16 @@ module Mongo
     # @note The set of returned collection names depends on the version of
     #   MongoDB server that fulfills the request.
     #
+    # @param [ Hash ] options
+    #
+    # @option options [ Hash ] :filter A filter on the collections returned.
+    # @option options [ true, false ] :authorized_collections A flag, when
+    #   set to true and used with nameOnly: true, that allows a user without the
+    #   required privilege to run the command when access control is enforced
+    #
+    #   See https://docs.mongodb.com/manual/reference/command/listCollections/
+    #   for more information and usage.
+    #
     # @return [ Array<String> ] Names of the collections.
     #
     # @since 2.0.0
@@ -129,6 +139,13 @@ module Mongo
     # @param [ Hash ] options
     #
     # @option options [ Hash ] :filter A filter on the collections returned.
+    # @option options [ true, false ] :name_only Indicates whether command
+    #   should return just collection/view names and type or return both the
+    #   name and other information
+    # @option options [ true, false ] :authorized_collections A flag, when
+    #   set to true and used with nameOnly: true, that allows a user without the
+    #   required privilege to run the command when access control is enforced
+    #
     #   See https://docs.mongodb.com/manual/reference/command/listCollections/
     #   for more information and usage.
     #
@@ -136,8 +153,8 @@ module Mongo
     #   collection in the database.
     #
     # @since 2.0.5
-    def list_collections(**options)
-      View.new(self).list_collections(**options)
+    def list_collections(options = {})
+      View.new(self).list_collections(options)
     end
 
     # Get all the non-system collections that belong to this database.
@@ -145,11 +162,21 @@ module Mongo
     # @note The set of returned collections depends on the version of
     #   MongoDB server that fulfills the request.
     #
+    # @param [ Hash ] options
+    #
+    # @option options [ Hash ] :filter A filter on the collections returned.
+    # @option options [ true, false ] :authorized_collections A flag, when
+    #   set to true and used with name_only: true, that allows a user without the
+    #   required privilege to run the command when access control is enforced
+    #
+    #   See https://docs.mongodb.com/manual/reference/command/listCollections/
+    #   for more information and usage.
+    #
     # @return [ Array<Mongo::Collection> ] The collections.
     #
     # @since 2.0.0
-    def collections
-      collection_names.map { |name| collection(name) }
+    def collections(options = {})
+      collection_names(options).map { |name| collection(name) }
     end
 
     # Execute a command on the database.

data/lib/mongo/database/view.rb

@@ -47,6 +47,13 @@ module Mongo
       #
       # @option options [ Integer ] :batch_size  The batch size for results
       #   returned from the listCollections command.
+      # @option options [ Hash ] :filter A filter on the collections returned.
+      # @option options [ true, false ] :authorized_collections A flag, when
+      #   set to true, that allows a user without the required privilege
+      #   to run the command when access control is enforced
+      #
+      #   See https://docs.mongodb.com/manual/reference/command/listCollections/
+      #   for more information and usage.
       #
       # @return [ Array<String> ] The names of all non-system collections.
       #
@@ -55,7 +62,7 @@ module Mongo
         @batch_size = options[:batch_size]
         session = client.send(:get_session, options)
         cursor = read_with_retry_cursor(session, ServerSelector.primary, self) do |server|
-          send_initial_query(server, session, name_only: true)
+          send_initial_query(server, session, options.merge(name_only: true))
         end
         cursor.map do |info|
           if cursor.server.with_connection { |connection| connection.features }.list_collections_enabled?
@@ -81,15 +88,22 @@ module Mongo
       # @param [ Hash ] options
       #
       # @option options [ Hash ] :filter A filter on the collections returned.
+      # @option options [ true, false ] :name_only Indicates whether command
+      #   should return just collection/view names and type or return both the
+      #   name and other information
+      # @option options [ true, false ] :authorized_collections A flag, when
+      #   set to true and used with nameOnly: true, that allows a user without the
+      #   required privilege to run the command when access control is enforced
+      #
       #   See https://docs.mongodb.com/manual/reference/command/listCollections/
       #   for more information and usage.
       #
       # @return [ Array<Hash> ] Info for each collection in the database.
       #
-      # @since 2.0.5
-      def list_collections(**options)
+      # @since 2.0.5 
+      def list_collections(options = {})
         session = client.send(:get_session)
-        collections_info(session, ServerSelector.primary, **options)
+        collections_info(session, ServerSelector.primary, options)
       end
 
       # Create the new database view.
@@ -166,6 +180,7 @@ module Mongo
         }.tap do |spec|
           spec[:selector][:nameOnly] = true if options[:name_only]
           spec[:selector][:filter] = options[:filter] if options[:filter]
+          spec[:selector][:authorizedCollections] = true if options[:authorized_collections]
         end
       end
 

data/lib/mongo/distinguishing_semaphore.rb

@@ -0,0 +1,55 @@
+# Copyright (C) 2020 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
+  # This is a semaphore that distinguishes waits ending due to the timeout
+  # being reached from waits ending due to the semaphore being signaled.
+  #
+  # @api private
+  class DistinguishingSemaphore
+    def initialize
+      @lock = Mutex.new
+      @cv = ConditionVariable.new
+      @queue = []
+    end
+
+    # Waits for the semaphore to be signaled up to timeout seconds.
+    # If semaphore is not signaled, returns after timeout seconds.
+    #
+    # @return [ true | false ] true if semaphore was signaled, false if
+    #   timeout was reached.
+    def wait(timeout = nil)
+      @lock.synchronize do
+        @cv.wait(@lock, timeout)
+        (!@queue.empty?).tap do
+          @queue.clear
+        end
+      end
+    end
+
+    def broadcast
+      @lock.synchronize do
+        @queue.push(true)
+        @cv.broadcast
+      end
+    end
+
+    def signal
+      @lock.synchronize do
+        @queue.push(true)
+        @cv.signal
+      end
+    end
+  end
+end