0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-05 14:06:27 -05:00

wallet: implement BerkeleyROBatch

Implement ReadKey and HasKey of BerkeleyROBatch, and Next of BerkeleyROCursor.
Also adds the containers for records to BerkeleyRODatabase so that
BerkeleyROBatch will be able to access the records.
This commit is contained in:
Ava Chow 2024-01-02 16:35:22 -05:00
parent 756ff9b478
commit 0c8e728476
5 changed files with 52 additions and 10 deletions

View file

@ -16,6 +16,9 @@
#include <vector>
namespace wallet {
bool operator<(BytePrefix a, Span<const std::byte> b) { return a.prefix < b.subspan(0, std::min(a.prefix.size(), b.size())); }
bool operator<(Span<const std::byte> a, BytePrefix b) { return a.subspan(0, std::min(a.size(), b.prefix.size())) < b.prefix; }
std::vector<fs::path> ListDatabases(const fs::path& wallet_dir)
{
std::vector<fs::path> paths;

View file

@ -20,6 +20,12 @@ class ArgsManager;
struct bilingual_str;
namespace wallet {
// BytePrefix compares equality with other byte spans that begin with the same prefix.
struct BytePrefix {
Span<const std::byte> prefix;
};
bool operator<(BytePrefix a, Span<const std::byte> b);
bool operator<(Span<const std::byte> a, BytePrefix b);
class DatabaseCursor
{

View file

@ -21,17 +21,42 @@ bool BerkeleyRODatabase::Backup(const std::string& dest) const
bool BerkeleyROBatch::ReadKey(DataStream&& key, DataStream& value)
{
return false;
SerializeData key_data{key.begin(), key.end()};
const auto it{m_database.m_records.find(key_data)};
if (it == m_database.m_records.end()) {
return false;
}
auto val = it->second;
value.clear();
value.write(Span(val));
return true;
}
bool BerkeleyROBatch::HasKey(DataStream&& key)
{
return false;
SerializeData key_data{key.begin(), key.end()};
return m_database.m_records.count(key_data) > 0;
}
BerkeleyROCursor::BerkeleyROCursor(const BerkeleyRODatabase& database, Span<const std::byte> prefix)
: m_database(database)
{
std::tie(m_cursor, m_cursor_end) = m_database.m_records.equal_range(BytePrefix{prefix});
}
DatabaseCursor::Status BerkeleyROCursor::Next(DataStream& ssKey, DataStream& ssValue)
{
return DatabaseCursor::Status::FAIL;
if (m_cursor == m_cursor_end) {
return DatabaseCursor::Status::DONE;
}
ssKey.write(Span(m_cursor->first));
ssValue.write(Span(m_cursor->second));
m_cursor++;
return DatabaseCursor::Status::MORE;
}
std::unique_ptr<DatabaseCursor> BerkeleyROBatch::GetNewPrefixCursor(Span<const std::byte> prefix)
{
return std::make_unique<BerkeleyROCursor>(m_database, prefix);
}
} // namespace wallet

View file

@ -10,6 +10,9 @@
#include <optional>
namespace wallet {
using BerkeleyROData = std::map<SerializeData, SerializeData, std::less<>>;
/**
* A class representing a BerkeleyDB file from which we can only read records.
* This is used only for migration of legacy to descriptor wallets
@ -27,6 +30,8 @@ public:
}
~BerkeleyRODatabase(){};
BerkeleyROData m_records;
/** Open the database if it is not already opened. */
void Open() override;
@ -69,7 +74,15 @@ public:
class BerkeleyROCursor : public DatabaseCursor
{
private:
const BerkeleyRODatabase& m_database;
BerkeleyROData::const_iterator m_cursor;
BerkeleyROData::const_iterator m_cursor_end;
public:
explicit BerkeleyROCursor(const BerkeleyRODatabase& database, Span<const std::byte> prefix = {});
~BerkeleyROCursor() {}
Status Next(DataStream& key, DataStream& value) override;
};
@ -97,8 +110,8 @@ public:
void Flush() override {}
void Close() override {}
std::unique_ptr<DatabaseCursor> GetNewCursor() override { return std::make_unique<BerkeleyROCursor>(); }
std::unique_ptr<DatabaseCursor> GetNewPrefixCursor(Span<const std::byte> prefix) override { return std::make_unique<BerkeleyROCursor>(); }
std::unique_ptr<DatabaseCursor> GetNewCursor() override { return std::make_unique<BerkeleyROCursor>(m_database); }
std::unique_ptr<DatabaseCursor> GetNewPrefixCursor(Span<const std::byte> prefix) override;
bool TxnBegin() override { return false; }
bool TxnCommit() override { return false; }
bool TxnAbort() override { return false; }

View file

@ -93,11 +93,6 @@ CTxDestination getNewDestination(CWallet& w, OutputType output_type)
return *Assert(w.GetNewDestination(output_type, ""));
}
// BytePrefix compares equality with other byte spans that begin with the same prefix.
struct BytePrefix { Span<const std::byte> prefix; };
bool operator<(BytePrefix a, Span<const std::byte> b) { return a.prefix < b.subspan(0, std::min(a.prefix.size(), b.size())); }
bool operator<(Span<const std::byte> a, BytePrefix b) { return a.subspan(0, std::min(a.size(), b.prefix.size())) < b.prefix; }
MockableCursor::MockableCursor(const MockableData& records, bool pass, Span<const std::byte> prefix)
{
m_pass = pass;