From 8df89f6aff3fd364c0775fc683b5c11d335123f5 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Thu, 22 Feb 2024 11:56:07 -0800 Subject: [PATCH] log: Remove Value.AsAny (#4963) --- log/DESIGN.md | 2 -- log/keyvalue.go | 25 ---------------------- log/keyvalue_bench_test.go | 43 -------------------------------------- log/keyvalue_test.go | 4 ---- 4 files changed, 74 deletions(-) diff --git a/log/DESIGN.md b/log/DESIGN.md index 2a342bd53..e961a45a3 100644 --- a/log/DESIGN.md +++ b/log/DESIGN.md @@ -288,8 +288,6 @@ func MapValue(kvs ...KeyValue) Value // Value accessors: -func (v Value) AsAny() any - func (v Value) AsString() string func (v Value) AsInt64() int64 diff --git a/log/keyvalue.go b/log/keyvalue.go index 12a79b8b7..141628436 100644 --- a/log/keyvalue.go +++ b/log/keyvalue.go @@ -126,31 +126,6 @@ func MapValue(kvs ...KeyValue) Value { } } -// AsAny returns the value held by v as an any. -func (v Value) AsAny() any { - switch v.Kind() { - case KindMap: - return v.asMap() - case KindSlice: - return v.asSlice() - case KindInt64: - return v.asInt64() - case KindFloat64: - return v.asFloat64() - case KindString: - return v.asString() - case KindBool: - return v.asBool() - case KindBytes: - return v.asBytes() - case KindEmpty: - return nil - default: - global.Error(errKind, "AsAny", "Kind", v.Kind()) - return nil - } -} - // AsString returns the value held by v as a string. func (v Value) AsString() string { if sp, ok := v.any.(stringptr); ok { diff --git a/log/keyvalue_bench_test.go b/log/keyvalue_bench_test.go index ea43cded1..15d78838d 100644 --- a/log/keyvalue_bench_test.go +++ b/log/keyvalue_bench_test.go @@ -26,7 +26,6 @@ var ( outV log.Value outKV log.KeyValue - outAny any outBool bool outFloat64 float64 outInt64 int64 @@ -58,12 +57,6 @@ func BenchmarkBool(b *testing.B) { outBool = kv.Value.AsBool() } }) - b.Run("AsAny", func(b *testing.B) { - b.ReportAllocs() - for i := 0; i < b.N; i++ { - outAny = kv.Value.AsAny() - } - }) } func BenchmarkFloat64(b *testing.B) { @@ -89,12 +82,6 @@ func BenchmarkFloat64(b *testing.B) { outFloat64 = kv.Value.AsFloat64() } }) - b.Run("AsAny", func(b *testing.B) { - b.ReportAllocs() - for i := 0; i < b.N; i++ { - outAny = kv.Value.AsAny() - } - }) } func BenchmarkInt(b *testing.B) { @@ -120,12 +107,6 @@ func BenchmarkInt(b *testing.B) { outInt64 = kv.Value.AsInt64() } }) - b.Run("AsAny", func(b *testing.B) { - b.ReportAllocs() - for i := 0; i < b.N; i++ { - outAny = kv.Value.AsAny() - } - }) } func BenchmarkInt64(b *testing.B) { @@ -151,12 +132,6 @@ func BenchmarkInt64(b *testing.B) { outInt64 = kv.Value.AsInt64() } }) - b.Run("AsAny", func(b *testing.B) { - b.ReportAllocs() - for i := 0; i < b.N; i++ { - outAny = kv.Value.AsAny() - } - }) } func BenchmarkMap(b *testing.B) { @@ -183,12 +158,6 @@ func BenchmarkMap(b *testing.B) { outMap = kv.Value.AsMap() } }) - b.Run("AsAny", func(b *testing.B) { - b.ReportAllocs() - for i := 0; i < b.N; i++ { - outAny = kv.Value.AsAny() - } - }) } func BenchmarkSlice(b *testing.B) { @@ -215,12 +184,6 @@ func BenchmarkSlice(b *testing.B) { outSlice = kv.Value.AsSlice() } }) - b.Run("AsAny", func(b *testing.B) { - b.ReportAllocs() - for i := 0; i < b.N; i++ { - outAny = kv.Value.AsAny() - } - }) } func BenchmarkString(b *testing.B) { @@ -246,10 +209,4 @@ func BenchmarkString(b *testing.B) { outStr = kv.Value.AsString() } }) - b.Run("AsAny", func(b *testing.B) { - b.ReportAllocs() - for i := 0; i < b.N; i++ { - outAny = kv.Value.AsAny() - } - }) } diff --git a/log/keyvalue_test.go b/log/keyvalue_test.go index 7a72ae064..c6e4e03a9 100644 --- a/log/keyvalue_test.go +++ b/log/keyvalue_test.go @@ -88,9 +88,6 @@ func TestEmpty(t *testing.T) { t.Run("Value.Empty", func(t *testing.T) { assert.True(t, v.Empty()) }) - t.Run("Value.AsAny", func(t *testing.T) { - assert.Nil(t, v.AsAny()) - }) t.Run("Bytes", func(t *testing.T) { assert.Nil(t, log.Bytes("b", nil).Value.AsBytes()) @@ -298,7 +295,6 @@ func testKV[T any](t *testing.T, key string, val T, kv log.KeyValue) { assert.Equal(t, key, kv.Key, "incorrect key") assert.False(t, kv.Value.Empty(), "value empty") - assert.Equal(t, kv.Value.AsAny(), T(val), "AsAny wrong value") } func TestAllocationLimits(t *testing.T) {