mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-12 19:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

cql3: throw proper request exception for INSERT JSON

Browse Source 
JSON code is amended in order to return proper
"Missing mandatory PRIMARY KEY part" message instead of generic
"Attempt to access value of a disengaged optional object".

Fixes #3665
Message-Id: <69157d659d51ce5a2d408614ce3ba7bf8e3a5d88.1534161127.git.sarna@scylladb.com>
This commit is contained in:
Piotr Sarna
2018-08-13 13:52:47 +02:00
committed by Duarte Nunes
parent b73669c329
commit 310d0a74b9
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cql3/statements/update_statement.cc
View File

@@ -209,7 +209,10 @@ insert_prepared_json_statement::build_partition_keys(const query_options& option
dht::partition_range_vector ranges;
for (const auto& def : s->partition_key_columns()) {
auto json_value = json_cache->at(def.name_as_text());
auto k = query::range<partition_key>::make_singular(partition_key::from_single_value(*s, json_value.value()));
if (!json_value) {
throw exceptions::invalid_request_exception(sprint("Missing mandatory PRIMARY KEY part %s", def.name_as_text()));
}
auto k = query::range<partition_key>::make_singular(partition_key::from_single_value(*s, *json_value));
ranges.emplace_back(std::move(k).transform(
[this] (partition_key&& k) -> query::ring_position {
auto token = dht::global_partitioner().get_token(*s, k);
@@ -224,7 +227,10 @@ query::clustering_row_ranges insert_prepared_json_statement::create_clustering_r
std::vector<bytes_opt> exploded;
for (const auto& def : s->clustering_key_columns()) {
auto json_value = json_cache->at(def.name_as_text());
exploded.emplace_back(json_value.value());
if (!json_value) {
throw exceptions::invalid_request_exception(sprint("Missing mandatory PRIMARY KEY part %s", def.name_as_text()));
}
exploded.emplace_back(*json_value);
}
auto k = query::range<clustering_key_prefix>::make_singular(clustering_key_prefix::from_optional_exploded(*s, std::move(exploded)));
ranges.emplace_back(query::clustering_range(std::move(k)));