GetAllLeaves On Channel #2081
Merged
GetAllLeaves On Channel #2081
Conversation
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
data/interface.go
Outdated
| @@ -20,6 +20,12 @@ const ( | |||
| // ModifiedHashes is used to memorize all old hashes and new hashes from when a trie is committed | |||
| type ModifiedHashes map[string]struct{} | |||
|
|
|||
| // TrieLeaf holds the key to a leaf and the value associated with that leaf | |||
There was a problem hiding this comment.
Exactly at the same pattern I have worked now. We might have a general implementation in core package (keyValueStorage) that will implement a core.KeyValueHolder interface. That interface will be reused in storage package also.
data/trie/patriciaMerkleTrie.go
Outdated
| @@ -602,6 +602,30 @@ func (tr *patriciaMerkleTrie) GetAllLeaves() (map[string][]byte, error) { | |||
| return leaves, nil | |||
| } | |||
|
|
|||
| // GetAllLeavesOnChannel adds all the trie leaves to the given channel | |||
| func (tr *patriciaMerkleTrie) GetAllLeavesOnChannel(leavesChannel chan *data.TrieLeaf) error { | |||
There was a problem hiding this comment.
I would change a little bit this:
func (tr *patriciaMerkleTrie) GetAllLeavesOnChannel() chan *data.TrieLeaf {
ch := make(chan *data.TrieLeaf)
//check nil part (including closing the channel)
go func() {
tr.mutOperation.RLock()
err := tr.root.getAllLeavesOnChannel(leavesChannel, []byte{}, tr.Database(), tr.marshalizer)
if err != nil {
log.Error("could not get all trie leaves: ", "error", err)
}
tr.mutOperation.RUnlock()
close(leavesChannel)
}()
return ch
}
data/trie/patriciaMerkleTrie_test.go
Outdated
|
|
||
| err := tr.GetAllLeavesOnChannel(leafChannel) | ||
| assert.Nil(t, err) | ||
| checkLeaves(t, leafChannel, leaves) |
There was a problem hiding this comment.
can be changed to this:
recovered := make(map[string][]byte)
for leaf := range leafChannel{
recovered[string(leaf.Key)] = leaf.Value
}
assert.Equal(t, leaves, recovered)
raduchis
previously approved these changes
Jul 9, 2020
…Leaves-on-channel # Conflicts: # core/interface.go
raduchis
previously approved these changes
Jul 10, 2020
data/trie/patriciaMerkleTrie.go
Outdated
| tr.mutOperation.RUnlock() | ||
| close(leavesChannel) | ||
|
|
||
| return nil |
There was a problem hiding this comment.
return leavesChannel in order to not output a nil chan and break down stream code
dataRetriever/mock/trieStub.go
Outdated
| } | ||
|
|
||
| return errNotImplemented | ||
| return nil |
There was a problem hiding this comment.
instead of returning nil, just return
ch := make(chan core.KeyValueHolder)
close(ch)
return ch
epochStart/mock/trieStub.go
Outdated
| } | ||
|
|
||
| return errNotImplemented | ||
| return nil |
There was a problem hiding this comment.
instead of returning nil, just return
ch := make(chan core.KeyValueHolder)
close(ch)
return ch
node/mock/trieStub.go
Outdated
| } | ||
|
|
||
| return errNotImplemented | ||
| return nil |
There was a problem hiding this comment.
instead of returning nil, just return
ch := make(chan core.KeyValueHolder)
close(ch)
return ch
process/mock/trieStub.go
Outdated
| } | ||
|
|
||
| return errNotImplemented | ||
| return nil |
There was a problem hiding this comment.
instead of returning nil, just return
ch := make(chan core.KeyValueHolder)
close(ch)
return ch
update/mock/trieStub.go
Outdated
| } | ||
|
|
||
| return errNotImplemented | ||
| return nil |
There was a problem hiding this comment.
instead of returning nil, just return
ch := make(chan core.KeyValueHolder)
close(ch)
return ch
iulianpascalau
approved these changes
Jul 10, 2020
raduchis
approved these changes
Jul 10, 2020
LucianMincu
approved these changes
Jul 10, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Add a new trie functionality, getAllLeavesOnChannel, which returns all the trie leaves on a channel. When all the leaves have been sent, the channel closes.