resolve conflicts

Signed-off-by: Ryan Leung <[email protected]>
rleungx · Oct 28, 2024 · 9a75c5e · 9a75c5e
1 parent 89bed1f
commit 9a75c5e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/tso/global_allocator.go b/pkg/tso/global_allocator.go
@@ -40,7 +40,7 @@ import (
 	"github.com/tikv/pd/pkg/utils/logutil"
 	"github.com/tikv/pd/pkg/utils/tsoutil"
 	"github.com/tikv/pd/pkg/utils/typeutil"
-	"go.etcd.io/etcd/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 )

diff --git a/tests/integrations/tso/server_test.go b/tests/integrations/tso/server_test.go
@@ -25,7 +25,7 @@ import (
 	"github.com/stretchr/testify/suite"
 	"github.com/tikv/pd/client/testutil"
 	tso "github.com/tikv/pd/pkg/mcs/tso/server"
-	"github.com/tikv/pd/pkg/mcs/utils"
+	"github.com/tikv/pd/pkg/mcs/utils/constant"
 	tsopkg "github.com/tikv/pd/pkg/tso"
 	"github.com/tikv/pd/pkg/utils/tempurl"
 	tu "github.com/tikv/pd/pkg/utils/testutil"
@@ -89,7 +89,7 @@ func (suite *tsoServerTestSuite) SetupSuite() {
 		suite.tsoServer, suite.tsoServerCleanup = tests.StartSingleTSOTestServer(suite.ctx, re, backendEndpoints, tempurl.Alloc())
 		suite.tsoClientConn, suite.tsoClient = tso.MustNewGrpcClient(re, suite.tsoServer.GetAddr())
 		testutil.Eventually(re, func() bool {
-			am, err := suite.tsoServer.GetKeyspaceGroupManager().GetAllocatorManager(utils.DefaultKeyspaceGroupID)
+			am, err := suite.tsoServer.GetKeyspaceGroupManager().GetAllocatorManager(constant.DefaultKeyspaceGroupID)
 			if err != nil {
 				return false
 			}