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

alternator:Implement NOT_NULL operator in Expected

Browse Source 
Signed-off-by: Dejan Mircevski <dejan@scylladb.com>
This commit is contained in:
Dejan Mircevski
2019-10-01 13:26:52 -04:00
parent 75960639a4
commit de18b3240b
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
alternator-test/test_expected.py
View File

@@ -447,7 +447,6 @@ def test_update_expected_1_gt(test_table_s):
)
# Tests for Expected with ComparisonOperator = "NOT_NULL":
@pytest.mark.xfail(reason="ComparisonOperator=NOT_NULL in Expected not yet implemented")
def test_update_expected_1_not_null(test_table_s):
# Note that despite its name, the "NOT_NULL" comparison operator doesn't check if
# the attribute has the type "NULL", or an empty value. Rather it is explicitly

16
alternator/conditions.cc
View File

@@ -42,9 +42,10 @@ comparison_operator_type get_comparison_operator(const rjson::value& comparison_
{"GT", comparison_operator_type::GT},
{"IN", comparison_operator_type::IN},
{"NULL", comparison_operator_type::IS_NULL},
{"NOT_NULL", comparison_operator_type::NOT_NULL},
{"BETWEEN", comparison_operator_type::BETWEEN},
{"BEGINS_WITH", comparison_operator_type::BEGINS_WITH},
}; //TODO: CONTAINS, NOT_NULL
}; //TODO: CONTAINS
if (!comparison_operator.IsString()) {
throw api_error("ValidationException", format("Invalid comparison operator definition {}", rjson::print(comparison_operator)));
}
@@ -190,6 +191,17 @@ static bool check_NULL(const rjson::value* val, const rjson::value* array) {
return val == nullptr;
}
// Check if array is empty and val is not null.
static bool check_NOT_NULL(const rjson::value* val, const rjson::value* array) {
if (!array || !array->IsArray()) {
throw api_error("ValidationException", "With ComparisonOperator, AttributeValueList must be given and an array");
}
if (array->Size() > 0) {
throw api_error("ValidationException", "NOT_NULL operator requires empty AttributeValueList");
}
return val != nullptr;
}
// Verify one Expect condition on one attribute (whose content is "got")
// for the verify_expected() below.
// This function returns true or false depending on whether the condition
@@ -239,6 +251,8 @@ static bool verify_expected_one(const rjson::value& condition, const rjson::valu
return check_IN(got, attribute_value_list);
case comparison_operator_type::IS_NULL:
return check_NULL(got, attribute_value_list);
case comparison_operator_type::NOT_NULL:
return check_NOT_NULL(got, attribute_value_list);
default:
// FIXME: implement all the missing types, so there will be no default here.
throw api_error("ValidationException", format("ComparisonOperator {} is not yet supported", *comparison_operator));