mongo 2.15.0 → 2.18.1

data/spec/runners/unified/crud_operations.rb

@@ -8,7 +8,19 @@ module Unified
     def find(op)
       collection = entities.get(:collection, op.use!('object'))
       use_arguments(op) do |args|
-        opts = {}
+        opts = {
+          let: args.use('let'),
+          comment: args.use('comment'),
+          allow_disk_use: args.use('allowDiskUse'),
+          show_disk_loc: args.use('showRecordId'),
+          return_key: args.use('returnKey'),
+          projection: args.use('projection'),
+          skip: args.use('skip'),
+          hint: args.use('hint'),
+          max_value: args.use('max'),
+          max_time_ms: args.use('maxTimeMS'),
+          min_value: args.use('min'),
+        }
         if session = args.use('session')
           opts[:session] = entities.get(:session, session)
         end
@@ -22,6 +34,9 @@ module Unified
         if limit = args.use('limit')
           req = req.limit(limit)
         end
+        if projection = args.use('projection')
+          req = req.projection(projection)
+        end
         result = req.to_a
       end
     end
@@ -29,7 +44,14 @@ module Unified
     def count_documents(op)
       collection = entities.get(:collection, op.use!('object'))
       use_arguments(op) do |args|
-        collection.find(args.use!('filter')).count_documents
+        opts = {}
+        if session = args.use('session')
+          opts[:session] = entities.get(:session, session)
+        end
+        if comment = args.use('comment')
+          opts[:comment] = comment
+        end
+        collection.find(args.use!('filter')).count_documents(**opts)
       end
     end
 
@@ -40,6 +62,9 @@ module Unified
         if max_time_ms = args.use('maxTimeMS')
           opts[:max_time_ms] = max_time_ms
         end
+        if comment = args.use('comment')
+          opts[:comment] = comment
+        end
         collection.estimated_document_count(**opts)
       end
     end
@@ -47,7 +72,14 @@ module Unified
     def distinct(op)
       collection = entities.get(:collection, op.use!('object'))
       use_arguments(op) do |args|
-        req = collection.find(args.use!('filter')).distinct(args.use!('fieldName'))
+        opts = {}
+        if session = args.use('session')
+          opts[:session] = entities.get(:session, session)
+        end
+        if comment = args.use('comment')
+          opts[:comment] = comment
+        end
+        req = collection.find(args.use!('filter'), **opts).distinct(args.use!('fieldName'), **opts)
         result = req.to_a
       end
     end
@@ -57,10 +89,17 @@ module Unified
       use_arguments(op) do |args|
         filter = args.use!('filter')
         update = args.use!('update')
-        opts = {}
+        opts = {
+          let: args.use('let'),
+          comment: args.use('comment'),
+          hint: args.use('hint'),
+        }
         if return_document = args.use('returnDocument')
           opts[:return_document] = return_document.downcase.to_sym
         end
+        if session = args.use('session')
+          opts[:session] = entities.get(:session, session)
+        end
         collection.find_one_and_update(filter, update, **opts)
       end
     end
@@ -70,7 +109,15 @@ module Unified
       use_arguments(op) do |args|
         filter = args.use!('filter')
         update = args.use!('replacement')
-        collection.find_one_and_replace(filter, update)
+        opts = {
+          let: args.use('let'),
+          comment: args.use('comment'),
+          hint: args.use('hint'),
+        }
+        if session = args.use('session')
+          opts[:session] = entities.get(:session, session)
+        end
+        collection.find_one_and_replace(filter, update, **opts)
       end
     end
 
@@ -78,14 +125,24 @@ module Unified
       collection = entities.get(:collection, op.use!('object'))
       use_arguments(op) do |args|
         filter = args.use!('filter')
-        collection.find_one_and_delete(filter)
+        opts = {
+          let: args.use('let'),
+          comment: args.use('comment'),
+          hint: args.use('hint'),
+        }
+        if session = args.use('session')
+          opts[:session] = entities.get(:session, session)
+        end
+        collection.find_one_and_delete(filter, **opts)
       end
     end
 
     def insert_one(op)
       collection = entities.get(:collection, op.use!('object'))
       use_arguments(op) do |args|
-        opts = {}
+        opts = {
+          comment: args.use('comment')
+        }
         if session = args.use('session')
           opts[:session] = entities.get(:session, session)
         end
@@ -96,25 +153,44 @@ module Unified
     def insert_many(op)
       collection = entities.get(:collection, op.use!('object'))
       use_arguments(op) do |args|
-        options = {}
+        opts = {
+          comment: args.use('comment')
+        }
         unless (ordered = args.use('ordered')).nil?
-          options[:ordered] = ordered
+          opts[:ordered] = ordered
+        end
+        if session = args.use('session')
+          opts[:session] = entities.get(:session, session)
         end
-        collection.insert_many(args.use!('documents'), **options)
+        collection.insert_many(args.use!('documents'), **opts)
       end
     end
 
     def update_one(op)
       collection = entities.get(:collection, op.use!('object'))
       use_arguments(op) do |args|
-        collection.update_one(args.use!('filter'), args.use!('update'))
+        opts = {
+          let: args.use('let'),
+          comment: args.use('comment'),
+          hint: args.use('hint'),
+          upsert: args.use('upsert'),
+        }
+        if session = args.use('session')
+          opts[:session] = entities.get(:session, session)
+        end
+        collection.update_one(args.use!('filter'), args.use!('update'), **opts)
       end
     end
 
     def update_many(op)
       collection = entities.get(:collection, op.use!('object'))
       use_arguments(op) do |args|
-        collection.update_many(args.use!('filter'), args.use!('update'))
+        opts = {
+          let: args.use('let'),
+          comment: args.use('comment'),
+          hint: args.use('hint'),
+        }
+        collection.update_many(args.use!('filter'), args.use!('update'), **opts)
       end
     end
 
@@ -124,7 +200,10 @@ module Unified
         collection.replace_one(
           args.use!('filter'),
           args.use!('replacement'),
+          comment: args.use('comment'),
           upsert: args.use('upsert'),
+          let: args.use('let'),
+          hint: args.use('hint')
         )
       end
     end
@@ -132,14 +211,27 @@ module Unified
     def delete_one(op)
       collection = entities.get(:collection, op.use!('object'))
       use_arguments(op) do |args|
-        collection.delete_one(args.use!('filter'))
+        opts = {
+          let: args.use('let'),
+          comment: args.use('comment'),
+          hint: args.use('hint'),
+        }
+        if session = args.use('session')
+          opts[:session] = entities.get(:session, session)
+        end
+        collection.delete_one(args.use!('filter'), **opts)
       end
     end
 
     def delete_many(op)
       collection = entities.get(:collection, op.use!('object'))
       use_arguments(op) do |args|
-        collection.delete_many(args.use!('filter'))
+        opts = {
+          let: args.use('let'),
+          comment: args.use('comment'),
+          hint: args.use('hint'),
+        }
+        collection.delete_many(args.use!('filter'), **opts)
       end
     end
 
@@ -150,13 +242,44 @@ module Unified
           convert_bulk_write_spec(req)
         end
         opts = {}
-        if ordered = args.use('ordered')
-          opts[:ordered] = true
+        if args.key?('ordered')
+          opts[:ordered] = args.use!('ordered')
+        end
+        if comment = args.use('comment')
+          opts[:comment] = comment
+        end
+        if let = args.use('let')
+          opts[:let] = let
         end
         collection.bulk_write(requests, **opts)
       end
     end
 
+    def aggregate(op)
+      obj = entities.get_any(op.use!('object'))
+      args = op.use!('arguments')
+      pipeline = args.use!('pipeline')
+      opts = {
+        let: args.use('let'),
+      }
+      if session = args.use('session')
+        opts[:session] = entities.get(:session, session)
+      end
+      if comment = args.use('comment')
+        opts[:comment] = comment
+      end
+      if batch_size = args.use('batchSize')
+        opts[:batch_size] = batch_size
+      end
+      if args.key?('allowDiskUse')
+        opts[:allow_disk_use] = args.use('allowDiskUse')
+      end
+      unless args.empty?
+        raise NotImplementedError, "Unhandled spec keys: #{args} in #{test_spec}"
+      end
+      obj.aggregate(pipeline, **opts).to_a
+    end
+
     private
 
     def convert_bulk_write_spec(spec)
