Skip to content

Commit

Permalink
Restore naming
Browse files Browse the repository at this point in the history
  • Loading branch information
phoebusm committed Jul 2, 2024
1 parent 1ef07c7 commit 0f803d3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions cpp/arcticdb/version/local_versioned_engine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -812,15 +812,15 @@ std::unordered_map<StreamId, VersionId> min_versions_for_each_stream(const std::
folly::Future<folly::Unit> delete_trees_responsibly(
std::shared_ptr<Store> store,
std::shared_ptr<VersionMap> &version_map,
const std::vector<IndexTypeKey>& idx_to_be_deleted,
const std::vector<IndexTypeKey>& orig_keys_to_delete,
const arcticdb::MasterSnapshotMap& snapshot_map,
const std::optional<SnapshotId>& snapshot_being_deleted,
const PreDeleteChecks& check,
const bool dry_run) {
ARCTICDB_SAMPLE(DeleteTree, 0)
ARCTICDB_RUNTIME_DEBUG(log::version(), "Command: delete_tree");

util::ContainerFilterWrapper keys_to_delete(idx_to_be_deleted);
util::ContainerFilterWrapper keys_to_delete(orig_keys_to_delete);
util::ContainerFilterWrapper not_to_delete(check.could_share_data);

// Each section below performs these checks:
Expand Down Expand Up @@ -858,7 +858,7 @@ folly::Future<folly::Unit> delete_trees_responsibly(
if (load_type != LoadType::NOT_LOADED) {
std::unordered_map<StreamId, std::shared_ptr<VersionMapEntry>> entry_map;
{
auto min_versions = min_versions_for_each_stream(idx_to_be_deleted);
auto min_versions = min_versions_for_each_stream(orig_keys_to_delete);
for (const auto& min : min_versions) {
auto load_param = load_type == LoadType::LOAD_DOWNTO
? LoadParameter{load_type, static_cast<SignedVersionId>(min.second)}
Expand Down
2 changes: 1 addition & 1 deletion cpp/arcticdb/version/local_versioned_engine.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ struct SortMergeOptions {
folly::Future<folly::Unit> delete_trees_responsibly(
std::shared_ptr<Store> store,
std::shared_ptr<VersionMap> &version_map,
const std::vector<IndexTypeKey>& idx_to_be_deleted,
const std::vector<IndexTypeKey>& orig_keys_to_delete,
const arcticdb::MasterSnapshotMap& snapshot_map,
const std::optional<SnapshotId>& snapshot_being_deleted = std::nullopt,
const PreDeleteChecks& check = default_pre_delete_checks,
Expand Down

0 comments on commit 0f803d3

Please sign in to comment.