CDRIVER-5780 Support QE with Client.bulkWrite #2043
Conversation
mdb-ad
requested review from
eramongodb and
kevinAlbs
and removed request for
eramongodb
| "runOnRequirements": [ | ||
| { | ||
| "minServerVersion": "8.0", | ||
| "serverless": "forbid" |
There was a problem hiding this comment.
I expect this test needs a csfle: true requirement. That might fix test failures on non-cse tasks. Example:
libmongoc is not built with support for Client-Side Field Level Encryption
| @@ -423,6 +426,7 @@ test_bson_size_limits_and_batch_splitting (void *unused) | |||
| coll = mongoc_client_get_collection (client, "db", "coll"); | |||
| /* End of setup */ | |||
|
|
|||
| /* Case 1 */ | |||
There was a problem hiding this comment.
Suggest removing "Case 1" and "Case 2" comments. AFAICT they do not refer to the prose tests directly. Whereas some other prose tests have cases (example).
| // Create a newly named collection to avoid cached previous JSON Schema. | ||
| mongoc_collection_t *coll2 = mongoc_database_create_collection (db, "coll2", coll_opts, &error); | ||
| ASSERT_OR_PRINT (coll2, error); | ||
| mongoc_collection_destroy(coll2); |
There was a problem hiding this comment.
| mongoc_collection_destroy(coll2); | |
| mongoc_collection_destroy (coll2); |
Aside: clang-format can be run with:
./tools/poetry.sh install --with=dev
./tools/poetry.sh run .evergreen/scripts/clang-format-all.shBut that is likely to be replaced soon with #2039:
uv run --frozen --only-group format .evergreen/scripts/clang-format-all.sh
There was a problem hiding this comment.
The --only-group format flag is optional. Dev dependencies are included by default with uv.
| mongoc_bulkwriteexception_destroy (bwr.exc); | ||
|
|
||
| /* Insert two documents that each exceed 2MiB after encryption occurs. Expect | ||
| * the bulk write to succeed and run as two separate inserts. |
There was a problem hiding this comment.
| * the bulk write to succeed and run as two separate inserts. | |
| * the bulk write to succeed and run as two separate bulkWrite commands. |
| @@ -340,14 +344,15 @@ _command_started (const mongoc_apm_command_started_t *event) | |||
| limits_apm_ctx_t *ctx; | |||
|
|
|||
| ctx = (limits_apm_ctx_t *) mongoc_apm_command_started_get_context (event); | |||
| if (0 == strcmp ("insert", mongoc_apm_command_started_get_command_name (event))) { | |||
| const char *cmd_name = mongoc_apm_command_started_get_command_name(event); | |||
| if (0 == strcmp ("insert", cmd_name) || 0 == strcmp("bulkWrite", cmd_name)) { | |||
There was a problem hiding this comment.
Suggest using a separate counter ctx->num_bulk_writes to distinguish insert operations from bulkWrite operations (which may not necessary be an insert).
if (0 == strcmp ("insert", cmd_name)) {
ctx->num_inserts++;
}
if (0 == strcmp ("bulkWrite", cmd_name)) {
ctx->num_bulk-writes++;
}| // Create a newly named collection to avoid cached previous JSON Schema. | ||
| mongoc_collection_t *coll2 = mongoc_database_create_collection (db, "coll2", coll_opts, &error); | ||
| ASSERT_OR_PRINT (coll2, error); | ||
| mongoc_collection_destroy(coll2); |
There was a problem hiding this comment.
The --only-group format flag is optional. Dev dependencies are included by default with uv.
https://spruce.mongodb.com/version/68520780d3481b00077a67cf