mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/raft/replication: clean up remaining index_t usage

Browse Source 
With implicit conversion of tagged integers to untagged ones going away,
explicitly untag the operands / arguments of the following operations, in
"test/raft/replication.hh":

- assignment to raft_cluster::_seen

- call to hasher_int::hash_range()

Signed-off-by: Laszlo Ersek <laszlo.ersek@scylladb.com>
This commit is contained in:
Laszlo Ersek
2024-08-14 22:03:31 +02:00
parent 3a32f3de81
commit 4dc2faa49a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/raft/replication.hh
View File

@@ -433,7 +433,7 @@ public:
future<> load_snapshot(raft::snapshot_id snp_id) override {
hasher = make_lw_shared<hasher_int>((*_snapshots)[_id][snp_id].hasher);
tlogger.debug("sm[{}] loads snapshot {} idx={}", _id, (*_snapshots)[_id][snp_id].hasher.finalize_uint64(), (*_snapshots)[_id][snp_id].idx);
_seen = (*_snapshots)[_id][snp_id].idx;
_seen = (*_snapshots)[_id][snp_id].idx.value();
if (_seen >= _apply_entries) {
_done.set_value();
}
@@ -1390,7 +1390,7 @@ void raft_cluster<Clock>::verify() {
for (auto& s : (*_persisted_snapshots)) {
auto& [snp, val] = s.second;
auto digest = val.hasher.finalize_uint64();
auto expected = hasher_int::hash_range(val.idx).finalize_uint64();
auto expected = hasher_int::hash_range(val.idx.value()).finalize_uint64();
BOOST_CHECK_MESSAGE(digest == expected,
format("Persisted snapshot {} doesn't match {} != {}", snp.id, digest, expected));
}
@@ -1410,7 +1410,7 @@ std::vector<initial_state> raft_cluster<Clock>::get_states(test_case test, bool
raft::index_t start_idx{1};
if (i < test.initial_snapshots.size()) {
states[i].snapshot = test.initial_snapshots[i].snap;
states[i].snp_value.hasher = hasher_int::hash_range(test.initial_snapshots[i].snap.idx);
states[i].snp_value.hasher = hasher_int::hash_range(test.initial_snapshots[i].snap.idx.value());
states[i].snp_value.idx = test.initial_snapshots[i].snap.idx;
start_idx = states[i].snapshot.idx + raft::index_t{1};
}