Enabling JournalPruneDataSource #478
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -76,7 +76,12 @@ private static class AionRepositoryImplHolder { | |
| // repository singleton instance | ||
| private final static AionRepositoryImpl inst = new AionRepositoryImpl( | ||
| new RepositoryConfig(new File(config.getBasePath(), config.getDb().getPath()).getAbsolutePath(), | ||
| config.getDb().getPrune() > 0 ? | ||
| // if the value is smaller than backward step | ||
|
There was a problem hiding this comment. Pruning value should dictate parameters for our sync. So if we set a value of There was a problem hiding this comment. the interaction between pruning and sync is tuned in #498 |
||
| // there is the risk of importing state-less blocks after reboot | ||
| (128 > config.getDb().getPrune() ? 128 : config.getDb().getPrune()) : | ||
| // negative value => pruning disabled | ||
| config.getDb().getPrune(), | ||
| ContractDetailsAion.getInstance(), | ||
| config.getDb())); | ||
| } | ||
|
|
@@ -115,7 +120,7 @@ public TransactionStore<AionTransaction, AionTxReceipt, AionTxInfo> getTransacti | |
| } | ||
|
|
||
| private Trie createStateTrie() { | ||
| return new SecureTrie(stateDSPrune).withPruningEnabled(pruneBlockCount > 0); | ||
| } | ||
|
|
||
| @Override | ||
|
|
@@ -501,34 +506,31 @@ public void commitBlock(A0BlockHeader blockHeader) { | |
| worldState.sync(); | ||
| detailsDS.syncLargeStorage(); | ||
|
|
||
| if (pruneBlockCount > 0) { | ||
| stateDSPrune.storeBlockChanges(blockHeader); | ||
| detailsDS.getStorageDSPrune().storeBlockChanges(blockHeader); | ||
| pruneBlocks(blockHeader); | ||
| } | ||
| } finally { | ||
| rwLock.writeLock().unlock(); | ||
| } | ||
| } | ||
|
|
||
| private void pruneBlocks(A0BlockHeader curBlock) { | ||
| if (curBlock.getNumber() > bestBlockNumber) { | ||
| // pruning only on increasing blocks | ||
| long pruneBlockNumber = curBlock.getNumber() - pruneBlockCount; | ||
| if (pruneBlockNumber >= 0) { | ||
| byte[] pruneBlockHash = blockStore.getBlockHashByNumber(pruneBlockNumber); | ||
| if (pruneBlockHash != null) { | ||
| A0BlockHeader header = blockStore.getBlockByHash(pruneBlockHash).getHeader(); | ||
| stateDSPrune.prune(header); | ||
| detailsDS.getStorageDSPrune().prune(header); | ||
| } | ||
| } | ||
| } | ||
| bestBlockNumber = curBlock.getNumber(); | ||
| } | ||
|
|
||
| public Trie getWorldState() { | ||
| return worldState; | ||
|
|
@@ -543,7 +545,7 @@ public IRepository getSnapshotTo(byte[] root) { | |
| repo.blockStore = blockStore; | ||
| repo.cfg = cfg; | ||
| repo.stateDatabase = this.stateDatabase; | ||
| repo.stateDSPrune = this.stateDSPrune; | ||
| repo.pruneBlockCount = this.pruneBlockCount; | ||
| repo.detailsDS = this.detailsDS; | ||
| repo.isSnapshot = true; | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
buildGenesis()seems to be building the genesis state based on the currentrepository. It's correct for the latter usage, when the database is empty, but is it still valid here?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it's valid, i.e. it always results in the same state root, because when calling
createAccount(Address)thestateRoot = EMPTY_TRIE_HASH;, so it does not build on the state root of the tracked repository