mongo 2.4.3 → 2.5.0.beta

data/spec/spec_helper.rb

@@ -133,6 +133,35 @@ def single_seed?
   ADDRESSES.size == 1
 end
 
+# For instances where behaviour is different on different versions, we need to
+# determine in the specs if we are 3.6 or higher.
+#
+# @since 2.5.0
+def op_msg_enabled?
+  $mongo_client ||= initialize_scanned_client!
+  $op_msg_enabled ||= $mongo_client.cluster.servers.first.features.op_msg_enabled?
+end
+alias :change_stream_enabled? :op_msg_enabled?
+alias :sessions_enabled? :op_msg_enabled?
+
+# Whether change streams can be tested. Change streams are available on server versions 3.6
+#   and higher and when connected to a replica set.
+#
+# @since 2.5.0
+def test_change_streams?
+  !BSON::Environment.jruby? && change_stream_enabled? & replica_set?
+end
+
+# For instances where behaviour is different on different versions, we need to
+# determine in the specs if we are 3.6 or higher.
+#
+# @since 2.5.0
+def array_filters_enabled?
+  $mongo_client ||= initialize_scanned_client!
+  $array_filters_enabled ||= $mongo_client.cluster.servers.first.features.array_filters_enabled?
+end
+
+
 # For instances where behaviour is different on different versions, we need to
 # determine in the specs if we are 3.4 or higher.
 #
@@ -183,6 +212,21 @@ def running_ssl?
   SSL
 end
 
+# Is the test suite using compression.
+#
+# @since 2.5.0
+def compression_enabled?
+  COMPRESSORS[:compressors]
+end
+
+# Is the test suite testing compression.
+# Requires that the server supports compression and compression is used by the test client.
+#
+# @since 2.5.0
+def testing_compression?
+  compression_enabled? && op_msg_enabled?
+end
+
 alias :scram_sha_1_enabled? :list_command_enabled?
 
 # Depending on whether write commands are enabled, there are different documents that
@@ -217,5 +261,65 @@ def initialize_scanned_client!
   Mongo::Client.new(ADDRESSES, TEST_OPTIONS.merge(database: TEST_DB))
 end
 
+# Test event subscriber.
+#
+# @since 2.5.0
+class EventSubscriber
+
+  # The started events.
+  #
+  # @since 2.5.0
+  attr_reader :started_events
+
+  # The succeeded events.
+  #
+  # @since 2.5.0
+  attr_reader :succeeded_events
+
+  # The failed events.
+  #
+  # @since 2.5.0
+  attr_reader :failed_events
+
+  # Create the test event subscriber.
+  #
+  # @example Create the subscriber
+  #   EventSubscriber.new
+  #
+  # @since 2.5.0
+  def initialize
+    @started_events = []
+    @succeeded_events = []
+    @failed_events = []
+  end
+
+  # Cache the succeeded event.
+  #
+  # @param [ Event ] event The event.
+  #
+  # @since 2.5.0
+  def succeeded(event)
+    @succeeded_events.push(event)
+  end
+
+  # Cache the started event.
+  #
+  # @param [ Event ] event The event.
+  #
+  # @since 2.5.0
+  def started(event)
+    @started_events.push(event)
+  end
+
+  # Cache the failed event.
+  #
+  # @param [ Event ] event The event.
+  #
+  # @since 2.5.0
+  def failed(event)
+    @failed_events.push(event)
+  end
+end
+
 # require all shared examples
 Dir['./spec/support/shared/*.rb'].sort.each { |file| require file }

data/spec/support/authorization.rb

@@ -62,6 +62,11 @@ INVALID_WRITE_CONCERN = { w: 4 }
 # @since 2.0.3
 SSL = (ENV['SSL'] == 'ssl') || (ENV['SSL_ENABLED'] == 'true')
 
+# What compressor to use, if any.
+#
+# @since 2.5.0
+COMPRESSORS = ENV['COMPRESSORS'] ? { compressors: ENV['COMPRESSORS'].split(',') } : {}
+
 # SSL options.
 #
 # @since 2.1.0
