mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-05-30 15:54:03 +02:00
scripted-diff: Use std::span over Span
-BEGIN VERIFY SCRIPT-
ren() { sed -i "s!\<$1\>!$2!g" $( git grep -l "$1" -- "./src" ":(exclude)src/span.h" ":(exclude)src/leveldb/db/log_test.cc" ) ; }
ren Span std::span
ren AsBytes std::as_bytes
ren AsWritableBytes std::as_writable_bytes
sed -i 's!SpanPopBack(Span!SpanPopBack(std::span!g' ./src/span.h
-END VERIFY SCRIPT-
This commit is contained in:
@@ -296,7 +296,7 @@ SafeDbt::operator Dbt*()
|
||||
return &m_dbt;
|
||||
}
|
||||
|
||||
static Span<const std::byte> SpanFromDbt(const SafeDbt& dbt)
|
||||
static std::span<const std::byte> SpanFromDbt(const SafeDbt& dbt)
|
||||
{
|
||||
return {reinterpret_cast<const std::byte*>(dbt.get_data()), dbt.get_size()};
|
||||
}
|
||||
@@ -726,7 +726,7 @@ void BerkeleyDatabase::ReloadDbEnv()
|
||||
env->ReloadDbEnv();
|
||||
}
|
||||
|
||||
BerkeleyCursor::BerkeleyCursor(BerkeleyDatabase& database, const BerkeleyBatch& batch, Span<const std::byte> prefix)
|
||||
BerkeleyCursor::BerkeleyCursor(BerkeleyDatabase& database, const BerkeleyBatch& batch, std::span<const std::byte> prefix)
|
||||
: m_key_prefix(prefix.begin(), prefix.end())
|
||||
{
|
||||
if (!database.m_db.get()) {
|
||||
@@ -760,7 +760,7 @@ DatabaseCursor::Status BerkeleyCursor::Next(DataStream& ssKey, DataStream& ssVal
|
||||
return Status::FAIL;
|
||||
}
|
||||
|
||||
Span<const std::byte> raw_key = SpanFromDbt(datKey);
|
||||
std::span<const std::byte> raw_key = SpanFromDbt(datKey);
|
||||
if (!m_key_prefix.empty() && std::mismatch(raw_key.begin(), raw_key.end(), m_key_prefix.begin(), m_key_prefix.end()).second != m_key_prefix.end()) {
|
||||
return Status::DONE;
|
||||
}
|
||||
@@ -786,7 +786,7 @@ std::unique_ptr<DatabaseCursor> BerkeleyBatch::GetNewCursor()
|
||||
return std::make_unique<BerkeleyCursor>(m_database, *this);
|
||||
}
|
||||
|
||||
std::unique_ptr<DatabaseCursor> BerkeleyBatch::GetNewPrefixCursor(Span<const std::byte> prefix)
|
||||
std::unique_ptr<DatabaseCursor> BerkeleyBatch::GetNewPrefixCursor(std::span<const std::byte> prefix)
|
||||
{
|
||||
if (!pdb) return nullptr;
|
||||
return std::make_unique<BerkeleyCursor>(m_database, *this, prefix);
|
||||
@@ -899,7 +899,7 @@ bool BerkeleyBatch::HasKey(DataStream&& key)
|
||||
return ret == 0;
|
||||
}
|
||||
|
||||
bool BerkeleyBatch::ErasePrefix(Span<const std::byte> prefix)
|
||||
bool BerkeleyBatch::ErasePrefix(std::span<const std::byte> prefix)
|
||||
{
|
||||
// Because this function erases records one by one, ensure that it is executed within a txn context.
|
||||
// Otherwise, consistency is at risk; it's possible that certain records are removed while others
|
||||
|
||||
Reference in New Issue
Block a user