@@ -173,16 +296,20 @@ module Unified
           filter: spec.use('filter'),
           update: spec.use('update'),
           upsert: spec.use('upsert'),
+          array_filters: spec.use('arrayFilters'),
+          hint: spec.use('hint'),
         }
       when 'replaceOne'
         {
           filter: spec.use('filter'),
           replacement: spec.use('replacement'),
           upsert: spec.use('upsert'),
+          hint: spec.use('hint'),
         }
       when 'deleteOne', 'deleteMany'
         {
           filter: spec.use('filter'),
+          hint: spec.use('hint'),
         }
       else
         raise NotImplementedError, "Unknown operation #{op}"
@@ -192,15 +319,5 @@ module Unified
       end
       {Utils.underscore(op) =>out}
     end
-
-    def aggregate(op)
-      obj = entities.get_any(op.use!('object'))
-      args = op.use!('arguments')
-      pipeline = args.use!('pipeline')
-      unless args.empty?
-        raise NotImplementedError, "Unhandled spec keys: #{test_spec}"
-      end
-      obj.aggregate(pipeline).to_a
-    end
   end
 end

data/spec/runners/unified/ddl_operations.rb

@@ -7,7 +7,13 @@ module Unified
 
     def list_databases(op)
       client = entities.get(:client, op.use!('object'))
-      client.list_databases
+      use_arguments(op) do |args|
+        opts = {}
+        if session = args.use('session')
+          opts[:session] = entities.get(:session, session)
+        end
+        client.list_databases({}, false, **opts)
+      end
     end
 
     def create_collection(op)
@@ -24,10 +30,33 @@ module Unified
         if expire_after_seconds = args.use('expireAfterSeconds')
           collection_opts[:expire_after] = expire_after_seconds
         end
+        if clustered_index = args.use('clusteredIndex')
+          collection_opts[:clustered_index] = clustered_index
+        end
+        if change_stream_pre_and_post_images = args.use('changeStreamPreAndPostImages')
+          collection_opts[:change_stream_pre_and_post_images] = change_stream_pre_and_post_images
+        end
+        if view_on = args.use('viewOn')
+          collection_opts[:view_on] = view_on
+        end
         database[args.use!('collection'), collection_opts].create(**opts)
       end
     end
 
+    def list_collections(op)
+      database = entities.get(:database, op.use!('object'))
+      use_arguments(op) do |args|
+        opts = {}
+        if session = args.use('session')
+          opts[:session] = entities.get(:session, session)
+        end
+        if filter = args.use('filter')
+          opts[:filter] = filter
+        end
+        database.list_collections(**opts)
+      end
+    end
+
     def drop_collection(op)
       database = entities.get(:database, op.use!('object'))
       use_arguments(op) do |args|
@@ -36,6 +65,23 @@ module Unified
       end
     end
 
+    def rename(op)
+      collection = entities.get(:collection, op.use!('object'))
+      use_arguments(op) do |args|
+        to = args.use!('to')
+        cmd = {
+          renameCollection: "#{collection.database.name}.#{collection.name}",
+          to: "#{collection.database.name}.#{to}"
+        }
+
+        if args.key?("dropTarget")
+          cmd[:dropTarget] = args.use("dropTarget")
+        end
+
+        collection.client.use(:admin).command(**cmd)
+      end
+    end
+
     def assert_collection_exists(op, state = true)
       consume_test_runner(op)
       use_arguments(op) do |args|
@@ -58,6 +104,17 @@ module Unified
       assert_collection_exists(op, false)
     end
 
+    def list_indexes(op)
+      collection = entities.get(:collection, op.use!('object'))
+      use_arguments(op) do |args|
+        opts = {}
+        if session = args.use('session')
+          opts[:session] = entities.get(:session, session)
+        end
+        collection.indexes(**opts).to_a
+      end
+    end
+
     def create_index(op)
       collection = entities.get(:collection, op.use!('object'))
       use_arguments(op) do |args|
@@ -74,6 +131,22 @@ module Unified
       end
     end
 
