Skip to content
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

CXXCBC-119: Set value of subdoc exists to "true" or "false" if result is success or path-not-found #452

Merged
merged 1 commit into from
Sep 18, 2023
Merged

CXXCBC-119: Set value of subdoc exists to "true" or "false" if result is success or path-not-found #452

Show file tree
Hide file tree
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
6 changes: 0 additions & 6 deletions core/impl/lookup_in_all_replicas.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,6 @@ initiate_lookup_in_all_replicas_operation(std::shared_ptr<cluster> core,
lookup_in_entry.exists = field.exists;
lookup_in_entry.original_index = field.original_index;
lookup_in_entry.ec = field.ec;
if (field.opcode == protocol::subdoc_opcode::exists && field.ec == errc::key_value::path_not_found) {
lookup_in_entry.ec.clear();
}
entries.emplace_back(lookup_in_entry);
}
ctx->result_.emplace_back(lookup_in_replica_result{ resp.cas, entries, resp.deleted, true /* replica */ });
Expand Down Expand Up @@ -160,9 +157,6 @@ initiate_lookup_in_all_replicas_operation(std::shared_ptr<cluster> core,
lookup_in_entry.exists = field.exists;
lookup_in_entry.original_index = field.original_index;
lookup_in_entry.ec = field.ec;
if (field.opcode == protocol::subdoc_opcode::exists && field.ec == errc::key_value::path_not_found) {
lookup_in_entry.ec.clear();
}
entries.emplace_back(lookup_in_entry);
}
ctx->result_.emplace_back(lookup_in_replica_result{ resp.cas, entries, resp.deleted, false /* active */ });
Expand Down
7 changes: 0 additions & 7 deletions core/impl/lookup_in_any_replica.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,6 @@ initiate_lookup_in_any_replica_operation(std::shared_ptr<cluster> core,
entry.exists = field.exists;
entry.value = field.value;
entry.ec = field.ec;
if (field.opcode == protocol::subdoc_opcode::exists &&
field.ec == errc::key_value::path_not_found) {
entry.ec.clear();
}
entries.emplace_back(entry);
}
return local_handler(std::move(resp.ctx),
Expand Down Expand Up @@ -162,9 +158,6 @@ initiate_lookup_in_any_replica_operation(std::shared_ptr<cluster> core,
entry.exists = field.exists;
entry.value = field.value;
entry.ec = field.ec;
if (field.opcode == protocol::subdoc_opcode::exists && field.ec == errc::key_value::path_not_found) {
entry.ec.clear();
}
entries.emplace_back(entry);
}
return local_handler(std::move(resp.ctx),
Expand Down
9 changes: 8 additions & 1 deletion core/impl/lookup_in_replica.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ lookup_in_replica_request::make_response(key_value_error_context&& ctx, const en
fields[i].status = res_entry.status;
fields[i].ec =
protocol::map_status_code(protocol::client_opcode::subdoc_multi_mutation, static_cast<std::uint16_t>(res_entry.status));
if (fields[i].opcode == protocol::subdoc_opcode::exists && fields[i].ec == errc::key_value::path_not_found) {
fields[i].ec.clear();
}
if (!fields[i].ec && !ctx.ec()) {
ec = fields[i].ec;
}
Expand All @@ -79,7 +82,11 @@ lookup_in_replica_request::make_response(key_value_error_context&& ctx, const en
}
fields[i].exists =
res_entry.status == key_value_status_code::success || res_entry.status == key_value_status_code::subdoc_success_deleted;
fields[i].value = utils::to_binary(res_entry.value);
if (fields[i].opcode == protocol::subdoc_opcode::exists && !fields[i].ec) {
fields[i].value = utils::json::generate_binary(fields[i].exists);
} else {
fields[i].value = utils::to_binary(res_entry.value);
}
}
if (!ec) {
cas = encoded.cas();
Expand Down
6 changes: 5 additions & 1 deletion core/operations/document_lookup_in.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,11 @@ lookup_in_request::make_response(key_value_error_context&& ctx, const encoded_re
}
fields[i].exists =
res_entry.status == key_value_status_code::success || res_entry.status == key_value_status_code::subdoc_success_deleted;
fields[i].value = utils::to_binary(res_entry.value);
if (fields[i].opcode == protocol::subdoc_opcode::exists && !fields[i].ec) {
fields[i].value = utils::json::generate_binary(fields[i].exists);
} else {
fields[i].value = utils::to_binary(res_entry.value);
}
}
if (!ec) {
cas = encoded.cas();
Expand Down
8 changes: 0 additions & 8 deletions core/operations/document_lookup_in_all_replicas.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,6 @@ struct lookup_in_all_replicas_request {
lookup_in_entry.exists = field.exists;
lookup_in_entry.original_index = field.original_index;
lookup_in_entry.opcode = field.opcode;
if (lookup_in_entry.opcode == protocol::subdoc_opcode::exists &&
lookup_in_entry.ec == errc::key_value::path_not_found) {
lookup_in_entry.ec.clear();
}
top_entry.fields.emplace_back(lookup_in_entry);
}
ctx->result_.emplace_back(lookup_in_all_replicas_response::entry{ top_entry });
Expand Down Expand Up @@ -173,10 +169,6 @@ struct lookup_in_all_replicas_request {
lookup_in_entry.exists = field.exists;
lookup_in_entry.original_index = field.original_index;
lookup_in_entry.opcode = field.opcode;
if (lookup_in_entry.opcode == protocol::subdoc_opcode::exists &&
lookup_in_entry.ec == errc::key_value::path_not_found) {
lookup_in_entry.ec.clear();
}
top_entry.fields.emplace_back(lookup_in_entry);
}
ctx->result_.emplace_back(lookup_in_all_replicas_response::entry{ top_entry });
Expand Down
8 changes: 0 additions & 8 deletions core/operations/document_lookup_in_any_replica.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,6 @@ struct lookup_in_any_replica_request {
lookup_in_entry.exists = field.exists;
lookup_in_entry.original_index = field.original_index;
lookup_in_entry.opcode = field.opcode;
if (lookup_in_entry.opcode == protocol::subdoc_opcode::exists &&
lookup_in_entry.ec == errc::key_value::path_not_found) {
lookup_in_entry.ec.clear();
}
res.fields.emplace_back(lookup_in_entry);
}
return local_handler(res);
Expand Down Expand Up @@ -177,10 +173,6 @@ struct lookup_in_any_replica_request {
lookup_in_entry.exists = field.exists;
lookup_in_entry.original_index = field.original_index;
lookup_in_entry.opcode = field.opcode;
if (lookup_in_entry.opcode == protocol::subdoc_opcode::exists &&
lookup_in_entry.ec == errc::key_value::path_not_found) {
lookup_in_entry.ec.clear();
}
res.fields.emplace_back(lookup_in_entry);
}
return local_handler(res);
Expand Down
Loading