fixup: new benchmark, bigger pool

Author: lavalamp

fieldpath/set_test.go

@@ -44,6 +44,7 @@ var randomPathMaker = randomPathAlphabet(MakePathOrDie(
 	"aac",
 	"aad",
 	"aae",
+	"aaf",
 	KeyByFields("name", value.StringValue("first")),
 	KeyByFields("name", value.StringValue("second")),
 	KeyByFields("port", value.IntValue(443), "protocol", value.StringValue("tcp")),
@@ -63,7 +64,7 @@ func BenchmarkFieldSet(b *testing.B) {
 		minPathLen int
 		maxPathLen int
 	}{
-		{10, 1, 2},
+		//{10, 1, 2},
 		{20, 2, 3},
 		{50, 2, 4},
 		{100, 3, 6},
@@ -79,6 +80,11 @@ func BenchmarkFieldSet(b *testing.B) {
 			}
 			return x
 		}
+		operands := make([]*Set, 500)
+		for i := range operands {
+			operands[i] = makeSet()
+		}
+		randOperand := func() *Set { return operands[rand.Intn(len(operands))] }
 
 		b.Run(fmt.Sprintf("insert-%v", here.size), func(b *testing.B) {
 			b.ReportAllocs()
@@ -87,35 +93,25 @@ func BenchmarkFieldSet(b *testing.B) {
 			}
 		})
 		b.Run(fmt.Sprintf("has-%v", here.size), func(b *testing.B) {
-			x := makeSet()
 			b.ReportAllocs()
-			b.ResetTimer()
 			for i := 0; i < b.N; i++ {
-				x.Has(randomPathMaker.makePath(here.minPathLen, here.maxPathLen))
+				randOperand().Has(randomPathMaker.makePath(here.minPathLen, here.maxPathLen))
 			}
 		})
 
-		operands := make([]*Set, 50)
-		for i := range operands {
-			operands[i] = makeSet()
-		}
-		randOperand := func() *Set { return operands[rand.Intn(len(operands))] }
 		b.Run(fmt.Sprintf("union-%v", here.size), func(b *testing.B) {
-			b.ResetTimer()
 			b.ReportAllocs()
 			for i := 0; i < b.N; i++ {
 				randOperand().Union(randOperand())
 			}
 		})
 		b.Run(fmt.Sprintf("intersection-%v", here.size), func(b *testing.B) {
-			b.ResetTimer()
 			b.ReportAllocs()
 			for i := 0; i < b.N; i++ {
 				randOperand().Intersection(randOperand())
 			}
 		})
 		b.Run(fmt.Sprintf("difference-%v", here.size), func(b *testing.B) {
-			b.ResetTimer()
 			b.ReportAllocs()
 			for i := 0; i < b.N; i++ {
 				randOperand().Difference(randOperand())