Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

log: Remove Value.AsAny #4963

Merged
merged 3 commits into from
Feb 22, 2024
Merged

log: Remove Value.AsAny #4963

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a329784
Remove Value.AsAny
MrAlias Feb 22, 2024
98a5847
Update DESIGN.md
pellared Feb 22, 2024
c494775
Merge branch 'main' into rm-AsAny
pellared Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 0 additions & 25 deletions log/keyvalue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
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
43 changes: 0 additions & 43 deletions log/keyvalue_bench_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ var (
outV log.Value
outKV log.KeyValue

outAny any
outBool bool
outFloat64 float64
outInt64 int64
Expand Down Expand Up @@ -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) {
Expand All @@ -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) {
Expand All @@ -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) {
Expand All @@ -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) {
Expand All @@ -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) {
Expand All @@ -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) {
Expand All @@ -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()
}
})
}
4 changes: 0 additions & 4 deletions log/keyvalue_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
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")
}