mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-29 11:10:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

alternator: better error handling for schema errors in CreateTable

Browse Source 
Signed-off-by: Nadav Har'El <nyh@scylladb.com>
This commit is contained in:
Nadav Har'El
2019-05-06 15:19:04 +03:00
parent 77de0af40f
commit dc34c92899
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
alternator/executor.cc
View File

@@ -210,19 +210,29 @@ future<json::json_return_type> executor::create_table(sstring content) {
sstring pk_name;
sstring ck_name;
// DynamoDB requries that KeySchema includes up to two elements, the
// first must be a HASH, the optional second one can be a RANGE.
// We are less picky about the order, but still don't allow multiple
// key columns of the same type, or a missing HASH key.
for (const Json::Value& key_info : key_schema) {
if (key_info[KEY_TYPE] == HASH) {
if (!pk_name.empty()) {
throw std::runtime_error(format("Only one partition key can be specified in {}", key_info.toStyledString()));
throw api_error(reply::status_type::bad_request, "ValidationException",
"Only one HASH key may be specified in KeySchema");
}
pk_name = key_info[ATTRIBUTE_NAME].asString();
} else if (key_info[KEY_TYPE] == RANGE) {
if (!ck_name.empty()) {
throw std::runtime_error(format("Only one clustering key can be specified in {}", key_info.toStyledString()));
throw api_error(reply::status_type::bad_request, "ValidationException",
"Only one RANGE key may be specified in KeySchema");
}
ck_name = key_info[ATTRIBUTE_NAME].asString();
}
}
if (pk_name.empty()) {
throw api_error(reply::status_type::bad_request, "ValidationException",
"Missing HASH key in KeySchema");
}
for (const Json::Value& attribute_info : attribute_definitions) {
sstring attr_name = attribute_info[ATTRIBUTE_NAME].asString();