bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

test: add a test case for SERIAL read consistency

Browse Source 
Pass custom query options to execute_prepared and
add a test case for custom SERIAL consistency.
This commit is contained in:
Konstantin Osipov
2020-03-17 00:38:01 +03:00
parent f5180725df
commit 4978bb513d
3 changed files with 62 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
test/boost/cql_query_test.cc
View File

@@ -5073,12 +5073,15 @@ SEASTAR_TEST_CASE(test_null_value_tuple_floating_types_and_uuids) {
});
}
static std::unique_ptr<cql3::query_options> q_serial_opts() {
static std::unique_ptr<cql3::query_options> q_serial_opts(
std::vector<cql3::raw_value> values,
db::consistency_level cl) {
const auto& so = cql3::query_options::specific_options::DEFAULT;
auto qo = std::make_unique<cql3::query_options>(
db::consistency_level::ONE,
cl,
infinite_timeout_config,
std::vector<cql3::raw_value>{},
values,
// Ensure (optional) serial consistency is always specified.
cql3::query_options::specific_options{
so.page_size,
@@ -5093,7 +5096,8 @@ static std::unique_ptr<cql3::query_options> q_serial_opts() {
// Run parametrized query on the appropriate shard
static void prepared_on_shard(cql_test_env& e, const sstring& query,
std::vector<bytes> params,
std::vector<std::vector<bytes_opt>> expected_rows) {
std::vector<std::vector<bytes_opt>> expected_rows,
db::consistency_level cl = db::consistency_level::ONE) {
auto execute = [&] () mutable {
return seastar::async([&] () mutable {
auto id = e.prepare(query).get0();
@@ -5103,8 +5107,8 @@ static void prepared_on_shard(cql_test_env& e, const sstring& query,
raw_values.emplace_back(cql3::raw_value::make_value(param));
}
auto qo = q_serial_opts();
auto msg = e.execute_prepared(id, raw_values).get0();
auto qo = q_serial_opts(std::move(raw_values), cl);
auto msg = e.execute_prepared_with_qo(id, std::move(qo)).get0();
if (!msg->move_to_shard()) {
assert_that(msg).is_rows().with_rows_ignore_order(expected_rows);
}
@@ -5136,6 +5140,34 @@ SEASTAR_TEST_CASE(test_like_parameter_marker) {
});
}
SEASTAR_TEST_CASE(test_select_serial_consistency) {
return do_with_cql_env_thread([] (cql_test_env& e) {
cquery_nofail(e, "CREATE TABLE t (a int, b int, primary key (a,b))").get();
cquery_nofail(e, "INSERT INTO t (a, b) VALUES (1, 1)").get();
cquery_nofail(e, "INSERT INTO t (a, b) VALUES (1, 2)").get();
cquery_nofail(e, "INSERT INTO t (a, b) VALUES (2, 1)").get();
cquery_nofail(e, "INSERT INTO t (a, b) VALUES (2, 2)").get();
auto check_fails = [&e] (const sstring& query, const source_location& loc = source_location::current()) {
try {
prepared_on_shard(e, query, {}, {}, db::consistency_level::SERIAL);
assert(false);
} catch (const exceptions::invalid_request_exception& e) {
testlog.info("Query '{}' failed as expected with error: {}", query, e);
} catch (...) {
BOOST_ERROR(format("query '{}' failed with unexpected error: {}\n{}:{}: originally from here",
query, std::current_exception(),
loc.file_name(), loc.line()));
}
};
check_fails("select * from t allow filtering");
check_fails("select * from t where b > 0 allow filtering");
check_fails("select * from t where a in (1, 3)");
prepared_on_shard(e, "select * from t where a = 1", {}, {{I(1), I(1)}, {I(1), I(2)}}, db::consistency_level::SERIAL);
});
}
SEASTAR_TEST_CASE(test_range_deletions_for_specific_column) {
return do_with_cql_env_thread([] (cql_test_env& e) {
cquery_nofail(e, "CREATE TABLE t (pk int, ck int, col text, PRIMARY KEY(pk, ck))").get();

32
test/lib/cql_test_env.cc
View File

@@ -184,28 +184,36 @@ public:
virtual future<::shared_ptr<cql_transport::messages::result_message>> execute_prepared(
cql3::prepared_cache_key_type id,
std::vector<cql3::raw_value> values,
db::consistency_level cl) override
{
auto prepared = local_qp().get_prepared(id);
if (!prepared) {
throw not_prepared_exception(id);
}
auto stmt = prepared->statement;
assert(stmt->get_bound_terms() == values.size());
db::consistency_level cl = db::consistency_level::ONE) override {
const auto& so = cql3::query_options::specific_options::DEFAULT;
auto options = ::make_shared<cql3::query_options>(cl, infinite_timeout_config,
auto options = std::make_unique<cql3::query_options>(cl, infinite_timeout_config,
std::move(values), cql3::query_options::specific_options{
so.page_size,
so.state,
db::consistency_level::SERIAL,
so.timestamp,
});
options->prepare(prepared->bound_names);
return execute_prepared_with_qo(id, std::move(options));
}
virtual future<::shared_ptr<cql_transport::messages::result_message>> execute_prepared_with_qo(
cql3::prepared_cache_key_type id,
std::unique_ptr<cql3::query_options> qo) override
{
auto prepared = local_qp().get_prepared(id);
if (!prepared) {
throw not_prepared_exception(id);
}
auto stmt = prepared->statement;
assert(stmt->get_bound_terms() == qo->get_values_count());
qo->prepare(prepared->bound_names);
auto qs = make_query_state();
return local_qp().execute_prepared(std::move(prepared), std::move(id), *qs, *options, true)
.finally([options, qs] {});
auto& lqo = *qo;
return local_qp().execute_prepared(std::move(prepared), std::move(id), *qs, lqo, true)
.finally([qs, qo = std::move(qo)] {});
}
virtual future<std::vector<mutation>> get_modification_mutations(const sstring& text) override {

4
test/lib/cql_test_env.hh
View File

@@ -92,6 +92,10 @@ public:
std::vector<cql3::raw_value> values,
db::consistency_level cl = db::consistency_level::ONE) = 0;
virtual future<::shared_ptr<cql_transport::messages::result_message>> execute_prepared_with_qo(
cql3::prepared_cache_key_type id,
std::unique_ptr<cql3::query_options> qo) = 0;
virtual future<std::vector<mutation>> get_modification_mutations(const sstring& text) = 0;
virtual future<> create_table(std::function<schema(std::string_view)> schema_maker) = 0;