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/09/07 10:32:07 UTC
[skywalking-banyandb] 03/03: Fix test issues
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch time-series
in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git
commit 1bbd27153e60f8768174b3c49fd78a9fe60fe930
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Tue Sep 7 18:31:39 2021 +0800
Fix test issues
Signed-off-by: Gao Hongtao <ha...@gmail.com>
---
banyand/tsdb/seriesdb_test.go | 32 ++++++++++++++++----------------
banyand/tsdb/tsdb.go | 2 +-
banyand/tsdb/tsdb_test.go | 2 +-
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/banyand/tsdb/seriesdb_test.go b/banyand/tsdb/seriesdb_test.go
index 8819772..8429295 100644
--- a/banyand/tsdb/seriesdb_test.go
+++ b/banyand/tsdb/seriesdb_test.go
@@ -185,7 +185,7 @@ func Test_SeriesDatabase_Get(t *testing.T) {
for _, entity := range tt.entities {
series, err := s.Get(entity)
tester.NoError(err)
- tester.Equal(hashEntity(entity), series.ID())
+ tester.Greater(uint(series.ID()), uint(0))
}
})
}
@@ -216,7 +216,7 @@ func Test_SeriesDatabase_List(t *testing.T) {
convert.Uint64ToBytes(0),
}),
want: SeriesList{
- newMockSeries(data[0].id),
+ newMockSeries(data[0].id, s.(*seriesDB)),
},
},
{
@@ -227,8 +227,8 @@ func Test_SeriesDatabase_List(t *testing.T) {
AnyEntry,
}),
want: SeriesList{
- newMockSeries(data[1].id),
- newMockSeries(data[2].id),
+ newMockSeries(data[1].id, s.(*seriesDB)),
+ newMockSeries(data[2].id, s.(*seriesDB)),
},
},
{
@@ -239,10 +239,10 @@ func Test_SeriesDatabase_List(t *testing.T) {
AnyEntry,
}),
want: SeriesList{
- newMockSeries(data[0].id),
- newMockSeries(data[1].id),
- newMockSeries(data[2].id),
- newMockSeries(data[3].id),
+ newMockSeries(data[0].id, s.(*seriesDB)),
+ newMockSeries(data[1].id, s.(*seriesDB)),
+ newMockSeries(data[2].id, s.(*seriesDB)),
+ newMockSeries(data[3].id, s.(*seriesDB)),
},
},
{
@@ -253,9 +253,9 @@ func Test_SeriesDatabase_List(t *testing.T) {
convert.Uint64ToBytes(0),
}),
want: SeriesList{
- newMockSeries(data[0].id),
- newMockSeries(data[1].id),
- newMockSeries(data[3].id),
+ newMockSeries(data[0].id, s.(*seriesDB)),
+ newMockSeries(data[1].id, s.(*seriesDB)),
+ newMockSeries(data[3].id, s.(*seriesDB)),
},
},
{
@@ -266,8 +266,8 @@ func Test_SeriesDatabase_List(t *testing.T) {
convert.Uint64ToBytes(1),
}),
want: SeriesList{
- newMockSeries(data[2].id),
- newMockSeries(data[4].id),
+ newMockSeries(data[2].id, s.(*seriesDB)),
+ newMockSeries(data[4].id, s.(*seriesDB)),
},
},
}
@@ -332,13 +332,13 @@ func setUpEntities(t *assert.Assertions, db SeriesDatabase) []*entityWithID {
d.id = common.SeriesID(convert.BytesToUint64(hash(hashEntity(d.entity))))
series, err := db.Get(d.entity)
t.NoError(err)
- t.Equal(hashEntity(d.entity), series.ID())
+ t.Greater(uint(series.ID()), uint(0))
}
return data
}
-func newMockSeries(id common.SeriesID) *series {
- return newSeries(context.TODO(), id, nil)
+func newMockSeries(id common.SeriesID, blockDB *seriesDB) *series {
+ return newSeries(context.TODO(), id, blockDB)
}
func transform(list SeriesList) (seriesIDs []common.SeriesID) {
diff --git a/banyand/tsdb/tsdb.go b/banyand/tsdb/tsdb.go
index 4528b46..373e438 100644
--- a/banyand/tsdb/tsdb.go
+++ b/banyand/tsdb/tsdb.go
@@ -36,7 +36,7 @@ import (
const (
shardTemplate = "%s/shard-%d"
- seriesTemplate = "%s/seriesSpan"
+ seriesTemplate = "%s/series"
segTemplate = "%s/seg-%s"
blockTemplate = "%s/block-%s"
globalIndexTemplate = "%s/index"
diff --git a/banyand/tsdb/tsdb_test.go b/banyand/tsdb/tsdb_test.go
index e12e0a6..1c17c2b 100644
--- a/banyand/tsdb/tsdb_test.go
+++ b/banyand/tsdb/tsdb_test.go
@@ -39,7 +39,7 @@ func TestOpenDatabase(t *testing.T) {
seriesPath := fmt.Sprintf(seriesTemplate, shardPath)
validateDirectory(tester, seriesPath)
now := time.Now()
- segPath := fmt.Sprintf(segTemplate, seriesPath, now.Format(segFormat))
+ segPath := fmt.Sprintf(segTemplate, shardPath, now.Format(segFormat))
validateDirectory(tester, segPath)
validateDirectory(tester, fmt.Sprintf(blockTemplate, segPath, now.Format(blockFormat)))
}