You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2024/05/08 21:50:17 UTC
(skywalking-banyandb) branch null-value created (now e769550d)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch null-value
in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git
at e769550d Change default null value
This branch includes the following new commits:
new e769550d Change default null value
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(skywalking-banyandb) 01/01: Change default null value
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch null-value
in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git
commit e769550daba34534dab13b8466159bfa31cbb50b
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Wed May 8 21:48:22 2024 +0000
Change default null value
Signed-off-by: Gao Hongtao <ha...@gmail.com>
---
banyand/measure/query.go | 17 +----------------
banyand/stream/query.go | 15 +--------------
pkg/pb/v1/metadata.go | 12 ------------
test/cases/topn/data/want/null_group.yaml | 3 +--
4 files changed, 3 insertions(+), 44 deletions(-)
diff --git a/banyand/measure/query.go b/banyand/measure/query.go
index 5a68d22b..88a91880 100644
--- a/banyand/measure/query.go
+++ b/banyand/measure/query.go
@@ -213,20 +213,7 @@ func (s *measure) parseTagProjection(qo queryOptions, result *queryResult) (proj
func mustDecodeTagValue(valueType pbv1.ValueType, value []byte) *modelv1.TagValue {
if value == nil {
- switch valueType {
- case pbv1.ValueTypeInt64:
- logger.Panicf("int64 can be nil")
- case pbv1.ValueTypeStr:
- return pbv1.EmptyStrTagValue
- case pbv1.ValueTypeStrArr:
- return pbv1.EmptyStrArrTagValue
- case pbv1.ValueTypeInt64Arr:
- return pbv1.EmptyIntArrTagValue
- case pbv1.ValueTypeBinaryData:
- return pbv1.EmptyBinaryTagValue
- default:
- return pbv1.NullTagValue
- }
+ return pbv1.NullTagValue
}
switch valueType {
case pbv1.ValueTypeInt64:
@@ -312,8 +299,6 @@ func strArrTagValue(values []string) *modelv1.TagValue {
func mustDecodeFieldValue(valueType pbv1.ValueType, value []byte) *modelv1.FieldValue {
if value == nil {
switch valueType {
- case pbv1.ValueTypeInt64, pbv1.ValueTypeFloat64:
- logger.Panicf("int64 and float64 can't be nil")
case pbv1.ValueTypeStr:
return pbv1.EmptyStrFieldValue
case pbv1.ValueTypeBinaryData:
diff --git a/banyand/stream/query.go b/banyand/stream/query.go
index da8827f3..4204c55f 100644
--- a/banyand/stream/query.go
+++ b/banyand/stream/query.go
@@ -55,20 +55,7 @@ func mustEncodeTagValue(name string, tagType databasev1.TagType, tagValue *model
func mustDecodeTagValue(valueType pbv1.ValueType, value []byte) *modelv1.TagValue {
if value == nil {
- switch valueType {
- case pbv1.ValueTypeInt64:
- logger.Panicf("int64 can be nil")
- case pbv1.ValueTypeStr:
- return pbv1.EmptyStrTagValue
- case pbv1.ValueTypeStrArr:
- return pbv1.EmptyStrArrTagValue
- case pbv1.ValueTypeInt64Arr:
- return pbv1.EmptyIntArrTagValue
- case pbv1.ValueTypeBinaryData:
- return pbv1.EmptyBinaryTagValue
- default:
- return pbv1.NullTagValue
- }
+ return pbv1.NullTagValue
}
switch valueType {
case pbv1.ValueTypeInt64:
diff --git a/pkg/pb/v1/metadata.go b/pkg/pb/v1/metadata.go
index cdae269c..dce4d832 100644
--- a/pkg/pb/v1/metadata.go
+++ b/pkg/pb/v1/metadata.go
@@ -210,16 +210,4 @@ var (
// NullTagValue represents a null tag value in the model.
NullTagValue = &modelv1.TagValue{Value: &modelv1.TagValue_Null{}}
-
- // EmptyStrTagValue represents an empty string tag value in the model.
- EmptyStrTagValue = &modelv1.TagValue{Value: &modelv1.TagValue_Str{Str: &modelv1.Str{Value: ""}}}
-
- // EmptyStrArrTagValue represents an empty string array tag value in the model.
- EmptyStrArrTagValue = &modelv1.TagValue{Value: &modelv1.TagValue_StrArray{StrArray: &modelv1.StrArray{Value: []string{}}}}
-
- // EmptyIntArrTagValue represents an empty integer array tag value in the model.
- EmptyIntArrTagValue = &modelv1.TagValue{Value: &modelv1.TagValue_IntArray{IntArray: &modelv1.IntArray{Value: []int64{}}}}
-
- // EmptyBinaryTagValue represents an empty binary tag value in the model.
- EmptyBinaryTagValue = &modelv1.TagValue{Value: &modelv1.TagValue_BinaryData{BinaryData: []byte{}}}
)
diff --git a/test/cases/topn/data/want/null_group.yaml b/test/cases/topn/data/want/null_group.yaml
index b39f77e7..166de533 100644
--- a/test/cases/topn/data/want/null_group.yaml
+++ b/test/cases/topn/data/want/null_group.yaml
@@ -44,8 +44,7 @@ lists:
- entity:
- key: service_id
value:
- str:
- value: ""
+ "null": null
- key: entity_id
value:
str: