aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheCharlatan <seb.kung@gmail.com>2023-07-14 11:21:26 +0200
committerTheCharlatan <seb.kung@gmail.com>2023-08-05 10:42:48 +0200
commitb7a1ab5cb4e60230f62c94efb3a10d07c9af4883 (patch)
tree41dfc81d8240e4ad46d43280d381bf9e96abf515
parentd7437908cdf242626263ba9d5541addcddadc594 (diff)
refactor: Split dbwrapper CDBIterator::GetKey implementation
Keep the generic serialization in the header, while moving leveldb-specifics to the implementation file. The context of this commit is an effort to decouple the dbwrapper header file from leveldb includes. To this end, the includes are moved to the dbwrapper implementation file. This is done as part of the kernel project to reduce the number of required includes for users of the kernel.
-rw-r--r--src/dbwrapper.cpp5
-rw-r--r--src/dbwrapper.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
index 87d46f3192..dbf1d18de2 100644
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -312,6 +312,11 @@ void CDBIterator::SeekImpl(Span<const std::byte> ssKey)
piter->Seek(slKey);
}
+Span<const std::byte> CDBIterator::GetKeyImpl() const
+{
+ return MakeByteSpan(piter->key());
+}
+
CDBIterator::~CDBIterator() { delete piter; }
bool CDBIterator::Valid() const { return piter->Valid(); }
void CDBIterator::SeekToFirst() { piter->SeekToFirst(); }
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index aa2b31b160..9aadeef76d 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -141,6 +141,7 @@ private:
leveldb::Iterator *piter;
void SeekImpl(Span<const std::byte> ssKey);
+ Span<const std::byte> GetKeyImpl() const;
public:
@@ -166,9 +167,8 @@ public:
void Next();
template<typename K> bool GetKey(K& key) {
- leveldb::Slice slKey = piter->key();
try {
- DataStream ssKey{MakeByteSpan(slKey)};
+ DataStream ssKey{GetKeyImpl()};
ssKey >> key;
} catch (const std::exception&) {
return false;