From fc44122db09e4714e803a4f3a21279e80a5e750d Mon Sep 17 00:00:00 2001 From: marcinromaszewicz Date: Thu, 25 Apr 2024 10:14:59 -0700 Subject: [PATCH] Fix autoformat changes I didn't intend to change your import statements in my last commit --- mockrc_test.go | 3 +-- region/client.go | 5 ++--- rpc.go | 4 ++-- rpc_test.go | 6 +++--- zk/client.go | 3 +-- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/mockrc_test.go b/mockrc_test.go index 02c228d5..5d819c09 100644 --- a/mockrc_test.go +++ b/mockrc_test.go @@ -13,12 +13,11 @@ import ( "sync/atomic" "time" - "google.golang.org/protobuf/proto" - "github.com/tsuna/gohbase/compression" "github.com/tsuna/gohbase/hrpc" "github.com/tsuna/gohbase/pb" "github.com/tsuna/gohbase/region" + "google.golang.org/protobuf/proto" ) type testClient struct { diff --git a/region/client.go b/region/client.go index b4482688..ec5580fc 100644 --- a/region/client.go +++ b/region/client.go @@ -22,11 +22,10 @@ import ( "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" - "google.golang.org/protobuf/encoding/protowire" - "google.golang.org/protobuf/proto" - "github.com/tsuna/gohbase/hrpc" "github.com/tsuna/gohbase/pb" + "google.golang.org/protobuf/encoding/protowire" + "google.golang.org/protobuf/proto" ) // ClientType is a type alias to represent the type of this region client diff --git a/rpc.go b/rpc.go index e22d543d..0654fe30 100644 --- a/rpc.go +++ b/rpc.go @@ -16,13 +16,13 @@ import ( "time" log "github.com/sirupsen/logrus" - "go.opentelemetry.io/otel/codes" - "google.golang.org/protobuf/proto" "github.com/tsuna/gohbase/hrpc" "github.com/tsuna/gohbase/internal/observability" "github.com/tsuna/gohbase/region" "github.com/tsuna/gohbase/zk" + "go.opentelemetry.io/otel/codes" + "google.golang.org/protobuf/proto" ) // Constants diff --git a/rpc_test.go b/rpc_test.go index 8c7dd485..e3eb9692 100644 --- a/rpc_test.go +++ b/rpc_test.go @@ -20,9 +20,6 @@ import ( "github.com/golang/mock/gomock" "github.com/prometheus/client_golang/prometheus" - "google.golang.org/protobuf/proto" - "google.golang.org/protobuf/types/known/wrapperspb" - "modernc.org/b/v2" "github.com/tsuna/gohbase/compression" "github.com/tsuna/gohbase/hrpc" @@ -33,6 +30,9 @@ import ( mockRegion "github.com/tsuna/gohbase/test/mock/region" mockZk "github.com/tsuna/gohbase/test/mock/zk" "github.com/tsuna/gohbase/zk" + "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/types/known/wrapperspb" + "modernc.org/b/v2" ) func newRegionClientFn(addr string) func() hrpc.RegionClient { diff --git a/zk/client.go b/zk/client.go index 51b8c253..75abfd5f 100644 --- a/zk/client.go +++ b/zk/client.go @@ -17,9 +17,8 @@ import ( log "github.com/sirupsen/logrus" "github.com/go-zookeeper/zk" - "google.golang.org/protobuf/proto" - "github.com/tsuna/gohbase/pb" + "google.golang.org/protobuf/proto" ) type logger struct{}