mongo 2.5.3 → 2.6.0

data/spec/support/command_monitoring/command.yml

@@ -40,3 +40,22 @@ tests:
       -
         command_failed_event:
           command_name: "count"
+  -
+    description: "A successful command with a non-primary read preference"
+    operation:
+      name: "count"
+      arguments:
+        filter: { _id: 1 }
+      read_preference: { mode: "primaryPreferred" }
+    expectations:
+      -
+        command_started_event:
+          command:
+            count: *collection_name
+            query: { _id: 1 }
+          command_name: "count"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply: { ok: 1.0, n: 1 }
+          command_name: "count"

data/spec/support/command_monitoring/find.yml

@@ -42,17 +42,15 @@ tests:
       arguments:
         filter: { _id: { $gt: 1 } }
         sort: { _id: 1 }
-        skip: 2
+        skip: {"$numberLong": "2"}
         modifiers:
           $comment: "test"
           $hint: { _id: 1 }
           $max: { _id: 6 }
-          $maxScan: 5000
           $maxTimeMS: 6000
           $min: { _id: 0 }
           $returnKey: false
           $showDiskLoc: false
-          $snapshot: false
     expectations:
       -
         command_started_event:
@@ -60,16 +58,14 @@ tests:
             find: *collection_name
             filter: { _id:  { $gt: 1 } }
             sort: { _id: 1 }
-            skip: 2
+            skip: {"$numberLong": "2"}
             comment: "test"
             hint: { _id: 1 }
             max: { _id: 6 }
-            maxScan: 5000
             maxTimeMS: 6000
             min: { _id: 0 }
             returnKey: false
             showRecordId: false
-            snapshot: false
           command_name: "find"
           database_name: *database_name
       -
@@ -90,7 +86,7 @@ tests:
       arguments:
         filter: { _id: { $gte: 1 }}
         sort: { _id: 1 }
-        batchSize: 3
+        batchSize: {"$numberLong": "3"}
     expectations:
       -
         command_started_event:
@@ -98,7 +94,7 @@ tests:
             find: *collection_name
             filter: { _id: { $gte : 1 }}
             sort: { _id: 1 }
-            batchSize: 3
+            batchSize: {"$numberLong": "3"}
           command_name: "find"
           database_name: *database_name
       -
@@ -118,7 +114,7 @@ tests:
           command:
             getMore: { $numberLong: "42" }
             collection: *collection_name
-            batchSize: 3
+            batchSize: {"$numberLong": "3"}
           command_name: "getMore"
           database_name: *database_name
       -
@@ -140,8 +136,8 @@ tests:
       arguments:
         filter: { _id: { $gte: 1 }}
         sort: { _id: 1 }
-        batchSize: 3
-        limit: 4
+        batchSize: {"$numberLong": "3"}
+        limit: {"$numberLong": "4"}
     expectations:
       -
         command_started_event:
@@ -149,8 +145,8 @@ tests:
             find: *collection_name
             filter: { _id: { $gte : 1 }}
             sort: { _id: 1 }
-            batchSize: 3
-            limit: 4
+            batchSize: {"$numberLong": "3"}
+            limit: {"$numberLong": "4"}
           command_name: "find"
           database_name: *database_name
       -
@@ -170,7 +166,7 @@ tests:
           command:
             getMore: { $numberLong: "42" }
             collection: *collection_name
-            batchSize: 1
+            batchSize: { $numberLong: "1" }
           command_name: "getMore"
           database_name: *database_name
       -
@@ -201,13 +197,15 @@ tests:
   -
     description: "A successful find event with a getmore and the server kills the cursor"
     ignore_if_server_version_less_than: "3.1"
+    ignore_if_topology_type:
+      - "sharded"
     operation:
       name: "find"
       arguments:
         filter: { _id: { $gte: 1 }}
         sort: { _id: 1 }
-        batchSize: 3
-        limit: 4
+        batchSize: {"$numberLong": "3"}
+        limit: {"$numberLong": "4"}
     expectations:
       -
         command_started_event:
@@ -215,8 +213,8 @@ tests:
             find: *collection_name
             filter: { _id: { $gte : 1 }}
             sort: { _id: 1 }
-            batchSize: 3
-            limit: 4
+            batchSize: {"$numberLong": "3"}
+            limit: {"$numberLong": "4"}
           command_name: "find"
           database_name: *database_name
       -
@@ -236,7 +234,7 @@ tests:
           command:
             getMore: { $numberLong: "42" }
             collection: *collection_name
-            batchSize: 3
+            batchSize: { $numberLong: "1" }
           command_name: "getMore"
           database_name: *database_name
       -

data/spec/support/command_monitoring/insertMany.yml

@@ -12,7 +12,6 @@ tests:
       arguments:
         documents:
           - { _id: 2, x: 22 }
-          - { _id: 3, x: 33 }
     expectations:
       -
         command_started_event:
@@ -20,13 +19,12 @@ tests:
             insert: *collection_name
             documents:
               - { _id: 2, x: 22 }
