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

cql_test_env: Use table.find_row() shortcut

Browse Source 
The require_column_has_value() finds the cell in three steps -- finds
partition, then row, then cell. The class table already has a method to
facilitate row finding by partition and clustering key

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>
This commit is contained in:
Pavel Emelyanov
2023-08-12 12:45:04 +03:00
parent 5afc242814
commit 7597663ef5
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/lib/cql_test_env.cc
View File

@@ -315,7 +315,7 @@ public:
auto exp = expected.type()->decompose(expected);
auto dk = dht::decorate_key(*schema, pkey);
auto shard = cf.get_effective_replication_map()->shard_of(*schema, dk._token);
return _db.invoke_on(shard, [pkey = std::move(pkey),
return _db.invoke_on(shard, [dk = std::move(dk),
ckey = std::move(ckey),
ks_name = std::move(ks_name),
column_name = std::move(column_name),
@@ -324,10 +324,7 @@ public:
auto& cf = db.find_column_family(ks_name, table_name);
auto schema = cf.schema();
auto permit = db.get_reader_concurrency_semaphore().make_tracking_only_permit(schema.get(), "require_column_has_value()", db::no_timeout, {});
return cf.find_partition_slow(schema, permit, pkey)
.then([schema, ckey, column_name, exp] (replica::column_family::const_mutation_partition_ptr p) {
assert(p != nullptr);
auto row = p->find_row(*schema, ckey);
return cf.find_row(schema, permit, dk, ckey).then([schema, column_name, exp] (auto row) {
assert(row != nullptr);
auto col_def = schema->get_column_definition(utf8_type->decompose(column_name));
assert(col_def != nullptr);