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

token_metadata: drop the template

Browse Source 
Replace token_metadata2 ->token_metadata,
make token_metadata back non-template.

No behavior changes, just compilation fixes.
This commit is contained in:
Petr Gusev
2023-11-07 17:02:44 +04:00
parent 799f747c8f
commit 7b55ccbd8e
58 changed files with 506 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
node_ops/node_ops_ctl.hh
View File

@@ -25,10 +25,7 @@ class storage_service;
}
namespace locator {
template <typename NodeId>
class generic_token_metadata;
using token_metadata = generic_token_metadata<gms::inet_address>;
using token_metadata2 = generic_token_metadata<host_id>;
class token_metadata;
}
class node_ops_info {
@@ -139,7 +136,7 @@ public:
sstring desc;
locator::host_id host_id; // Host ID of the node operand (i.e. added, replaced, or leaving node)
gms::inet_address endpoint; // IP address of the node operand (i.e. added, replaced, or leaving node)
lw_shared_ptr<const locator::token_metadata2> tmptr;
lw_shared_ptr<const locator::token_metadata> tmptr;
std::unordered_set<gms::inet_address> sync_nodes;
std::unordered_set<gms::inet_address> ignore_nodes;
node_ops_cmd_request req;