Added some additional benchmarks.

Author: dustinhiatt-wf

btree/palm/tree_test.go

@@ -437,7 +437,7 @@ func BenchmarkReadAndWrites(b *testing.B) {
 		keys = append(keys, generateRandomKeys(numItems))
 	}
 
-	tree := newTree(16, 8)
+	tree := newTree(8, 8)
 	b.ResetTimer()
 
 	for i := 0; i < b.N; i++ {
@@ -447,25 +447,27 @@ func BenchmarkReadAndWrites(b *testing.B) {
 }
 
 func BenchmarkSimultaneousReadsAndWrites(b *testing.B) {
-	numItems := 1000
+	numItems := 10000
 	numRoutines := 8
-	keys := make([]common.Comparators, 0, numRoutines)
-	for i := 0; i < numRoutines; i++ {
-		keys = append(keys, generateRandomKeys(numItems))
+	keys := generateRandomKeys(numItems)
+	chunks := chunkKeys(keys, int64(numRoutines))
+
+	trees := make([]*ptree, 0, numItems)
+	for i := 0; i < b.N; i++ {
+		trees = append(trees, newTree(8, 8))
 	}
 
-	tree := newTree(16, 8)
 	var wg sync.WaitGroup
 	b.ResetTimer()
 
 	for i := 0; i < b.N; i++ {
 		wg.Add(numRoutines)
 		for j := 0; j < numRoutines; j++ {
-			go func(j int) {
-				tree.Insert(keys[j]...)
-				tree.Get(keys[j]...)
+			go func(i, j int) {
+				trees[i].Insert(chunks[j]...)
+				trees[i].Get(chunks[j]...)
 				wg.Done()
-			}(j)
+			}(i, j)
 		}
 
 		wg.Wait()
@@ -475,12 +477,15 @@ func BenchmarkSimultaneousReadsAndWrites(b *testing.B) {
 func BenchmarkBulkAdd(b *testing.B) {
 	numItems := 10000
 	keys := generateRandomKeys(numItems)
+	trees := make([]*ptree, 0, b.N)
+	for i := 0; i < b.N; i++ {
+		trees = append(trees, newTree(8, 8))
+	}
 
 	b.ResetTimer()
 
 	for i := 0; i < b.N; i++ {
-		tree := newTree(8, 8)
-		tree.Insert(keys...)
+		trees[i].Insert(keys...)
 	}
 }
 
@@ -515,7 +520,7 @@ func BenchmarkBulkAddToExisting(b *testing.B) {
 func BenchmarkGet(b *testing.B) {
 	numItems := 10000
 	keys := generateRandomKeys(numItems)
-	tree := newTree(32, 8)
+	tree := newTree(8, 8)
 	tree.Insert(keys...)
 
 	b.ResetTimer()

btree/plus/btree_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package plus
 
 import (
+	"sync"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -394,3 +395,34 @@ func BenchmarkReadAndWrites(b *testing.B) {
 		tree.Get(ks[i]...)
 	}
 }
+
+func BenchmarkSimultaneousReadsAndWrites(b *testing.B) {
+	numItems := 10000
+	numRoutines := 8
+	keys := constructRandomMockKeys(numItems)
+	chunks := chunkKeys(keys, int64(numRoutines))
+
+	trees := make([]*btree, 0, numItems)
+	for i := 0; i < b.N; i++ {
+		trees = append(trees, newBTree(8))
+	}
+
+	var wg sync.WaitGroup
+	var lock sync.Mutex
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		wg.Add(numRoutines)
+		for j := 0; j < numRoutines; j++ {
+			go func(i, j int) {
+				lock.Lock()
+				trees[i].Insert(chunks[j]...)
+				trees[i].Get(chunks[j]...)
+				lock.Unlock()
+				wg.Done()
+			}(i, j)
+		}
+
+		wg.Wait()
+	}
+}

btree/plus/mock_test.go

@@ -16,6 +16,14 @@ limitations under the License.
 
 package plus
 
+func chunkKeys(ks keys, numParts int64) []keys {
+	parts := make([]keys, numParts)
+	for i := int64(0); i < numParts; i++ {
+		parts[i] = ks[i*int64(len(ks))/numParts : (i+1)*int64(len(ks))/numParts]
+	}
+	return parts
+}
+
 type mockKey struct {
 	value int
 }