fix: repair buld_load_timescale error

bulk_query/query.go

@@ -434,6 +434,7 @@ loop:
 		waitFinished = true
 		waitCh <- 1
 	}()
+	_ = waitFinished
 	waitTimer := time.NewTimer(time.Minute * 10)
 waitLoop:
 	for {

cmd/bulk_load_influx/main.go

@@ -24,6 +24,7 @@ import (
 	"github.com/influxdata/influxdb-comparisons/bulk_data_gen/common"
 	"github.com/influxdata/influxdb-comparisons/bulk_load"
 	"github.com/influxdata/influxdb-comparisons/util/report"
+	"github.com/influxdata/influxdb/models"
 	"github.com/valyala/fasthttp"
 )
 
@@ -803,13 +804,14 @@ func (l *InfluxBulkLoad) listOrgs2(daemonUrl string, orgName string) (map[string
 
 // countFields return number of fields in protocol line
 func countFields(line string) int {
-	lineParts := strings.Split(line, " ") // "measurement,tags fields timestamp"
-	if len(lineParts) != 3 {
-		log.Fatalf("invalid protocol line: '%s'", line)
+	points, err := models.ParsePointsString(line)
+	if err != nil {
+		log.Fatalln(err)
 	}
-	fieldCnt := strings.Count(lineParts[1], "=")
-	if fieldCnt == 0 {
-		log.Fatalf("invalid fields parts: '%s'", lineParts[1])
+	fields, err := points[0].Fields()
+	if err != nil {
+		log.Fatalln(err)
 	}
-	return fieldCnt
+
+	return len(fields)
 }

cmd/bulk_load_timescale/main.go

@@ -16,8 +16,8 @@ import (
 
 	"github.com/influxdata/influxdb-comparisons/bulk_load"
 	"github.com/influxdata/influxdb-comparisons/util/report"
-	"github.com/jackc/pgx"
-	"github.com/jackc/pgx/pgxpool"
+	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v4/pgxpool"
 
 	"bytes"
 	"context"

cmd/query_benchmarker_timescale/main.go

@@ -22,8 +22,8 @@ import (
 	"strings"
 
 	"github.com/influxdata/influxdb-comparisons/util/report"
-	"github.com/jackc/pgx"
-	"github.com/jackc/pgx/pgxpool"
+	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v4/pgxpool"
 )
 
 type TimescaleQueryBenchmarker struct {

go.mod

@@ -3,10 +3,17 @@ module github.com/influxdata/influxdb-comparisons
 go 1.15
 
 require (
+	github.com/gocql/gocql v1.2.0
 	github.com/golang/protobuf v1.5.2
-	github.com/google/flatbuffers v1.12.0
-	github.com/google/uuid v1.3.0
+	github.com/google/flatbuffers v2.0.5+incompatible
+	github.com/influxdata/influxdb v1.10.0
+	github.com/jackc/pgx/v4 v4.16.1
+	github.com/kisielk/og-rek v1.2.0
+	github.com/klauspost/compress v1.13.6
 	github.com/pelletier/go-toml v1.9.0
+	github.com/pkg/errors v0.9.1
 	github.com/pkg/profile v1.6.0
+	github.com/stretchr/testify v1.8.0
 	github.com/valyala/fasthttp v1.24.0
+	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
 )