*: use kafka v2 to avoid compile error on linux arm64

risingwavelabs · May 16, 2023 · d8af83b · d8af83b
1 parent 75ba1e9
commit d8af83b
Show file tree

Hide file tree

Showing 7 changed files with 1,975 additions and 32 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,7 @@
-GOARCH := $(if $(GOARCH),$(GOARCH),amd64)
+OS ?= $(shell go env GOOS)
+ARCH ?= $(shell go env GOARCH)
 #GO=GO15VENDOREXPERIMENT="1" CGO_ENABLED=0 GOARCH=$(GOARCH) GO111MODULE=on go
-GO := go
+GO := GOOS=$(OS) GOARCH=$(ARCH) GO111MODULE=on go
 
 PACKAGE_LIST  := go list ./...| grep -vE "cmd"
 PACKAGES  := $$($(PACKAGE_LIST))

diff --git a/go.mod b/go.mod
@@ -4,14 +4,14 @@ go 1.18
 
 require (
 	github.com/HdrHistogram/hdrhistogram-go v1.0.0
-	github.com/confluentinc/confluent-kafka-go v1.9.2
-	github.com/go-sql-driver/mysql v1.5.0
+	github.com/confluentinc/confluent-kafka-go/v2 v2.1.1
+	github.com/go-sql-driver/mysql v1.6.0
 	github.com/jedib0t/go-pretty v4.3.0+incompatible
 	github.com/lib/pq v1.10.6
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/prometheus/client_golang v1.15.0
-	github.com/spf13/cobra v1.0.0
-	github.com/stretchr/testify v1.8.0
+	github.com/spf13/cobra v1.1.3
+	github.com/stretchr/testify v1.8.2
 	go.uber.org/atomic v1.9.0
 	golang.org/x/sync v0.1.0
 )

diff --git a/go.sum b/go.sum
diff --git a/pkg/sink/kafka.go b/pkg/sink/kafka.go
@@ -5,7 +5,7 @@ import (
 	"database/sql"
 	"encoding/json"
 	"fmt"
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 	"reflect"
 )
 

diff --git a/pkg/util/kafka.go b/pkg/util/kafka.go
@@ -2,7 +2,7 @@ package util
 
 import (
 	"context"
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 	"time"
 )
 

diff --git a/tpch/loader.go b/tpch/loader.go
@@ -3,7 +3,7 @@ package tpch
 import (
 	"context"
 	"database/sql"
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 
 	"github.com/pingcap/go-tpc/pkg/sink"
 	"github.com/pingcap/go-tpc/tpch/dbgen"

diff --git a/tpch/workload.go b/tpch/workload.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 	"os"
 	"path"
 	"sort"