mirror of
https://github.com/arnaucube/arbo.git
synced 2026-01-15 09:51:29 +01:00
Add CPU parallelization to buildTreBottomUp
buildTreeBottomUp splits the key-values into n Buckets (where n is the number of CPUs), in parallel builds a subtree for each bucket, once all the subtrees are built, uses the subtrees roots as keys for a new tree, which as result will have the complete Tree build from bottom to up, where until the log2(nCPU) level it has been computed in parallel. As result of this, the tree construction can be parallelized until almost the top level, almost dividing the time by the number of CPUs.
This commit is contained in:
14
tree.go
14
tree.go
@@ -138,7 +138,7 @@ func (t *Tree) AddBatch(keys, values [][]byte) ([]int, error) {
|
||||
return indexes, err
|
||||
}
|
||||
// update nLeafs
|
||||
if err = t.incNLeafs(uint64(len(keys) - len(indexes))); err != nil {
|
||||
if err = t.incNLeafs(len(keys) - len(indexes)); err != nil {
|
||||
return indexes, err
|
||||
}
|
||||
|
||||
@@ -629,7 +629,7 @@ func (t *Tree) dbGet(k []byte) ([]byte, error) {
|
||||
|
||||
// Warning: should be called with a Tree.tx created, and with a Tree.tx.Commit
|
||||
// after the setNLeafs call.
|
||||
func (t *Tree) incNLeafs(nLeafs uint64) error {
|
||||
func (t *Tree) incNLeafs(nLeafs int) error {
|
||||
oldNLeafs, err := t.GetNLeafs()
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -640,9 +640,9 @@ func (t *Tree) incNLeafs(nLeafs uint64) error {
|
||||
|
||||
// Warning: should be called with a Tree.tx created, and with a Tree.tx.Commit
|
||||
// after the setNLeafs call.
|
||||
func (t *Tree) setNLeafs(nLeafs uint64) error {
|
||||
func (t *Tree) setNLeafs(nLeafs int) error {
|
||||
b := make([]byte, 8)
|
||||
binary.LittleEndian.PutUint64(b, nLeafs)
|
||||
binary.LittleEndian.PutUint64(b, uint64(nLeafs))
|
||||
if err := t.tx.Put(dbKeyNLeafs, b); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -650,13 +650,13 @@ func (t *Tree) setNLeafs(nLeafs uint64) error {
|
||||
}
|
||||
|
||||
// GetNLeafs returns the number of Leafs of the Tree.
|
||||
func (t *Tree) GetNLeafs() (uint64, error) {
|
||||
func (t *Tree) GetNLeafs() (int, error) {
|
||||
b, err := t.dbGet(dbKeyNLeafs)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
nLeafs := binary.LittleEndian.Uint64(b)
|
||||
return nLeafs, nil
|
||||
return int(nLeafs), nil
|
||||
}
|
||||
|
||||
// Iterate iterates through the full Tree, executing the given function on each
|
||||
@@ -776,7 +776,7 @@ func (t *Tree) ImportDump(b []byte) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := t.incNLeafs(uint64(count)); err != nil {
|
||||
if err := t.incNLeafs(count); err != nil {
|
||||
return err
|
||||
}
|
||||
if err = t.tx.Commit(); err != nil {
|
||||
|
||||
Reference in New Issue
Block a user