Skip to content

CDRIVER-4629 Remove OP_QUERY codepath in mongoc_cluster_run_command_monitored #1251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2023
Merged

CDRIVER-4629 Remove OP_QUERY codepath in mongoc_cluster_run_command_monitored #1251

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions src/libmongoc/src/mongoc/mongoc-cluster.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,6 @@ mongoc_cluster_run_command_monitored (mongoc_cluster_t *cluster,
const mongoc_server_stream_t *server_stream;
bson_t reply_local;
bson_error_t error_local;
int32_t compressor_id;
bson_iter_t iter;
bson_t encrypted = BSON_INITIALIZER;
bson_t decrypted = BSON_INITIALIZER;
Expand All @@ -512,7 +511,6 @@ mongoc_cluster_run_command_monitored (mongoc_cluster_t *cluster,

server_stream = cmd->server_stream;
server_id = server_stream->sd->id;
compressor_id = mongoc_server_description_compressor_id (server_stream->sd);

callbacks = &cluster->client->apm_callbacks;
if (!reply) {
Expand Down Expand Up @@ -545,13 +543,7 @@ mongoc_cluster_run_command_monitored (mongoc_cluster_t *cluster,
mongoc_apm_command_started_cleanup (&started_event);
}

if (mongoc_cluster_uses_server_api (cluster) ||
server_stream->sd->max_wire_version >= WIRE_VERSION_MIN) {
retval = mongoc_cluster_run_opmsg (cluster, cmd, reply, error);
} else {
retval = mongoc_cluster_run_command_opquery (
cluster, cmd, compressor_id, reply, error);
}
retval = mongoc_cluster_run_opmsg (cluster, cmd, reply, error);

if (retval && callbacks->succeeded) {
bson_t fake_reply = BSON_INITIALIZER;
Expand Down