Skip to content
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.

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

Merge rc 1.6.0 trie sync optimizations #5309

Merged

Conversation

ssd04
Copy link
Contributor

@ssd04 ssd04 commented May 30, 2023

Reasoning behind the pull request

  • N/A

Pre-requisites

Based on the Contributing Guidelines the PR author and the reviewers must check the following requirements are met:

  • was the PR targeted to the correct branch?
  • if this is a larger feature that probably needs more than one PR, is there a feat branch created?
  • if this is a feat branch merging, do all satellite projects have a proper tag inside go.mod?

BeniaminDrasovean and others added 30 commits October 24, 2022 14:51
…ata-trie

Add hasher to trackable data trie
…ie-tracker

Add marshaller to data trie tracker
….4.0-to-feat/balance-data-tries

# Conflicts:
#	integrationTests/testInitializer.go
#	integrationTests/vm/testInitializer.go
#	state/trackableDataTrie_test.go
…eat/balance-data-tries

28.10 merge rc/1.4.0 to feat/balance data tries
…data-trie

Enable epochs handler to data trie
# Conflicts:
#	epochStart/metachain/systemSCs.go
#	integrationTests/testProcessorNode.go
#	node/node.go
#	node/trieIterators/delegatedListProcessor.go
#	node/trieIterators/directStakedListProcessor.go
#	node/trieIterators/stakeValuesProcessor.go
remove key size from total leaf size computation
BeniaminDrasovean and others added 24 commits May 23, 2023 14:32
…nce-data-tries-23may

Merge rc/v1.6.0 in feat/balance data tries 23may
…persister

Merge rc 1.6.0 into sharded persister
…in-feat/balance-data-tries-24may

# Conflicts:
#	dataRetriever/factory/storageRequestersContainer/baseRequestersContainerFactory.go
#	dataRetriever/factory/storageRequestersContainer/metaRequestersContainerFactory.go
#	dataRetriever/factory/storageRequestersContainer/shardRequestersContainerFactory.go
#	epochStart/metachain/baseRewards_test.go
#	epochStart/metachain/systemSCs_test.go
#	errors/errors.go
#	factory/processing/blockProcessorCreator_test.go
#	factory/state/stateComponents.go
#	genesis/process/genesisBlockCreator.go
#	genesis/process/genesisBlockCreator_test.go
#	go.mod
#	go.sum
#	integrationTests/benchmarks/loadFromTrie_test.go
#	integrationTests/state/stateTrieClose/stateTrieClose_test.go
#	integrationTests/testProcessorNode.go
#	integrationTests/vm/testInitializer.go
#	state/accountsDB.go
#	state/syncer/errors.go
#	testscommon/components/components.go
#	trie/branchNode.go
#	trie/branchNode_test.go
#	trie/doubleListSync_test.go
#	trie/errors.go
#	trie/extensionNode.go
#	trie/extensionNode_test.go
#	trie/factory/trieCreator.go
#	trie/factory/trieCreator_test.go
#	trie/interface.go
#	trie/leafNode.go
#	trie/patriciaMerkleTrie.go
#	trie/patriciaMerkleTrie_test.go
#	trie/trieStorageManager_test.go
#	update/genesis/import.go
…in-feat/balance-data-tries-24may

# Conflicts:
#	go.mod
#	go.sum
…nce-data-tries-24may

Merge rc/v1.6.0 in feat/balance data tries 24may
…poch

change epoch in which autoBalanceDataTries is enabled
…nce-data-tries-29may

# Conflicts:
#	common/enablers/enableEpochsHandler.go
#	common/enablers/epochFlags.go
#	common/interface.go
#	go.mod
#	go.sum
#	sharding/mock/enableEpochsHandlerMock.go
#	testscommon/enableEpochsHandlerMock/enableEpochsHandlerStub.go
…es-29may

Update feat/balance data tries 29may
…persister

Merge rc 1.6.0 into sharded persister
@ssd04 ssd04 self-assigned this May 30, 2023
@@ -243,6 +243,8 @@ func (u *userAccountsSyncer) syncAccountDataTries(
return trie.ErrNilTrieIteratorChannels
}

defer u.printDataTrieStatistics()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@ssd04 ssd04 merged commit 5d6daec into feat/trie-sync-optimizations May 30, 2023
@ssd04 ssd04 deleted the merge-rc-1.6.0-trie-sync-optimizations branch May 30, 2023 14:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants