status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

optimize multi keys of branch node algorithm

This commit is contained in:
andri lim 2020-05-08 10:18:41 +07:00
parent 798de46ca7
commit 3cfabeeb3d
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
stateless/multi_keys.nim
View File

@ -78,28 +78,29 @@ proc newMultiKeys*(keys: openArray[StorageSlot]): MultikeysRef =
func initGroup*(m: MultikeysRef): Group = func initGroup*(m: MultikeysRef): Group =
type T = type result.last type T = type result.last
result = Group(first: 0'i16, last: (m.keys.len - 1).T) result = Group(first: 0.T, last: (m.keys.len - 1).T)
func groups*(m: MultikeysRef, parentGroup: Group, depth: int): BranchGroup = func groups*(m: MultikeysRef, parentGroup: Group, depth: int): BranchGroup =
# similar to a branch node, the product of this func # similar to a branch node, the product of this func
# is a 16 bits bitmask and an array of max 16 groups # is a 16 bits bitmask and an array of max 16 groups
# if the bit is set, the n-th elem of array have a group # if the bit is set, the n-th elem of array have a group
# each group consist of at least one key # each group consist of at least one key
var g = Group(first: parentGroup.first, last: parentGroup.first) var g = Group(first: parentGroup.first)
var nibble = getNibble(m.keys[g.first].hash, depth) var nibble = getNibble(m.keys[g.first].hash, depth)
let last = parentGroup.last
for i in parentGroup.first..parentGroup.last: for i in parentGroup.first..parentGroup.last:
let currNibble = getNibble(m.keys[i].hash, depth) let currNibble = getNibble(m.keys[i].hash, depth)
if currNibble != nibble: if currNibble != nibble:
# close current group and start a new group
g.last = i - 1 g.last = i - 1
setBranchMaskBit(result.mask, nibble.int) setBranchMaskBit(result.mask, nibble.int)
result.groups[nibble.int] = g result.groups[nibble.int] = g
nibble = currNibble nibble = currNibble
g.first = i g.first = i
if i == last:
g.last = last # always close the last group
setBranchMaskBit(result.mask, nibble.int) g.last = parentGroup.last
result.groups[nibble.int] = g setBranchMaskBit(result.mask, nibble.int)
result.groups[nibble.int] = g
func groups*(m: MultikeysRef, depth: int, n: NibblesSeq, parentGroup: Group): MatchGroup = func groups*(m: MultikeysRef, depth: int, n: NibblesSeq, parentGroup: Group): MatchGroup =
# using common-prefix comparison, this iterator # using common-prefix comparison, this iterator
@ -111,11 +112,11 @@ func groups*(m: MultikeysRef, depth: int, n: NibblesSeq, parentGroup: Group): Ma
while i <= parentGroup.last: while i <= parentGroup.last:
if not compareNibbles(m.keys[i].hash, depth, n): if not compareNibbles(m.keys[i].hash, depth, n):
g.last = i - 1 g.last = i - 1
# condition 1: match and no match # case 1: match and no match
return (true, g) return (true, g)
inc i inc i
# condition 2: all is a match group # case 2: all is a match group
g.last = parentGroup.last g.last = parentGroup.last
return (true, g) return (true, g)
@ -131,19 +132,19 @@ func groups*(m: MultikeysRef, depth: int, n: NibblesSeq, parentGroup: Group): Ma
if i <= parentGroup.last: if i <= parentGroup.last:
while i <= parentGroup.last: while i <= parentGroup.last:
if not compareNibbles(m.keys[i].hash, depth, n): if not compareNibbles(m.keys[i].hash, depth, n):
# condition 3: no match, match, and no match # case 3: no match, match, and no match
g.last = i - 1 g.last = i - 1
return (true, g) return (true, g)
inc i inc i
# condition 4: no match and match # case 4: no match and match
g.last = parentGroup.last g.last = parentGroup.last
return (true, g) return (true, g)
# condition 5: no match at all # case 5: no match at all
result = (false, g) result = (false, g)
func isValidMatch(mg: MatchGroup): bool = func isValidMatch(mg: MatchGroup): bool {.inline.} =
result = mg.match and mg.group.first == mg.group.last result = mg.match and mg.group.first == mg.group.last
proc visitMatch*(m: var MultikeysRef, mg: MatchGroup, depth: int, k: NibblesSeq): KeyData = proc visitMatch*(m: var MultikeysRef, mg: MatchGroup, depth: int, k: NibblesSeq): KeyData =