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 2021/08/16 05:08:02 UTC
[skywalking-banyandb] branch main updated: remove redundent fields
with _name suffix (#35)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git
The following commit(s) were added to refs/heads/main by this push:
new 2e7a7bf remove redundent fields with _name suffix (#35)
2e7a7bf is described below
commit 2e7a7bf72a946ca56643b5eda540608aa5328a23
Author: Jiajing LU <lu...@gmail.com>
AuthorDate: Mon Aug 16 13:07:58 2021 +0800
remove redundent fields with _name suffix (#35)
Signed-off-by: Megrez Lu <lu...@gmail.com>
---
banyand/query/processor_test.go | 18 ------------------
banyand/series/schema/sw/trace_series.bin | 5 +----
banyand/series/schema/sw/trace_series.textproto | 12 ------------
banyand/series/trace/common_test.go | 18 ------------------
banyand/series/trace/query_test.go | 5 ++---
banyand/series/trace/write_test.go | 12 ------------
pkg/query/logical/analyzer_test.go | 8 ++++----
7 files changed, 7 insertions(+), 71 deletions(-)
diff --git a/banyand/query/processor_test.go b/banyand/query/processor_test.go
index bfa555f..7aee816 100644
--- a/banyand/query/processor_test.go
+++ b/banyand/query/processor_test.go
@@ -146,9 +146,6 @@ func setupData(tester *require.Assertions, baseTs time.Time, svc series.Service)
"webapp_id",
"10.0.0.1_id",
"/home_id",
- "webapp",
- "10.0.0.1",
- "/home",
300,
1622933202000000000,
},
@@ -174,9 +171,6 @@ func setupData(tester *require.Assertions, baseTs time.Time, svc series.Service)
"httpserver_id",
"10.0.0.3_id",
"/home_id",
- "httpserver",
- "10.0.0.3",
- "/home",
300,
1622933202000000000,
"GET",
@@ -194,9 +188,6 @@ func setupData(tester *require.Assertions, baseTs time.Time, svc series.Service)
"database_id",
"10.0.0.4_id",
"/home_id",
- "database",
- "10.0.0.4",
- "/home",
300,
1622933202000000000,
nil,
@@ -216,9 +207,6 @@ func setupData(tester *require.Assertions, baseTs time.Time, svc series.Service)
"mq_id",
"10.0.0.5_id",
"/home_id",
- "mq",
- "10.0.0.5",
- "/home",
300,
1622933202000000000,
nil,
@@ -240,9 +228,6 @@ func setupData(tester *require.Assertions, baseTs time.Time, svc series.Service)
"database_id",
"10.0.0.6_id",
"/home_id",
- "database",
- "10.0.0.6",
- "/home",
300,
1622933202000000000,
nil,
@@ -262,9 +247,6 @@ func setupData(tester *require.Assertions, baseTs time.Time, svc series.Service)
"nq_id",
"10.0.0.7_id",
"/home_id",
- "mq",
- "10.0.0.7",
- "/home",
300,
1622933202000000000,
nil,
diff --git a/banyand/series/schema/sw/trace_series.bin b/banyand/series/schema/sw/trace_series.bin
index 76dadfa..fdccfec 100644
--- a/banyand/series/schema/sw/trace_series.bin
+++ b/banyand/series/schema/sw/trace_series.bin
@@ -6,10 +6,7 @@
service_id
service_instance_id
- endpoint_id
- service_name
-service_instance_name
-
endpoint_name
+ endpoint_id
duration
start_time
diff --git a/banyand/series/schema/sw/trace_series.textproto b/banyand/series/schema/sw/trace_series.textproto
index 679e3cf..663d0a8 100644
--- a/banyand/series/schema/sw/trace_series.textproto
+++ b/banyand/series/schema/sw/trace_series.textproto
@@ -23,18 +23,6 @@ fields: [
type: FIELD_TYPE_STRING
},
{
- name: "service_name",
- type: FIELD_TYPE_STRING
- },
- {
- name: "service_instance_name",
- type: FIELD_TYPE_STRING
- },
- {
- name: "endpoint_name",
- type: FIELD_TYPE_STRING
- },
- {
name: "duration",
type: FIELD_TYPE_INT
},
diff --git a/banyand/series/trace/common_test.go b/banyand/series/trace/common_test.go
index 9445c62..9071bb4 100644
--- a/banyand/series/trace/common_test.go
+++ b/banyand/series/trace/common_test.go
@@ -109,9 +109,6 @@ func testData(t time.Time) []seriesEntity {
"webapp_id",
"10.0.0.1_id",
"/home_id",
- "webapp",
- "10.0.0.1",
- "/home",
300,
1622933202000000000,
),
@@ -131,9 +128,6 @@ func testData(t time.Time) []seriesEntity {
"httpserver_id",
"10.0.0.3_id",
"/home_id",
- "httpserver",
- "10.0.0.3",
- "/home",
300,
1622933202000000000,
"GET",
@@ -148,9 +142,6 @@ func testData(t time.Time) []seriesEntity {
"database_id",
"10.0.0.4_id",
"/home_id",
- "database",
- "10.0.0.4",
- "/home",
300,
1622933202000000000,
nil,
@@ -167,9 +158,6 @@ func testData(t time.Time) []seriesEntity {
"mq_id",
"10.0.0.5_id",
"/home_id",
- "mq",
- "10.0.0.5",
- "/home",
300,
1622933202000000000,
nil,
@@ -188,9 +176,6 @@ func testData(t time.Time) []seriesEntity {
"database_id",
"10.0.0.6_id",
"/home_id",
- "database",
- "10.0.0.6",
- "/home",
300,
1622933202000000000,
nil,
@@ -207,9 +192,6 @@ func testData(t time.Time) []seriesEntity {
"nq_id",
"10.0.0.7_id",
"/home_id",
- "mq",
- "10.0.0.7",
- "/home",
300,
1622933202000000000,
nil,
diff --git a/banyand/series/trace/query_test.go b/banyand/series/trace/query_test.go
index 5f7e94c..da53e01 100644
--- a/banyand/series/trace/query_test.go
+++ b/banyand/series/trace/query_test.go
@@ -63,7 +63,7 @@ func Test_traceSeries_FetchEntity(t *testing.T) {
name: "multiple fields",
args: args{
chunkIDIndices: []int{0, 1, 2, 3, 4, 5, 6},
- opt: series.ScanOptions{Projection: []string{"trace_id", "service_name", "state", "duration", "mq.queue"}},
+ opt: series.ScanOptions{Projection: []string{"trace_id", "service_id", "state", "duration", "mq.queue"}},
},
wantEntities: []wantEntity{
{entityID: "1", fieldsSize: 5},
@@ -311,8 +311,7 @@ func Test_traceSeries_ScanEntity(t *testing.T) {
assert.Equal(t, len(tt.wantEntities), len(entities))
sort.Sort(entities)
for i, e := range entities {
- // TODO: we have to check time accuracy
- // assert.Greater(t, tt.args.end.UnixNano(), e.Timestamp.AsTime().UnixNano())
+ assert.GreaterOrEqual(t, tt.args.end.UnixNano(), e.Timestamp.AsTime().UnixNano())
assert.Equal(t, tt.wantEntities[i].entityID, e.GetEntityId())
assert.Equal(t, tt.wantEntities[i].dataBinary, e.GetDataBinary())
assert.Len(t, e.GetFields(), tt.wantEntities[i].fieldsSize)
diff --git a/banyand/series/trace/write_test.go b/banyand/series/trace/write_test.go
index a671cb2..41dbcb0 100644
--- a/banyand/series/trace/write_test.go
+++ b/banyand/series/trace/write_test.go
@@ -47,9 +47,6 @@ func Test_traceSeries_Write(t *testing.T) {
"webapp_id",
"10.0.0.1_id",
"/home_id",
- "webapp",
- "10.0.0.1",
- "/home",
300,
1622933202000000000,
),
@@ -75,9 +72,6 @@ func Test_traceSeries_Write(t *testing.T) {
"webapp_id",
"10.0.0.1_id",
"/home_id",
- "webapp",
- "10.0.0.1",
- "/home",
300,
1622933202000000000,
"GET",
@@ -95,9 +89,6 @@ func Test_traceSeries_Write(t *testing.T) {
"webapp_id",
"10.0.0.1_id",
"/home_id",
- "webapp",
- "10.0.0.1",
- "/home",
300,
1622933202000000000,
nil,
@@ -117,9 +108,6 @@ func Test_traceSeries_Write(t *testing.T) {
"webapp_id",
"10.0.0.1_id",
"/home_id",
- "webapp",
- "10.0.0.1",
- "/home",
300,
1622933202000000000,
nil,
diff --git a/pkg/query/logical/analyzer_test.go b/pkg/query/logical/analyzer_test.go
index 849647b..dc24fd9 100644
--- a/pkg/query/logical/analyzer_test.go
+++ b/pkg/query/logical/analyzer_test.go
@@ -123,7 +123,7 @@ func TestAnalyzer_TraceIDQuery(t *testing.T) {
criteria := pb.NewQueryRequestBuilder().
Limit(5).
Offset(10).
- Metadata("default", "trace").
+ Metadata("default", "sw").
Fields("trace_id", "=", "123").
Build()
@@ -181,7 +181,7 @@ func TestAnalyzer_OrderBy_FieldNotDefined(t *testing.T) {
Limit(5).
Offset(10).
OrderBy("duration", modelv1.QueryOrder_SORT_DESC).
- Metadata("default", "trace").
+ Metadata("default", "sw").
Projection("trace_id", "service_id").
TimeRange(time.Now().Add(-3*time.Hour), time.Now()).
Build()
@@ -232,10 +232,10 @@ func TestAnalyzer_Fields_IndexNotDefined(t *testing.T) {
criteria := pb.NewQueryRequestBuilder().
Limit(5).
Offset(10).
- Metadata("default", "trace").
+ Metadata("default", "sw").
Projection("duration", "service_id").
TimeRange(time.Now().Add(-3*time.Hour), time.Now()).
- Fields("service_name", "=", "app").
+ Fields("status_code", "=", "200").
Build()
metadata := &common.Metadata{