Merge branch 'master' of github.com:mongodb/mongo-python-driver

.evergreen/run-tests.sh

@@ -31,9 +31,6 @@ set -o xtrace
 AUTH=${AUTH:-noauth}
 SSL=${SSL:-nossl}
 TEST_ARGS="${*:1}"
-PYTHON=$(which python)
-# TODO: Remove when we drop PyPy 3.8 support.
-OLD_PYPY=$(python -c "import sys; print(sys.implementation.name.lower() == 'pypy' and sys.implementation.version < (7, 3, 12))")
 
 export PIP_QUIET=1  # Quiet by default
 export PIP_PREFER_BINARY=1 # Prefer binary dists by default
@@ -113,10 +110,6 @@ fi
 
 if [ "$COMPRESSORS" = "snappy" ]; then
     python -m pip install '.[snappy]'
-    if [ "$OLD_PYPY" == "True" ]; then
-        pip install "python-snappy<0.7.0"
-    fi
-    PYTHON=python
 elif [ "$COMPRESSORS" = "zstd" ]; then
     python -m pip install zstandard
 fi
@@ -237,7 +230,7 @@ if [ -n "$PERF_TEST" ]; then
     TEST_ARGS="test/performance/perf_test.py"
 fi
 
-echo "Running $AUTH tests over $SSL with python $PYTHON"
+echo "Running $AUTH tests over $SSL with python $(which python)"
 python -c 'import sys; print(sys.version)'
 
 
@@ -246,7 +239,7 @@ python -c 'import sys; print(sys.version)'
 
 # Run the tests with coverage if requested and coverage is installed.
 # Only cover CPython. PyPy reports suspiciously low coverage.
-PYTHON_IMPL=$($PYTHON -c "import platform; print(platform.python_implementation())")
+PYTHON_IMPL=$(python -c "import platform; print(platform.python_implementation())")
 if [ -n "$COVERAGE" ] && [ "$PYTHON_IMPL" = "CPython" ]; then
     # Keep in sync with combine-coverage.sh.
     # coverage >=5 is needed for relative_files=true.

doc/changelog.rst

@@ -1,6 +1,22 @@
 Changelog
 =========
 
+Changes in Version 4.9.0
+-------------------------
+
+PyMongo 4.9 brings a number of improvements including:
+
+- A new asynchronous API with full asyncio support.
+
+Issues Resolved
+...............
+
+See the `PyMongo 4.9 release notes in JIRA`_ for the list of resolved issues
+in this release.
+
+.. _PyMongo 4.9 release notes in JIRA: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=39940
+
+
 Changes in Version 4.8.0
 -------------------------
 
@@ -10,7 +26,6 @@ PyMongo 4.8 brings a number of improvements including:
 
 - The handshake metadata for "os.name" on Windows has been simplified to "Windows" to improve import time.
 - The repr of ``bson.binary.Binary`` is now redacted when the subtype is SENSITIVE_SUBTYPE(8).
-- A new asynchronous API with full asyncio support.
 
 Unavoidable breaking changes
 ............................
@@ -18,6 +33,14 @@ Unavoidable breaking changes
 - Since we are now using ``hatch`` as our build backend, we no longer have a ``setup.py`` file
   and require installation using ``pip``.
 
+Issues Resolved
+...............
+
+See the `PyMongo 4.8 release notes in JIRA`_ for the list of resolved issues
+in this release.
+
+.. _PyMongo 4.8 release notes in JIRA: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=37057
+
 Changes in Version 4.7.3
 -------------------------
 

pymongo/_version.py

@@ -18,7 +18,7 @@ from __future__ import annotations
 import re
 from typing import List, Tuple, Union
 
-__version__ = "4.8.0.dev1"
+__version__ = "4.9.0.dev0"
 
 
 def get_version_tuple(version: str) -> Tuple[Union[int, str], ...]:

pymongo/asynchronous/encryption.py

@@ -456,13 +456,10 @@ class Algorithm(str, enum.Enum):
 
     .. versionadded:: 4.2
     """
-    RANGEPREVIEW = "RangePreview"
-    """RangePreview.
+    RANGE = "Range"
+    """Range.
 
-    .. note:: Support for Range queries is in beta.
-       Backwards-breaking changes may be made before the final release.
-
-    .. versionadded:: 4.4
+    .. versionadded:: 4.8
     """
 
 
@@ -475,11 +472,9 @@ class QueryType(str, enum.Enum):
     EQUALITY = "equality"
     """Used to encrypt a value for an equality query."""
 
-    RANGEPREVIEW = "rangePreview"
+    RANGE = "range"
     """Used to encrypt a value for a range query.
 
-    .. note:: Support for Range queries is in beta.
-       Backwards-breaking changes may be made before the final release.
 """
 
 
@@ -836,10 +831,14 @@ class ClientEncryption(Generic[_DocumentType]):
             when the algorithm is :attr:`Algorithm.INDEXED`.  An integer value
             *must* be given when the :attr:`Algorithm.INDEXED` algorithm is
             used.
-        :param range_opts: Experimental only, not intended for public use.
+        :param range_opts: Index options for `range` queries. See
+            :class:`RangeOpts` for some valid options.
 
         :return: The encrypted value, a :class:`~bson.binary.Binary` with subtype 6.
 
+        .. versionchanged:: 4.8
+           Added the `range_opts` parameter.
+
         .. versionchanged:: 4.7
            ``key_id`` can now be passed in as a :class:`uuid.UUID`.
 
