Use a more clear package naming

Signed-off-by: JmPotato <[email protected]>
tikv · Nov 20, 2024 · 2368933 · 2368933
1 parent 4bb14f4
commit 2368933
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 10 deletions.
diff --git a/client/client.go b/client/client.go
@@ -35,7 +35,7 @@ import (
 	"github.com/tikv/pd/client/clients/metastorage"
 	"github.com/tikv/pd/client/errs"
 	"github.com/tikv/pd/client/opt"
-	"github.com/tikv/pd/client/sd"
+	sd "github.com/tikv/pd/client/servicediscovery"
 	"github.com/tikv/pd/client/utils"
 	"github.com/tikv/pd/client/utils/tlsutil"
 	"go.uber.org/zap"

diff --git a/client/http/client.go b/client/http/client.go
@@ -28,7 +28,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/tikv/pd/client/errs"
 	"github.com/tikv/pd/client/retry"
-	"github.com/tikv/pd/client/sd"
+	sd "github.com/tikv/pd/client/servicediscovery"
 	"go.uber.org/zap"
 )
 

diff --git a/client/sd/mock_pd_service_discovery.go → ...icediscovery/mock_pd_service_discovery.go b/client/sd/mock_pd_service_discovery.go → ...icediscovery/mock_pd_service_discovery.go
diff --git a/client/sd/pd_service_discovery.go → .../servicediscovery/pd_service_discovery.go b/client/sd/pd_service_discovery.go → .../servicediscovery/pd_service_discovery.go
diff --git a/client/sd/pd_service_discovery_test.go → ...icediscovery/pd_service_discovery_test.go b/client/sd/pd_service_discovery_test.go → ...icediscovery/pd_service_discovery_test.go
diff --git a/client/sd/tso_service_discovery.go → ...servicediscovery/tso_service_discovery.go b/client/sd/tso_service_discovery.go → ...servicediscovery/tso_service_discovery.go
diff --git a/client/tso_client.go b/client/tso_client.go
@@ -27,7 +27,7 @@ import (
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/client/errs"
 	"github.com/tikv/pd/client/opt"
-	"github.com/tikv/pd/client/sd"
+	sd "github.com/tikv/pd/client/servicediscovery"
 	"github.com/tikv/pd/client/utils/grpcutil"
 	"github.com/tikv/pd/client/utils/tlsutil"
 	"go.uber.org/zap"

diff --git a/client/tso_dispatcher.go b/client/tso_dispatcher.go
@@ -31,7 +31,7 @@ import (
 	"github.com/tikv/pd/client/errs"
 	"github.com/tikv/pd/client/opt"
 	"github.com/tikv/pd/client/retry"
-	"github.com/tikv/pd/client/sd"
+	sd "github.com/tikv/pd/client/servicediscovery"
 	"github.com/tikv/pd/client/utils/timerutil"
 	"github.com/tikv/pd/client/utils/tsoutil"
 	"go.uber.org/zap"

diff --git a/client/tso_dispatcher_test.go b/client/tso_dispatcher_test.go
@@ -27,7 +27,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 	"github.com/tikv/pd/client/opt"
-	"github.com/tikv/pd/client/sd"
+	sd "github.com/tikv/pd/client/servicediscovery"
 	"go.uber.org/zap/zapcore"
 )
 

diff --git a/tests/integrations/client/client_test.go b/tests/integrations/client/client_test.go
@@ -40,7 +40,7 @@ import (
 	pd "github.com/tikv/pd/client"
 	"github.com/tikv/pd/client/opt"
 	"github.com/tikv/pd/client/retry"
-	"github.com/tikv/pd/client/sd"
+	sd "github.com/tikv/pd/client/servicediscovery"
 	"github.com/tikv/pd/pkg/core"
 	"github.com/tikv/pd/pkg/mcs/utils/constant"
 	"github.com/tikv/pd/pkg/mock/mockid"

diff --git a/tests/integrations/mcs/resourcemanager/resource_manager_test.go b/tests/integrations/mcs/resourcemanager/resource_manager_test.go
@@ -33,7 +33,7 @@ import (
 	"github.com/stretchr/testify/suite"
 	pd "github.com/tikv/pd/client"
 	"github.com/tikv/pd/client/resource_group/controller"
-	"github.com/tikv/pd/client/sd"
+	sd "github.com/tikv/pd/client/servicediscovery"
 	"github.com/tikv/pd/pkg/mcs/resourcemanager/server"
 	"github.com/tikv/pd/pkg/utils/testutil"
 	"github.com/tikv/pd/pkg/utils/typeutil"

diff --git a/tests/integrations/tso/client_test.go b/tests/integrations/tso/client_test.go
@@ -30,7 +30,7 @@ import (
 	"github.com/stretchr/testify/suite"
 	pd "github.com/tikv/pd/client"
 	"github.com/tikv/pd/client/opt"
-	"github.com/tikv/pd/client/sd"
+	sd "github.com/tikv/pd/client/servicediscovery"
 	"github.com/tikv/pd/client/utils/testutil"
 	bs "github.com/tikv/pd/pkg/basicserver"
 	"github.com/tikv/pd/pkg/mcs/utils/constant"

diff --git a/tools/pd-simulator/simulator/client.go b/tools/pd-simulator/simulator/client.go
@@ -27,7 +27,7 @@ import (
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	pdHttp "github.com/tikv/pd/client/http"
-	"github.com/tikv/pd/client/sd"
+	sd "github.com/tikv/pd/client/servicediscovery"
 	"github.com/tikv/pd/pkg/core"
 	"github.com/tikv/pd/pkg/utils/typeutil"
 	sc "github.com/tikv/pd/tools/pd-simulator/simulator/config"

diff --git a/tools/pd-simulator/simulator/drive.go b/tools/pd-simulator/simulator/drive.go
@@ -31,7 +31,7 @@ import (
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	pdHttp "github.com/tikv/pd/client/http"
-	"github.com/tikv/pd/client/sd"
+	sd "github.com/tikv/pd/client/servicediscovery"
 	"github.com/tikv/pd/pkg/core"
 	"github.com/tikv/pd/pkg/utils/typeutil"
 	"github.com/tikv/pd/tools/pd-simulator/simulator/cases"