M addbatch.go → addbatch.go

@@ -297,34 +297,50 @@ return invalids, kvsNonP2, nil
 }
 
 func (t *Tree) caseD(nCPU, l int, kvs []kv) ([]int, error) {
-	fmt.Println("CASE D", nCPU)
 	keysAtL, err := t.getKeysAtLevel(l + 1)
 	if err != nil {
 		return nil, err
 	}
 	buckets := splitInBuckets(kvs, nCPU)
 
-	var subRoots [][]byte
-	var invalids []int
-	for i := 0; i < len(keysAtL); i++ {
-		bucketTree := Tree{tx: t.tx, db: t.db, maxLevels: t.maxLevels, // maxLevels-l
-			hashFunction: t.hashFunction, root: keysAtL[i]}
+	subRoots := make([][]byte, nCPU)
+	invalidsInBucket := make([][]int, nCPU)
+	txs := make([]db.Tx, nCPU)
 
-		for j := 0; j < len(buckets[i]); j++ {
-			if err = bucketTree.add(l, buckets[i][j].k, buckets[i][j].v); err != nil {
-				fmt.Println("failed", buckets[i][j].k[:4])
+	var wg sync.WaitGroup
+	wg.Add(nCPU)
+	for i := 0; i < nCPU; i++ {
+		go func(cpu int) {
+			var err error
+			txs[cpu], err = t.db.NewTx()
+			if err != nil {
+				panic(err) // TODO
+			}
+			bucketTree := Tree{tx: txs[cpu], db: t.db, maxLevels: t.maxLevels, // maxLevels-l
+				hashFunction: t.hashFunction, root: keysAtL[cpu]}
 
-				panic(err)
-				// invalids = append(invalids, buckets[i][j].pos)
+			for j := 0; j < len(buckets[cpu]); j++ {
+				if err = bucketTree.add(l, buckets[cpu][j].k, buckets[cpu][j].v); err != nil {
+					fmt.Println("failed", buckets[cpu][j].k[:4])
+					invalidsInBucket[cpu] = append(invalidsInBucket[cpu], buckets[cpu][j].pos)
+				}
 			}
-		}
-		subRoots = append(subRoots, bucketTree.root)
+			subRoots[cpu] = bucketTree.root
+			wg.Done()
+		}(i)
 	}
+	wg.Wait()
+
 	newRoot, err := t.upFromKeys(subRoots)
 	if err != nil {
 		return nil, err
 	}
 	t.root = newRoot
+
+	var invalids []int
+	for i := 0; i < len(invalidsInBucket); i++ {
+		invalids = append(invalids, invalidsInBucket[i]...)
+	}
 
 	return invalids, nil
 }

M addbatch_test.go → addbatch_test.go

@@ -11,7 +11,7 @@ qt "github.com/frankban/quicktest"
 	"github.com/iden3/go-merkletree/db/memory"
 )
 
-func TestBatchAux(t *testing.T) {
+func TestBatchAux(t *testing.T) { // TODO TMP this test will be delted
 	c := qt.New(t)
 
 	nLeafs := 16
@@ -342,7 +342,7 @@
 func TestAddBatchCaseD(t *testing.T) {
 	c := qt.New(t)
 
-	nLeafs := 8192
+	nLeafs := 4096
 
 	tree, err := NewTree(memory.NewMemoryStorage(), 100, HashFunctionPoseidon)
 	c.Assert(err, qt.IsNil)
@@ -364,15 +364,13 @@ defer tree2.db.Close()
 
 	// add the initial leafs to fill a bit the tree before calling the
 	// AddBatch method
-	for i := 0; i < 900; i++ { // TMP TODO use const minLeafsThreshold-1 once ready
+	for i := 0; i < 900; i++ { // TMP TODO use const minLeafsThreshold+1 once ready
 		k := BigIntToBytes(big.NewInt(int64(i)))
 		v := BigIntToBytes(big.NewInt(int64(i * 2)))
 		if err := tree2.Add(k, v); err != nil {
 			t.Fatal(err)
 		}
 	}
-	// tree2.PrintGraphvizFirstNLevels(nil, 4)
-	// tree2.PrintGraphviz(nil)
 
 	var keys, values [][]byte
 	for i := 900; i < nLeafs; i++ {