@@ -888,10 +887,14 @@ class ClientEncryption(Generic[_DocumentType]):
             when the algorithm is :attr:`Algorithm.INDEXED`.  An integer value
             *must* be given when the :attr:`Algorithm.INDEXED` algorithm is
             used.
-        :param range_opts: Experimental only, not intended for public use.
+        :param range_opts: Index options for `range` queries. See
+            :class:`RangeOpts` for some valid options.
 
         :return: The encrypted expression, a :class:`~bson.RawBSONDocument`.
 
+        .. versionchanged:: 4.8
+           Added the `range_opts` parameter.
+
         .. versionchanged:: 4.7
            ``key_id`` can now be passed in as a :class:`uuid.UUID`.
 

pymongo/asynchronous/encryption_options.py

@@ -231,20 +231,20 @@ class AutoEncryptionOpts:
 
 
 class RangeOpts:
-    """Options to configure encrypted queries using the rangePreview algorithm."""
+    """Options to configure encrypted queries using the range algorithm."""
 
     def __init__(
         self,
         sparsity: int,
+        trim_factor: int,
         min: Optional[Any] = None,
         max: Optional[Any] = None,
         precision: Optional[int] = None,
     ) -> None:
-        """Options to configure encrypted queries using the rangePreview algorithm.
-
-        .. note:: This feature is experimental only, and not intended for public use.
+        """Options to configure encrypted queries using the range algorithm.
 
         :param sparsity: An integer.
+        :param trim_factor: An integer.
         :param min: A BSON scalar value corresponding to the type being queried.
         :param max: A BSON scalar value corresponding to the type being queried.
         :param precision: An integer, may only be set for double or decimal128 types.
@@ -254,6 +254,7 @@ class RangeOpts:
         self.min = min
         self.max = max
         self.sparsity = sparsity
+        self.trim_factor = trim_factor
         self.precision = precision
 
     @property
@@ -261,6 +262,7 @@ class RangeOpts:
         doc = {}
         for k, v in [
             ("sparsity", int64.Int64(self.sparsity)),
+            ("trimFactor", self.trim_factor),
             ("precision", self.precision),
             ("min", self.min),
             ("max", self.max),

pymongo/asynchronous/mongo_client.py

@@ -854,6 +854,7 @@ class AsyncMongoClient(common.BaseObject, Generic[_DocumentType]):
             server_monitoring_mode=options.server_monitoring_mode,
         )
 
+        self._opened = False
         self._init_background()
 
         if _IS_SYNC and connect:
@@ -895,13 +896,14 @@ class AsyncMongoClient(common.BaseObject, Generic[_DocumentType]):
         # this closure. When the client is freed, stop the executor soon.
         self_ref: Any = weakref.ref(self, executor.close)
         self._kill_cursors_executor = executor
+        self._opened = False
 
     def _should_pin_cursor(self, session: Optional[ClientSession]) -> Optional[bool]:
         return self._options.load_balanced and not (session and session.in_transaction)
 
     def _after_fork(self) -> None:
         """Resets topology in a child after successfully forking."""
-        self._init_background()
+        self._init_background(self._topology._pid)
         # Reset the session pool to avoid duplicate sessions in the child process.
         self._topology._session_pool.reset()
 
@@ -1382,7 +1384,9 @@ class AsyncMongoClient(common.BaseObject, Generic[_DocumentType]):
         the server may change. In such cases, store a local reference to a
         ServerDescription first, then use its properties.
         """
-        server = await self._topology.select_server(writable_server_selector, _Op.TEST)
+        server = await (await self._get_topology()).select_server(
+            writable_server_selector, _Op.TEST
+        )
 
         return getattr(server.description, attr_name)
 
@@ -1528,9 +1532,11 @@ class AsyncMongoClient(common.BaseObject, Generic[_DocumentType]):
         If this client was created with "connect=False", calling _get_topology
         launches the connection process in the background.
         """
-        await self._topology.open()
-        async with self._lock:
-            self._kill_cursors_executor.open()
+        if not self._opened:
+            await self._topology.open()
+            async with self._lock:
+                self._kill_cursors_executor.open()
+            self._opened = True
         return self._topology
 
     @contextlib.asynccontextmanager
@@ -1631,9 +1637,9 @@ class AsyncMongoClient(common.BaseObject, Generic[_DocumentType]):
         # always send primaryPreferred when directly connected to a repl set
         # member.
         # Thread safe: if the type is single it cannot change.
-        topology = await self._get_topology()
-        single = topology.description.topology_type == TOPOLOGY_TYPE.Single
-
+        # NOTE: We already opened the Topology when selecting a server so there's no need
+        # to call _get_topology() again.
+        single = self._topology.description.topology_type == TOPOLOGY_TYPE.Single
         async with self._checkout(server, session) as conn:
             if single:
                 if conn.is_repl and not (session and session.in_transaction):
@@ -1652,7 +1658,6 @@ class AsyncMongoClient(common.BaseObject, Generic[_DocumentType]):
         operation: str,
     ) -> AsyncContextManager[tuple[Connection, _ServerMode]]:
         assert read_preference is not None, "read_preference must not be None"
-        _ = await self._get_topology()
         server = await self._select_server(read_preference, session, operation)
         return self._conn_from_server(read_preference, server, session)
 

pymongo/asynchronous/pool.py

@@ -216,13 +216,14 @@ elif sys.platform == "darwin":
         "version": platform.mac_ver()[0],
     }
 elif sys.platform == "win32":
+    _ver = sys.getwindowsversion()
     _METADATA["os"] = {
-        "type": platform.system(),
-        # "Windows XP", "Windows 7", "Windows 10", etc.
-        "name": " ".join((platform.system(), platform.release())),
-        "architecture": platform.machine(),
-        # Windows patch level (e.g. 5.1.2600-SP3)
-        "version": "-".join(platform.win32_ver()[1:3]),
+        "type": "Windows",
+        "name": "Windows",
+        # Avoid using platform calls, see PYTHON-4455.
+        "architecture": os.environ.get("PROCESSOR_ARCHITECTURE") or platform.machine(),
+        # Windows patch level (e.g. 10.0.17763-SP0).
+        "version": ".".join(map(str, _ver[:3])) + f"-SP{_ver[-1] or '0'}",
     }
 elif sys.platform.startswith("java"):
     _name, _ver, _arch = platform.java_ver()[-1]

pymongo/ssl_support.py

@@ -15,6 +15,7 @@
 """Support for SSL in PyMongo."""
 from __future__ import annotations
 
+import warnings
 from typing import Optional
 
 from pymongo.errors import ConfigurationError
@@ -23,7 +24,17 @@ HAVE_SSL = True
 
 try:
     import pymongo.pyopenssl_context as _ssl
-except ImportError:
+except (ImportError, AttributeError) as exc:
+    if isinstance(exc, AttributeError):
+        warnings.warn(
+            "Failed to use the installed version of PyOpenSSL. "
+            "Falling back to stdlib ssl, disabling OCSP support. "
+            "This is likely caused by incompatible versions "
+            "of PyOpenSSL < 23.2.0 and cryptography >= 42.0.0. "
+            "Try updating PyOpenSSL >= 23.2.0 to enable OCSP.",
+            UserWarning,
+            stacklevel=2,
+        )
     try:
         import pymongo.ssl_context as _ssl  # type: ignore[no-redef]
     except ImportError:

pymongo/synchronous/encryption.py

@@ -454,13 +454,10 @@ class Algorithm(str, enum.Enum):
 
     .. versionadded:: 4.2
     """
-    RANGEPREVIEW = "RangePreview"
-    """RangePreview.
+    RANGE = "Range"
+    """Range.
 
-    .. note:: Support for Range queries is in beta.
-       Backwards-breaking changes may be made before the final release.
-
-    .. versionadded:: 4.4
+    .. versionadded:: 4.8
     """
 
 
@@ -473,11 +470,9 @@ class QueryType(str, enum.Enum):
     EQUALITY = "equality"
     """Used to encrypt a value for an equality query."""
 
-    RANGEPREVIEW = "rangePreview"
+    RANGE = "range"
     """Used to encrypt a value for a range query.
 
-    .. note:: Support for Range queries is in beta.
-       Backwards-breaking changes may be made before the final release.
 """
 
 
@@ -834,10 +829,14 @@ class ClientEncryption(Generic[_DocumentType]):
             when the algorithm is :attr:`Algorithm.INDEXED`.  An integer value
             *must* be given when the :attr:`Algorithm.INDEXED` algorithm is
             used.
-        :param range_opts: Experimental only, not intended for public use.
+        :param range_opts: Index options for `range` queries. See
+            :class:`RangeOpts` for some valid options.
 
         :return: The encrypted value, a :class:`~bson.binary.Binary` with subtype 6.
 
+        .. versionchanged:: 4.8
+           Added the `range_opts` parameter.
+
         .. versionchanged:: 4.7
            ``key_id`` can now be passed in as a :class:`uuid.UUID`.
 
@@ -886,10 +885,14 @@ class ClientEncryption(Generic[_DocumentType]):
             when the algorithm is :attr:`Algorithm.INDEXED`.  An integer value
             *must* be given when the :attr:`Algorithm.INDEXED` algorithm is
             used.
-        :param range_opts: Experimental only, not intended for public use.
+        :param range_opts: Index options for `range` queries. See
+            :class:`RangeOpts` for some valid options.
 
         :return: The encrypted expression, a :class:`~bson.RawBSONDocument`.
 
+        .. versionchanged:: 4.8
+           Added the `range_opts` parameter.
+
         .. versionchanged:: 4.7
            ``key_id`` can now be passed in as a :class:`uuid.UUID`.
 

pymongo/synchronous/encryption_options.py

@@ -231,20 +231,20 @@ class AutoEncryptionOpts:
 
 
 class RangeOpts:
-    """Options to configure encrypted queries using the rangePreview algorithm."""
+    """Options to configure encrypted queries using the range algorithm."""
 
     def __init__(
         self,
         sparsity: int,
+        trim_factor: int,
         min: Optional[Any] = None,
         max: Optional[Any] = None,
         precision: Optional[int] = None,
     ) -> None:
-        """Options to configure encrypted queries using the rangePreview algorithm.
-
-        .. note:: This feature is experimental only, and not intended for public use.
+        """Options to configure encrypted queries using the range algorithm.
 
         :param sparsity: An integer.
+        :param trim_factor: An integer.
         :param min: A BSON scalar value corresponding to the type being queried.
         :param max: A BSON scalar value corresponding to the type being queried.
         :param precision: An integer, may only be set for double or decimal128 types.