-              - { _id: 3, x: 33 }
             ordered: true
           command_name: "insert"
           database_name: *database_name
       -
         command_succeeded_event:
-          reply: { ok: 1.0, n: 2 }
+          reply: { ok: 1.0, n: 1 }
           command_name: "insert"
   -
     description: "A successful insert many command with write errors"
@@ -35,7 +33,6 @@ tests:
       arguments:
         documents:
           - { _id: 1, x: 11 }
-          - { _id: 2, x: 22 }
     expectations:
       -
         command_started_event:
@@ -43,7 +40,6 @@ tests:
             insert: *collection_name
             documents:
               - { _id: 1, x: 11 }
-              - { _id: 2, x: 22 }
             ordered: true
           command_name: "insert"
           database_name: *database_name
@@ -62,7 +58,6 @@ tests:
       arguments:
         documents:
           - { _id: 2, x: 22 }
-          - { _id: 3, x: 33 }
         ordered: false
     expectations:
       -
@@ -71,11 +66,10 @@ tests:
             insert: *collection_name
             documents:
               - { _id: 2, x: 22 }
-              - { _id: 3, x: 33 }
             ordered: false
           command_name: "insert"
           database_name: *database_name
       -
         command_succeeded_event:
-          reply: { ok: 1.0, n: 2 }
+          reply: { ok: 1.0, n: 1 }
           command_name: "insert"

data/spec/support/command_monitoring/unacknowledgedBulkWrite.yml

