Skip to content

Commit d8f1222

Browse files
committed
refactor: Correct dbwrapper key naming
The ss- prefix should connotate a DataStream variable. Now that these variables are byte spans, drop the prefix.
1 parent be8f159 commit d8f1222

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

src/dbwrapper.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ void CDBBatch::Clear()
168168
size_estimate = 0;
169169
}
170170

171-
void CDBBatch::WriteImpl(Span<const std::byte> ssKey, CDataStream& ssValue)
171+
void CDBBatch::WriteImpl(Span<const std::byte> key, CDataStream& ssValue)
172172
{
173-
leveldb::Slice slKey(CharCast(ssKey.data()), ssKey.size());
173+
leveldb::Slice slKey(CharCast(key.data()), key.size());
174174
ssValue.Xor(dbwrapper_private::GetObfuscateKey(parent));
175175
leveldb::Slice slValue(CharCast(ssValue.data()), ssValue.size());
176176
m_impl_batch->batch.Put(slKey, slValue);
@@ -184,9 +184,9 @@ void CDBBatch::WriteImpl(Span<const std::byte> ssKey, CDataStream& ssValue)
184184
size_estimate += 3 + (slKey.size() > 127) + slKey.size() + (slValue.size() > 127) + slValue.size();
185185
}
186186

187-
void CDBBatch::EraseImpl(Span<const std::byte> ssKey)
187+
void CDBBatch::EraseImpl(Span<const std::byte> key)
188188
{
189-
leveldb::Slice slKey(CharCast(ssKey.data()), ssKey.size());
189+
leveldb::Slice slKey(CharCast(key.data()), key.size());
190190
m_impl_batch->batch.Delete(slKey);
191191
// LevelDB serializes erases as:
192192
// - byte: header
@@ -336,9 +336,9 @@ std::vector<unsigned char> CDBWrapper::CreateObfuscateKey() const
336336
return ret;
337337
}
338338

339-
std::optional<std::string> CDBWrapper::ReadImpl(Span<const std::byte> ssKey) const
339+
std::optional<std::string> CDBWrapper::ReadImpl(Span<const std::byte> key) const
340340
{
341-
leveldb::Slice slKey(CharCast(ssKey.data()), ssKey.size());
341+
leveldb::Slice slKey(CharCast(key.data()), key.size());
342342
std::string strValue;
343343
leveldb::Status status = DBContext().pdb->Get(DBContext().readoptions, slKey, &strValue);
344344
if (!status.ok()) {
@@ -350,9 +350,9 @@ std::optional<std::string> CDBWrapper::ReadImpl(Span<const std::byte> ssKey) con
350350
return strValue;
351351
}
352352

353-
bool CDBWrapper::ExistsImpl(Span<const std::byte> ssKey) const
353+
bool CDBWrapper::ExistsImpl(Span<const std::byte> key) const
354354
{
355-
leveldb::Slice slKey(CharCast(ssKey.data()), ssKey.size());
355+
leveldb::Slice slKey(CharCast(key.data()), key.size());
356356

357357
std::string strValue;
358358
leveldb::Status status = DBContext().pdb->Get(DBContext().readoptions, slKey, &strValue);
@@ -365,10 +365,10 @@ bool CDBWrapper::ExistsImpl(Span<const std::byte> ssKey) const
365365
return true;
366366
}
367367

368-
size_t CDBWrapper::EstimateSizeImpl(Span<const std::byte> ssKey1, Span<const std::byte> ssKey2) const
368+
size_t CDBWrapper::EstimateSizeImpl(Span<const std::byte> key1, Span<const std::byte> key2) const
369369
{
370-
leveldb::Slice slKey1(CharCast(ssKey1.data()), ssKey1.size());
371-
leveldb::Slice slKey2(CharCast(ssKey2.data()), ssKey2.size());
370+
leveldb::Slice slKey1(CharCast(key1.data()), key1.size());
371+
leveldb::Slice slKey2(CharCast(key2.data()), key2.size());
372372
uint64_t size = 0;
373373
leveldb::Range range(slKey1, slKey2);
374374
DBContext().pdb->GetApproximateSizes(&range, 1, &size);
@@ -396,9 +396,9 @@ CDBIterator* CDBWrapper::NewIterator()
396396
return new CDBIterator{*this, std::make_unique<CDBIterator::IteratorImpl>(DBContext().pdb->NewIterator(DBContext().iteroptions))};
397397
}
398398

399-
void CDBIterator::SeekImpl(Span<const std::byte> ssKey)
399+
void CDBIterator::SeekImpl(Span<const std::byte> key)
400400
{
401-
leveldb::Slice slKey(CharCast(ssKey.data()), ssKey.size());
401+
leveldb::Slice slKey(CharCast(key.data()), key.size());
402402
m_impl_iter->iter->Seek(slKey);
403403
}
404404

src/dbwrapper.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ class CDBBatch
8585

8686
size_t size_estimate{0};
8787

88-
void WriteImpl(Span<const std::byte> ssKey, CDataStream& ssValue);
89-
void EraseImpl(Span<const std::byte> ssKey);
88+
void WriteImpl(Span<const std::byte> key, CDataStream& ssValue);
89+
void EraseImpl(Span<const std::byte> key);
9090

9191
public:
9292
/**
@@ -129,7 +129,7 @@ class CDBIterator
129129
const CDBWrapper &parent;
130130
const std::unique_ptr<IteratorImpl> m_impl_iter;
131131

132-
void SeekImpl(Span<const std::byte> ssKey);
132+
void SeekImpl(Span<const std::byte> key);
133133
Span<const std::byte> GetKeyImpl() const;
134134
Span<const std::byte> GetValueImpl() const;
135135

@@ -206,9 +206,9 @@ class CDBWrapper
206206
//! whether or not the database resides in memory
207207
bool m_is_memory;
208208

209-
std::optional<std::string> ReadImpl(Span<const std::byte> ssKey) const;
210-
bool ExistsImpl(Span<const std::byte> ssKey) const;
211-
size_t EstimateSizeImpl(Span<const std::byte> ssKey1, Span<const std::byte> ssKey2) const;
209+
std::optional<std::string> ReadImpl(Span<const std::byte> key) const;
210+
bool ExistsImpl(Span<const std::byte> key) const;
211+
size_t EstimateSizeImpl(Span<const std::byte> key1, Span<const std::byte> key2) const;
212212
auto& DBContext() const LIFETIMEBOUND { return *Assert(m_db_context); }
213213

214214
public:

0 commit comments

Comments
 (0)