DRIVERS-2604 deduplicate encrypted fields files #1400
Merged
Conversation
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
kevinAlbs
force-pushed
the
remove-duplicate-encryptedFields
branch
from
32b6d35 to
e303013
Compare
kevinAlbs
changed the title
kevinAlbs
requested review from
katcharov and
jmikola
and removed request for
a team and
katcharov
jmikola
approved these changes
Apr 14, 2023
If contention is not present, the server will provide a default value. The default value will be included in the `command_started_event`. Adding `contention` to the `range-encryptedFields-*` files enable the same YAML to be used for `encrypted_fields` and the `command_started_event` in specification tests.
Server accepts either. Use numberLong for consistency.
kevinAlbs
force-pushed
the
remove-duplicate-encryptedFields
branch
from
e303013 to
a338dc7
Compare
kevinAlbs
added a commit
to kevinAlbs/mongo-c-driver
that referenced
this pull request
Apr 24, 2023
kevinAlbs
added a commit
to mongodb/mongo-c-driver
that referenced
this pull request
Apr 24, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
encryptedFields-Range-*files withrange-encryptedFields-*.encryptedDoubleandencryptedDecimalwithencryptedDoubleNoPrecisionandencryptedDecimalNoPrecisionto match the field name in therange-encryptedFields-*files.There is no expected test coverage or behavior change.
Changes tested with C driver in this patch build: https://spruce.mongodb.com/version/6436ce262a60edecd5b8f761
Background & Motivation
Motivated by this comment: #1396 (comment)
The
range-encryptedFields-*.jsonfiles and theencryptedFields-Range-*.jsonfiles are almost identical.14c5099 adds
contentiontoencryptedFields-Range-*.json. The server response tolistCollectionsincludes the default value chosen forcontention.encryptedFields-Range-*.jsonis used both for collection creation and for thecommand_startedevent assertions. Without addingcontentionto the expectedcommand_startedevent, the test assertion fails since the actual event contains the defaultcontention.9b2df75 uses
$numberLongconsistently for sparsity. The server accepts both$numberLongand$numberInt. The only motivation was for consistency.Please complete the following before merging:
[ ] Update changelog.N/A. Only test files changed[ ] Test these changes against all server versions and topologies (including standalone, replica set, sharded clusters, and serverless).Tested in C driver on replica set only.