@@ -254,6 +254,7 @@ class RangeOpts:
         self.min = min
         self.max = max
         self.sparsity = sparsity
+        self.trim_factor = trim_factor
         self.precision = precision
 
     @property
@@ -261,6 +262,7 @@ class RangeOpts:
         doc = {}
         for k, v in [
             ("sparsity", int64.Int64(self.sparsity)),
+            ("trimFactor", self.trim_factor),
             ("precision", self.precision),
             ("min", self.min),
             ("max", self.max),

pymongo/synchronous/mongo_client.py

@@ -853,6 +853,7 @@ class MongoClient(common.BaseObject, Generic[_DocumentType]):
             server_monitoring_mode=options.server_monitoring_mode,
         )
 
+        self._opened = False
         self._init_background()
 
         if _IS_SYNC and connect:
@@ -894,13 +895,14 @@ class MongoClient(common.BaseObject, Generic[_DocumentType]):
         # this closure. When the client is freed, stop the executor soon.
         self_ref: Any = weakref.ref(self, executor.close)
         self._kill_cursors_executor = executor
+        self._opened = False
 
     def _should_pin_cursor(self, session: Optional[ClientSession]) -> Optional[bool]:
         return self._options.load_balanced and not (session and session.in_transaction)
 
     def _after_fork(self) -> None:
         """Resets topology in a child after successfully forking."""
-        self._init_background()
+        self._init_background(self._topology._pid)
         # Reset the session pool to avoid duplicate sessions in the child process.
         self._topology._session_pool.reset()
 
@@ -1381,7 +1383,7 @@ class MongoClient(common.BaseObject, Generic[_DocumentType]):
         the server may change. In such cases, store a local reference to a
         ServerDescription first, then use its properties.
         """
-        server = self._topology.select_server(writable_server_selector, _Op.TEST)
+        server = (self._get_topology()).select_server(writable_server_selector, _Op.TEST)
 
         return getattr(server.description, attr_name)
 
@@ -1527,9 +1529,11 @@ class MongoClient(common.BaseObject, Generic[_DocumentType]):
         If this client was created with "connect=False", calling _get_topology
         launches the connection process in the background.
         """
-        self._topology.open()
-        with self._lock:
-            self._kill_cursors_executor.open()
+        if not self._opened:
+            self._topology.open()
+            with self._lock:
+                self._kill_cursors_executor.open()
+            self._opened = True
         return self._topology
 
     @contextlib.contextmanager
@@ -1630,9 +1634,9 @@ class MongoClient(common.BaseObject, Generic[_DocumentType]):
         # always send primaryPreferred when directly connected to a repl set
         # member.
         # Thread safe: if the type is single it cannot change.
-        topology = self._get_topology()
-        single = topology.description.topology_type == TOPOLOGY_TYPE.Single
-
+        # NOTE: We already opened the Topology when selecting a server so there's no need
+        # to call _get_topology() again.
+        single = self._topology.description.topology_type == TOPOLOGY_TYPE.Single
         with self._checkout(server, session) as conn:
             if single:
                 if conn.is_repl and not (session and session.in_transaction):
@@ -1651,7 +1655,6 @@ class MongoClient(common.BaseObject, Generic[_DocumentType]):
         operation: str,
     ) -> ContextManager[tuple[Connection, _ServerMode]]:
         assert read_preference is not None, "read_preference must not be None"
-        _ = self._get_topology()
         server = self._select_server(read_preference, session, operation)
         return self._conn_from_server(read_preference, server, session)
 

pymongo/synchronous/pool.py

@@ -216,13 +216,14 @@ elif sys.platform == "darwin":
         "version": platform.mac_ver()[0],
     }
 elif sys.platform == "win32":
+    _ver = sys.getwindowsversion()
     _METADATA["os"] = {
-        "type": platform.system(),
-        # "Windows XP", "Windows 7", "Windows 10", etc.
-        "name": " ".join((platform.system(), platform.release())),
-        "architecture": platform.machine(),
-        # Windows patch level (e.g. 5.1.2600-SP3)
-        "version": "-".join(platform.win32_ver()[1:3]),
+        "type": "Windows",
+        "name": "Windows",
+        # Avoid using platform calls, see PYTHON-4455.
+        "architecture": os.environ.get("PROCESSOR_ARCHITECTURE") or platform.machine(),
+        # Windows patch level (e.g. 10.0.17763-SP0).
+        "version": ".".join(map(str, _ver[:3])) + f"-SP{_ver[-1] or '0'}",
     }
 elif sys.platform.startswith("java"):
     _name, _ver, _arch = platform.java_ver()[-1]

test/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 @@
       }
     }
   ]
-}
+}

test/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"
         }
       }
     }
   ]
-}
+}

test/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 @@
       }
     }
   ]
-}
+}

test/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"
         }
       }
     }
   ]
-}
+}

test/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 @@
       }
     }
   ]
-}
+}

test/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 @@
       }
     }
   ]
-}
+}

test/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 @@
       }
     }
   ]
-}
+}

test/client-side-encryption/spec/legacy/azureKMS.json

@@ -78,6 +78,17 @@
           "bsonType": "string",
           "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
         }
+      },
+      "encrypted_string_kmip_delegated": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$uuid": "7411e9af-c688-4df7-8143-5e60ae96cba6"
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
       }
     },
     "bsonType": "object"

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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"
           },

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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"
           }

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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"
           },

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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"
           }

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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"
           },

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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"
           },

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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"
           },

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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=",

