Skip to content

Cache last blocks data (block headers, block bodies, transactions' receipts and total difficulty) #5933

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

Closed
ahamlat wants to merge 9 commits into from
Closed

Cache last blocks data (block headers, block bodies, transactions' receipts and total difficulty) #5933

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b06202a
Cache last blocks data (block headers, block bodies, transactions' re…
ahamlat Sep 25, 2023
9a6c602
Refactoring
ahamlat Sep 25, 2023
25e3c67
Modify default value from 512 to 1024
ahamlat Sep 25, 2023
1a6c033
Cache last blocks data (block headers, block bodies, transactions' re…
ahamlat Sep 25, 2023
2c84833
Refactoring
ahamlat Sep 25, 2023
ce53f17
Modify default value from 512 to 1024
ahamlat Sep 25, 2023
9b468c0
Merge remote-tracking branch 'origin/cache-last-blocks-data' into cac…
ahamlat Sep 25, 2023
d789063
Modify default value from 1024 to 2048
ahamlat Sep 25, 2023
c276e89
Merge branch 'main' into cache-last-blocks-data
ahamlat Oct 6, 2023
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
47 changes: 43 additions & 4 deletions ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.hyperledger.besu.ethereum.core.Transaction;
import org.hyperledger.besu.ethereum.core.TransactionReceipt;
import org.hyperledger.besu.metrics.BesuMetricCategory;
import org.hyperledger.besu.metrics.prometheus.PrometheusMetricsSystem;
import org.hyperledger.besu.plugin.services.MetricsSystem;
import org.hyperledger.besu.util.InvalidConfigurationException;
import org.hyperledger.besu.util.Subscribers;
Expand All @@ -49,8 +50,11 @@
import java.util.stream.Stream;

import com.google.common.annotations.VisibleForTesting;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.common.collect.Lists;
import com.google.common.collect.Streams;
import io.prometheus.client.guava.cache.CacheMetricsCollector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -73,6 +77,20 @@ public class DefaultBlockchain implements MutableBlockchain {

private Comparator<BlockHeader> blockChoiceRule;

private static final int BLOCK_HEADERS_CACHE_SIZE = 2048;
private static final int BLOCK_BODIES_CACHE_SIZE = 2048;
private static final int TRX_RECEIPTS_CACHE_SIZE = 2048;
private static final int TOTAL_DIFFICULTY_CACHE_SIZE = 2048;

private final Cache<Hash, BlockHeader> blockHeadersCache =
CacheBuilder.newBuilder().recordStats().maximumSize(BLOCK_HEADERS_CACHE_SIZE).build();
private final Cache<Hash, BlockBody> blockBodiesCache =
CacheBuilder.newBuilder().recordStats().maximumSize(BLOCK_BODIES_CACHE_SIZE).build();
private final Cache<Hash, List<TransactionReceipt>> transactionReceiptsCache =
CacheBuilder.newBuilder().recordStats().maximumSize(TRX_RECEIPTS_CACHE_SIZE).build();
private final Cache<Hash, Difficulty> totalDifficultyCache =
CacheBuilder.newBuilder().recordStats().maximumSize(TOTAL_DIFFICULTY_CACHE_SIZE).build();

private DefaultBlockchain(
final Optional<Block> genesisBlock,
final BlockchainStorage blockchainStorage,
Expand Down Expand Up @@ -144,6 +162,14 @@ private DefaultBlockchain(

this.reorgLoggingThreshold = reorgLoggingThreshold;
this.blockChoiceRule = heaviestChainBlockChoiceRule;

CacheMetricsCollector cacheMetrics = new CacheMetricsCollector();
cacheMetrics.addCache("blockHeaders", blockHeadersCache);
cacheMetrics.addCache("blockBodies", blockBodiesCache);
cacheMetrics.addCache("transactionReceipts", transactionReceiptsCache);
cacheMetrics.addCache("totalDifficulty", totalDifficultyCache);
if (metricsSystem instanceof PrometheusMetricsSystem prometheusMetricsSystem)
prometheusMetricsSystem.addCollector(BesuMetricCategory.BLOCKCHAIN, () -> cacheMetrics);
}

public static MutableBlockchain createMutable(
Expand Down Expand Up @@ -232,17 +258,20 @@ public Optional<BlockHeader> getBlockHeader(final long blockNumber) {

@Override
public Optional<BlockHeader> getBlockHeader(final Hash blockHeaderHash) {
return blockchainStorage.getBlockHeader(blockHeaderHash);
return Optional.ofNullable(blockHeadersCache.getIfPresent(blockHeaderHash))
.or(() -> blockchainStorage.getBlockHeader(blockHeaderHash));
}

@Override
public Optional<BlockBody> getBlockBody(final Hash blockHeaderHash) {
return blockchainStorage.getBlockBody(blockHeaderHash);
return Optional.ofNullable(blockBodiesCache.getIfPresent(blockHeaderHash))
.or(() -> blockchainStorage.getBlockBody(blockHeaderHash));
}

@Override
public Optional<List<TransactionReceipt>> getTxReceipts(final Hash blockHeaderHash) {
return blockchainStorage.getTransactionReceipts(blockHeaderHash);
return Optional.ofNullable(transactionReceiptsCache.getIfPresent(blockHeaderHash))
.or(() -> blockchainStorage.getTransactionReceipts(blockHeaderHash));
}

@Override
Expand All @@ -252,7 +281,8 @@ public Optional<Hash> getBlockHashByNumber(final long number) {

@Override
public Optional<Difficulty> getTotalDifficultyByHash(final Hash blockHeaderHash) {
return blockchainStorage.getTotalDifficulty(blockHeaderHash);
return Optional.ofNullable(totalDifficultyCache.getIfPresent(blockHeaderHash))
.or(() -> blockchainStorage.getTotalDifficulty(blockHeaderHash));
}

@Override
Expand Down Expand Up @@ -283,14 +313,23 @@ public void setBlockChoiceRule(final Comparator<BlockHeader> blockChoiceRule) {

@Override
public synchronized void appendBlock(final Block block, final List<TransactionReceipt> receipts) {
cacheBlockData(block, receipts);
appendBlockHelper(new BlockWithReceipts(block, receipts), false);
}

@Override
public synchronized void storeBlock(final Block block, final List<TransactionReceipt> receipts) {
cacheBlockData(block, receipts);
appendBlockHelper(new BlockWithReceipts(block, receipts), true);
}

private void cacheBlockData(final Block block, final List<TransactionReceipt> receipts) {
blockHeadersCache.put(block.getHash(), block.getHeader());
blockBodiesCache.put(block.getHash(), block.getBody());
transactionReceiptsCache.put(block.getHash(), receipts);
totalDifficultyCache.put(block.getHash(), block.getHeader().getDifficulty());
}

private boolean blockShouldBeProcessed(
final Block block, final List<TransactionReceipt> receipts) {
checkArgument(
Expand Down