Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ case $host in
esac
fi

AX_CHECK_LINK_FLAG([[-lboost_system -Wl,-headerpad_max_install_names]], [LDFLAGS="$LDFLAGS -lboost_system -Wl,-headerpad_max_install_names"])
AX_CHECK_LINK_FLAG([[-Wl,-headerpad_max_install_names]], [LDFLAGS="$LDFLAGS -Wl,-headerpad_max_install_names"])
CPPFLAGS="$CPPFLAGS -DMAC_OSX"
OBJCXXFLAGS="$CXXFLAGS"
;;
Expand Down Expand Up @@ -773,7 +773,9 @@ define(MINIMUM_REQUIRED_BOOST, 1.47.0)

dnl Check for boost libs
AX_BOOST_BASE([MINIMUM_REQUIRED_BOOST])
AX_BOOST_SYSTEM
dnl Boost.System is header-only since Boost 1.69; skip library check
dnl AX_BOOST_SYSTEM
BOOST_SYSTEM_LIB=""
AX_BOOST_FILESYSTEM
AX_BOOST_PROGRAM_OPTIONS
AX_BOOST_THREAD
Expand Down
52 changes: 47 additions & 5 deletions src/assets/assetdb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,18 +83,60 @@ bool CAssetsDB::EraseAddressAssetQuantity(const std::string &address, const std:

bool EraseAddressAssetQuantity(const std::string &address, const std::string &assetName);

// Perf: Batch write/erase methods — these add operations to an existing
// CDBBatch without flushing. Call FlushBatch() once after accumulating
// all operations to commit them in a single LevelDB write.
void CAssetsDB::WriteAssetDataBatch(CDBBatch& batch, const CNewAsset &asset, const int nHeight, const uint256& blockHash)
{
CDatabasedAssetData data(asset, nHeight, blockHash);
batch.Write(std::make_pair(ASSET_FLAG, asset.strName), data);
}

void CAssetsDB::WriteAssetAddressQuantityBatch(CDBBatch& batch, const std::string &assetName, const std::string &address, const CAmount &quantity)
{
batch.Write(std::make_pair(ASSET_ADDRESS_QUANTITY_FLAG, std::make_pair(assetName, address)), quantity);
}

void CAssetsDB::WriteAddressAssetQuantityBatch(CDBBatch& batch, const std::string &address, const std::string &assetName, const CAmount& quantity)
{
batch.Write(std::make_pair(ADDRESS_ASSET_QUANTITY_FLAG, std::make_pair(address, assetName)), quantity);
}

void CAssetsDB::EraseAssetDataBatch(CDBBatch& batch, const std::string& assetName)
{
batch.Erase(std::make_pair(ASSET_FLAG, assetName));
}

void CAssetsDB::EraseAssetAddressQuantityBatch(CDBBatch& batch, const std::string &assetName, const std::string &address)
{
batch.Erase(std::make_pair(ASSET_ADDRESS_QUANTITY_FLAG, std::make_pair(assetName, address)));
}

void CAssetsDB::EraseAddressAssetQuantityBatch(CDBBatch& batch, const std::string &address, const std::string &assetName)
{
batch.Erase(std::make_pair(ADDRESS_ASSET_QUANTITY_FLAG, std::make_pair(address, assetName)));
}

bool CAssetsDB::FlushBatch(CDBBatch& batch)
{
return WriteBatch(batch, true);
}

bool CAssetsDB::WriteBlockUndoAssetData(const uint256& blockhash, const std::vector<std::pair<std::string, CBlockAssetUndo> >& assetUndoData)
{
return Write(std::make_pair(BLOCK_ASSET_UNDO_DATA, blockhash), assetUndoData);
}

bool CAssetsDB::ReadBlockUndoAssetData(const uint256 &blockhash, std::vector<std::pair<std::string, CBlockAssetUndo> > &assetUndoData)
{
// If it exists, return the read value.
if (Exists(std::make_pair(BLOCK_ASSET_UNDO_DATA, blockhash)))
return Read(std::make_pair(BLOCK_ASSET_UNDO_DATA, blockhash), assetUndoData);
// Perf: Read() already returns false on not-found, so the previous
// Exists() + Read() pattern caused two LevelDB lookups for the same key.
// We just call Read() directly; if the key doesn't exist we return true
// because absence of undo data is not an error.
if (Read(std::make_pair(BLOCK_ASSET_UNDO_DATA, blockhash), assetUndoData))
return true;

// If it doesn't exist, we just return true because we don't want to fail just because it didn't exist in the db
// Key not found — not an error, just no undo data for this block
return true;
}

Expand All @@ -110,7 +152,7 @@ bool CAssetsDB::ReadReissuedMempoolState()
// If it exists, return the read value.
bool rv = Read(MEMPOOL_REISSUED_TX, mapReissuedAssets);
if (rv) {
for (auto pair : mapReissuedAssets)
for (const auto& pair : mapReissuedAssets)
mapReissuedTx.insert(std::make_pair(pair.second, pair.first));
}
return rv;
Expand Down
11 changes: 11 additions & 0 deletions src/assets/assetdb.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,17 @@ class CAssetsDB : public CDBWrapper
bool WriteBlockUndoAssetData(const uint256& blockhash, const std::vector<std::pair<std::string, CBlockAssetUndo> >& assetUndoData);
bool WriteReissuedMempoolState();

// Perf: Batch write methods — accumulate writes into an external CDBBatch
// instead of creating individual batches per call. Call FlushBatch() once
// after all writes are queued to commit them in a single LevelDB write.
void WriteAssetDataBatch(CDBBatch& batch, const CNewAsset& asset, const int nHeight, const uint256& blockHash);
void WriteAssetAddressQuantityBatch(CDBBatch& batch, const std::string& assetName, const std::string& address, const CAmount& quantity);
void WriteAddressAssetQuantityBatch(CDBBatch& batch, const std::string& address, const std::string& assetName, const CAmount& quantity);
void EraseAssetDataBatch(CDBBatch& batch, const std::string& assetName);
void EraseAssetAddressQuantityBatch(CDBBatch& batch, const std::string& assetName, const std::string& address);
void EraseAddressAssetQuantityBatch(CDBBatch& batch, const std::string& address, const std::string& assetName);
bool FlushBatch(CDBBatch& batch);

// Read from database functions
bool ReadAssetData(const std::string& strName, CNewAsset& asset, int& nHeight, uint256& blockHash);
bool ReadAssetAddressQuantity(const std::string& assetName, const std::string& address, CAmount& quantity);
Expand Down
Loading