Skip to content

Commit

Permalink
rename IndexBuilder, TransactionIndex1
Browse files Browse the repository at this point in the history
  • Loading branch information
@battlmonstr
battlmonstr committed Mar 21, 2024
1 parent ba11a28 commit b2191a7
Show file tree
Hide file tree
Showing 17 changed files with 48 additions and 51 deletions.
6 changes: 3 additions & 3 deletions cmd/dev/snapshots.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <silkworm/db/snapshots/bittorrent/client.hpp>
#include <silkworm/db/snapshots/body_index.hpp>
#include <silkworm/db/snapshots/header_index.hpp>
#include <silkworm/db/snapshots/index.hpp>
#include <silkworm/db/snapshots/index_builder.hpp>
#include <silkworm/db/snapshots/repository.hpp>
#include <silkworm/db/snapshots/seg/seg_zip.hpp>
#include <silkworm/db/snapshots/snapshot.hpp>
Expand Down Expand Up @@ -297,8 +297,8 @@ void create_index(const SnapSettings& settings, int repetitions) {
break;
}
case SnapshotType::transactions: {
auto bodies_segment_path = TransactionIndex1::bodies_segment_path(*snap_file);
auto index = TransactionIndex1::make(bodies_segment_path, *snap_file);
auto bodies_segment_path = TransactionIndex::bodies_segment_path(*snap_file);
auto index = TransactionIndex::make(bodies_segment_path, *snap_file);
index.build();

auto index_hash_to_block = TransactionToBlockIndex::make(bodies_segment_path, *snap_file);
Expand Down
14 changes: 7 additions & 7 deletions silkworm/capi/silkworm.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <silkworm/db/buffer.hpp>
#include <silkworm/db/snapshots/body_index.hpp>
#include <silkworm/db/snapshots/header_index.hpp>
#include <silkworm/db/snapshots/index.hpp>
#include <silkworm/db/snapshots/index_builder.hpp>
#include <silkworm/db/snapshots/txn_index.hpp>
#include <silkworm/db/snapshots/txn_to_block_index.hpp>
#include <silkworm/db/stages.hpp>
Expand Down Expand Up @@ -236,7 +236,7 @@ SILKWORM_EXPORT int silkworm_build_recsplit_indexes(SilkwormHandle handle, struc
return SILKWORM_INVALID_HANDLE;
}

std::vector<std::shared_ptr<snapshots::Index>> needed_indexes;
std::vector<std::shared_ptr<snapshots::IndexBuilder>> needed_indexes;
for (size_t i = 0; i < len; i++) {
struct SilkwormMemoryMappedFile* snapshot = snapshots[i];
if (!snapshot) {
Expand All @@ -249,26 +249,26 @@ SILKWORM_EXPORT int silkworm_build_recsplit_indexes(SilkwormHandle handle, struc
return SILKWORM_INVALID_PATH;
}

std::shared_ptr<snapshots::Index> index;
std::shared_ptr<snapshots::IndexBuilder> index;
switch (snapshot_path->type()) {
case snapshots::SnapshotType::headers: {
index = std::make_shared<snapshots::Index>(snapshots::HeaderIndex::make(*snapshot_path, snapshot_region));
index = std::make_shared<snapshots::IndexBuilder>(snapshots::HeaderIndex::make(*snapshot_path, snapshot_region));
needed_indexes.push_back(index);
break;
}
case snapshots::SnapshotType::bodies: {
index = std::make_shared<snapshots::Index>(snapshots::BodyIndex::make(*snapshot_path, snapshot_region));
index = std::make_shared<snapshots::IndexBuilder>(snapshots::BodyIndex::make(*snapshot_path, snapshot_region));
needed_indexes.push_back(index);
break;
}
case snapshots::SnapshotType::transactions: {
auto bodies_segment_path = snapshots::TransactionIndex1::bodies_segment_path(*snapshot_path);
auto bodies_segment_path = snapshots::TransactionIndex::bodies_segment_path(*snapshot_path);
auto bodies_file = std::find_if(snapshots, snapshots + len, [&](SilkwormMemoryMappedFile* file) -> bool {
return snapshots::SnapshotPath::parse(file->file_path) == bodies_segment_path;
});

if (bodies_file < snapshots + len) {
index = std::make_shared<snapshots::Index>(snapshots::TransactionIndex1::make(bodies_segment_path, *snapshot_path));
index = std::make_shared<snapshots::IndexBuilder>(snapshots::TransactionIndex::make(bodies_segment_path, *snapshot_path));
needed_indexes.push_back(index);

index = std::make_shared<snapshots::IndexBuilder>(snapshots::TransactionToBlockIndex::make(bodies_segment_path, *snapshot_path));
Expand Down
4 changes: 2 additions & 2 deletions silkworm/capi/silkworm_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <silkworm/db/mdbx/mdbx.hpp>
#include <silkworm/db/snapshots/body_index.hpp>
#include <silkworm/db/snapshots/header_index.hpp>
#include <silkworm/db/snapshots/index.hpp>
#include <silkworm/db/snapshots/index_builder.hpp>
#include <silkworm/db/snapshots/snapshot.hpp>
#include <silkworm/db/snapshots/test_util/common.hpp>
#include <silkworm/db/snapshots/txn_index.hpp>
Expand Down Expand Up @@ -658,7 +658,7 @@ TEST_CASE_METHOD(CApiTest, "CAPI silkworm_add_snapshot", "[silkworm][capi]") {
body_snapshot.reopen_segment();
body_snapshot.reopen_index();

auto tx_index = snapshots::TransactionIndex1::make(body_snapshot_path, tx_snapshot_path);
auto tx_index = snapshots::TransactionIndex::make(body_snapshot_path, tx_snapshot_path);
tx_index.build();
auto tx_index_hash_to_block = snapshots::TransactionToBlockIndex::make(body_snapshot_path, tx_snapshot_path);
tx_index_hash_to_block.build();
Expand Down
2 changes: 1 addition & 1 deletion silkworm/db/snapshot_sync.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <silkworm/core/types/hash.hpp>
#include <silkworm/db/mdbx/etl_mdbx_collector.hpp>
#include <silkworm/db/snapshots/config.hpp>
#include <silkworm/db/snapshots/index.hpp>
#include <silkworm/db/snapshots/index_builder.hpp>
#include <silkworm/db/snapshots/path.hpp>
#include <silkworm/db/stages.hpp>
#include <silkworm/infra/common/ensure.hpp>
Expand Down
2 changes: 1 addition & 1 deletion silkworm/db/snapshots/body_index.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <silkworm/core/common/bytes.hpp>
#include <silkworm/infra/common/memory_mapped_file.hpp>

#include "index.hpp"
#include "index_builder.hpp"
#include "path.hpp"

namespace silkworm::snapshots {
Expand Down
2 changes: 1 addition & 1 deletion silkworm/db/snapshots/header_index.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <silkworm/core/common/bytes.hpp>
#include <silkworm/infra/common/memory_mapped_file.hpp>

#include "index.hpp"
#include "index_builder.hpp"
#include "path.hpp"

namespace silkworm::snapshots {
Expand Down
2 changes: 1 addition & 1 deletion silkworm/db/snapshots/index.cpp → silkworm/db/snapshots/index_builder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
limitations under the License.
*/

#include "index.hpp"
#include "index_builder.hpp"

#include <silkworm/db/snapshots/rec_split/rec_split.hpp>
#include <silkworm/db/snapshots/rec_split/rec_split_seq.hpp>
Expand Down
3 changes: 0 additions & 3 deletions silkworm/db/snapshots/index.hpp → silkworm/db/snapshots/index_builder.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,4 @@ struct IndexBuilder {
std::unique_ptr<IndexInputDataQuery> query_;
};

// TODO: remove
using Index = IndexBuilder;

} // namespace silkworm::snapshots
18 changes: 9 additions & 9 deletions silkworm/db/snapshots/index_test.cpp → silkworm/db/snapshots/index_builder_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
limitations under the License.
*/

#include "index.hpp"
#include "index_builder.hpp"

#include <catch2/catch.hpp>

Expand Down Expand Up @@ -60,7 +60,7 @@ TEST_CASE("TransactionIndex::build KO: empty snapshot", "[silkworm][snapshot][in
auto txs_snapshot_path = *SnapshotPath::parse(txs_snapshot_file.path());
auto bodies_snapshot_path = *SnapshotPath::parse(bodies_snapshot_file.path());

CHECK_THROWS_WITH(TransactionIndex1::make(bodies_snapshot_path, txs_snapshot_path).build(), StartsWith("empty body snapshot"));
CHECK_THROWS_WITH(TransactionIndex::make(bodies_snapshot_path, txs_snapshot_path).build(), StartsWith("empty body snapshot"));
CHECK_THROWS_WITH(TransactionToBlockIndex::make(bodies_snapshot_path, txs_snapshot_path).build(), StartsWith("empty body snapshot"));
}
}
Expand All @@ -84,7 +84,7 @@ TEST_CASE("TransactionIndex::build KO: invalid snapshot", "[silkworm][snapshot][
auto txs_snapshot_path = *SnapshotPath::parse(txs_snapshot_file.path());
auto bodies_snapshot_path = *SnapshotPath::parse(bodies_snapshot_file.path());

CHECK_THROWS_WITH(TransactionIndex1::make(bodies_snapshot_path, txs_snapshot_path).build(), StartsWith("invalid zero word length"));
CHECK_THROWS_WITH(TransactionIndex::make(bodies_snapshot_path, txs_snapshot_path).build(), StartsWith("invalid zero word length"));
CHECK_THROWS_WITH(TransactionToBlockIndex::make(bodies_snapshot_path, txs_snapshot_path).build(), StartsWith("invalid zero word length"));
}

Expand All @@ -100,7 +100,7 @@ TEST_CASE("TransactionIndex::build KO: invalid snapshot", "[silkworm][snapshot][
test::SampleTransactionSnapshotFile valid_txs_snapshot{};
test::SampleTransactionSnapshotPath txs_snapshot_path{valid_txs_snapshot.path()}; // necessary to tweak the block numbers

CHECK_THROWS_WITH(TransactionIndex1::make(bodies_snapshot_path, txs_snapshot_path).build(), Contains("invalid: position depth"));
CHECK_THROWS_WITH(TransactionIndex::make(bodies_snapshot_path, txs_snapshot_path).build(), Contains("invalid: position depth"));
CHECK_THROWS_WITH(TransactionToBlockIndex::make(bodies_snapshot_path, txs_snapshot_path).build(), Contains("invalid: position depth"));
}

Expand All @@ -116,7 +116,7 @@ TEST_CASE("TransactionIndex::build KO: invalid snapshot", "[silkworm][snapshot][
test::SampleTransactionSnapshotFile valid_txs_snapshot{};
test::SampleTransactionSnapshotPath txs_snapshot_path{valid_txs_snapshot.path()}; // necessary to tweak the block numbers

CHECK_THROWS_WITH(TransactionIndex1::make(bodies_snapshot_path, txs_snapshot_path).build(), Contains("invalid: position read"));
CHECK_THROWS_WITH(TransactionIndex::make(bodies_snapshot_path, txs_snapshot_path).build(), Contains("invalid: position read"));
CHECK_THROWS_WITH(TransactionToBlockIndex::make(bodies_snapshot_path, txs_snapshot_path).build(), Contains("invalid: position read"));
}

Expand All @@ -132,7 +132,7 @@ TEST_CASE("TransactionIndex::build KO: invalid snapshot", "[silkworm][snapshot][
test::SampleTransactionSnapshotFile valid_txs_snapshot{};
test::SampleTransactionSnapshotPath txs_snapshot_path{valid_txs_snapshot.path()}; // necessary to tweak the block numbers

CHECK_THROWS_WITH(TransactionIndex1::make(bodies_snapshot_path, txs_snapshot_path).build(), Contains("invalid: position read"));
CHECK_THROWS_WITH(TransactionIndex::make(bodies_snapshot_path, txs_snapshot_path).build(), Contains("invalid: position read"));
CHECK_THROWS_WITH(TransactionToBlockIndex::make(bodies_snapshot_path, txs_snapshot_path).build(), Contains("invalid: position read"));
}

Expand All @@ -148,7 +148,7 @@ TEST_CASE("TransactionIndex::build KO: invalid snapshot", "[silkworm][snapshot][
test::SampleTransactionSnapshotFile valid_txs_snapshot{};
test::SampleTransactionSnapshotPath txs_snapshot_path{valid_txs_snapshot.path()}; // necessary to tweak the block numbers

CHECK_THROWS_AS(TransactionIndex1::make(bodies_snapshot_path, txs_snapshot_path).build(), DecodingException);
CHECK_THROWS_AS(TransactionIndex::make(bodies_snapshot_path, txs_snapshot_path).build(), DecodingException);
CHECK_THROWS_AS(TransactionToBlockIndex::make(bodies_snapshot_path, txs_snapshot_path).build(), DecodingException);
}

Expand All @@ -172,7 +172,7 @@ TEST_CASE("TransactionIndex::build KO: invalid snapshot", "[silkworm][snapshot][
};
test::SampleTransactionSnapshotPath txs_snapshot_path{invalid_txs_snapshot.path()}; // necessary to tweak the block numbers

auto tx_index = TransactionIndex1::make(bodies_snapshot_path, txs_snapshot_path);
auto tx_index = TransactionIndex::make(bodies_snapshot_path, txs_snapshot_path);
CHECK_THROWS_WITH(tx_index.build(), StartsWith("keys expected"));
auto tx_index_hash_to_block = TransactionToBlockIndex::make(bodies_snapshot_path, txs_snapshot_path);
CHECK_THROWS_WITH(tx_index_hash_to_block.build(), Contains("tx count mismatch"));
Expand All @@ -186,7 +186,7 @@ TEST_CASE("TransactionIndex::build OK", "[silkworm][snapshot][index]") {
test::SampleTransactionSnapshotFile valid_txs_snapshot{};
test::SampleTransactionSnapshotPath txs_snapshot_path{valid_txs_snapshot.path()}; // necessary to tweak the block numbers

auto tx_index = TransactionIndex1::make(bodies_snapshot_path, txs_snapshot_path);
auto tx_index = TransactionIndex::make(bodies_snapshot_path, txs_snapshot_path);
tx_index.build();
auto tx_index_hash_to_block = TransactionToBlockIndex::make(bodies_snapshot_path, txs_snapshot_path);
tx_index_hash_to_block.build();
Expand Down
10 changes: 5 additions & 5 deletions silkworm/db/snapshots/repository.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <silkworm/core/common/assert.hpp>
#include <silkworm/db/snapshots/body_index.hpp>
#include <silkworm/db/snapshots/header_index.hpp>
#include <silkworm/db/snapshots/index.hpp>
#include <silkworm/db/snapshots/index_builder.hpp>
#include <silkworm/db/snapshots/txn_index.hpp>
#include <silkworm/db/snapshots/txn_to_block_index.hpp>
#include <silkworm/infra/common/ensure.hpp>
Expand Down Expand Up @@ -203,13 +203,13 @@ std::optional<BlockNum> SnapshotRepository::find_block_number(Hash txn_hash) con

std::vector<std::shared_ptr<IndexBuilder>> SnapshotRepository::missing_indexes() const {
SnapshotPathList segment_files = get_segment_files();
std::vector<std::shared_ptr<Index>> missing_index_list;
std::vector<std::shared_ptr<IndexBuilder>> missing_index_list;
missing_index_list.reserve(segment_files.size());
for (const auto& seg_file : segment_files) {
const auto index_file = seg_file.index_file();
SILK_TRACE << "Segment file: " << seg_file.filename() << " has index: " << index_file.filename();
if (!std::filesystem::exists(index_file.path())) {
std::shared_ptr<Index> index;
std::shared_ptr<IndexBuilder> index;
switch (seg_file.type()) {
case SnapshotType::headers: {
index = std::make_shared<IndexBuilder>(HeaderIndex::make(seg_file));
Expand All @@ -222,9 +222,9 @@ std::vector<std::shared_ptr<IndexBuilder>> SnapshotRepository::missing_indexes()
break;
}
case SnapshotType::transactions: {
auto bodies_segment_path = TransactionIndex1::bodies_segment_path(seg_file);
auto bodies_segment_path = TransactionIndex::bodies_segment_path(seg_file);
if (std::find(segment_files.begin(), segment_files.end(), bodies_segment_path) != segment_files.end()) {
index = std::make_shared<IndexBuilder>(TransactionIndex1::make(bodies_segment_path, seg_file));
index = std::make_shared<IndexBuilder>(TransactionIndex::make(bodies_segment_path, seg_file));
missing_index_list.push_back(index);

index = std::make_shared<IndexBuilder>(TransactionToBlockIndex::make(bodies_segment_path, seg_file));
Expand Down
6 changes: 3 additions & 3 deletions silkworm/db/snapshots/repository_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <silkworm/db/snapshots/body_index.hpp>
#include <silkworm/db/snapshots/header_index.hpp>
#include <silkworm/db/snapshots/index.hpp>
#include <silkworm/db/snapshots/index_builder.hpp>
#include <silkworm/db/snapshots/test_util/common.hpp>
#include <silkworm/db/snapshots/txn_index.hpp>
#include <silkworm/db/snapshots/txn_to_block_index.hpp>
Expand Down Expand Up @@ -181,7 +181,7 @@ TEST_CASE("SnapshotRepository::find_segment", "[silkworm][node][snapshot]") {
auto body_index = BodyIndex::make(body_snapshot_path);
REQUIRE_NOTHROW(body_index.build());
test::SampleTransactionSnapshotPath txn_snapshot_path{txn_snapshot.path()}; // necessary to tweak the block numbers
REQUIRE_NOTHROW(TransactionIndex1::make(body_snapshot_path, txn_snapshot_path).build());
REQUIRE_NOTHROW(TransactionIndex::make(body_snapshot_path, txn_snapshot_path).build());
REQUIRE_NOTHROW(TransactionToBlockIndex::make(body_snapshot_path, txn_snapshot_path).build());

REQUIRE_NOTHROW(repository.reopen_folder());
Expand Down Expand Up @@ -229,7 +229,7 @@ TEST_CASE("SnapshotRepository::find_block_number", "[silkworm][node][snapshot]")
auto body_index = BodyIndex::make(body_snapshot_path);
REQUIRE_NOTHROW(body_index.build());
test::SampleTransactionSnapshotPath txn_snapshot_path{txn_snapshot.path()}; // necessary to tweak the block numbers
REQUIRE_NOTHROW(TransactionIndex1::make(body_snapshot_path, txn_snapshot_path).build());
REQUIRE_NOTHROW(TransactionIndex::make(body_snapshot_path, txn_snapshot_path).build());
REQUIRE_NOTHROW(TransactionToBlockIndex::make(body_snapshot_path, txn_snapshot_path).build());

REQUIRE_NOTHROW(repository.reopen_folder());
Expand Down
6 changes: 3 additions & 3 deletions silkworm/db/snapshots/snapshot_benchmark.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <silkworm/core/common/util.hpp>
#include <silkworm/db/snapshots/body_index.hpp>
#include <silkworm/db/snapshots/header_index.hpp>
#include <silkworm/db/snapshots/index.hpp>
#include <silkworm/db/snapshots/index_builder.hpp>
#include <silkworm/db/snapshots/seg/decompressor.hpp>
#include <silkworm/db/snapshots/test_util/common.hpp>
#include <silkworm/db/snapshots/txn_index.hpp>
Expand Down Expand Up @@ -123,7 +123,7 @@ static void build_tx_index(benchmark::State& state) {
body_index.build();

test::SampleTransactionSnapshotPath txn_snapshot_path{txn_snapshot.path()}; // necessary to tweak the block numbers
auto tx_index = TransactionIndex1::make(body_snapshot_path, txn_snapshot_path);
auto tx_index = TransactionIndex::make(body_snapshot_path, txn_snapshot_path);
tx_index.build();
auto tx_index_hash_to_block = TransactionToBlockIndex::make(body_snapshot_path, txn_snapshot_path);
tx_index_hash_to_block.build();
Expand Down Expand Up @@ -153,7 +153,7 @@ static void reopen_folder(benchmark::State& state) {
body_index.build();

test::SampleTransactionSnapshotPath txn_snapshot_path{txn_snapshot.path()}; // necessary to tweak the block numbers
auto tx_index = TransactionIndex1::make(body_snapshot_path, txn_snapshot_path);
auto tx_index = TransactionIndex::make(body_snapshot_path, txn_snapshot_path);
tx_index.build();
auto tx_index_hash_to_block = TransactionToBlockIndex::make(body_snapshot_path, txn_snapshot_path);
tx_index_hash_to_block.build();
Expand Down
Loading

0 comments on commit b2191a7

Please sign in to comment.