Merge pull request #105030 from liggitt/json-stdlib

switch from json-iterator to forked stdlib json decoder

pkg/api/testing/serialization_test.go

@@ -26,7 +26,6 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	jsoniter "github.com/json-iterator/go"
 
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
@@ -38,7 +37,6 @@ import (
 	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/runtime/serializer/json"
 	"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/watch"
@@ -589,59 +587,6 @@ func BenchmarkDecodeIntoJSON(b *testing.B) {
 	b.StopTimer()
 }
 
-// BenchmarkDecodeIntoJSONCodecGenConfigFast provides a baseline
-// for JSON decode performance with jsoniter.ConfigFast
-func BenchmarkDecodeIntoJSONCodecGenConfigFast(b *testing.B) {
-	kcodec := legacyscheme.Codecs.LegacyCodec(v1.SchemeGroupVersion)
-	items := benchmarkItems(b)
-	width := len(items)
-	encoded := make([][]byte, width)
-	for i := range items {
-		data, err := runtime.Encode(kcodec, &items[i])
-		if err != nil {
-			b.Fatal(err)
-		}
-		encoded[i] = data
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		obj := v1.Pod{}
-		if err := jsoniter.ConfigFastest.Unmarshal(encoded[i%width], &obj); err != nil {
-			b.Fatal(err)
-		}
-	}
-	b.StopTimer()
-}
-
-// BenchmarkDecodeIntoJSONCodecGenConfigCompatibleWithStandardLibrary provides a
-// baseline for JSON decode performance with
-// jsoniter.ConfigCompatibleWithStandardLibrary, but with case sensitivity set
-// to true
-func BenchmarkDecodeIntoJSONCodecGenConfigCompatibleWithStandardLibrary(b *testing.B) {
-	kcodec := legacyscheme.Codecs.LegacyCodec(v1.SchemeGroupVersion)
-	items := benchmarkItems(b)
-	width := len(items)
-	encoded := make([][]byte, width)
-	for i := range items {
-		data, err := runtime.Encode(kcodec, &items[i])
-		if err != nil {
-			b.Fatal(err)
-		}
-		encoded[i] = data
-	}
-
-	b.ResetTimer()
-	iter := json.CaseSensitiveJSONIterator()
-	for i := 0; i < b.N; i++ {
-		obj := v1.Pod{}
-		if err := iter.Unmarshal(encoded[i%width], &obj); err != nil {
-			b.Fatal(err)
-		}
-	}
-	b.StopTimer()
-}
-
 // BenchmarkEncodeYAMLMarshal provides a baseline for regular YAML encode performance
 func BenchmarkEncodeYAMLMarshal(b *testing.B) {
 	items := benchmarkItems(b)

pkg/api/testing/unstructured_test.go

@@ -19,12 +19,10 @@ package testing
 import (
 	"math/rand"
 	"reflect"
-	"sort"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
 	fuzz "github.com/google/gofuzz"
-	jsoniter "github.com/json-iterator/go"
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
@@ -260,75 +258,3 @@ func BenchmarkFromUnstructuredViaJSON(b *testing.B) {
 	}
 	b.StopTimer()
 }
-
-func BenchmarkToUnstructuredViaJSONIter(b *testing.B) {
-	items := benchmarkItems(b)
-	size := len(items)
-	var keys []string
-	for k := range jsonIterConfig {
-		keys = append(keys, k)
-	}
-	sort.Strings(keys)
-	for _, name := range keys {
-		c := jsonIterConfig[name]
-		b.Run(name, func(b *testing.B) {
-			b.ResetTimer()
-			for i := 0; i < b.N; i++ {
-				data, err := c.Marshal(&items[i%size])
-				if err != nil {
-					b.Fatalf("unexpected error: %v", err)
-				}
-				unstr := map[string]interface{}{}
-				if err := c.Unmarshal(data, &unstr); err != nil {
-					b.Fatalf("unexpected error: %v", err)
-				}
-			}
-			b.StopTimer()
-		})
-	}
-}
-
-var jsonIterConfig = map[string]jsoniter.API{
-	"default": jsoniter.ConfigDefault,
-	"fastest": jsoniter.ConfigFastest,
-	"compat":  jsoniter.ConfigCompatibleWithStandardLibrary,
-}
-
-func BenchmarkFromUnstructuredViaJSONIter(b *testing.B) {
-	items := benchmarkItems(b)
-	var unstr []map[string]interface{}
-	for i := range items {
-		data, err := jsoniter.Marshal(&items[i])
-		if err != nil {
-			b.Fatalf("unexpected error: %v", err)
-		}
-		item := map[string]interface{}{}
-		if err := json.Unmarshal(data, &item); err != nil {
-			b.Fatalf("unexpected error: %v", err)
-		}
-		unstr = append(unstr, item)
-	}
-	size := len(items)
-	var keys []string
-	for k := range jsonIterConfig {
-		keys = append(keys, k)
-	}
-	sort.Strings(keys)
-	for _, name := range keys {
-		c := jsonIterConfig[name]
-		b.Run(name, func(b *testing.B) {
-			b.ResetTimer()
-			for i := 0; i < b.N; i++ {
-				item, err := c.Marshal(unstr[i%size])
-				if err != nil {
-					b.Fatalf("unexpected error: %v", err)
-				}
-				obj := v1.Pod{}
-				if err := c.Unmarshal(item, &obj); err != nil {
-					b.Fatalf("unexpected error: %v", err)
-				}
-			}
-			b.StopTimer()
-		})
-	}
-}