Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Archival bucketlist #4403

Merged
merged 5 commits into from
Nov 23, 2024
Merged

Archival bucketlist #4403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d05cd23
Added basic Hot Archive BucketList structure
SirTyson Jul 21, 2024
0e24f0f
Templated common BucketList code
SirTyson Jul 22, 2024
896b81e
Added Hot Archive merge and search logic
SirTyson Jul 25, 2024
0218ebe
Manage bucket types seperately in BucketManager
SirTyson Nov 1, 2024
1673888
Aditional BucketList refactoring
SirTyson Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
205 changes: 0 additions & 205 deletions src/bucket/Bucket.h
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions src/bucket/BucketApplicator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#include "util/asio.h" // IWYU pragma: keep
#include "bucket/BucketApplicator.h"
#include "bucket/Bucket.h"
#include "bucket/BucketList.h"
#include "bucket/LiveBucket.h"
#include "bucket/LiveBucketList.h"
#include "ledger/LedgerTxn.h"
#include "ledger/LedgerTxnEntry.h"
#include "main/Application.h"
Expand All @@ -20,7 +20,7 @@ BucketApplicator::BucketApplicator(Application& app,
uint32_t maxProtocolVersion,
uint32_t minProtocolVersionSeen,
uint32_t level,
std::shared_ptr<Bucket const> bucket,
std::shared_ptr<LiveBucket const> bucket,
std::function<bool(LedgerEntryType)> filter,
std::unordered_set<LedgerKey>& seenKeys)
: mApp(app)
Expand Down Expand Up @@ -135,7 +135,7 @@ BucketApplicator::advance(BucketApplicator::Counters& counters)
}

BucketEntry const& e = *mBucketIter;
Bucket::checkProtocolLegality(e, mMaxProtocolVersion);
LiveBucket::checkProtocolLegality(e, mMaxProtocolVersion);

if (shouldApplyEntry(mEntryTypeFilter, e))
{
Expand Down Expand Up @@ -167,15 +167,15 @@ BucketApplicator::advance(BucketApplicator::Counters& counters)
// The last level can have live entries, but at that point we
// know that they are actually init entries because the earliest
// state of all entries is init, so we mark them as such here
if (mLevel == BucketList::kNumLevels - 1 &&
if (mLevel == LiveBucketList::kNumLevels - 1 &&
e.type() == LIVEENTRY)
{
ltx->createWithoutLoading(e.liveEntry());
}
else if (
protocolVersionIsBefore(
mMinProtocolVersionSeen,
Bucket::
LiveBucket::
FIRST_PROTOCOL_SUPPORTING_INITENTRY_AND_METAENTRY))
{
// Prior to protocol 11, INITENTRY didn't exist, so we need
Expand Down Expand Up @@ -207,7 +207,7 @@ BucketApplicator::advance(BucketApplicator::Counters& counters)
releaseAssertOrThrow(!isUsingBucketListDB);
if (protocolVersionIsBefore(
mMinProtocolVersionSeen,
Bucket::
LiveBucket::
FIRST_PROTOCOL_SUPPORTING_INITENTRY_AND_METAENTRY))
{
// Prior to protocol 11, DEAD entries could exist
Expand Down
6 changes: 3 additions & 3 deletions src/bucket/BucketApplicator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
// under the Apache License, Version 2.0. See the COPYING file at the root
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0

#include "bucket/Bucket.h"
#include "bucket/BucketInputIterator.h"
#include "bucket/LiveBucket.h"
#include "util/Timer.h"
#include <memory>

Expand All @@ -24,7 +24,7 @@ class BucketApplicator
uint32_t mMaxProtocolVersion;
uint32_t mMinProtocolVersionSeen;
uint32_t mLevel;
BucketInputIterator mBucketIter;
LiveBucketInputIterator mBucketIter;
size_t mCount{0};
std::function<bool(LedgerEntryType)> mEntryTypeFilter;
std::unordered_set<LedgerKey>& mSeenKeys;
Expand Down Expand Up @@ -72,7 +72,7 @@ class BucketApplicator
// When this flag is set, each offer key read is added to seenKeys
BucketApplicator(Application& app, uint32_t maxProtocolVersion,
uint32_t minProtocolVersionSeen, uint32_t level,
std::shared_ptr<Bucket const> bucket,
std::shared_ptr<LiveBucket const> bucket,
std::function<bool(LedgerEntryType)> filter,
std::unordered_set<LedgerKey>& seenKeys);
operator bool() const;
Expand Down
Loading
Loading