@@ -0,0 +1,34 @@
+data:
+  - { _id: 1, x: 11 }
+
+collection_name: &collection_name "test"
+database_name: &database_name "ruby-driver"
+
+tests:
+  -
+    description: "A successful unordered bulk write with an unacknowledged write concern"
+    comment: "On a 2.4 server, no GLE is sent and requires a client-side manufactured reply"
+    operation:
+      name: "bulkWrite"
+      arguments:
+        requests:
+          - name: "insertOne"
+            arguments:
+              document: { _id: "unorderedBulkWriteInsertW0", x: 44 }
+        options: { ordered: false }
+        writeConcern: { w: 0 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            insert: *collection_name
+            documents:
+              - { _id: "unorderedBulkWriteInsertW0", x: 44 }
+            ordered: false
+            writeConcern: { w: 0 }
+          command_name: "insert"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply: { ok: 1.0 }
+          command_name: "insert"

data/spec/support/connection_string.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2017 MongoDB, Inc.
+# Copyright (C) 2014-2018 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/spec/support/constraints.rb

@@ -0,0 +1,56 @@
+module Constraints
+  def min_server_version(version)
+    unless version =~ /^\d+\.\d+$/
+      raise ArgumentError, "Version can only be major.minor: #{version}"
+    end
+
+    before do
+      client = authorized_client
+      $server_version ||= client.database.command(buildInfo: 1).first['version']
+
+      if version > $server_version
+        skip "Server version #{version} required, we have #{$server_version}"
+      end
+    end
+  end
+
+  def require_sessions
+    before do
+      unless sessions_enabled?
+        skip 'Sessions are not enabled'
+      end
+    end
+  end
+
+  def require_topology(*topologies)
+    topologies = topologies.map { |t| t.to_s }
+    invalid_topologies = topologies - %w(single replica_set sharded)
+    unless invalid_topologies.empty?
+      raise ArgumentError, "Invalid topologies requested: #{invalid_topologies.join(', ')}"
+    end
+    before do
+      topology = authorized_client.cluster.topology.class.name.sub(/.*::/, '')
+      topology = topology.gsub(/([A-Z])/) { |match| '_' + match.downcase }.sub(/^_/, '')
+      unless topologies.include?(topology)
+        skip "Topology #{topologies.join(' or ')} required, we have #{topology}"
+      end
+    end
+  end
+
+  # Constrain tests that use TimeoutInterrupt to MRI (and Unix)
+  def only_mri
+    before do
+      if RUBY_PLATFORM =~ /\bjava\b/
+        skip "MRI required, we have #{RUBY_PLATFORM}"
+      end
+    end
+  end
+
+  def max_example_run_time(timeout)
+    around do |example|
+      TimeoutInterrupt.timeout(timeout) do
+        example.run
+      end
+    end
+  end
+end

data/spec/support/crud.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2017 MongoDB, Inc.
+# Copyright (C) 2014-2018 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -125,7 +125,8 @@ module Mongo
       # @since 2.0.0
       attr_reader :description
 
-      FAIL_POINT_BASE_COMMAND = { configureFailPoint: "onPrimaryTransactionalWrite" }
+      # Spec tests have configureFailPoint as a string, make it a string here too
+      FAIL_POINT_BASE_COMMAND = { 'configureFailPoint' => "onPrimaryTransactionalWrite" }
 
       # Instantiate the new CRUDTest.
       #
@@ -139,7 +140,9 @@ module Mongo
       # @since 2.0.0
       def initialize(data, test)
         @data = data
-        @fail_point_command = FAIL_POINT_BASE_COMMAND.merge(test['failPoint']) if test['failPoint']
+        if test['failPoint']
+          @fail_point_command = FAIL_POINT_BASE_COMMAND.merge(test['failPoint'])
+        end
         @description = test['description']
         @operation = Operation.get(test['operation'])
         @outcome = test['outcome']
@@ -169,7 +172,9 @@ module Mongo
       end
 
       def set_up_fail_point(collection)
-        collection.client.use(:admin).command(@fail_point_command) if @fail_point_command
+        if @fail_point_command
+          collection.client.use(:admin).command(@fail_point_command)
+        end
       end
 
       def clear_fail_point(collection)

data/spec/support/crud/read.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2017 MongoDB, Inc.
+# Copyright (C) 2014-2018 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -70,7 +70,7 @@ module Mongo
         #
         # @since 2.0.0
         def execute(collection)
-          send(name.to_sym, collection)
+          send(camel_to_snake(name), collection)
         end
 
         # Whether the operation is expected to have restuls.
@@ -96,6 +96,22 @@ module Mongo
           collection.count(filter, options)
         end
 
+        def count_documents(collection)
+          options = ARGUMENT_MAP.reduce({}) do |opts, (key, value)|
+            opts.merge!(key => arguments[value]) if arguments[value]
+            opts
+          end
+          collection.count_documents(filter, options)
+        end
+
+        def estimated_document_count(collection)
+          options = ARGUMENT_MAP.reduce({}) do |opts, (key, value)|
+            opts.merge!(key => arguments[value]) if arguments[value]
+            opts
+          end
+          collection.estimated_document_count(options)
+        end
+
         def aggregate(collection)
           collection.aggregate(pipeline, options).to_a
         end
@@ -111,7 +127,12 @@ module Mongo
 
         def options
           ARGUMENT_MAP.reduce({}) do |opts, (key, value)|
-            arguments[value] ? opts.merge!(key => arguments[value]) : opts
+            value = if arguments[value].is_a?(Hash) && arguments[value]['$numberLong']
+                      arguments[value]['$numberLong'].to_i
+                    else
+                      arguments[value]
+                    end
+            value ? opts.merge!(key => value) : opts
           end
         end
 

data/spec/support/crud/write.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2017 MongoDB, Inc.
+# Copyright (C) 2014-2018 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -167,7 +167,12 @@ module Mongo
         end
 
         def options
-          ARGUMENT_MAP.reduce({}) do |opts, (key, value)|
+          args = (arguments['options'] || {}).reduce({}) do |a, kv|
+            a[kv.first.to_sym] = kv.last
+            a
+          end
+
+          ARGUMENT_MAP.reduce(args) do |opts, (key, value)|
             arguments.key?(value) ? opts.merge!(key => send(key)) : opts
           end
         end

data/spec/support/crud_tests/read/count-collation.yml

@@ -4,12 +4,22 @@ minServerVersion: '3.4'
 
 tests:
     -
-        description: "Count with collation"
+        description: "Count documents with collation"
         operation:
-            name: count
+            name: countDocuments
             arguments:
                 filter: { x: 'ping' }
                 collation: { locale: 'en_US', strength: 2 } # https://docs.mongodb.com/master/reference/collation/#collation-document
 
         outcome:
             result: 1
+    -
+        description: "Deprecated count with collation"
+        operation:
+            name: count
+            arguments:
+                filter: { x: 'ping' }
+                collation: { locale: 'en_US', strength: 2 }
+
+        outcome:
+            result: 1

data/spec/support/crud_tests/read/count.yml

@@ -5,7 +5,45 @@ data:
 
 tests:
     -
-        description: "Count without a filter"
+        description: "Estimated document count"
+        operation:
+            name: estimatedDocumentCount
+            arguments: { }
+
+        outcome:
+            result: 3
+    -
+        description: "Count documents without a filter"
+        operation:
+            name: countDocuments
+            arguments:
+                filter: { }
+
+        outcome:
+            result: 3
+    -
+        description: "Count documents with a filter"
+        operation:
+            name: countDocuments
+            arguments:
+                filter:
+                    _id: {$gt: 1}
+
+        outcome:
+            result: 2
+    -
+        description: "Count documents with skip and limit"
+        operation:
+            name: countDocuments
+            arguments:
+                filter: {}
+                skip: 1
+                limit: 3
+
+        outcome:
+            result: 2
+    -
+        description: "Deprecated count without a filter"
         operation:
             name: count
             arguments:
@@ -14,17 +52,17 @@ tests:
         outcome:
             result: 3
     -
-        description: "Count with a filter"
+        description: "Deprecated count with a filter"
         operation:
             name: count
             arguments:
-                filter: 
+                filter:
                     _id: {$gt: 1}
 
         outcome:
             result: 2
     -
-        description: "Count with skip and limit"
+        description: "Deprecated count with skip and limit"
         operation:
             name: count
             arguments:
@@ -33,4 +71,4 @@ tests:
                 limit: 3
 
         outcome:
-            result: 2
+            result: 2