diff --git a/.evergreen/config.yml b/.evergreen/config.yml index ef4a55380..fcf1ccef1 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -105,5 +105,6 @@ include: - filename: .evergreen/config/generated/test-variant/full-php-8.1.yml - filename: .evergreen/config/generated/test-variant/full-php-8.0.yml - filename: .evergreen/config/generated/test-variant/full-php-7.4.yml - - filename: .evergreen/config/generated/test-variant/phpc-php-8.3.yml - - filename: .evergreen/config/generated/test-variant/lowest-php-7.4.yml + # TODO: Re-enable when 1.20.0 is released +# - filename: .evergreen/config/generated/test-variant/phpc-php-8.3.yml +# - filename: .evergreen/config/generated/test-variant/lowest-php-7.4.yml diff --git a/.evergreen/config/generate-config.php b/.evergreen/config/generate-config.php index 819101834..270c65f62 100644 --- a/.evergreen/config/generate-config.php +++ b/.evergreen/config/generate-config.php @@ -62,8 +62,9 @@ // Test variants $allFiles[] = generateConfigs('test-variant', 'phpVersion', 'modern-php-full.yml', 'full-php-%s', $modernPhpVersions); $allFiles[] = generateConfigs('test-variant', 'phpVersion', 'legacy-php-full.yml', 'full-php-%s', $legacyPhpVersions); -$allFiles[] = generateConfigs('test-variant', 'phpVersion', 'phpc.yml', 'phpc-php-%s', [$latestPhpVersion]); -$allFiles[] = generateConfigs('test-variant', 'phpVersion', 'lowest.yml', 'lowest-php-%s', [$lowestPhpVersion]); +// TODO: Re-enable when 1.20.0 is released +// $allFiles[] = generateConfigs('test-variant', 'phpVersion', 'phpc.yml', 'phpc-php-%s', [$latestPhpVersion]); +// $allFiles[] = generateConfigs('test-variant', 'phpVersion', 'lowest.yml', 'lowest-php-%s', [$lowestPhpVersion]); echo "Generated config. Use the following list to import files:\n"; echo implode("\n", array_map('getImportConfig', array_merge(...$allFiles))) . "\n"; diff --git a/.evergreen/config/generated/build/build-php-7.4.yml b/.evergreen/config/generated/build/build-php-7.4.yml index 8d205a4b4..817bbb54c 100644 --- a/.evergreen/config/generated/build/build-php-7.4.yml +++ b/.evergreen/config/generated/build/build-php-7.4.yml @@ -7,34 +7,38 @@ tasks: vars: PHP_VERSION: "7.4" - func: "compile extension" - - func: "upload extension" - - name: "build-php-7.4-lowest" - tags: ["build", "php7.4", "lowest", "pr", "tag"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "7.4" - - func: "compile extension" - vars: - EXTENSION_VERSION: "1.19.0" - - func: "upload extension" - - name: "build-php-7.4-next-stable" - tags: ["build", "php7.4", "next-stable", "pr", "tag"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "7.4" - - func: "compile extension" - vars: - EXTENSION_BRANCH: "v1.19" - - func: "upload extension" - - name: "build-php-7.4-next-minor" - tags: ["build", "php7.4", "next-minor"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "7.4" - - func: "compile extension" + # TODO: remove once 1.20.0 is released vars: EXTENSION_BRANCH: "master" - func: "upload extension" + # TODO: re-enable once 1.20.0 is released +# - name: "build-php-7.4-lowest" +# tags: ["build", "php7.4", "lowest", "pr", "tag"] +# commands: +# - func: "locate PHP binaries" +# vars: +# PHP_VERSION: "7.4" +# - func: "compile extension" +# vars: +# EXTENSION_VERSION: "1.20.0" +# - func: "upload extension" +# - name: "build-php-7.4-next-stable" +# tags: ["build", "php7.4", "next-stable", "pr", "tag"] +# commands: +# - func: "locate PHP binaries" +# vars: +# PHP_VERSION: "7.4" +# - func: "compile extension" +# vars: +# EXTENSION_BRANCH: "v1.20.0" +# - func: "upload extension" +# - name: "build-php-7.4-next-minor" +# tags: ["build", "php7.4", "next-minor"] +# commands: +# - func: "locate PHP binaries" +# vars: +# PHP_VERSION: "7.4" +# - func: "compile extension" +# vars: +# EXTENSION_BRANCH: "master" +# - func: "upload extension" diff --git a/.evergreen/config/generated/build/build-php-8.0.yml b/.evergreen/config/generated/build/build-php-8.0.yml index 8b7d87230..172b28b89 100644 --- a/.evergreen/config/generated/build/build-php-8.0.yml +++ b/.evergreen/config/generated/build/build-php-8.0.yml @@ -7,34 +7,38 @@ tasks: vars: PHP_VERSION: "8.0" - func: "compile extension" - - func: "upload extension" - - name: "build-php-8.0-lowest" - tags: ["build", "php8.0", "lowest", "pr", "tag"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "8.0" - - func: "compile extension" - vars: - EXTENSION_VERSION: "1.19.0" - - func: "upload extension" - - name: "build-php-8.0-next-stable" - tags: ["build", "php8.0", "next-stable", "pr", "tag"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "8.0" - - func: "compile extension" - vars: - EXTENSION_BRANCH: "v1.19" - - func: "upload extension" - - name: "build-php-8.0-next-minor" - tags: ["build", "php8.0", "next-minor"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "8.0" - - func: "compile extension" + # TODO: remove once 1.20.0 is released vars: EXTENSION_BRANCH: "master" - func: "upload extension" + # TODO: re-enable once 1.20.0 is released +# - name: "build-php-8.0-lowest" +# tags: ["build", "php8.0", "lowest", "pr", "tag"] +# commands: +# - func: "locate PHP binaries" +# vars: +# PHP_VERSION: "8.0" +# - func: "compile extension" +# vars: +# EXTENSION_VERSION: "1.20.0" +# - func: "upload extension" +# - name: "build-php-8.0-next-stable" +# tags: ["build", "php8.0", "next-stable", "pr", "tag"] +# commands: +# - func: "locate PHP binaries" +# vars: +# PHP_VERSION: "8.0" +# - func: "compile extension" +# vars: +# EXTENSION_BRANCH: "v1.20.0" +# - func: "upload extension" +# - name: "build-php-8.0-next-minor" +# tags: ["build", "php8.0", "next-minor"] +# commands: +# - func: "locate PHP binaries" +# vars: +# PHP_VERSION: "8.0" +# - func: "compile extension" +# vars: +# EXTENSION_BRANCH: "master" +# - func: "upload extension" diff --git a/.evergreen/config/generated/build/build-php-8.1.yml b/.evergreen/config/generated/build/build-php-8.1.yml index 82ffe9648..0eab5a351 100644 --- a/.evergreen/config/generated/build/build-php-8.1.yml +++ b/.evergreen/config/generated/build/build-php-8.1.yml @@ -7,34 +7,38 @@ tasks: vars: PHP_VERSION: "8.1" - func: "compile extension" - - func: "upload extension" - - name: "build-php-8.1-lowest" - tags: ["build", "php8.1", "lowest", "pr", "tag"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "8.1" - - func: "compile extension" - vars: - EXTENSION_VERSION: "1.19.0" - - func: "upload extension" - - name: "build-php-8.1-next-stable" - tags: ["build", "php8.1", "next-stable", "pr", "tag"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "8.1" - - func: "compile extension" - vars: - EXTENSION_BRANCH: "v1.19" - - func: "upload extension" - - name: "build-php-8.1-next-minor" - tags: ["build", "php8.1", "next-minor"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "8.1" - - func: "compile extension" + # TODO: remove once 1.20.0 is released vars: EXTENSION_BRANCH: "master" - func: "upload extension" + # TODO: re-enable once 1.20.0 is released +# - name: "build-php-8.1-lowest" +# tags: ["build", "php8.1", "lowest", "pr", "tag"] +# commands: +# - func: "locate PHP binaries" +# vars: +# PHP_VERSION: "8.1" +# - func: "compile extension" +# vars: +# EXTENSION_VERSION: "1.20.0" +# - func: "upload extension" +# - name: "build-php-8.1-next-stable" +# tags: ["build", "php8.1", "next-stable", "pr", "tag"] +# commands: +# - func: "locate PHP binaries" +# vars: +# PHP_VERSION: "8.1" +# - func: "compile extension" +# vars: +# EXTENSION_BRANCH: "v1.20.0" +# - func: "upload extension" +# - name: "build-php-8.1-next-minor" +# tags: ["build", "php8.1", "next-minor"] +# commands: +# - func: "locate PHP binaries" +# vars: +# PHP_VERSION: "8.1" +# - func: "compile extension" +# vars: +# EXTENSION_BRANCH: "master" +# - func: "upload extension" diff --git a/.evergreen/config/generated/build/build-php-8.2.yml b/.evergreen/config/generated/build/build-php-8.2.yml index 6bac17e19..dd6ab11e4 100644 --- a/.evergreen/config/generated/build/build-php-8.2.yml +++ b/.evergreen/config/generated/build/build-php-8.2.yml @@ -7,34 +7,38 @@ tasks: vars: PHP_VERSION: "8.2" - func: "compile extension" - - func: "upload extension" - - name: "build-php-8.2-lowest" - tags: ["build", "php8.2", "lowest", "pr", "tag"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "8.2" - - func: "compile extension" - vars: - EXTENSION_VERSION: "1.19.0" - - func: "upload extension" - - name: "build-php-8.2-next-stable" - tags: ["build", "php8.2", "next-stable", "pr", "tag"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "8.2" - - func: "compile extension" - vars: - EXTENSION_BRANCH: "v1.19" - - func: "upload extension" - - name: "build-php-8.2-next-minor" - tags: ["build", "php8.2", "next-minor"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "8.2" - - func: "compile extension" + # TODO: remove once 1.20.0 is released vars: EXTENSION_BRANCH: "master" - func: "upload extension" + # TODO: re-enable once 1.20.0 is released +# - name: "build-php-8.2-lowest" +# tags: ["build", "php8.2", "lowest", "pr", "tag"] +# commands: +# - func: "locate PHP binaries" +# vars: +# PHP_VERSION: "8.2" +# - func: "compile extension" +# vars: +# EXTENSION_VERSION: "1.20.0" +# - func: "upload extension" +# - name: "build-php-8.2-next-stable" +# tags: ["build", "php8.2", "next-stable", "pr", "tag"] +# commands: +# - func: "locate PHP binaries" +# vars: +# PHP_VERSION: "8.2" +# - func: "compile extension" +# vars: +# EXTENSION_BRANCH: "v1.20.0" +# - func: "upload extension" +# - name: "build-php-8.2-next-minor" +# tags: ["build", "php8.2", "next-minor"] +# commands: +# - func: "locate PHP binaries" +# vars: +# PHP_VERSION: "8.2" +# - func: "compile extension" +# vars: +# EXTENSION_BRANCH: "master" +# - func: "upload extension" diff --git a/.evergreen/config/generated/build/build-php-8.3.yml b/.evergreen/config/generated/build/build-php-8.3.yml index b2ae2d4c5..3ae1c9608 100644 --- a/.evergreen/config/generated/build/build-php-8.3.yml +++ b/.evergreen/config/generated/build/build-php-8.3.yml @@ -7,34 +7,38 @@ tasks: vars: PHP_VERSION: "8.3" - func: "compile extension" - - func: "upload extension" - - name: "build-php-8.3-lowest" - tags: ["build", "php8.3", "lowest", "pr", "tag"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "8.3" - - func: "compile extension" - vars: - EXTENSION_VERSION: "1.19.0" - - func: "upload extension" - - name: "build-php-8.3-next-stable" - tags: ["build", "php8.3", "next-stable", "pr", "tag"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "8.3" - - func: "compile extension" - vars: - EXTENSION_BRANCH: "v1.19" - - func: "upload extension" - - name: "build-php-8.3-next-minor" - tags: ["build", "php8.3", "next-minor"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "8.3" - - func: "compile extension" + # TODO: remove once 1.20.0 is released vars: EXTENSION_BRANCH: "master" - func: "upload extension" + # TODO: re-enable once 1.20.0 is released +# - name: "build-php-8.3-lowest" +# tags: ["build", "php8.3", "lowest", "pr", "tag"] +# commands: +# - func: "locate PHP binaries" +# vars: +# PHP_VERSION: "8.3" +# - func: "compile extension" +# vars: +# EXTENSION_VERSION: "1.20.0" +# - func: "upload extension" +# - name: "build-php-8.3-next-stable" +# tags: ["build", "php8.3", "next-stable", "pr", "tag"] +# commands: +# - func: "locate PHP binaries" +# vars: +# PHP_VERSION: "8.3" +# - func: "compile extension" +# vars: +# EXTENSION_BRANCH: "v1.20.0" +# - func: "upload extension" +# - name: "build-php-8.3-next-minor" +# tags: ["build", "php8.3", "next-minor"] +# commands: +# - func: "locate PHP binaries" +# vars: +# PHP_VERSION: "8.3" +# - func: "compile extension" +# vars: +# EXTENSION_BRANCH: "master" +# - func: "upload extension" diff --git a/.evergreen/config/generated/test-variant/full-php-7.4.yml b/.evergreen/config/generated/test-variant/full-php-7.4.yml index 34bde4253..03366c9dc 100644 --- a/.evergreen/config/generated/test-variant/full-php-7.4.yml +++ b/.evergreen/config/generated/test-variant/full-php-7.4.yml @@ -43,35 +43,6 @@ buildvariants: - ".sharded .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".loadbalanced .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - # Test with upcoming PHPC versions - - name: test-debian11-php-7.4-phpc-next-stable - tags: ["test", "debian", "x64", "php7.4", "pr", "tag"] - display_name: "Test: Debian 11, PHP 7.4, PHPC next-stable" - run_on: debian11-small - expansions: - FETCH_BUILD_VARIANT: "build-debian11" - FETCH_BUILD_TASK: "build-php-7.4-next-stable" - PHP_VERSION: "7.4" - depends_on: - - variant: "build-debian11" - name: "build-php-7.4-next-stable" - tasks: - - ".replicaset .local .7.0 !.csfle" - - - name: test-debian11-php-7.4-phpc-next-minor - tags: ["test", "debian", "x64", "php7.4"] - display_name: "Test: Debian 11, PHP 7.4, PHPC next-minor" - run_on: debian11-small - expansions: - FETCH_BUILD_VARIANT: "build-debian11" - FETCH_BUILD_TASK: "build-php-7.4-next-minor" - PHP_VERSION: "7.4" - depends_on: - - variant: "build-debian11" - name: "build-php-7.4-next-minor" - tasks: - - ".replicaset .local .7.0 !.csfle" - # Test Atlas and CSFLE on RHEL 8 - name: test-rhel80-php-7.4-atlas tags: ["test", "debian", "x64", "php7.4", "pr", "tag"] diff --git a/.evergreen/config/generated/test-variant/full-php-8.0.yml b/.evergreen/config/generated/test-variant/full-php-8.0.yml index 2e1c1005e..25399db7b 100644 --- a/.evergreen/config/generated/test-variant/full-php-8.0.yml +++ b/.evergreen/config/generated/test-variant/full-php-8.0.yml @@ -43,35 +43,6 @@ buildvariants: - ".sharded .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".loadbalanced .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - # Test with upcoming PHPC versions - - name: test-debian11-php-8.0-phpc-next-stable - tags: ["test", "debian", "x64", "php8.0", "pr", "tag"] - display_name: "Test: Debian 11, PHP 8.0, PHPC next-stable" - run_on: debian11-small - expansions: - FETCH_BUILD_VARIANT: "build-debian11" - FETCH_BUILD_TASK: "build-php-8.0-next-stable" - PHP_VERSION: "8.0" - depends_on: - - variant: "build-debian11" - name: "build-php-8.0-next-stable" - tasks: - - ".replicaset .local .7.0 !.csfle" - - - name: test-debian11-php-8.0-phpc-next-minor - tags: ["test", "debian", "x64", "php8.0"] - display_name: "Test: Debian 11, PHP 8.0, PHPC next-minor" - run_on: debian11-small - expansions: - FETCH_BUILD_VARIANT: "build-debian11" - FETCH_BUILD_TASK: "build-php-8.0-next-minor" - PHP_VERSION: "8.0" - depends_on: - - variant: "build-debian11" - name: "build-php-8.0-next-minor" - tasks: - - ".replicaset .local .7.0 !.csfle" - # Test Atlas and CSFLE on RHEL 8 - name: test-rhel80-php-8.0-atlas tags: ["test", "debian", "x64", "php8.0", "pr", "tag"] diff --git a/.evergreen/config/templates/build/build-extension.yml b/.evergreen/config/templates/build/build-extension.yml index 8de957ddb..346dd1c44 100644 --- a/.evergreen/config/templates/build/build-extension.yml +++ b/.evergreen/config/templates/build/build-extension.yml @@ -6,34 +6,38 @@ tasks: vars: PHP_VERSION: "%phpVersion%" - func: "compile extension" - - func: "upload extension" - - name: "build-php-%phpVersion%-lowest" - tags: ["build", "php%phpVersion%", "lowest", "pr", "tag"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "%phpVersion%" - - func: "compile extension" - vars: - EXTENSION_VERSION: "1.19.0" - - func: "upload extension" - - name: "build-php-%phpVersion%-next-stable" - tags: ["build", "php%phpVersion%", "next-stable", "pr", "tag"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "%phpVersion%" - - func: "compile extension" - vars: - EXTENSION_BRANCH: "v1.19" - - func: "upload extension" - - name: "build-php-%phpVersion%-next-minor" - tags: ["build", "php%phpVersion%", "next-minor"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "%phpVersion%" - - func: "compile extension" + # TODO: remove once 1.20.0 is released vars: EXTENSION_BRANCH: "master" - func: "upload extension" + # TODO: re-enable once 1.20.0 is released +# - name: "build-php-%phpVersion%-lowest" +# tags: ["build", "php%phpVersion%", "lowest", "pr", "tag"] +# commands: +# - func: "locate PHP binaries" +# vars: +# PHP_VERSION: "%phpVersion%" +# - func: "compile extension" +# vars: +# EXTENSION_VERSION: "1.20.0" +# - func: "upload extension" +# - name: "build-php-%phpVersion%-next-stable" +# tags: ["build", "php%phpVersion%", "next-stable", "pr", "tag"] +# commands: +# - func: "locate PHP binaries" +# vars: +# PHP_VERSION: "%phpVersion%" +# - func: "compile extension" +# vars: +# EXTENSION_BRANCH: "v1.20.0" +# - func: "upload extension" +# - name: "build-php-%phpVersion%-next-minor" +# tags: ["build", "php%phpVersion%", "next-minor"] +# commands: +# - func: "locate PHP binaries" +# vars: +# PHP_VERSION: "%phpVersion%" +# - func: "compile extension" +# vars: +# EXTENSION_BRANCH: "master" +# - func: "upload extension" diff --git a/.evergreen/config/templates/test-variant/legacy-php-full.yml b/.evergreen/config/templates/test-variant/legacy-php-full.yml index 43d27da82..363923649 100644 --- a/.evergreen/config/templates/test-variant/legacy-php-full.yml +++ b/.evergreen/config/templates/test-variant/legacy-php-full.yml @@ -42,35 +42,6 @@ buildvariants: - ".sharded .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".loadbalanced .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - # Test with upcoming PHPC versions - - name: test-debian11-php-%phpVersion%-phpc-next-stable - tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"] - display_name: "Test: Debian 11, PHP %phpVersion%, PHPC next-stable" - run_on: debian11-small - expansions: - FETCH_BUILD_VARIANT: "build-debian11" - FETCH_BUILD_TASK: "build-php-%phpVersion%-next-stable" - PHP_VERSION: "%phpVersion%" - depends_on: - - variant: "build-debian11" - name: "build-php-%phpVersion%-next-stable" - tasks: - - ".replicaset .local .7.0 !.csfle" - - - name: test-debian11-php-%phpVersion%-phpc-next-minor - tags: ["test", "debian", "x64", "php%phpVersion%"] - display_name: "Test: Debian 11, PHP %phpVersion%, PHPC next-minor" - run_on: debian11-small - expansions: - FETCH_BUILD_VARIANT: "build-debian11" - FETCH_BUILD_TASK: "build-php-%phpVersion%-next-minor" - PHP_VERSION: "%phpVersion%" - depends_on: - - variant: "build-debian11" - name: "build-php-%phpVersion%-next-minor" - tasks: - - ".replicaset .local .7.0 !.csfle" - # Test Atlas and CSFLE on RHEL 8 - name: test-rhel80-php-%phpVersion%-atlas tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"] diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 8ac2e9427..ba987c7e5 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -19,8 +19,8 @@ runs: id: extcache uses: shivammathur/cache-extensions@v1 with: - php-version: ${{ env.PHP_VERSION }} - extensions: "mongodb-${{ env.DRIVER_VERSION }}" + php-version: ${{ inputs.php-version }} + extensions: "mongodb-${{ inputs.driver-version }}" key: "extcache-v1" - name: Cache extensions diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 9fe30fbb0..6c0f9d6fe 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -15,7 +15,9 @@ on: env: PHP_VERSION: "8.2" - DRIVER_VERSION: "stable" + # TODO: change to "stable" once 1.20.0 is released + # DRIVER_VERSION: "stable" + DRIVER_VERSION: "mongodb/mongo-php-driver@master" jobs: phpcs: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 7a634683b..e1ff4495c 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -21,7 +21,9 @@ on: env: PHP_VERSION: "8.2" - DRIVER_VERSION: "stable" + # TODO: change to "stable" once 1.20.0 is released + # DRIVER_VERSION: "stable" + DRIVER_VERSION: "mongodb/mongo-php-driver@master" jobs: psalm: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d2c56953f..dbb4490f2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,9 @@ on: - "docs/**" env: - DRIVER_VERSION: "stable" + # TODO: change to "stable" once 1.20.0 is released + # DRIVER_VERSION: "stable" + DRIVER_VERSION: "mongodb/mongo-php-driver@master" jobs: phpunit: diff --git a/composer.json b/composer.json index 466b53c2c..fceee1108 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "php": "^7.4 || ^8.0", "ext-hash": "*", "ext-json": "*", - "ext-mongodb": "^1.19.0", + "ext-mongodb": "^1.20.0", "composer-runtime-api": "^2.0", "psr/log": "^1.1.4|^2|^3", "symfony/polyfill-php80": "^1.27", diff --git a/tests/SpecTests/ClientSideEncryption/Prose22_RangeExplicitEncryptionTest.php b/tests/SpecTests/ClientSideEncryption/Prose22_RangeExplicitEncryptionTest.php index 5b5aea63d..aebfa6303 100644 --- a/tests/SpecTests/ClientSideEncryption/Prose22_RangeExplicitEncryptionTest.php +++ b/tests/SpecTests/ClientSideEncryption/Prose22_RangeExplicitEncryptionTest.php @@ -26,7 +26,7 @@ /** * Prose test 22: Range Explicit Encryption * - * @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.rst#range-explicit-encryption + * @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.md#22-range-explicit-encryption * @group csfle * @group serverless */ @@ -49,8 +49,7 @@ public function setUp(): void $this->markTestSkipped('Range explicit encryption tests require replica sets'); } - $this->skipIfServerVersion('<', '7.0.0', 'Range explicit encryption tests require MongoDB 7.0 or later'); - $this->skipIfServerVersion('>=', '8.0.0', 'Range explicit encryption tests require MongoDB 8.0 or earlier'); + $this->skipIfServerVersion('<', '8.0.0', 'Range explicit encryption tests require MongoDB 8.0 or later'); $client = static::createTestClient(); @@ -98,7 +97,7 @@ public function setUpWithTypeAndRangeOpts(string $type, array $rangeOpts): void $encryptOpts = [ 'keyId' => $this->key1Id, - 'algorithm' => ClientEncryption::ALGORITHM_RANGE_PREVIEW, + 'algorithm' => ClientEncryption::ALGORITHM_RANGE, 'contentionFactor' => 0, 'rangeOpts' => $rangeOpts, ]; @@ -123,7 +122,7 @@ public function tearDown(): void $this->encryptedClient = null; } - /** @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.rst#test-setup-rangeopts */ + /** @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.md#test-setup-rangeopts */ public static function provideTypeAndRangeOpts(): Generator { // TODO: skip DecimalNoPrecision test on mongos @@ -186,7 +185,7 @@ public static function provideTypeAndRangeOpts(): Generator } /** - * @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.rst#case-1-can-decrypt-a-payload + * @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.md#case-1-can-decrypt-a-payload * @dataProvider provideTypeAndRangeOpts */ public function testCase1_CanDecryptAPayload(string $type, array $rangeOpts): void @@ -195,7 +194,7 @@ public function testCase1_CanDecryptAPayload(string $type, array $rangeOpts): vo $encryptOpts = [ 'keyId' => $this->key1Id, - 'algorithm' => ClientEncryption::ALGORITHM_RANGE_PREVIEW, + 'algorithm' => ClientEncryption::ALGORITHM_RANGE, 'contentionFactor' => 0, 'rangeOpts' => $rangeOpts, ]; @@ -220,7 +219,7 @@ public function testCase1_CanDecryptAPayload(string $type, array $rangeOpts): vo } /** - * @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.rst#case-2-can-find-encrypted-range-and-return-the-maximum + * @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.md#case-2-can-find-encrypted-range-and-return-the-maximum * @dataProvider provideTypeAndRangeOpts */ public function testCase2_CanFindEncryptedRangeAndReturnTheMaximum(string $type, array $rangeOpts): void @@ -229,8 +228,8 @@ public function testCase2_CanFindEncryptedRangeAndReturnTheMaximum(string $type, $encryptOpts = [ 'keyId' => $this->key1Id, - 'algorithm' => ClientEncryption::ALGORITHM_RANGE_PREVIEW, - 'queryType' => ClientEncryption::QUERY_TYPE_RANGE_PREVIEW, + 'algorithm' => ClientEncryption::ALGORITHM_RANGE, + 'queryType' => ClientEncryption::QUERY_TYPE_RANGE, 'contentionFactor' => 0, 'rangeOpts' => $rangeOpts, ]; @@ -258,7 +257,7 @@ public function testCase2_CanFindEncryptedRangeAndReturnTheMaximum(string $type, } /** - * @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.rst#case-3-can-find-encrypted-range-and-return-the-minimum + * @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.md#case-3-can-find-encrypted-range-and-return-the-minimum * @dataProvider provideTypeAndRangeOpts */ public function testCase3_CanFindEncryptedRangeAndReturnTheMinimum(string $type, array $rangeOpts): void @@ -267,8 +266,8 @@ public function testCase3_CanFindEncryptedRangeAndReturnTheMinimum(string $type, $encryptOpts = [ 'keyId' => $this->key1Id, - 'algorithm' => ClientEncryption::ALGORITHM_RANGE_PREVIEW, - 'queryType' => ClientEncryption::QUERY_TYPE_RANGE_PREVIEW, + 'algorithm' => ClientEncryption::ALGORITHM_RANGE, + 'queryType' => ClientEncryption::QUERY_TYPE_RANGE, 'contentionFactor' => 0, 'rangeOpts' => $rangeOpts, ]; @@ -295,7 +294,7 @@ public function testCase3_CanFindEncryptedRangeAndReturnTheMinimum(string $type, } /** - * @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.rst#case-4-can-find-encrypted-range-with-an-open-range-query + * @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.md#case-4-can-find-encrypted-range-with-an-open-range-query * @dataProvider provideTypeAndRangeOpts */ public function testCase4_CanFindEncryptedRangeWithAnOpenRangeQuery(string $type, array $rangeOpts): void @@ -304,8 +303,8 @@ public function testCase4_CanFindEncryptedRangeWithAnOpenRangeQuery(string $type $encryptOpts = [ 'keyId' => $this->key1Id, - 'algorithm' => ClientEncryption::ALGORITHM_RANGE_PREVIEW, - 'queryType' => ClientEncryption::QUERY_TYPE_RANGE_PREVIEW, + 'algorithm' => ClientEncryption::ALGORITHM_RANGE, + 'queryType' => ClientEncryption::QUERY_TYPE_RANGE, 'contentionFactor' => 0, 'rangeOpts' => $rangeOpts, ]; @@ -323,7 +322,7 @@ public function testCase4_CanFindEncryptedRangeWithAnOpenRangeQuery(string $type } /** - * @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.rst#case-5-can-run-an-aggregation-expression-inside-expr + * @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.md#case-5-can-run-an-aggregation-expression-inside-expr * @dataProvider provideTypeAndRangeOpts */ public function testCase5_CanRunAnAggregationExpressionInsideExpr(string $type, array $rangeOpts): void @@ -332,8 +331,8 @@ public function testCase5_CanRunAnAggregationExpressionInsideExpr(string $type, $encryptOpts = [ 'keyId' => $this->key1Id, - 'algorithm' => ClientEncryption::ALGORITHM_RANGE_PREVIEW, - 'queryType' => ClientEncryption::QUERY_TYPE_RANGE_PREVIEW, + 'algorithm' => ClientEncryption::ALGORITHM_RANGE, + 'queryType' => ClientEncryption::QUERY_TYPE_RANGE, 'contentionFactor' => 0, 'rangeOpts' => $rangeOpts, ]; @@ -356,7 +355,7 @@ public function testCase5_CanRunAnAggregationExpressionInsideExpr(string $type, } /** - * @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.rst#case-6-encrypting-a-document-greater-than-the-maximum-errors + * @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.md#case-6-encrypting-a-document-greater-than-the-maximum-errors * @dataProvider provideTypeAndRangeOpts */ public function testCase6_EncryptingADocumentGreaterThanTheMaximumErrors(string $type, array $rangeOpts): void @@ -369,7 +368,7 @@ public function testCase6_EncryptingADocumentGreaterThanTheMaximumErrors(string $encryptOpts = [ 'keyId' => $this->key1Id, - 'algorithm' => ClientEncryption::ALGORITHM_RANGE_PREVIEW, + 'algorithm' => ClientEncryption::ALGORITHM_RANGE, 'contentionFactor' => 0, 'rangeOpts' => $rangeOpts, ]; @@ -382,7 +381,7 @@ public function testCase6_EncryptingADocumentGreaterThanTheMaximumErrors(string } /** - * @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.rst#case-7-encrypting-a-value-of-a-different-type-errors + * @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.md#case-7-encrypting-a-value-of-a-different-type-errors * @dataProvider provideTypeAndRangeOpts */ public function testCase7_EncryptingAValueOfADifferentTypeErrors(string $type, array $rangeOpts): void @@ -397,7 +396,7 @@ public function testCase7_EncryptingAValueOfADifferentTypeErrors(string $type, a $encryptOpts = [ 'keyId' => $this->key1Id, - 'algorithm' => ClientEncryption::ALGORITHM_RANGE_PREVIEW, + 'algorithm' => ClientEncryption::ALGORITHM_RANGE, 'contentionFactor' => 0, 'rangeOpts' => $rangeOpts, ]; @@ -410,7 +409,7 @@ public function testCase7_EncryptingAValueOfADifferentTypeErrors(string $type, a } /** - * @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.rst#case-8-setting-precision-errors-if-the-type-is-not-double-or-decimal128 + * @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.md#case-8-setting-precision-errors-if-the-type-is-not-double-or-decimal128 * @dataProvider provideTypeAndRangeOpts */ public function testCase8_SettingPrecisionErrorsIfTheTypeIsNotDoubleOrDecimal128(string $type, array $rangeOpts): void @@ -423,7 +422,7 @@ public function testCase8_SettingPrecisionErrorsIfTheTypeIsNotDoubleOrDecimal128 $encryptOpts = [ 'keyId' => $this->key1Id, - 'algorithm' => ClientEncryption::ALGORITHM_RANGE_PREVIEW, + 'algorithm' => ClientEncryption::ALGORITHM_RANGE, 'contentionFactor' => 0, 'rangeOpts' => $rangeOpts + ['precision' => 2], ]; diff --git a/tests/SpecTests/ClientSideEncryptionSpecTest.php b/tests/SpecTests/ClientSideEncryptionSpecTest.php index 83621635a..5f00cb553 100644 --- a/tests/SpecTests/ClientSideEncryptionSpecTest.php +++ b/tests/SpecTests/ClientSideEncryptionSpecTest.php @@ -60,58 +60,58 @@ class ClientSideEncryptionSpecTest extends FunctionalTestCase private static array $incompleteTests = [ 'explain: Explain a find with deterministic encryption' => 'crypt_shared does not add apiVersion field to explain commands (PHPLIB-947, SERVER-69564)', - 'fle2v2-Range-Decimal-Aggregate: FLE2 Range Decimal. Aggregate.' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-Correctness: Find with $gt' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-Correctness: Find with $gte' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-Correctness: Find with $gt with no results' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-Correctness: Find with $lt' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-Correctness: Find with $lte' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-Correctness: Find with $gt and $lt' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-Correctness: Find with equality' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-Correctness: Find with $in' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-Correctness: Aggregate with $gte' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-Correctness: Aggregate with $gt with no results' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-Correctness: Aggregate with $lt' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-Correctness: Aggregate with $lte' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-Correctness: Aggregate with $gt and $lt' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-Correctness: Aggregate with equality' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-Correctness: Aggregate with $in' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-Correctness: Wrong type: Insert Int' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-Correctness: Wrong type: Find Int' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-Delete: FLE2 Range Decimal. Delete.' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-FindOneAndUpdate: FLE2 Range Decimal. FindOneAndUpdate.' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-InsertFind: FLE2 Range Decimal. Insert and Find.' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Aggregate: FLE2 Range DecimalPrecision. Aggregate.' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Find with $gt' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Find with $gte' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Find with $gt with no results' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Find with $lt' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Find with $lte' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Find with $lt below min' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Find with $gt above max' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Find with $gt and $lt' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Find with equality' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Find with full range' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Find with $in' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Insert out of range' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Insert min and max' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Aggregate with $gte' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Aggregate with $gt with no results' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Aggregate with $lt' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Aggregate with $lte' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Aggregate with $lt below min' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Aggregate with $gt above max' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Aggregate with $gt and $lt' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Aggregate with equality' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Aggregate with full range' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Aggregate with $in' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Wrong type: Insert Int' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Correctness: Wrong type: Find Int' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Delete: FLE2 Range DecimalPrecision. Delete.' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-FindOneAndUpdate: FLE2 Range DecimalPrecision. FindOneAndUpdate.' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-InsertFind: FLE2 Range DecimalPrecision. Insert and Find.' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-DecimalPrecision-Update: FLE2 Range DecimalPrecision. Update.' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', - 'fle2v2-Range-Decimal-Update: FLE2 Range Decimal. Update.' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-Aggregate: FLE2 Range Decimal. Aggregate.' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-Correctness: Find with $gt' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-Correctness: Find with $gte' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-Correctness: Find with $gt with no results' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-Correctness: Find with $lt' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-Correctness: Find with $lte' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-Correctness: Find with $gt and $lt' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-Correctness: Find with equality' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-Correctness: Find with $in' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-Correctness: Aggregate with $gte' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-Correctness: Aggregate with $gt with no results' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-Correctness: Aggregate with $lt' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-Correctness: Aggregate with $lte' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-Correctness: Aggregate with $gt and $lt' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-Correctness: Aggregate with equality' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-Correctness: Aggregate with $in' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-Correctness: Wrong type: Insert Int' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-Correctness: Wrong type: Find Int' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-Delete: FLE2 Range Decimal. Delete.' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-FindOneAndUpdate: FLE2 Range Decimal. FindOneAndUpdate.' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-InsertFind: FLE2 Range Decimal. Insert and Find.' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Aggregate: FLE2 Range DecimalPrecision. Aggregate.' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Find with $gt' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Find with $gte' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Find with $gt with no results' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Find with $lt' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Find with $lte' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Find with $lt below min' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Find with $gt above max' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Find with $gt and $lt' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Find with equality' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Find with full range' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Find with $in' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Insert out of range' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Insert min and max' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Aggregate with $gte' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Aggregate with $gt with no results' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Aggregate with $lt' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Aggregate with $lte' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Aggregate with $lt below min' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Aggregate with $gt above max' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Aggregate with $gt and $lt' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Aggregate with equality' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Aggregate with full range' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Aggregate with $in' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Wrong type: Insert Int' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Correctness: Wrong type: Find Int' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Delete: FLE2 Range DecimalPrecision. Delete.' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-FindOneAndUpdate: FLE2 Range DecimalPrecision. FindOneAndUpdate.' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-InsertFind: FLE2 Range DecimalPrecision. Insert and Find.' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-DecimalPrecision-Update: FLE2 Range DecimalPrecision. Update.' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', + 'fle2v2-Rangev2-Decimal-Update: FLE2 Range Decimal. Update.' => 'Bundled libmongocrypt does not support Decimal128 (PHPC-2207)', 'timeoutMS: timeoutMS applied to listCollections to get collection schema' => 'Not yet implemented (PHPC-1760)', 'timeoutMS: remaining timeoutMS applied to find to get keyvault data' => 'Not yet implemented (PHPC-1760)', 'namedKMS: Automatically encrypt and decrypt with a named KMS provider' => 'Not yet implemented (PHPLIB-1328)', diff --git a/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-Date.json b/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-Date.json index 97a2b2d4e..defa6e37f 100644 --- a/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-Date.json +++ b/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-Date.json @@ -10,10 +10,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -30,4 +33,4 @@ } } ] -} +} \ No newline at end of file diff --git a/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-DecimalNoPrecision.json b/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-DecimalNoPrecision.json index 4d284475f..dbe28e9c1 100644 --- a/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-DecimalNoPrecision.json +++ b/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-DecimalNoPrecision.json @@ -10,14 +10,17 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } } } ] -} +} \ No newline at end of file diff --git a/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-DecimalPrecision.json b/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-DecimalPrecision.json index 53449182b..538ab20f0 100644 --- a/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-DecimalPrecision.json +++ b/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-DecimalPrecision.json @@ -10,10 +10,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -29,4 +32,4 @@ } } ] -} +} \ No newline at end of file diff --git a/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-DoubleNoPrecision.json b/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-DoubleNoPrecision.json index b478a772d..fb4f46d37 100644 --- a/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-DoubleNoPrecision.json +++ b/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-DoubleNoPrecision.json @@ -10,14 +10,17 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } } } ] -} +} \ No newline at end of file diff --git a/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-DoublePrecision.json b/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-DoublePrecision.json index 395a36968..07d1c84d6 100644 --- a/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-DoublePrecision.json +++ b/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-DoublePrecision.json @@ -10,10 +10,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -29,4 +32,4 @@ } } ] -} +} \ No newline at end of file diff --git a/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-Int.json b/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-Int.json index 61b7082df..4f0b4854e 100644 --- a/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-Int.json +++ b/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-Int.json @@ -10,10 +10,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -26,4 +29,4 @@ } } ] -} +} \ No newline at end of file diff --git a/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-Long.json b/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-Long.json index b18b84b6e..32fe1ea15 100644 --- a/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-Long.json +++ b/tests/SpecTests/client-side-encryption/etc/data/range-encryptedFields-Long.json @@ -10,10 +10,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -26,4 +29,4 @@ } } ] -} +} \ No newline at end of file diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Date-Aggregate.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Date-Aggregate.json similarity index 95% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Date-Aggregate.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Date-Aggregate.json index 9eaabe0d7..63a2db3ef 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Date-Aggregate.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Date-Aggregate.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -226,10 +228,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -283,10 +288,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -346,10 +354,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -383,12 +394,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "RjBYT2h3ZAoHxhf8DU6/dFbDkEBZp0IxREcsRTu2MXs=", @@ -445,12 +450,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "bE1vqWj3KNyM7cCYUv/cnYm8BPaUL3eMp5syTHq6NF4=", - "subType": "00" - } - }, { "$binary": { "base64": "25j9sQXZCihCmHKvTHgaBsAVZFcGPn7JjHdrCGlwyyw=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Date-Correctness.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Date-Correctness.json similarity index 99% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Date-Correctness.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Date-Correctness.json index fa887e089..fae25a1c0 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Date-Correctness.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Date-Correctness.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Date-Delete.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Date-Delete.json similarity index 95% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Date-Delete.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Date-Delete.json index cce4faf18..63a2b29fc 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Date-Delete.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Date-Delete.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -215,10 +217,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -272,10 +277,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -336,10 +344,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -373,12 +384,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "RjBYT2h3ZAoHxhf8DU6/dFbDkEBZp0IxREcsRTu2MXs=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Date-FindOneAndUpdate.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Date-FindOneAndUpdate.json similarity index 95% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Date-FindOneAndUpdate.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Date-FindOneAndUpdate.json index 4392b6768..049186c86 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Date-FindOneAndUpdate.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Date-FindOneAndUpdate.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -230,10 +232,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -287,10 +292,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -352,10 +360,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -389,12 +400,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "RjBYT2h3ZAoHxhf8DU6/dFbDkEBZp0IxREcsRTu2MXs=", @@ -451,12 +456,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "DLCAJs+W2PL2DV5YChCL6dYrQNr+j4p3L7xhVaub4ic=", - "subType": "00" - } - }, { "$binary": { "base64": "hyDcE6QQjPrYJaIS/n7evEZFYcm31Tj89CpEYGF45cI=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Date-InsertFind.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Date-InsertFind.json similarity index 95% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Date-InsertFind.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Date-InsertFind.json index 27ce7881d..d0751434b 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Date-InsertFind.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Date-InsertFind.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -222,10 +224,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -279,10 +284,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -337,10 +345,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -374,12 +385,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "RjBYT2h3ZAoHxhf8DU6/dFbDkEBZp0IxREcsRTu2MXs=", @@ -436,12 +441,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "bE1vqWj3KNyM7cCYUv/cnYm8BPaUL3eMp5syTHq6NF4=", - "subType": "00" - } - }, { "$binary": { "base64": "25j9sQXZCihCmHKvTHgaBsAVZFcGPn7JjHdrCGlwyyw=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Date-Update.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Date-Update.json similarity index 95% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Date-Update.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Date-Update.json index f7d5a6af6..1e7750fee 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Date-Update.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Date-Update.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -226,10 +228,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -283,10 +288,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -354,10 +362,13 @@ "path": "encryptedDate", "bsonType": "date", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -391,12 +402,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "RjBYT2h3ZAoHxhf8DU6/dFbDkEBZp0IxREcsRTu2MXs=", @@ -453,12 +458,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "DLCAJs+W2PL2DV5YChCL6dYrQNr+j4p3L7xhVaub4ic=", - "subType": "00" - } - }, { "$binary": { "base64": "hyDcE6QQjPrYJaIS/n7evEZFYcm31Tj89CpEYGF45cI=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Decimal-Aggregate.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Decimal-Aggregate.json similarity index 99% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Decimal-Aggregate.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Decimal-Aggregate.json index 401ee34e3..5f573a933 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Decimal-Aggregate.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Decimal-Aggregate.json @@ -1,11 +1,10 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -23,10 +22,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -206,10 +208,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -253,10 +258,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -306,10 +314,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -335,12 +346,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "rbf3AeBEv4wWFAKknqDxRW5cLNkFvbIs6iJjc6LShQY=", @@ -1119,12 +1124,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "bE1vqWj3KNyM7cCYUv/cnYm8BPaUL3eMp5syTHq6NF4=", - "subType": "00" - } - }, { "$binary": { "base64": "RGTjNVEsNJb+DG7DpPOam8rQWD5HZAMpRyiTQaw7tk8=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Decimal-Correctness.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Decimal-Correctness.json similarity index 99% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Decimal-Correctness.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Decimal-Correctness.json index 758d3e573..4316a31c3 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Decimal-Correctness.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Decimal-Correctness.json @@ -1,11 +1,10 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -23,10 +22,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Decimal-Delete.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Decimal-Delete.json similarity index 99% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Decimal-Delete.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Decimal-Delete.json index 24a08f318..a94dd40fe 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Decimal-Delete.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Decimal-Delete.json @@ -1,11 +1,10 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -23,10 +22,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -197,10 +199,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -244,10 +249,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -298,10 +306,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -327,12 +338,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "rbf3AeBEv4wWFAKknqDxRW5cLNkFvbIs6iJjc6LShQY=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Decimal-FindOneAndUpdate.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Decimal-FindOneAndUpdate.json similarity index 99% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Decimal-FindOneAndUpdate.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Decimal-FindOneAndUpdate.json index 2a8070ecf..5226facfb 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Decimal-FindOneAndUpdate.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Decimal-FindOneAndUpdate.json @@ -1,11 +1,10 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -23,10 +22,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -208,10 +210,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -255,10 +260,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -310,10 +318,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -339,12 +350,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "rbf3AeBEv4wWFAKknqDxRW5cLNkFvbIs6iJjc6LShQY=", @@ -1123,12 +1128,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "DLCAJs+W2PL2DV5YChCL6dYrQNr+j4p3L7xhVaub4ic=", - "subType": "00" - } - }, { "$binary": { "base64": "Mr/laWHUijZT5VT3x2a7crb7wgd/UXOGz8jr8BVqBpM=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Decimal-InsertFind.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Decimal-InsertFind.json similarity index 99% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Decimal-InsertFind.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Decimal-InsertFind.json index 2ef63f42b..b6615454b 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Decimal-InsertFind.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Decimal-InsertFind.json @@ -1,11 +1,10 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -23,10 +22,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -202,10 +204,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -249,10 +254,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -297,10 +305,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -326,12 +337,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "rbf3AeBEv4wWFAKknqDxRW5cLNkFvbIs6iJjc6LShQY=", @@ -1110,12 +1115,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "bE1vqWj3KNyM7cCYUv/cnYm8BPaUL3eMp5syTHq6NF4=", - "subType": "00" - } - }, { "$binary": { "base64": "RGTjNVEsNJb+DG7DpPOam8rQWD5HZAMpRyiTQaw7tk8=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Decimal-Update.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Decimal-Update.json similarity index 99% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Decimal-Update.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Decimal-Update.json index 8064eb1b1..ceef8ca9b 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Decimal-Update.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Decimal-Update.json @@ -1,11 +1,10 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -23,10 +22,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -206,10 +208,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -253,10 +258,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -314,10 +322,13 @@ "path": "encryptedDecimalNoPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -343,12 +354,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "rbf3AeBEv4wWFAKknqDxRW5cLNkFvbIs6iJjc6LShQY=", @@ -1127,12 +1132,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "DLCAJs+W2PL2DV5YChCL6dYrQNr+j4p3L7xhVaub4ic=", - "subType": "00" - } - }, { "$binary": { "base64": "Mr/laWHUijZT5VT3x2a7crb7wgd/UXOGz8jr8BVqBpM=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DecimalPrecision-Aggregate.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DecimalPrecision-Aggregate.json similarity index 96% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DecimalPrecision-Aggregate.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DecimalPrecision-Aggregate.json index 8cf143c09..35cc4aba8 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DecimalPrecision-Aggregate.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DecimalPrecision-Aggregate.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -217,10 +219,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -273,10 +278,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -335,10 +343,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -373,12 +384,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "Dri0CXmL78L2DOgk9w0DwxHOMGMzih7m6l59vgy+WWo=", @@ -479,12 +484,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "bE1vqWj3KNyM7cCYUv/cnYm8BPaUL3eMp5syTHq6NF4=", - "subType": "00" - } - }, { "$binary": { "base64": "mVZb+Ra0EYjQ4Zrh9X//E2T8MRj7NMqm5GUJXhRrBEI=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DecimalPrecision-Correctness.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DecimalPrecision-Correctness.json similarity index 99% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DecimalPrecision-Correctness.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DecimalPrecision-Correctness.json index a4b06998f..895444588 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DecimalPrecision-Correctness.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DecimalPrecision-Correctness.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DecimalPrecision-Delete.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DecimalPrecision-Delete.json similarity index 96% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DecimalPrecision-Delete.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DecimalPrecision-Delete.json index fad823483..e000c4058 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DecimalPrecision-Delete.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DecimalPrecision-Delete.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -208,10 +210,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -264,10 +269,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -327,10 +335,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -365,12 +376,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "Dri0CXmL78L2DOgk9w0DwxHOMGMzih7m6l59vgy+WWo=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DecimalPrecision-FindOneAndUpdate.json similarity index 96% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DecimalPrecision-FindOneAndUpdate.json index fb8f4f414..27f10a30a 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DecimalPrecision-FindOneAndUpdate.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -219,10 +221,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -275,10 +280,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -339,10 +347,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -377,12 +388,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "Dri0CXmL78L2DOgk9w0DwxHOMGMzih7m6l59vgy+WWo=", @@ -483,12 +488,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "DLCAJs+W2PL2DV5YChCL6dYrQNr+j4p3L7xhVaub4ic=", - "subType": "00" - } - }, { "$binary": { "base64": "V6knyt7Zq2CG3++l75UtBx2m32iGAPjHiAe439Bf02w=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DecimalPrecision-InsertFind.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DecimalPrecision-InsertFind.json similarity index 96% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DecimalPrecision-InsertFind.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DecimalPrecision-InsertFind.json index 79562802e..5fb96730d 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DecimalPrecision-InsertFind.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DecimalPrecision-InsertFind.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -213,10 +215,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -269,10 +274,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -326,10 +334,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -362,12 +373,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "Dri0CXmL78L2DOgk9w0DwxHOMGMzih7m6l59vgy+WWo=", @@ -466,12 +471,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "bE1vqWj3KNyM7cCYUv/cnYm8BPaUL3eMp5syTHq6NF4=", - "subType": "00" - } - }, { "$binary": { "base64": "mVZb+Ra0EYjQ4Zrh9X//E2T8MRj7NMqm5GUJXhRrBEI=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DecimalPrecision-Update.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DecimalPrecision-Update.json similarity index 96% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DecimalPrecision-Update.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DecimalPrecision-Update.json index cc93b7694..f67ae3ca2 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DecimalPrecision-Update.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DecimalPrecision-Update.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -217,10 +219,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -273,10 +278,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -343,10 +351,13 @@ "path": "encryptedDecimalPrecision", "bsonType": "decimal", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -379,12 +390,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "Dri0CXmL78L2DOgk9w0DwxHOMGMzih7m6l59vgy+WWo=", @@ -483,12 +488,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "DLCAJs+W2PL2DV5YChCL6dYrQNr+j4p3L7xhVaub4ic=", - "subType": "00" - } - }, { "$binary": { "base64": "V6knyt7Zq2CG3++l75UtBx2m32iGAPjHiAe439Bf02w=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Double-Aggregate.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Double-Aggregate.json similarity index 98% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Double-Aggregate.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Double-Aggregate.json index 79f26660f..e14ca8ff0 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Double-Aggregate.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Double-Aggregate.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -208,10 +210,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -255,10 +260,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -308,10 +316,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -335,12 +346,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "6YrBn2ofIw1b5ooakrLOwF41BWrps8OO0H9WH4/rtlE=", @@ -733,12 +738,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "bE1vqWj3KNyM7cCYUv/cnYm8BPaUL3eMp5syTHq6NF4=", - "subType": "00" - } - }, { "$binary": { "base64": "2FIZh/9N+NeJEQwxYIX5ikQT85xJzulBNReXk8PnG/s=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Double-Correctness.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Double-Correctness.json similarity index 99% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Double-Correctness.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Double-Correctness.json index 117e56af6..edb336743 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Double-Correctness.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Double-Correctness.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Double-Delete.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Double-Delete.json similarity index 98% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Double-Delete.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Double-Delete.json index 40d8ed5bb..6821c9793 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Double-Delete.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Double-Delete.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -199,10 +201,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -246,10 +251,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -300,10 +308,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -327,12 +338,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "6YrBn2ofIw1b5ooakrLOwF41BWrps8OO0H9WH4/rtlE=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Double-FindOneAndUpdate.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Double-FindOneAndUpdate.json similarity index 98% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Double-FindOneAndUpdate.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Double-FindOneAndUpdate.json index f0893ce66..298a4506c 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Double-FindOneAndUpdate.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Double-FindOneAndUpdate.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -210,10 +212,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -257,10 +262,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -312,10 +320,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -339,12 +350,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "6YrBn2ofIw1b5ooakrLOwF41BWrps8OO0H9WH4/rtlE=", @@ -737,12 +742,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "DLCAJs+W2PL2DV5YChCL6dYrQNr+j4p3L7xhVaub4ic=", - "subType": "00" - } - }, { "$binary": { "base64": "HI88j1zrIsFoijIXKybr9mYubNV5uVeODyLHFH4Ueco=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Double-InsertFind.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Double-InsertFind.json similarity index 98% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Double-InsertFind.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Double-InsertFind.json index d3dc2f830..0c6f9e987 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Double-InsertFind.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Double-InsertFind.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -204,10 +206,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -251,10 +256,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -299,10 +307,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -326,12 +337,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "6YrBn2ofIw1b5ooakrLOwF41BWrps8OO0H9WH4/rtlE=", @@ -724,12 +729,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "bE1vqWj3KNyM7cCYUv/cnYm8BPaUL3eMp5syTHq6NF4=", - "subType": "00" - } - }, { "$binary": { "base64": "2FIZh/9N+NeJEQwxYIX5ikQT85xJzulBNReXk8PnG/s=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Double-Update.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Double-Update.json similarity index 98% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Double-Update.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Double-Update.json index 9d6a1fbfd..dabe8a093 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Double-Update.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Double-Update.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -208,10 +210,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -255,10 +260,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -316,10 +324,13 @@ "path": "encryptedDoubleNoPrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" } @@ -343,12 +354,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "6YrBn2ofIw1b5ooakrLOwF41BWrps8OO0H9WH4/rtlE=", @@ -741,12 +746,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "DLCAJs+W2PL2DV5YChCL6dYrQNr+j4p3L7xhVaub4ic=", - "subType": "00" - } - }, { "$binary": { "base64": "HI88j1zrIsFoijIXKybr9mYubNV5uVeODyLHFH4Ueco=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DoublePrecision-Aggregate.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DoublePrecision-Aggregate.json similarity index 96% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DoublePrecision-Aggregate.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DoublePrecision-Aggregate.json index 4188685a2..8d434dc27 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DoublePrecision-Aggregate.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DoublePrecision-Aggregate.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -217,10 +219,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -273,10 +278,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -335,10 +343,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -371,12 +382,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "Dri0CXmL78L2DOgk9w0DwxHOMGMzih7m6l59vgy+WWo=", @@ -475,12 +480,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "bE1vqWj3KNyM7cCYUv/cnYm8BPaUL3eMp5syTHq6NF4=", - "subType": "00" - } - }, { "$binary": { "base64": "mVZb+Ra0EYjQ4Zrh9X//E2T8MRj7NMqm5GUJXhRrBEI=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DoublePrecision-Correctness.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DoublePrecision-Correctness.json similarity index 99% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DoublePrecision-Correctness.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DoublePrecision-Correctness.json index 60f1ea7a3..87d0e3dd8 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DoublePrecision-Correctness.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DoublePrecision-Correctness.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DoublePrecision-Delete.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DoublePrecision-Delete.json similarity index 96% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DoublePrecision-Delete.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DoublePrecision-Delete.json index 4ed591d3f..a9315dec9 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DoublePrecision-Delete.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DoublePrecision-Delete.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -208,10 +210,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -264,10 +269,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -327,10 +335,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -363,12 +374,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "Dri0CXmL78L2DOgk9w0DwxHOMGMzih7m6l59vgy+WWo=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DoublePrecision-FindOneAndUpdate.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DoublePrecision-FindOneAndUpdate.json similarity index 96% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DoublePrecision-FindOneAndUpdate.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DoublePrecision-FindOneAndUpdate.json index d8fbbfae7..28bebe0db 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DoublePrecision-FindOneAndUpdate.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DoublePrecision-FindOneAndUpdate.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -219,10 +221,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -275,10 +280,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -339,10 +347,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -375,12 +386,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "Dri0CXmL78L2DOgk9w0DwxHOMGMzih7m6l59vgy+WWo=", @@ -479,12 +484,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "DLCAJs+W2PL2DV5YChCL6dYrQNr+j4p3L7xhVaub4ic=", - "subType": "00" - } - }, { "$binary": { "base64": "V6knyt7Zq2CG3++l75UtBx2m32iGAPjHiAe439Bf02w=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DoublePrecision-InsertFind.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DoublePrecision-InsertFind.json similarity index 96% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DoublePrecision-InsertFind.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DoublePrecision-InsertFind.json index 4213b066d..3b3176be6 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DoublePrecision-InsertFind.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DoublePrecision-InsertFind.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -213,10 +215,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -269,10 +274,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -326,10 +334,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -362,12 +373,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "Dri0CXmL78L2DOgk9w0DwxHOMGMzih7m6l59vgy+WWo=", @@ -466,12 +471,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "bE1vqWj3KNyM7cCYUv/cnYm8BPaUL3eMp5syTHq6NF4=", - "subType": "00" - } - }, { "$binary": { "base64": "mVZb+Ra0EYjQ4Zrh9X//E2T8MRj7NMqm5GUJXhRrBEI=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DoublePrecision-Update.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DoublePrecision-Update.json similarity index 96% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DoublePrecision-Update.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DoublePrecision-Update.json index 89eb4c338..be2d0e9f4 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-DoublePrecision-Update.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-DoublePrecision-Update.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -217,10 +219,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -273,10 +278,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -343,10 +351,13 @@ "path": "encryptedDoublePrecision", "bsonType": "double", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -379,12 +390,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "Dri0CXmL78L2DOgk9w0DwxHOMGMzih7m6l59vgy+WWo=", @@ -483,12 +488,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "DLCAJs+W2PL2DV5YChCL6dYrQNr+j4p3L7xhVaub4ic=", - "subType": "00" - } - }, { "$binary": { "base64": "V6knyt7Zq2CG3++l75UtBx2m32iGAPjHiAe439Bf02w=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Int-Aggregate.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Int-Aggregate.json similarity index 95% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Int-Aggregate.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Int-Aggregate.json index 686f0241b..c689dede1 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Int-Aggregate.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Int-Aggregate.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -214,10 +216,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -267,10 +272,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -326,10 +334,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -359,12 +370,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "RjBYT2h3ZAoHxhf8DU6/dFbDkEBZp0IxREcsRTu2MXs=", @@ -421,12 +426,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "bE1vqWj3KNyM7cCYUv/cnYm8BPaUL3eMp5syTHq6NF4=", - "subType": "00" - } - }, { "$binary": { "base64": "25j9sQXZCihCmHKvTHgaBsAVZFcGPn7JjHdrCGlwyyw=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Int-Correctness.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Int-Correctness.json similarity index 99% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Int-Correctness.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Int-Correctness.json index 2964624f2..9dc4e4e50 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Int-Correctness.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Int-Correctness.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Int-Delete.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Int-Delete.json similarity index 95% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Int-Delete.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Int-Delete.json index 531b3e759..4a6b34a1d 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Int-Delete.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Int-Delete.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -205,10 +207,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -258,10 +263,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -318,10 +326,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -351,12 +362,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "RjBYT2h3ZAoHxhf8DU6/dFbDkEBZp0IxREcsRTu2MXs=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Int-FindOneAndUpdate.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Int-FindOneAndUpdate.json similarity index 95% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Int-FindOneAndUpdate.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Int-FindOneAndUpdate.json index 402086cdb..2bf905fa6 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Int-FindOneAndUpdate.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Int-FindOneAndUpdate.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -216,10 +218,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -269,10 +274,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -330,10 +338,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -363,12 +374,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "RjBYT2h3ZAoHxhf8DU6/dFbDkEBZp0IxREcsRTu2MXs=", @@ -425,12 +430,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "DLCAJs+W2PL2DV5YChCL6dYrQNr+j4p3L7xhVaub4ic=", - "subType": "00" - } - }, { "$binary": { "base64": "hyDcE6QQjPrYJaIS/n7evEZFYcm31Tj89CpEYGF45cI=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Int-InsertFind.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Int-InsertFind.json similarity index 95% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Int-InsertFind.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Int-InsertFind.json index 965b8a551..a5eb4d60e 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Int-InsertFind.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Int-InsertFind.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -210,10 +212,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -263,10 +268,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -317,10 +325,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -350,12 +361,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "RjBYT2h3ZAoHxhf8DU6/dFbDkEBZp0IxREcsRTu2MXs=", @@ -412,12 +417,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "bE1vqWj3KNyM7cCYUv/cnYm8BPaUL3eMp5syTHq6NF4=", - "subType": "00" - } - }, { "$binary": { "base64": "25j9sQXZCihCmHKvTHgaBsAVZFcGPn7JjHdrCGlwyyw=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Int-Update.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Int-Update.json similarity index 95% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Int-Update.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Int-Update.json index 6cf44ac78..e826ea2ac 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Int-Update.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Int-Update.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -214,10 +216,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -267,10 +272,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -334,10 +342,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -367,12 +378,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "RjBYT2h3ZAoHxhf8DU6/dFbDkEBZp0IxREcsRTu2MXs=", @@ -429,12 +434,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "DLCAJs+W2PL2DV5YChCL6dYrQNr+j4p3L7xhVaub4ic=", - "subType": "00" - } - }, { "$binary": { "base64": "hyDcE6QQjPrYJaIS/n7evEZFYcm31Tj89CpEYGF45cI=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Long-Aggregate.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Long-Aggregate.json similarity index 95% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Long-Aggregate.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Long-Aggregate.json index 6edb38a80..d5020f592 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Long-Aggregate.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Long-Aggregate.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -214,10 +216,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -267,10 +272,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -326,10 +334,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -359,12 +370,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "RjBYT2h3ZAoHxhf8DU6/dFbDkEBZp0IxREcsRTu2MXs=", @@ -421,12 +426,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "bE1vqWj3KNyM7cCYUv/cnYm8BPaUL3eMp5syTHq6NF4=", - "subType": "00" - } - }, { "$binary": { "base64": "25j9sQXZCihCmHKvTHgaBsAVZFcGPn7JjHdrCGlwyyw=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Long-Correctness.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Long-Correctness.json similarity index 99% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Long-Correctness.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Long-Correctness.json index 3d33f7381..d81e0933f 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Long-Correctness.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Long-Correctness.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Long-Delete.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Long-Delete.json similarity index 95% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Long-Delete.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Long-Delete.json index 1b3278201..3720d0034 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Long-Delete.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Long-Delete.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -205,10 +207,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -258,10 +263,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -318,10 +326,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -351,12 +362,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "RjBYT2h3ZAoHxhf8DU6/dFbDkEBZp0IxREcsRTu2MXs=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Long-FindOneAndUpdate.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Long-FindOneAndUpdate.json similarity index 95% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Long-FindOneAndUpdate.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Long-FindOneAndUpdate.json index b8e3b888a..5e4b5ae0d 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Long-FindOneAndUpdate.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Long-FindOneAndUpdate.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -216,10 +218,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -269,10 +274,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -330,10 +338,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -363,12 +374,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "RjBYT2h3ZAoHxhf8DU6/dFbDkEBZp0IxREcsRTu2MXs=", @@ -425,12 +430,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "DLCAJs+W2PL2DV5YChCL6dYrQNr+j4p3L7xhVaub4ic=", - "subType": "00" - } - }, { "$binary": { "base64": "hyDcE6QQjPrYJaIS/n7evEZFYcm31Tj89CpEYGF45cI=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Long-InsertFind.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Long-InsertFind.json similarity index 95% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Long-InsertFind.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Long-InsertFind.json index d637fcf9e..0d4858062 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Long-InsertFind.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Long-InsertFind.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -210,10 +212,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -263,10 +268,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -317,10 +325,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -350,12 +361,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "RjBYT2h3ZAoHxhf8DU6/dFbDkEBZp0IxREcsRTu2MXs=", @@ -412,12 +417,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "bE1vqWj3KNyM7cCYUv/cnYm8BPaUL3eMp5syTHq6NF4=", - "subType": "00" - } - }, { "$binary": { "base64": "25j9sQXZCihCmHKvTHgaBsAVZFcGPn7JjHdrCGlwyyw=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Long-Update.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Long-Update.json similarity index 95% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Long-Update.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Long-Update.json index 1b76019a4..2d3321fd8 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-Long-Update.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-Long-Update.json @@ -1,13 +1,12 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" - ], - "maxServerVersion": "7.99.99" + ] } ], "database_name": "default", @@ -25,10 +24,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -214,10 +216,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -267,10 +272,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -334,10 +342,13 @@ "path": "encryptedLong", "bsonType": "long", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberInt": "1" + }, "sparsity": { "$numberLong": "1" }, @@ -367,12 +378,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=", - "subType": "00" - } - }, { "$binary": { "base64": "RjBYT2h3ZAoHxhf8DU6/dFbDkEBZp0IxREcsRTu2MXs=", @@ -429,12 +434,6 @@ "$$type": "binData" }, "__safeContent__": [ - { - "$binary": { - "base64": "DLCAJs+W2PL2DV5YChCL6dYrQNr+j4p3L7xhVaub4ic=", - "subType": "00" - } - }, { "$binary": { "base64": "hyDcE6QQjPrYJaIS/n7evEZFYcm31Tj89CpEYGF45cI=", diff --git a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-WrongType.json b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-WrongType.json similarity index 95% rename from tests/SpecTests/client-side-encryption/tests/fle2v2-Range-WrongType.json rename to tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-WrongType.json index 704a693b8..621560450 100644 --- a/tests/SpecTests/client-side-encryption/tests/fle2v2-Range-WrongType.json +++ b/tests/SpecTests/client-side-encryption/tests/fle2v2-Rangev2-WrongType.json @@ -1,13 +1,13 @@ { "runOn": [ { - "minServerVersion": "7.0.0", + "minServerVersion": "8.0.0", "topology": [ "replicaset", "sharded", "load-balanced" ], - "maxServerVersion": "7.99.99" + "maxServerVersion": "8.99.99" } ], "database_name": "default", @@ -25,10 +25,13 @@ "path": "encryptedInt", "bsonType": "int", "queries": { - "queryType": "rangePreview", + "queryType": "range", "contention": { "$numberLong": "0" }, + "trimFactor": { + "$numberLong": "1" + }, "sparsity": { "$numberLong": "1" },