Skip to content

Commit

Permalink
Remove Value.AsAny
Browse files Browse the repository at this point in the history
Fix #4962
  • Loading branch information
MrAlias committed Feb 22, 2024
1 parent 6ea99af commit 2d8e30b
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 71 deletions.
25 changes: 0 additions & 25 deletions log/keyvalue.go
Expand Up @@ -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 {
Expand Down
42 changes: 0 additions & 42 deletions log/keyvalue_bench_test.go
Expand Up @@ -58,12 +58,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) {
Expand All @@ -89,12 +83,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) {
Expand All @@ -120,12 +108,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) {
Expand All @@ -151,12 +133,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) {
Expand All @@ -183,12 +159,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) {
Expand All @@ -215,12 +185,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) {
Expand All @@ -246,10 +210,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()
}
})
}
4 changes: 0 additions & 4 deletions log/keyvalue_test.go
Expand Up @@ -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())
Expand Down Expand Up @@ -298,5 +295,4 @@ 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")
}

0 comments on commit 2d8e30b

Please sign in to comment.