@@ -87,7 +92,7 @@ BASE_OPTIONS = {
 # Options for test suite clients.
 #
 # @since 2.0.3
-TEST_OPTIONS = BASE_OPTIONS.merge(CONNECT).merge(SSL_OPTIONS)
+TEST_OPTIONS = BASE_OPTIONS.merge(CONNECT).merge(SSL_OPTIONS).merge(COMPRESSORS)
 
 # The root user name.
 #

data/spec/support/crud.rb

@@ -114,7 +114,9 @@ module Mongo
 
       def lower_bound_satisfied?(client)
         if @min_server_version
-          if @min_server_version >= '3.4'
+          if @min_server_version >= '3.6'
+            client.cluster.next_primary.features.array_filters_enabled?
+          elsif @min_server_version >= '3.4'
             client.cluster.next_primary.features.collation_enabled?
           elsif @min_server_version >= '2.6'
             client.cluster.next_primary.features.write_command_enabled?

data/spec/support/crud/write.rb

@@ -48,7 +48,8 @@ module Mongo
                         :upsert => 'upsert',
                         :ordered => 'ordered',
                         :write_concern => 'writeConcern',
-                        :collation => 'collation'
+                        :collation => 'collation',
+                        :array_filters => 'arrayFilters'
                        }.freeze
 
         # The operation name.
@@ -199,6 +200,10 @@ module Mongo
           arguments['filter']
         end
 
+        def array_filters
+          arguments['arrayFilters']
+        end
+
         def requests
           arguments['requests'].map do |request|
             case request.keys.first

data/spec/support/crud_tests/write/findOneAndUpdate-arrayFilters.yml

@@ -0,0 +1,69 @@
+data:
+    - {_id: 1, y: [{b: 3}, {b: 1}]}
+    - {_id: 2, y: [{b: 0}, {b: 1}]}
+minServerVersion: '3.6'
+
+tests:
+    -
+        description: "FindOneAndUpdate when no document matches arrayFilters"
+        operation:
+            name: findOneAndUpdate
+            arguments:
+                filter: {}
+                update:
+                    $set: {"y.$[i].b": 2}
+                arrayFilters:
+                    - {i.b: 4}
+
+        outcome:
+            result:
+                _id: 1
+                y:
+                    - {b: 3}
+                    - {b: 1}
+            collection:
+                data:
+                    - {_id: 1, y: [{b: 3}, {b: 1}]}
+                    - {_id: 2, y: [{b: 0}, {b: 1}]}
+    -
+        description: "FindOneAndUpdate when one document matches arrayFilters"
+        operation:
+            name: findOneAndUpdate
+            arguments:
+                filter: {}
+                update:
+                    $set: {"y.$[i].b": 2}
+                arrayFilters:
+                    - {i.b: 3}
+
+        outcome:
+            result:
+                _id: 1
+                y:
+                    - {b: 3}
+                    - {b: 1}
+            collection:
+                data:
+                    - {_id: 1, y: [{b: 2}, {b: 1}]}
+                    - {_id: 2, y: [{b: 0}, {b: 1}]}
+    -
+        description: "FindOneAndUpdate when multiple documents match arrayFilters"
+        operation:
+            name: findOneAndUpdate
+            arguments:
+                filter: {}
+                update:
+                    $set: {"y.$[i].b": 2}
+                arrayFilters:
+                    - {i.b: 1}
+
+        outcome:
+            result:
+                _id: 1
+                y:
+                    - {b: 3}
+                    - {b: 1}
+            collection:
+                data:
+                    - {_id: 1, y: [{b: 3}, {b: 2}]}
+                    - {_id: 2, y: [{b: 0}, {b: 1}]}

data/spec/support/crud_tests/write/updateMany-arrayFilters.yml

@@ -0,0 +1,63 @@
+data:
+    - {_id: 1, y: [{b: 3}, {b: 1}]}
+    - {_id: 2, y: [{b: 0}, {b: 1}]}
+minServerVersion: '3.6'
+
+tests:
+    -
+        description: "UpdateMany when no documents match arrayFilters"
+        operation:
+            name: "updateMany"
+            arguments:
+                filter: {}
+                update:
+                    $set: {"y.$[i].b": 2}
+                arrayFilters:
+                    - {i.b: 4}
+
+        outcome:
+            result:
+                matchedCount: 2
+                modifiedCount: 0
+            collection:
+                data:
+                    - {_id: 1, y: [{b: 3}, {b: 1}]}
+                    - {_id: 2, y: [{b: 0}, {b: 1}]}
+    -
+        description: "UpdateMany when one document matches arrayFilters"
+        operation:
+            name: "updateMany"
+            arguments:
+                filter: {}
+                update:
+                    $set: {"y.$[i].b": 2}
+                arrayFilters:
+                    - {i.b: 3}
+
+        outcome:
+            result:
+                matchedCount: 2
+                modifiedCount: 1
+            collection:
+                data:
+                    - {_id: 1, y: [{b: 2}, {b: 1}]}
+                    - {_id: 2, y: [{b: 0}, {b: 1}]}
+    -
+        description: "UpdateMany when multiple documents match arrayFilters"
+        operation:
+            name: "updateMany"
+            arguments:
+                filter: {}
+                update:
+                    $set: {"y.$[i].b": 2}
+                arrayFilters:
+                    - {i.b: 1}
+
+        outcome:
+            result:
+                matchedCount: 2
+                modifiedCount: 2
+            collection:
+                data:
+                    - {_id: 1, y: [{b: 3}, {b: 2}]}
+                    - {_id: 2, y: [{b: 0}, {b: 2}]}

