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

[WIP] [kernelheaders 1/n] Cleave LevelDB headers from our header tree #24676

Closed
wants to merge 18 commits into from
Closed

[WIP] [kernelheaders 1/n] Cleave LevelDB headers from our header tree #24676

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
eaf3313
Split Get, Exists
dongcarl Sep 14, 2021
0287411
Split EstimateSize, CompactRange
dongcarl Feb 3, 2022
0dc1e67
Move Wrapper::NewIterator to .cpp
dongcarl Mar 25, 2022
41d09a5
pimpl CDBWrapper
dongcarl Feb 4, 2022
7105adf
Remove CreateObfuscateKey from CDBWrapper iface
dongcarl Mar 25, 2022
35966e3
Remove temporary doRawGet from CDBWrapper iface
dongcarl Mar 25, 2022
73172af
unique_ptr NewIterator
dongcarl Feb 4, 2022
048cd95
CDBIterator: Factor out leveldb specific parts from templated methods
dongcarl Feb 3, 2022
da42535
Move all dbiterator impl to cpp
dongcarl Feb 3, 2022
fd849a4
pimpl CDBIterator
dongcarl Feb 3, 2022
43eb4d7
Remove leveldb reference from CDBIterator ctor as well
dongcarl Feb 3, 2022
5c596f4
Manage Iterator::piter's memory with unique_ptr
dongcarl Feb 3, 2022
3662432
CDBBatch: Create CDataStream as needed instead of having members
dongcarl Mar 25, 2022
6315852
Factor out leveldb specific parts
dongcarl Feb 3, 2022
becf58e
Move all dbbatch impl to cpp
dongcarl Feb 3, 2022
f164451
pimpl CDBBatch
dongcarl Feb 3, 2022
da69dce
Move HandleError to cpp
dongcarl Feb 4, 2022
47ccacd
Remove all leveldb references from header tree
dongcarl Mar 25, 2022
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
Prev Previous commit
Next Next commit
Remove leveldb reference from CDBIterator ctor as well
  • Loading branch information
@dongcarl
dongcarl committed Mar 25, 2022
commit 43eb4d7cc9114cbcfff7ea49117640ecfd6d242d
14 changes: 7 additions & 7 deletions src/dbwrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ class DBIteratorImpl
void Next();
};

CDBIterator::CDBIterator(const CDBWrapper& _parent, leveldb::Iterator* _piter)
: m_impl(std::make_unique<DBIteratorImpl>(_parent, _piter)) {};
CDBIterator::CDBIterator(std::unique_ptr<DBIteratorImpl> impl)
: m_impl(std::move(impl)) {};

DBIteratorImpl::DBIteratorImpl(const CDBWrapper& _parent, leveldb::Iterator* _piter)
: parent(_parent), piter(_piter){};
Expand Down Expand Up @@ -248,7 +248,7 @@ class DBWrapperImpl

size_t DynamicMemoryUsage() const;

std::unique_ptr<CDBIterator> NewIterator();
std::unique_ptr<DBIteratorImpl> NewIterator();

bool IsEmpty();

Expand Down Expand Up @@ -463,12 +463,12 @@ size_t DBWrapperImpl::DynamicMemoryUsage() const

std::unique_ptr<CDBIterator> CDBWrapper::NewIterator()
{
return m_impl->NewIterator();
return std::make_unique<CDBIterator>(m_impl->NewIterator());
}

std::unique_ptr<CDBIterator> DBWrapperImpl::NewIterator()
std::unique_ptr<DBIteratorImpl> DBWrapperImpl::NewIterator()
{
return std::make_unique<CDBIterator>(m_parent, pdb->NewIterator(iteroptions));
return std::make_unique<DBIteratorImpl>(m_parent, pdb->NewIterator(iteroptions));
}

// Prefixed with null character to avoid collisions with other keys
Expand All @@ -493,7 +493,7 @@ bool CDBWrapper::IsEmpty()

bool DBWrapperImpl::IsEmpty()
{
std::unique_ptr<CDBIterator> it(NewIterator());
std::unique_ptr<DBIteratorImpl> it(NewIterator());
it->SeekToFirst();
return !(it->Valid());
}
Expand Down
6 changes: 2 additions & 4 deletions src/dbwrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,10 @@ class CDBIterator
CDataStream doGetValue();

public:

/**
* @param[in] _parent Parent CDBWrapper instance.
* @param[in] _piter The original leveldb iterator.
* @param[in] impl DBIteratorImpl instance.
*/
CDBIterator(const CDBWrapper &_parent, leveldb::Iterator *_piter);
CDBIterator(std::unique_ptr<DBIteratorImpl> impl);
~CDBIterator();

bool Valid() const;
Expand Down