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.
This commit is contained in:
TheCharlatan 2023-07-14 11:21:26 +02:00
parent d7437908cd
commit b7a1ab5cb4
No known key found for this signature in database
GPG key ID: 9B79B45691DB4173
2 changed files with 7 additions and 2 deletions

View file

@ -312,6 +312,11 @@ void CDBIterator::SeekImpl(Span<const std::byte> ssKey)
piter->Seek(slKey); piter->Seek(slKey);
} }
Span<const std::byte> CDBIterator::GetKeyImpl() const
{
return MakeByteSpan(piter->key());
}
CDBIterator::~CDBIterator() { delete piter; } CDBIterator::~CDBIterator() { delete piter; }
bool CDBIterator::Valid() const { return piter->Valid(); } bool CDBIterator::Valid() const { return piter->Valid(); }
void CDBIterator::SeekToFirst() { piter->SeekToFirst(); } void CDBIterator::SeekToFirst() { piter->SeekToFirst(); }

View file

@ -141,6 +141,7 @@ private:
leveldb::Iterator *piter; leveldb::Iterator *piter;
void SeekImpl(Span<const std::byte> ssKey); void SeekImpl(Span<const std::byte> ssKey);
Span<const std::byte> GetKeyImpl() const;
public: public:
@ -166,9 +167,8 @@ public:
void Next(); void Next();
template<typename K> bool GetKey(K& key) { template<typename K> bool GetKey(K& key) {
leveldb::Slice slKey = piter->key();
try { try {
DataStream ssKey{MakeByteSpan(slKey)}; DataStream ssKey{GetKeyImpl()};
ssKey >> key; ssKey >> key;
} catch (const std::exception&) { } catch (const std::exception&) {
return false; return false;