+    def drop_index(op)
+      collection = entities.get(:collection, op.use!('object'))
+      use_arguments(op) do |args|
+        opts = {}
+        if session = args.use('session')
+          opts[:session] = entities.get(:session, session)
+        end
+
+        collection.indexes.drop_one(
+          args.use!('name'),
+          **opts,
+        )
+      end
+    end
+
+
     def assert_index_exists(op)
       consume_test_runner(op)
       use_arguments(op) do |args|

data/spec/runners/unified/entity_map.rb

@@ -3,6 +3,8 @@
 
 module Unified
   class EntityMap
+    extend Forwardable
+
     def initialize
       @map = {}
     end
@@ -35,8 +37,6 @@ module Unified
       raise Error::EntityMissing, "There is no #{id} known"
     end
 
-    def [](type)
-      @map[type]
-    end
+    def_delegators :@map, :[], :fetch
   end
 end

data/spec/runners/unified/error.rb

@@ -23,6 +23,7 @@ module Unified
     class InvalidTest < Error
     end
 
+    class UnsupportedOperation < Error
+    end
   end
-
 end

data/spec/runners/unified/event_subscriber.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
-require 'support/event_subscriber'
+require 'mrss/event_subscriber'
 
 module Unified
 
-  class EventSubscriber < ::EventSubscriber
+  class EventSubscriber < Mrss::EventSubscriber
     def ignore_commands(command_names)
       @ignore_commands = command_names
     end

data/spec/runners/unified/grid_fs_operations.rb

@@ -20,6 +20,18 @@ module Unified
       end
     end
 
+    def download_by_name(op)
+      bucket = entities.get(:bucket, op.use!('object'))
+      use_arguments(op) do |args|
+        opts = {}
+        if revision = args.use('revision')
+          opts[:revision] = revision
+        end
+        stream = bucket.open_download_stream_by_name(args.use!('filename'), opts)
+        stream.read
+      end
+    end
+
     def upload(op)
       bucket = entities.get(:bucket, op.use!('object'))
       use_arguments(op) do |args|
@@ -27,6 +39,15 @@ module Unified
         if chunk_size = args.use('chunkSizeBytes')
           opts[:chunk_size] = chunk_size
         end
+        if metadata = args.use('metadata')
+          opts[:metadata] = metadata
+        end
+        if content_type = args.use('contentType')
+          opts[:content_type] = content_type
+        end
+        if disable_md5 = args.use('disableMD5')
+          opts[:disable_md5] = disable_md5
+        end
         contents = transform_contents(args.use!('source'))
         file_id = nil
         bucket.open_upload_stream(args.use!('filename'), **opts) do |stream|

data/spec/runners/unified/support_operations.rb

@@ -13,7 +13,12 @@ module Unified
 
         cmd = args.use!('command')
 
-        database.command(cmd)
+        opts = {}
+        if session = args.use('session')
+          opts[:session] = entities.get(:session, session)
+        end
+
+        database.command(cmd, **opts)
       end
     end
 
@@ -54,8 +59,11 @@ module Unified
 
     def assert_session_dirty(op)
       consume_test_runner(op)
-      # https://jira.mongodb.org/browse/RUBY-1813
-      true
+      use_arguments(op) do |args|
+        session = entities.get(:session, args.use!('session'))
+        # https://jira.mongodb.org/browse/RUBY-1813
+        true
+      end
     end
 
     def assert_session_not_dirty(op)
@@ -208,12 +216,20 @@ module Unified
             else
               raise
             end
+          rescue Interrupt
+            raise
           rescue => e
-            if store_errors
+            if store_failures
+              STDERR.puts "Error: #{e.class}: #{e} (reporting as failure)"
+              entities.get(:failure_list, store_failures) << {
+                error: "#{e.class}: #{e}",
+                time: Time.now.to_f,
+              }
+            elsif store_errors
               STDERR.puts "Error: #{e.class}: #{e}"
               entities.get(:error_list, store_errors) << {
                 error: "#{e.class}: #{e}",
-                observedAt: Time.now.to_f,
+                time: Time.now.to_f,
               }
             else
               raise