DRIVERS-3547: Explicit Encryption Case 2 recreates collection with contention: 10#1952
Draft
rozza wants to merge 5 commits into
Draft
DRIVERS-3547: Explicit Encryption Case 2 recreates collection with contention: 10#1952rozza wants to merge 5 commits into
rozza wants to merge 5 commits into
Conversation
…ntention: 10 Case 2 uses contentionFactor: 10 but the shared Test Setup creates db.explicit_encryption with contention: 0. Servers implementing SERVER-91887 now reject payloads whose contentionFactor exceeds the collection's configured contention. Fix by dropping and recreating the collection with contention: 10 at the start of Case 2, matching the Python driver fix in PYTHON-5882.
Servers implementing SERVER-91887 require find payloads to exactly match the collection's configured contention factor, not just avoid exceeding it. Drop the find with contentionFactor=0 (which the server now rejects) and update the note to accurately describe the server behavior.
kevinAlbs
reviewed
Jun 16, 2026
kevinAlbs
left a comment
kevinAlbs
left a comment
Contributor
There was a problem hiding this comment.
FYI testing in the C driver revealed more test failures in the explicit encryption prose tests for QE string queries.
Suggest including 17b9c3d in this PR to address all test failures caused by SERVER-91887.
| [ClientEncryptionOpts](#ClientEncryptionOpts) or [AutoEncryptionOpts](#AutoEncryptionOpts). | ||
| 2. Initialize $P$ to an empty [KMSProviders](#kmsproviders) object. | ||
| 3. If $K$ contains an `aws` property, and that property is an empty map: | ||
| 1. Initialize $P$ to an empty [KMSProviders](#kmsproviders) object. |
Contributor
There was a problem hiding this comment.
Revert unintended numbering changes.
|
|
||
| #### Case 2: can insert encrypted indexed and find with non-zero contention | ||
|
|
||
| > [!NOTE] |
Contributor
There was a problem hiding this comment.
Rather than requiring the test recreate the collection, suggest adding a new collection to the test setup.
Add a new file: encryptedFields-c10.json as a copy of encryptedFields.json with contention: 10. Add steps to Test Setup:
Load the file
[encryptedFields-c10.json](https://github.com/mongodb/specifications/tree/master/source/client-side-encryption/etc/data/encryptedFields-c10.json)
as `encryptedFields_c10`.
Drop and create the collection `db.explicit_encryption_c10` using `encryptedFields` as an option. See
[FLE 2 CreateCollection() and Collection.Drop()](../client-side-encryption.md#create-collection-helper).This may be more consistent with other tests. This was simpler to implement in the C driver (rewriting nested fields in BSON is lots of boilerplate).
Contributor
|
C driver implementation with suggested changes: mongodb/mongo-c-driver#2320 |
Co-authored-by: Kevin Albertson <kevin.eric.albertson@gmail.com>
- Use a pre-created db.explicit_encryption_c10 collection (contention: 10) in Test Setup rather than requiring Case 2 to reconstruct collection BSON - Add encryptedFields-c10.json fixture file - Add explicit contention: 0 to encryptedFields-prefix-suffix.json and encryptedFields-substring.json for SERVER-91887 compatibility
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Case 2 uses contentionFactor: 10 but the shared Test Setup creates db.explicit_encryption with contention: 0. Servers implementing SERVER-91887 now reject payloads whose contentionFactor exceeds the collection's configured contention. Fix by dropping and recreating the collection with contention: 10 at the start of Case 2, matching the Python driver fix in PYTHON-5882.
Please complete the following before merging: