Skip to content

Commit 47f659c

Browse files
committed
feat(db): optimize bloom filter for transaction cache
1 parent 0a145f4 commit 47f659c

5 files changed

Lines changed: 9 additions & 3 deletions

File tree

chainbase/src/main/java/org/tron/core/db/TronStoreWithRevoking.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ public abstract class TronStoreWithRevoking<T extends ProtoCapsule> implements I
5151
@Autowired
5252
private DbStatService dbStatService;
5353

54-
private DB<byte[], byte[]> db;
54+
@Getter
55+
private final DB<byte[], byte[]> db;
5556

5657
protected TronStoreWithRevoking(String dbName) {
5758
String dbEngine = CommonParameter.getInstance().getStorage().getDbEngine();

chainbase/src/main/java/org/tron/core/db2/common/TxCacheDB.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ public TxCacheDB(String name, RecentTransactionStore recentTransactionStore) {
8686
this.bloomFilters[1] = BloomFilter.create(Funnels.byteArrayFunnel(),
8787
MAX_BLOCK_SIZE * TRANSACTION_COUNT);
8888

89-
init();
9089
}
9190

9291
/**
@@ -110,7 +109,7 @@ private void initCache() {
110109
System.currentTimeMillis() - start);
111110
}
112111

113-
private void init() {
112+
public void init() {
114113
long size = recentTransactionStore.size();
115114
if (size != MAX_BLOCK_SIZE) {
116115
// 0. load from persistentStore

chainbase/src/main/java/org/tron/core/db2/core/SnapshotManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,7 @@ private void checkV1() {
509509
}
510510
}
511511
recover(checkTmpStore);
512+
logger.info("checkpoint v1 recover success");
512513
unChecked = false;
513514
}
514515

framework/src/main/java/org/tron/core/db/Manager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,7 @@ public void init() {
450450
trieService.setChainBaseManager(chainBaseManager);
451451
revokingStore.disable();
452452
revokingStore.check();
453+
transactionCache.initCache();
453454
this.setProposalController(ProposalController.createInstance(this));
454455
this.setMerkleContainer(
455456
merkleContainer.createInstance(chainBaseManager.getMerkleTreeStore(),

framework/src/main/java/org/tron/core/db/TransactionCache.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,8 @@ public TransactionCache(@Value("trans-cache") String dbName,
1414
RecentTransactionStore recentTransactionStore) {
1515
super(new TxCacheDB(dbName, recentTransactionStore));
1616
}
17+
18+
public void initCache() {
19+
((TxCacheDB) getDb()).init();
20+
}
1721
}

0 commit comments

Comments
 (0)