test/client-side-encryption/spec/legacy/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"
           },

test/client-side-encryption/spec/legacy/gcpKMS.json

@@ -78,6 +78,17 @@
           "bsonType": "string",
           "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
         }
+      },
+      "encrypted_string_kmip_delegated": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$uuid": "7411e9af-c688-4df7-8143-5e60ae96cba6"
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
       }
     },
     "bsonType": "object"

test/client-side-encryption/spec/legacy/kmipKMS.json

@@ -78,6 +78,17 @@
           "bsonType": "string",
           "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
         }
+      },
+      "encrypted_string_kmip_delegated": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$uuid": "7411e9af-c688-4df7-8143-5e60ae96cba6"
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
       }
     },
     "bsonType": "object"
@@ -117,6 +128,38 @@
         "altname",
         "kmip_altname"
       ]
+    },
+    {
+      "_id": {
+        "$uuid": "7411e9af-c688-4df7-8143-5e60ae96cba6"
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "5TLMFWlguBWe5GUESTvOVtkdBsCrynhnV72XRyZ66/nk+EP9/1oEp1t1sg0+vwCTqULHjBiUE6DRx2mYD/Eup1+u2Jgz9/+1sV1drXeOPALNPkSgiZiDbIb67zRi+wTABEcKcegJH+FhmSGxwUoQAiHCsCbcvia5P8tN1lt98YQ=",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1634220190041"
+        }
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1634220190041"
+        }
+      },
+      "status": {
+        "$numberInt": "0"
+      },
+      "masterKey": {
+        "provider": "kmip",
+        "delegated": true,
+        "keyId": "11"
+      },
+      "keyAltNames": [
+        "delegated"
+      ]
     }
   ],
   "tests": [
@@ -218,6 +261,102 @@
           ]
         }
       }
+    },
+    {
+      "description": "Insert a document with auto encryption using KMIP delegated KMS provider",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "kmip": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_string_kmip_delegated": "string0"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$uuid": "7411e9af-c688-4df7-8143-5e60ae96cba6"
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "keyvault"
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "default",
+              "documents": [
+                {
+                  "_id": 1,
+                  "encrypted_string_kmip_delegated": {
+                    "$binary": {
+                      "base64": "AXQR6a/GiE33gUNeYK6Wy6YCkB+8NVfAAjIbvLqyXIg6g1a8tXrym92DPoqmxpcdQyH0vQM3aFNMz7tZwQBimKs29ztZV/LWjM633HhO5ACl9A==",
+                      "subType": "06"
+                    }
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "insert"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string_kmip_delegated": {
+                "$binary": {
+                  "base64": "AXQR6a/GiE33gUNeYK6Wy6YCkB+8NVfAAjIbvLqyXIg6g1a8tXrym92DPoqmxpcdQyH0vQM3aFNMz7tZwQBimKs29ztZV/LWjM633HhO5ACl9A==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
     }
   ]
 }

test/client-side-encryption/spec/unified/createDataKey.json

@@ -337,6 +337,70 @@
         }
       ]
     },
