chore: upgrade ceresdb-client to v1.1.0

Author: ShiKaiWi

cmd/tsbs_run_queries_ceresdb/main.go

@@ -10,7 +10,6 @@ import (
 	"time"
 
 	"github.com/CeresDB/ceresdb-client-go/ceresdb"
-	"github.com/CeresDB/ceresdb-client-go/types"
 	"github.com/blagojts/viper"
 	"github.com/spf13/pflag"
 	"github.com/timescale/tsbs/internal/utils"
@@ -81,7 +80,7 @@ func newProcessor() query.Processor {
 
 // query.Processor interface implementation
 func (p *processor) Init(workerNumber int) {
-	client, err := ceresdb.NewClient(ceresdbAddr, types.Direct, ceresdb.WithDefaultDatabase("public"))
+	client, err := ceresdb.NewClient(ceresdbAddr, ceresdb.Direct, ceresdb.WithDefaultDatabase("public"))
 	if err != nil {
 		panic(err)
 	}
@@ -111,7 +110,7 @@ func (p *processor) ProcessQuery(q query.Query, isWarm bool) ([]*query.Stat, err
 	}
 
 	// Main action - run the query
-	rows, err := p.db.SQLQuery(context.TODO(), types.SQLQueryRequest{
+	rows, err := p.db.SQLQuery(context.TODO(), ceresdb.SQLQueryRequest{
 		Tables: []string{string(ceresdbQuery.Table)},
 		SQL:    sql,
 	})

go.mod

@@ -4,7 +4,7 @@ go 1.14
 
 require (
 	github.com/BurntSushi/toml v1.2.0 // indirect
-	github.com/CeresDB/ceresdb-client-go v1.0.1
+	github.com/CeresDB/ceresdb-client-go v1.1.0
 	github.com/HdrHistogram/hdrhistogram-go v1.0.0
 	github.com/SiriDB/go-siridb-connector v0.0.0-20190110105621-86b34c44c921
 	github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect

go.sum

@@ -51,10 +51,10 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
 github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/CeresDB/ceresdb-client-go v1.0.1 h1:lWF8DF5S+tNPX+y/OlrHBdGRpXcDZlXFXdIte6MuiIY=
-github.com/CeresDB/ceresdb-client-go v1.0.1/go.mod h1:msZb4XO8ak9/JzOSU9ytdWR8YbhTZ1GCEIRSmnZ+Gn4=
-github.com/CeresDB/ceresdbproto/golang v0.0.0-20230209095436-43939799b2e6 h1:EqRcuCuMDc+x5vWbyut236dR7RRwWjFOpYjwbi8mNFc=
-github.com/CeresDB/ceresdbproto/golang v0.0.0-20230209095436-43939799b2e6/go.mod h1:qLTh6jtSu2ZLIFsU3iiDIKvkrQvyY/Csg6Mk0Ub0QZ4=
+github.com/CeresDB/ceresdb-client-go v1.1.0 h1:iCBb03OubOA7NCLSiYBis9lMaR3nu6s0wipUulEeonU=
+github.com/CeresDB/ceresdb-client-go v1.1.0/go.mod h1:bZneg5VvvfSZhCnlKO0SjIoPY+fLKnFwhPb3gijLorE=
+github.com/CeresDB/ceresdbproto/golang v0.0.0-20230228090856-37ba6214b131 h1:ePzWeIoLOT4FsdjNrmEVrrtm412H2xHM6ZNLamB0bqk=
+github.com/CeresDB/ceresdbproto/golang v0.0.0-20230228090856-37ba6214b131/go.mod h1:qLTh6jtSu2ZLIFsU3iiDIKvkrQvyY/Csg6Mk0Ub0QZ4=
 github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/Djarvur/go-err113 v0.0.0-20200511133814-5174e21577d5/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs=

pkg/targets/ceresdb/batch.go

@@ -5,15 +5,14 @@ import (
 	"time"
 
 	"github.com/CeresDB/ceresdb-client-go/ceresdb"
-	"github.com/CeresDB/ceresdb-client-go/types"
 	"github.com/influxdata/line-protocol/v2/lineprotocol"
 	"github.com/timescale/tsbs/pkg/data"
 )
 
 type batch struct {
 	pointCount uint64
 	fieldCount uint64
-	points     []types.Point
+	points     []ceresdb.Point
 }
 
 func (b *batch) Len() uint {
@@ -53,7 +52,7 @@ func (b *batch) Append(item data.LoadedPoint) {
 			if key == nil {
 				break
 			}
-			builder.AddTag(string(key), types.NewStringValue(string(val)))
+			builder.AddTag(string(key), ceresdb.NewStringValue(string(val)))
 		}
 
 		for {
@@ -64,7 +63,7 @@ func (b *batch) Append(item data.LoadedPoint) {
 			if key == nil {
 				break
 			}
-			builder.AddField(string(key), types.NewDoubleValue(valueToFloat64(val)))
+			builder.AddField(string(key), ceresdb.NewDoubleValue(valueToFloat64(val)))
 		}
 
 		timestamp, err := dec.Time(lineprotocol.Nanosecond, time.Time{})

pkg/targets/ceresdb/creator.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 
 	"github.com/CeresDB/ceresdb-client-go/ceresdb"
-	"github.com/CeresDB/ceresdb-client-go/types"
 	"github.com/timescale/tsbs/pkg/data/usecases/common"
 	"github.com/timescale/tsbs/pkg/targets"
 )
@@ -50,7 +49,7 @@ func (d *dbCreator) DBExists(dbName string) bool { return true }
 
 // loader.DBCreator interface implementation
 func (d *dbCreator) CreateDB(dbName string) error {
-	client, err := ceresdb.NewClient(d.config.CeresdbAddr, types.Direct, ceresdb.WithDefaultDatabase("public"))
+	client, err := ceresdb.NewClient(d.config.CeresdbAddr, ceresdb.Direct, ceresdb.WithDefaultDatabase("public"))
 	if err != nil {
 		return err
 	}
@@ -92,7 +91,7 @@ storage_format = '%s'
 `
 	sql := fmt.Sprintf(tmpl, tableName, strings.Join(columnDefs, ","), d.config.PrimaryKeys, d.config.RowGroupSize, d.config.StorageFormat)
 	// fmt.Printf("sql = %s\n", sql)
-	_, err := client.SQLQuery(context.TODO(), types.SQLQueryRequest{
+	_, err := client.SQLQuery(context.TODO(), ceresdb.SQLQueryRequest{
 		Tables: []string{tableName},
 		SQL:    sql,
 	})

pkg/targets/ceresdb/processor.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/CeresDB/ceresdb-client-go/ceresdb"
-	"github.com/CeresDB/ceresdb-client-go/types"
 	"github.com/timescale/tsbs/pkg/targets"
 )
 
@@ -16,7 +15,7 @@ type processor struct {
 }
 
 func (p *processor) Init(workerNum int, doLoad, hashWorkers bool) {
-	client, err := ceresdb.NewClient(p.addr, types.Direct, ceresdb.WithDefaultDatabase("public"))
+	client, err := ceresdb.NewClient(p.addr, ceresdb.Direct, ceresdb.WithDefaultDatabase("public"))
 	if err != nil {
 		panic(err)
 	}
@@ -34,7 +33,7 @@ func (p *processor) ProcessBatch(b targets.Batch, doLoad bool) (metricCount, row
 
 func (p *processor) do(b *batch) (uint64, uint64) {
 	for {
-		ret, err := p.client.Write(context.TODO(), types.WriteRequest{Points: b.points})
+		ret, err := p.client.Write(context.TODO(), ceresdb.WriteRequest{Points: b.points})
 
 		if err == nil {
 			// log.Printf("success :%d\n", ret)