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

system_keyspace: prepare forward-declared members

Browse Source 
In anticipation of making system_keyspace a class instead of a
namespace, rename any member that is currently forward-declared,
since one can't forward-declare a class member. Each member
is taken out of the system_keyspace namespace and gains a
system_keyspace prefix. Aliases are added to reduce code churn.

The result isn't lovely, but can be adjusted later.
This commit is contained in:
Avi Kivity
2021-09-13 14:32:42 +03:00
parent c6ce81d6a0
commit 115d6d8d4c
11 changed files with 64 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
db/view/view.cc
View File

@@ -1610,8 +1610,8 @@ void view_builder::reshard(
void view_builder::setup_shard_build_step(
view_builder_init_state& vbi,
std::vector<system_keyspace::view_name> built,
std::vector<system_keyspace::view_build_progress> in_progress) {
std::vector<system_keyspace_view_name> built,
std::vector<system_keyspace_view_build_progress> in_progress) {
// Shard 0 makes cleanup changes to the system tables, but none that could conflict
// with the other shards; everyone is thus able to proceed independently.
auto base_table_exists = [this] (const view_ptr& view) {
@@ -1625,7 +1625,7 @@ void view_builder::setup_shard_build_step(
return false;
}
};
auto maybe_fetch_view = [&, this] (system_keyspace::view_name& name) {
auto maybe_fetch_view = [&, this] (system_keyspace_view_name& name) {
try {
auto s = _db.find_schema(name.first, name.second);
if (s->is_view()) {

8
db/view/view_builder.hh
View File

@@ -46,10 +46,10 @@ class system_distributed_keyspace;
}
namespace db::system_keyspace {
namespace db {
using view_name = std::pair<sstring, sstring>;
class view_build_progress;
using system_keyspace_view_name = std::pair<sstring, sstring>;
class system_keyspace_view_build_progress;
}
@@ -227,7 +227,7 @@ private:
future<> initialize_reader_at_current_token(build_step&);
void load_view_status(view_build_status, std::unordered_set<utils::UUID>&);
void reshard(std::vector<std::vector<view_build_status>>, std::unordered_set<utils::UUID>&);
void setup_shard_build_step(view_builder_init_state& vbi, std::vector<system_keyspace::view_name>, std::vector<system_keyspace::view_build_progress>);
void setup_shard_build_step(view_builder_init_state& vbi, std::vector<system_keyspace_view_name>, std::vector<system_keyspace_view_build_progress>);
future<> calculate_shard_build_step(view_builder_init_state& vbi);
future<> add_new_view(view_ptr, build_step&);
future<> do_build_step();