+    {
+      "description": "create datakey with KMIP delegated KMS provider",
+      "operations": [
+        {
+          "name": "createDataKey",
+          "object": "clientEncryption0",
+          "arguments": {
+            "kmsProvider": "kmip",
+            "opts": {
+              "masterKey": {
+                "delegated": true
+              }
+            }
+          },
+          "expectResult": {
+            "$$type": "binData"
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "events": [
+            {
+              "commandStartedEvent": {
+                "databaseName": "keyvault",
+                "command": {
+                  "insert": "datakeys",
+                  "documents": [
+                    {
+                      "_id": {
+                        "$$type": "binData"
+                      },
+                      "keyMaterial": {
+                        "$$type": "binData"
+                      },
+                      "creationDate": {
+                        "$$type": "date"
+                      },
+                      "updateDate": {
+                        "$$type": "date"
+                      },
+                      "status": {
+                        "$$exists": true
+                      },
+                      "masterKey": {
+                        "provider": "kmip",
+                        "keyId": {
+                          "$$type": "string"
+                        },
+                        "delegated": true
+                      }
+                    }
+                  ],
+                  "writeConcern": {
+                    "w": "majority"
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
     {
       "description": "create datakey with local KMS provider",
       "operations": [

test/client-side-encryption/spec/unified/rewrapManyDataKey.json

@@ -246,6 +246,36 @@
           "masterKey": {
             "provider": "local"
           }
+        },
+        {
+          "_id": {
+            "$uuid": "7411e9af-c688-4df7-8143-5e60ae96cba5"
+          },
+          "keyAltNames": [
+            "kmip_delegated_key"
+          ],
+          "keyMaterial": {
+            "$binary": {
+              "base64": "5TLMFWlguBWe5GUESTvOVtkdBsCrynhnV72XRyZ66/nk+EP9/1oEp1t1sg0+vwCTqULHjBiUE6DRx2mYD/Eup1+u2Jgz9/+1sV1drXeOPALNPkSgiZiDbIb67zRi+wTABEcKcegJH+FhmSGxwUoQAiHCsCbcvia5P8tN1lt98YQ=",
+              "subType": "00"
+            }
+          },
+          "creationDate": {
+            "$date": {
+              "$numberLong": "1641024000000"
+            }
+          },
+          "updateDate": {
+            "$date": {
+              "$numberLong": "1641024000000"
+            }
+          },
+          "status": 1,
+          "masterKey": {
+            "provider": "kmip",
+            "keyId": "11",
+            "delegated": true
+          }
         }
       ]
     }
@@ -317,8 +347,8 @@
           "expectResult": {
             "bulkWriteResult": {
               "insertedCount": 0,
-              "matchedCount": 4,
-              "modifiedCount": 4,
+              "matchedCount": 5,
+              "modifiedCount": 5,
               "deletedCount": 0,
               "upsertedCount": 0,
               "upsertedIds": {},
@@ -440,6 +470,34 @@
                         "$$unsetOrMatches": false
                       }
                     },
+                    {
+                      "q": {
+                        "_id": {
+                          "$$type": "binData"
+                        }
+                      },
+                      "u": {
+                        "$set": {
+                          "masterKey": {
+                            "provider": "aws",
+                            "key": "arn:aws:kms:us-east-1:579766882180:key/061334ae-07a8-4ceb-a813-8135540e837d",
+                            "region": "us-east-1"
+                          },
+                          "keyMaterial": {
+                            "$$type": "binData"
+                          }
+                        },
+                        "$currentDate": {
+                          "updateDate": true
+                        }
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
+                      }
+                    },
                     {
                       "q": {
                         "_id": {
@@ -502,8 +560,8 @@
           "expectResult": {
             "bulkWriteResult": {
               "insertedCount": 0,
-              "matchedCount": 4,
-              "modifiedCount": 4,
+              "matchedCount": 5,
+              "modifiedCount": 5,
               "deletedCount": 0,
               "upsertedCount": 0,
               "upsertedIds": {},
@@ -625,6 +683,34 @@
                         "$$unsetOrMatches": false
                       }
                     },
+                    {
+                      "q": {
+                        "_id": {
+                          "$$type": "binData"
+                        }
+                      },
+                      "u": {
+                        "$set": {
+                          "masterKey": {
+                            "provider": "azure",
+                            "keyVaultEndpoint": "key-vault-csfle.vault.azure.net",
+                            "keyName": "key-name-csfle"
+                          },
+                          "keyMaterial": {
+                            "$$type": "binData"
+                          }
+                        },
+                        "$currentDate": {
+                          "updateDate": true
+                        }
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
+                      }
+                    },
                     {
                       "q": {
                         "_id": {
@@ -689,8 +775,8 @@
           "expectResult": {
             "bulkWriteResult": {
               "insertedCount": 0,
-              "matchedCount": 4,
-              "modifiedCount": 4,
+              "matchedCount": 5,
+              "modifiedCount": 5,
               "deletedCount": 0,
               "upsertedCount": 0,
               "upsertedIds": {},
@@ -818,6 +904,36 @@
                         "$$unsetOrMatches": false
                       }
                     },
+                    {
+                      "q": {
+                        "_id": {
+                          "$$type": "binData"
+                        }
+                      },
+                      "u": {
+                        "$set": {
+                          "masterKey": {
+                            "provider": "gcp",
+                            "projectId": "devprod-drivers",
+                            "location": "global",
+                            "keyRing": "key-ring-csfle",
+                            "keyName": "key-name-csfle"
+                          },
+                          "keyMaterial": {
+                            "$$type": "binData"
+                          }
+                        },
+                        "$currentDate": {
+                          "updateDate": true
+                        }
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
+                      }
+                    },
                     {
                       "q": {
                         "_id": {
@@ -878,8 +994,8 @@
           "expectResult": {
             "bulkWriteResult": {
               "insertedCount": 0,
-              "matchedCount": 4,
-              "modifiedCount": 4,
+              "matchedCount": 5,
+              "modifiedCount": 5,
               "deletedCount": 0,
               "upsertedCount": 0,
               "upsertedIds": {},
@@ -1032,6 +1148,257 @@
                       "upsert": {
                         "$$unsetOrMatches": false
                       }
+                    },
+                    {
+                      "q": {
+                        "_id": {
+                          "$$type": "binData"
+                        }
+                      },
+                      "u": {
+                        "$set": {
+                          "masterKey": {
+                            "provider": "kmip",
+                            "keyId": {
+                              "$$type": "string"
+                            }
+                          },
+                          "keyMaterial": {
+                            "$$type": "binData"
+                          }
+                        },
+                        "$currentDate": {
+                          "updateDate": true
+                        }
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
+                      }
+                    }
+                  ],
+                  "writeConcern": {
+                    "w": "majority"
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "rewrap with new KMIP delegated KMS provider",
+      "operations": [
+        {
+          "name": "rewrapManyDataKey",
+          "object": "clientEncryption0",
+          "arguments": {
+            "filter": {
+              "keyAltNames": {
+                "$ne": "kmip_delegated_key"
+              }
+            },
+            "opts": {
+              "provider": "kmip",
+              "masterKey": {
+                "delegated": true
+              }
+            }
+          },
+          "expectResult": {
+            "bulkWriteResult": {
+              "insertedCount": 0,
+              "matchedCount": 5,
+              "modifiedCount": 5,
+              "deletedCount": 0,
+              "upsertedCount": 0,
+              "upsertedIds": {},
+              "insertedIds": {
+                "$$unsetOrMatches": {}
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "events": [
+            {
+              "commandStartedEvent": {
+                "databaseName": "keyvault",
+                "command": {
+                  "find": "datakeys",
+                  "filter": {
+                    "keyAltNames": {
+                      "$ne": "kmip_delegated_key"
+                    }
+                  },
+                  "readConcern": {
+                    "level": "majority"
+                  }
+                }
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "databaseName": "keyvault",
+                "command": {
+                  "update": "datakeys",
+                  "ordered": true,
+                  "updates": [
+                    {
+                      "q": {
+                        "_id": {
+                          "$$type": "binData"
+                        }
+                      },
+                      "u": {
+                        "$set": {
+                          "masterKey": {
+                            "provider": "kmip",
+                            "delegated": true,
+                            "keyId": {
+                              "$$type": "string"
+                            }
+                          },
+                          "keyMaterial": {
+                            "$$type": "binData"
+                          }
+                        },
+                        "$currentDate": {
+                          "updateDate": true
+                        }
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
+                      }
+                    },
+                    {
+                      "q": {
+                        "_id": {
+                          "$$type": "binData"
+                        }
+                      },
+                      "u": {
+                        "$set": {
+                          "masterKey": {
+                            "provider": "kmip",
+                            "delegated": true,
+                            "keyId": {
+                              "$$type": "string"
+                            }
+                          },
+                          "keyMaterial": {
+                            "$$type": "binData"
+                          }
+                        },
+                        "$currentDate": {
+                          "updateDate": true
+                        }
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
+                      }
+                    },
+                    {
+                      "q": {
+                        "_id": {
+                          "$$type": "binData"
+                        }
+                      },
+                      "u": {
+                        "$set": {
+                          "masterKey": {
+                            "provider": "kmip",
+                            "delegated": true,
+                            "keyId": {
+                              "$$type": "string"
+                            }
+                          },
+                          "keyMaterial": {
+                            "$$type": "binData"
+                          }
+                        },
+                        "$currentDate": {
+                          "updateDate": true
+                        }
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
+                      }
+                    },
+                    {
+                      "q": {
+                        "_id": {
+                          "$$type": "binData"
+                        }
+                      },
+                      "u": {
+                        "$set": {
+                          "masterKey": {
+                            "provider": "kmip",
+                            "delegated": true,
+                            "keyId": {
+                              "$$type": "string"
+                            }
+                          },
+                          "keyMaterial": {
+                            "$$type": "binData"
+                          }
+                        },
+                        "$currentDate": {
+                          "updateDate": true
+                        }
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
+                      }
+                    },
+                    {
+                      "q": {
+                        "_id": {
+                          "$$type": "binData"
+                        }
+                      },
+                      "u": {
+                        "$set": {
+                          "masterKey": {
+                            "provider": "kmip",
+                            "delegated": true,
+                            "keyId": {
+                              "$$type": "string"
+                            }
+                          },
+                          "keyMaterial": {
+                            "$$type": "binData"
+                          }
+                        },
+                        "$currentDate": {
+                          "updateDate": true
+                        }
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
+                      }
                     }
                   ],
                   "writeConcern": {
@@ -1063,8 +1430,8 @@
           "expectResult": {
             "bulkWriteResult": {
               "insertedCount": 0,
-              "matchedCount": 4,
-              "modifiedCount": 4,
+              "matchedCount": 5,
+              "modifiedCount": 5,
               "deletedCount": 0,
               "upsertedCount": 0,
               "upsertedIds": {},
@@ -1180,6 +1547,32 @@
                         "$$unsetOrMatches": false
                       }
                     },
+                    {
+                      "q": {
+                        "_id": {
+                          "$$type": "binData"
+                        }
+                      },
+                      "u": {
+                        "$set": {
+                          "masterKey": {
+                            "provider": "local"
+                          },
+                          "keyMaterial": {
+                            "$$type": "binData"
+                          }
+                        },
+                        "$currentDate": {
+                          "updateDate": true
+                        }
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
+                      }
+                    },
                     {
                       "q": {
                         "_id": {
@@ -1229,8 +1622,8 @@
           "expectResult": {
             "bulkWriteResult": {
               "insertedCount": 0,
-              "matchedCount": 5,
-              "modifiedCount": 5,
+              "matchedCount": 6,
+              "modifiedCount": 6,
               "deletedCount": 0,
               "upsertedCount": 0,
               "upsertedIds": {},
@@ -1294,6 +1687,16 @@
                 "keyName": "key-name-csfle"
               }
             },
+            {
+              "_id": {
+                "$uuid": "7411e9af-c688-4df7-8143-5e60ae96cba5"
+              },
+              "masterKey": {
+                "provider": "kmip",
+                "keyId": "11",
+                "delegated": true
+              }
+            },
             {
               "_id": {
                 "$binary": {
@@ -1447,6 +1850,32 @@
                         "$$unsetOrMatches": false
                       }
                     },
+                    {
+                      "q": {
+                        "_id": {
+                          "$$type": "binData"
+                        }
+                      },
+                      "u": {
+                        "$set": {
+                          "masterKey": {
+                            "$$type": "object"
+                          },
+                          "keyMaterial": {
+                            "$$type": "binData"
+                          }
+                        },
+                        "$currentDate": {
+                          "updateDate": true
+                        }
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
+                      }
+                    },
                     {
                       "q": {
                         "_id": {

test/test_encryption.py

@@ -2602,11 +2602,10 @@ class TestQueryableEncryptionDocsExample(EncryptionIntegrationTest):
         client_encryption.close()
 
 
-# https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.rst#range-explicit-encryption
+# https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.md#22-range-explicit-encryption
 class TestRangeQueryProse(EncryptionIntegrationTest):
     @client_context.require_no_standalone
-    @client_context.require_version_min(7, 0, -1)
-    @client_context.require_version_max(7, 9, 99)
+    @client_context.require_version_min(8, 0, -1)
     def setUp(self):
         super().setUp()
         self.key1_document = json_data("etc", "data", "keys", "key1-document.json")
@@ -2634,8 +2633,8 @@ class TestRangeQueryProse(EncryptionIntegrationTest):
         find_payload = self.client_encryption.encrypt_expression(
             expression=expression,
             key_id=key_id or self.key1_id,
-            algorithm=Algorithm.RANGEPREVIEW,
-            query_type=QueryType.RANGEPREVIEW,
+            algorithm=Algorithm.RANGE,
+            query_type=QueryType.RANGE,
             contention_factor=0,
             range_opts=range_opts,
         )
@@ -2656,7 +2655,7 @@ class TestRangeQueryProse(EncryptionIntegrationTest):
             return self.client_encryption.encrypt(
                 cast_func(i),
                 key_id=self.key1_id,
-                algorithm=Algorithm.RANGEPREVIEW,
+                algorithm=Algorithm.RANGE,
                 contention_factor=0,
                 range_opts=range_opts,
             )
@@ -2668,7 +2667,7 @@ class TestRangeQueryProse(EncryptionIntegrationTest):
         insert_payload = self.client_encryption.encrypt(
             cast_func(6),
             key_id=self.key1_id,
-            algorithm=Algorithm.RANGEPREVIEW,
+            algorithm=Algorithm.RANGE,
             contention_factor=0,
             range_opts=range_opts,
         )
@@ -2735,7 +2734,7 @@ class TestRangeQueryProse(EncryptionIntegrationTest):
                 self.client_encryption.encrypt(
                     cast_func(201),
                     key_id=self.key1_id,
-                    algorithm=Algorithm.RANGEPREVIEW,
+                    algorithm=Algorithm.RANGE,
                     contention_factor=0,
                     range_opts=range_opts,
                 )
@@ -2747,7 +2746,7 @@ class TestRangeQueryProse(EncryptionIntegrationTest):
                 self.client_encryption.encrypt(
                     6 if cast_func != int else float(6),
                     key_id=self.key1_id,
-                    algorithm=Algorithm.RANGEPREVIEW,
+                    algorithm=Algorithm.RANGE,
                     contention_factor=0,
                     range_opts=range_opts,
                 )
@@ -2762,44 +2761,54 @@ class TestRangeQueryProse(EncryptionIntegrationTest):
                     self.client_encryption.encrypt(
                         cast_func(6),
                         key_id=self.key1_id,
-                        algorithm=Algorithm.RANGEPREVIEW,
+                        algorithm=Algorithm.RANGE,
                         contention_factor=0,
                         range_opts=RangeOpts(
-                            min=cast_func(0), max=cast_func(200), sparsity=1, precision=2
+                            min=cast_func(0),
+                            max=cast_func(200),
+                            sparsity=1,
+                            trim_factor=1,
+                            precision=2,
                         ),
                     )
 
     def test_double_no_precision(self):
-        self.run_test_cases("DoubleNoPrecision", RangeOpts(sparsity=1), float)
+        self.run_test_cases("DoubleNoPrecision", RangeOpts(sparsity=1, trim_factor=1), float)
 
     def test_double_precision(self):
         self.run_test_cases(
             "DoublePrecision",
-            RangeOpts(min=0.0, max=200.0, sparsity=1, precision=2),
+            RangeOpts(min=0.0, max=200.0, sparsity=1, trim_factor=1, precision=2),
             float,
         )
 
     def test_decimal_no_precision(self):
         self.run_test_cases(
-            "DecimalNoPrecision", RangeOpts(sparsity=1), lambda x: Decimal128(str(x))
+            "DecimalNoPrecision", RangeOpts(sparsity=1, trim_factor=1), lambda x: Decimal128(str(x))
         )
 
     def test_decimal_precision(self):
         self.run_test_cases(
             "DecimalPrecision",
-            RangeOpts(min=Decimal128("0.0"), max=Decimal128("200.0"), sparsity=1, precision=2),
+            RangeOpts(
+                min=Decimal128("0.0"),
+                max=Decimal128("200.0"),
+                sparsity=1,
+                trim_factor=1,
+                precision=2,
+            ),
             lambda x: Decimal128(str(x)),
         )
 
     def test_datetime(self):
         self.run_test_cases(
             "Date",
-            RangeOpts(min=DatetimeMS(0), max=DatetimeMS(200), sparsity=1),
+            RangeOpts(min=DatetimeMS(0), max=DatetimeMS(200), sparsity=1, trim_factor=1),
             lambda x: DatetimeMS(x).as_datetime(),
         )
 
     def test_int(self):
-        self.run_test_cases("Int", RangeOpts(min=0, max=200, sparsity=1), int)
+        self.run_test_cases("Int", RangeOpts(min=0, max=200, sparsity=1, trim_factor=1), int)
 
 
 # https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.rst#automatic-data-encryption-keys