data/spec/support/crud_tests/write/updateOne-arrayFilters.yml

@@ -0,0 +1,109 @@
+data:
+    - {_id: 1, y: [{b: 3}, {b: 1}]}
+    - {_id: 2, y: [{b: 0}, {b: 1}]}
+    - {_id: 3, y: [{b: 5, c: [{d: 2}, {d: 1}] }]}
+minServerVersion: '3.6'
+
+tests:
+    -
+        description: "UpdateOne when no document matches arrayFilters"
+        operation:
+            name: "updateOne"
+            arguments:
+                filter: {}
+                update:
+                    $set: {"y.$[i].b": 2}
+                arrayFilters:
+                    - {i.b: 4}
+
+        outcome:
+            result:
+                matchedCount: 1
+                modifiedCount: 0
+            collection:
+                data:
+                  - {_id: 1, y: [{b: 3}, {b: 1}]}
+                  - {_id: 2, y: [{b: 0}, {b: 1}]}
+                  - {_id: 3, y: [{b: 5, c: [{d: 2}, {d: 1}] }]}
+    -
+        description: "UpdateOne when one document matches arrayFilters"
+        operation:
+            name: "updateOne"
+            arguments:
+                filter: {}
+                update:
+                    $set: {"y.$[i].b": 2}
+                arrayFilters:
+                  - {i.b: 3}
+
+        outcome:
+            result:
+                matchedCount: 1
+                modifiedCount: 1
+            collection:
+                data:
+                  - {_id: 1, y: [{b: 2}, {b: 1}]}
+                  - {_id: 2, y: [{b: 0}, {b: 1}]}
+                  - {_id: 3, y: [{b: 5, c: [{d: 2}, {d: 1}] }]}
+    -
+        description: "UpdateOne when multiple documents match arrayFilters"
+        operation:
+            name: "updateOne"
+            arguments:
+                filter: {}
+                update:
+                    $set: {"y.$[i].b": 2}
+                arrayFilters:
+                  - {i.b: 1}
+
+        outcome:
+            result:
+                matchedCount: 1
+                modifiedCount: 1
+            collection:
+                data:
+                  - {_id: 1, y: [{b: 3}, {b: 2}]}
+                  - {_id: 2, y: [{b: 0}, {b: 1}]}
+                  - {_id: 3, y: [{b: 5, c: [{d: 2}, {d: 1}] }]}
+    -
+        description: "UpdateOne when no documents match multiple arrayFilters"
+        operation:
+            name: "updateOne"
+            arguments:
+                filter: {_id: 3}
+                update:
+                    $set: {"y.$[i].c.$[j].d": 0}
+                arrayFilters:
+                  - {i.b: 5}
+                  - {j.d: 3}
+
+        outcome:
+            result:
+                matchedCount: 1
+                modifiedCount: 0 
+            collection:
+                data:
+                  - {_id: 1, y: [{b: 3}, {b: 1}]}
+                  - {_id: 2, y: [{b: 0}, {b: 1}]}
+                  - {_id: 3, y: [{b: 5, c: [{d: 2}, {d: 1}] }]}
+    -
+        description: "UpdateOne when one document matches multiple arrayFilters"
+        operation:
+            name: "updateOne"
+            arguments:
+                filter: {_id: 3}
+                update:
+                    $set: {"y.$[i].c.$[j].d": 0}
+                arrayFilters:
+                  - {i.b: 5}
+                  - {j.d: 1}
+
+        outcome:
+            result:
+                matchedCount: 1
+                modifiedCount: 1
+            collection:
+                data:
+                  - {_id: 1, y: [{b: 3}, {b: 1}]}
+                  - {_id: 2, y: [{b: 0}, {b: 1}]}
+                  - {_id: 3, y: [{b: 5, c: [{d: 2}, {d: 0}] }]}

data/spec/support/sdam/rs/discover_arbiters.yml

@@ -33,8 +33,8 @@ phases: [
                     setName:
                 }
             },
-
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     }

data/spec/support/sdam/rs/discover_passives.yml

@@ -33,8 +33,8 @@ phases: [
                     setName:
                 }
             },
-
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     },
@@ -69,8 +69,8 @@ phases: [
                     setName: "rs"
                 }
             },
-
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     }