Merge pull request #107 from apelisse/add-even-more-benchmarks

Add even more benchmarks

Author: k8s-ci-robot

merge/real_test.go

@@ -17,8 +17,10 @@ limitations under the License.
 package merge_test
 
 import (
+	"fmt"
 	"io/ioutil"
 	"path/filepath"
+	"strings"
 	"testing"
 
 	. "sigs.k8s.io/structured-merge-diff/internal/fixture"
@@ -37,6 +39,10 @@ func read(file string) []byte {
 	return s
 }
 
+func lastPart(s string) string {
+	return s[strings.LastIndex(s, ".")+1:]
+}
+
 var parser = func() *typed.Parser {
 	s := read(testdata("k8s-schema.yaml"))
 	parser, err := typed.NewParser(typed.YAMLObject(s))
@@ -46,7 +52,7 @@ var parser = func() *typed.Parser {
 	return parser
 }()
 
-func BenchmarkUpdates(b *testing.B) {
+func BenchmarkOperations(b *testing.B) {
 	benches := []struct {
 		typename string
 		obj      typed.YAMLObject
@@ -66,26 +72,37 @@ func BenchmarkUpdates(b *testing.B) {
 	}
 
 	for _, bench := range benches {
-		b.Run(bench.typename, func(b *testing.B) {
-			test := TestCase{
-				Ops: []Operation{
-					Update{
-						Manager:    "controller",
-						APIVersion: "v1",
-						Object:     bench.obj,
-					},
+
+		b.Run(lastPart(bench.typename), func(b *testing.B) {
+			ops := []Operation{
+				Update{
+					Manager:    "controller",
+					APIVersion: "v1",
+					Object:     bench.obj,
+				},
+				Apply{
+					Manager:    "controller",
+					APIVersion: "v1",
+					Object:     bench.obj,
 				},
 			}
+			for _, op := range ops {
+				b.Run(lastPart(fmt.Sprintf("%T", op)), func(b *testing.B) {
+					test := TestCase{
+						Ops: []Operation{op},
+					}
 
-			pt := parser.Type(bench.typename)
-			test.PreprocessOperations(pt)
+					pt := parser.Type(bench.typename)
+					test.PreprocessOperations(pt)
 
-			b.ReportAllocs()
-			b.ResetTimer()
-			for n := 0; n < b.N; n++ {
-				if err := test.Bench(pt); err != nil {
-					b.Fatal(err)
-				}
+					b.ReportAllocs()
+					b.ResetTimer()
+					for n := 0; n < b.N; n++ {
+						if err := test.Bench(pt); err != nil {
+							b.Fatal(err)
+						}
+					}
+				})
 			}
 		})
 	}

typed/parser_test.go

@@ -19,6 +19,7 @@ package typed_test
 import (
 	"io/ioutil"
 	"path/filepath"
+	"strings"
 	"testing"
 
 	yaml "gopkg.in/yaml.v2"
@@ -29,10 +30,35 @@ func testdata(file string) string {
 	return filepath.Join("..", "internal", "testdata", file)
 }
 
-func BenchmarkFromUnstructured(b *testing.B) {
-	pod, err := ioutil.ReadFile(testdata("pod.yaml"))
+func read(file string) []byte {
+	obj, err := ioutil.ReadFile(file)
 	if err != nil {
-		b.Fatal(err)
+		panic(err)
+	}
+	return obj
+}
+
+func lastPart(s string) string {
+	return s[strings.LastIndex(s, ".")+1:]
+}
+
+func BenchmarkFromUnstructured(b *testing.B) {
+	tests := []struct {
+		typename string
+		obj      []byte
+	}{
+		{
+			typename: "io.k8s.api.core.v1.Pod",
+			obj:      read(testdata("pod.yaml")),
+		},
+		{
+			typename: "io.k8s.api.core.v1.Node",
+			obj:      read(testdata("node.yaml")),
+		},
+		{
+			typename: "io.k8s.api.core.v1.Endpoints",
+			obj:      read(testdata("endpoints.yaml")),
+		},
 	}
 
 	s, err := ioutil.ReadFile(testdata("k8s-schema.yaml"))
@@ -43,19 +69,24 @@ func BenchmarkFromUnstructured(b *testing.B) {
 	if err != nil {
 		b.Fatal(err)
 	}
-	pt := parser.Type("io.k8s.api.core.v1.Pod")
 
-	obj := map[string]interface{}{}
-	if err := yaml.Unmarshal([]byte(pod), &obj); err != nil {
-		b.Fatal(err)
-	}
+	for _, test := range tests {
+		b.Run(lastPart(test.typename), func(b *testing.B) {
+			pt := parser.Type(test.typename)
+
+			obj := map[string]interface{}{}
+			if err := yaml.Unmarshal(test.obj, &obj); err != nil {
+				b.Fatal(err)
+			}
 
-	b.ReportAllocs()
-	b.ResetTimer()
-	for n := 0; n < b.N; n++ {
-		if _, err := pt.FromUnstructured(obj); err != nil {
-			b.Fatal(err)
-		}
+			b.ReportAllocs()
+			b.ResetTimer()
+			for n := 0; n < b.N; n++ {
+				if _, err := pt.FromUnstructured(obj); err != nil {
+					b.Fatal(err)
+				}
+			}
+		})
 	}
 
 }