merge master

Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

.golangci.yml

@@ -12,6 +12,7 @@ linters:
     - gosec
     - bodyclose
     - testifylint
+    - gofmt
   disable:
     - errcheck
 linters-settings:
@@ -41,3 +42,10 @@ linters-settings:
       - require-error
       - suite-dont-use-pkg
       - suite-extra-assert-call
+  gofmt:
+    # https://golangci-lint.run/usage/linters/#gofmt
+    # disable for faster check
+    simplify: false
+    rewrite-rules:
+      - pattern: 'interface{}'
+        replacement: 'any'

Makefile

@@ -186,6 +186,11 @@ static: install-tools pre-build
 
 	@ for mod in $(SUBMODULES); do cd $$mod && $(MAKE) static && cd $(ROOT_PATH) > /dev/null; done
 
+# Because CI downloads the dashboard code and runs gofmt, we can't add this check into static now.
+fmt:
+	@ echo "gofmt ..."
+	@ gofmt -s -l -w -r 'interface{} -> any' -d $(PACKAGE_DIRECTORIES) 2>&1 | awk '{ print } END { if (NR > 0) { exit 1 } }'
+
 tidy:
 	@ go mod tidy
 	git diff go.mod go.sum | cat

client/client.go

@@ -134,7 +134,7 @@ type Client interface {
 	// WatchGlobalConfig returns a stream with all global config and updates
 	WatchGlobalConfig(ctx context.Context, configPath string, revision int64) (chan []GlobalConfigItem, error)
 	// UpdateOption updates the client option.
-	UpdateOption(option DynamicOption, value interface{}) error
+	UpdateOption(option DynamicOption, value any) error
 
 	// GetExternalTimestamp returns external timestamp
 	GetExternalTimestamp(ctx context.Context) (uint64, error)
@@ -691,7 +691,7 @@ func (c *client) GetServiceDiscovery() ServiceDiscovery {
 }
 
 // UpdateOption updates the client option.
-func (c *client) UpdateOption(option DynamicOption, value interface{}) error {
+func (c *client) UpdateOption(option DynamicOption, value any) error {
 	switch option {
 	case MaxTSOBatchWaitInterval:
 		interval, ok := value.(time.Duration)

client/http/client.go

@@ -47,7 +47,7 @@ const (
 )
 
 // respHandleFunc is the function to handle the HTTP response.
-type respHandleFunc func(resp *http.Response, res interface{}) error
+type respHandleFunc func(resp *http.Response, res any) error
 
 // clientInner is the inner implementation of the PD HTTP client, which contains some fundamental fields.
 // It is wrapped by the `client` struct to make sure the inner implementation won't be exposed and could
@@ -328,7 +328,7 @@ func (c *client) WithCallerID(callerID string) Client {
 
 // WithRespHandler sets and returns a new client with the given HTTP response handler.
 func (c *client) WithRespHandler(
-	handler func(resp *http.Response, res interface{}) error,
+	handler func(resp *http.Response, res any) error,
 ) Client {
 	newClient := *c
 	newClient.respHandler = handler

client/http/interface.go

@@ -50,14 +50,14 @@ type Client interface {
 	GetStore(context.Context, uint64) (*StoreInfo, error)
 	SetStoreLabels(context.Context, int64, map[string]string) error
 	/* Config-related interfaces */
-	GetConfig(context.Context) (map[string]interface{}, error)
-	SetConfig(context.Context, map[string]interface{}, ...float64) error
-	GetScheduleConfig(context.Context) (map[string]interface{}, error)
-	SetScheduleConfig(context.Context, map[string]interface{}) error
+	GetConfig(context.Context) (map[string]any, error)
+	SetConfig(context.Context, map[string]any, ...float64) error
+	GetScheduleConfig(context.Context) (map[string]any, error)
+	SetScheduleConfig(context.Context, map[string]any) error
 	GetClusterVersion(context.Context) (string, error)
 	GetCluster(context.Context) (*metapb.Cluster, error)
 	GetClusterStatus(context.Context) (*ClusterState, error)
-	GetReplicateConfig(context.Context) (map[string]interface{}, error)
+	GetReplicateConfig(context.Context) (map[string]any, error)
 	/* Scheduler-related interfaces */
 	GetSchedulers(context.Context) ([]string, error)
 	CreateScheduler(ctx context.Context, name string, storeID uint64) error
@@ -100,7 +100,7 @@ type Client interface {
 	// This allows the caller to customize how the response is handled, including error handling logic.
 	// Additionally, it is important for the caller to handle the content of the response body properly
 	// in order to ensure that it can be read and marshaled correctly into `res`.
-	WithRespHandler(func(resp *http.Response, res interface{}) error) Client
+	WithRespHandler(func(resp *http.Response, res any) error) Client
 	// WithBackoffer sets and returns a new client with the given backoffer.
 	WithBackoffer(*retry.Backoffer) Client
 	// Close gracefully closes the HTTP client.
@@ -323,8 +323,8 @@ func (c *client) SetStoreLabels(ctx context.Context, storeID int64, storeLabels
 }
 
 // GetConfig gets the configurations.
-func (c *client) GetConfig(ctx context.Context) (map[string]interface{}, error) {
-	var config map[string]interface{}
+func (c *client) GetConfig(ctx context.Context) (map[string]any, error) {
+	var config map[string]any
 	err := c.request(ctx, newRequestInfo().
 		WithName(getConfigName).
 		WithURI(Config).
@@ -337,7 +337,7 @@ func (c *client) GetConfig(ctx context.Context) (map[string]interface{}, error)
 }
 
 // SetConfig sets the configurations. ttlSecond is optional.
-func (c *client) SetConfig(ctx context.Context, config map[string]interface{}, ttlSecond ...float64) error {
+func (c *client) SetConfig(ctx context.Context, config map[string]any, ttlSecond ...float64) error {
 	configJSON, err := json.Marshal(config)
 	if err != nil {
 		return errors.Trace(err)
@@ -356,8 +356,8 @@ func (c *client) SetConfig(ctx context.Context, config map[string]interface{}, t
 }
 
 // GetScheduleConfig gets the schedule configurations.
-func (c *client) GetScheduleConfig(ctx context.Context) (map[string]interface{}, error) {
-	var config map[string]interface{}
+func (c *client) GetScheduleConfig(ctx context.Context) (map[string]any, error) {
+	var config map[string]any
 	err := c.request(ctx, newRequestInfo().
 		WithName(getScheduleConfigName).
 		WithURI(ScheduleConfig).
@@ -370,7 +370,7 @@ func (c *client) GetScheduleConfig(ctx context.Context) (map[string]interface{},
 }
 
 // SetScheduleConfig sets the schedule configurations.
-func (c *client) SetScheduleConfig(ctx context.Context, config map[string]interface{}) error {
+func (c *client) SetScheduleConfig(ctx context.Context, config map[string]any) error {
 	configJSON, err := json.Marshal(config)
 	if err != nil {
 		return errors.Trace(err)
@@ -453,8 +453,8 @@ func (c *client) GetClusterStatus(ctx context.Context) (*ClusterState, error) {
 }
 
 // GetReplicateConfig gets the replication configurations.
-func (c *client) GetReplicateConfig(ctx context.Context) (map[string]interface{}, error) {
-	var config map[string]interface{}
+func (c *client) GetReplicateConfig(ctx context.Context) (map[string]any, error) {
+	var config map[string]any
 	err := c.request(ctx, newRequestInfo().
 		WithName(getReplicateConfigName).
 		WithURI(ReplicateConfig).
@@ -694,7 +694,7 @@ func (c *client) GetSchedulers(ctx context.Context) ([]string, error) {
 
 // CreateScheduler creates a scheduler to PD cluster.
 func (c *client) CreateScheduler(ctx context.Context, name string, storeID uint64) error {
-	inputJSON, err := json.Marshal(map[string]interface{}{
+	inputJSON, err := json.Marshal(map[string]any{
 		"name":     name,
 		"store_id": storeID,
 	})

client/http/request_info.go

@@ -83,7 +83,7 @@ type requestInfo struct {
 	uri         string
 	method      string
 	body        []byte
-	res         interface{}
+	res         any
 	respHandler respHandleFunc
 	bo          *retry.Backoffer
 }
@@ -124,7 +124,7 @@ func (ri *requestInfo) WithBody(body []byte) *requestInfo {
 }
 
 // WithResp sets the response struct of the request.
-func (ri *requestInfo) WithResp(res interface{}) *requestInfo {
+func (ri *requestInfo) WithResp(res any) *requestInfo {
 	ri.res = res
 	return ri
 }

client/http/types.go

@@ -575,7 +575,7 @@ type LabelRule struct {
 	Index    int           `json:"index"`
 	Labels   []RegionLabel `json:"labels"`
 	RuleType string        `json:"rule_type"`
-	Data     interface{}   `json:"data"`
+	Data     any           `json:"data"`
 }
 
 // LabelRulePatch is the patch to update the label rules.

client/pd_service_discovery.go

@@ -662,7 +662,7 @@ func (c *pdServiceDiscovery) checkFollowerHealth(ctx context.Context) {
 func (c *pdServiceDiscovery) Close() {
 	c.closeOnce.Do(func() {
 		log.Info("[pd] close pd service discovery client")
-		c.clientConns.Range(func(key, cc interface{}) bool {
+		c.clientConns.Range(func(key, cc any) bool {
 			if err := cc.(*grpc.ClientConn).Close(); err != nil {
 				log.Error("[pd] failed to close grpc clientConn", errs.ZapError(errs.ErrCloseGRPCConn, err))
 			}

client/tso_client.go

@@ -55,7 +55,7 @@ type tsoRequest struct {
 }
 
 var tsoReqPool = sync.Pool{
-	New: func() interface{} {
+	New: func() any {
 		return &tsoRequest{
 			done:     make(chan error, 1),
 			physical: 0,
@@ -137,7 +137,7 @@ func (c *tsoClient) Close() {
 	c.wg.Wait()
 
 	log.Info("close tso client")
-	c.tsoDispatcher.Range(func(_, dispatcherInterface interface{}) bool {
+	c.tsoDispatcher.Range(func(_, dispatcherInterface any) bool {
 		if dispatcherInterface != nil {
 			dispatcher := dispatcherInterface.(*tsoDispatcher)
 			tsoErr := errors.WithStack(errClosing)
@@ -237,7 +237,7 @@ func (c *tsoClient) updateTSOGlobalServAddr(addr string) error {
 
 func (c *tsoClient) gcAllocatorServingAddr(curAllocatorMap map[string]string) {
 	// Clean up the old TSO allocators
-	c.tsoAllocators.Range(func(dcLocationKey, _ interface{}) bool {
+	c.tsoAllocators.Range(func(dcLocationKey, _ any) bool {
 		dcLocation := dcLocationKey.(string)
 		// Skip the Global TSO Allocator
 		if dcLocation == globalDCLocation {

client/tso_dispatcher.go

@@ -121,15 +121,15 @@ func (req *tsoRequest) Wait() (physical int64, logical int64, err error) {
 
 func (c *tsoClient) updateTSODispatcher() {
 	// Set up the new TSO dispatcher and batch controller.
-	c.GetTSOAllocators().Range(func(dcLocationKey, _ interface{}) bool {
+	c.GetTSOAllocators().Range(func(dcLocationKey, _ any) bool {
 		dcLocation := dcLocationKey.(string)
 		if !c.checkTSODispatcher(dcLocation) {
 			c.createTSODispatcher(dcLocation)
 		}
 		return true
 	})
 	// Clean up the unused TSO dispatcher
-	c.tsoDispatcher.Range(func(dcLocationKey, dispatcher interface{}) bool {
+	c.tsoDispatcher.Range(func(dcLocationKey, dispatcher any) bool {
 		dcLocation := dcLocationKey.(string)
 		// Skip the Global TSO Allocator
 		if dcLocation == globalDCLocation {
@@ -173,7 +173,7 @@ func (c *tsoClient) tsCancelLoop() {
 	defer ticker.Stop()
 	for {
 		// Watch every dc-location's tsDeadlineCh
-		c.GetTSOAllocators().Range(func(dcLocation, _ interface{}) bool {
+		c.GetTSOAllocators().Range(func(dcLocation, _ any) bool {
 			c.watchTSDeadline(tsCancelLoopCtx, dcLocation.(string))
 			return true
 		})
@@ -343,7 +343,7 @@ func (c *tsoClient) handleDispatcher(
 	defer func() {
 		log.Info("[tso] exit tso dispatcher", zap.String("dc-location", dc))
 		// Cancel all connections.
-		connectionCtxs.Range(func(_, cc interface{}) bool {
+		connectionCtxs.Range(func(_, cc any) bool {
 			cc.(*tsoConnectionContext).cancel()
 			return true
 		})
@@ -532,7 +532,7 @@ func (c *tsoClient) allowTSOFollowerProxy(dc string) bool {
 // connectionCtxs will only have only one stream to choose when the TSO Follower Proxy is off.
 func (c *tsoClient) chooseStream(connectionCtxs *sync.Map) (connectionCtx *tsoConnectionContext) {
 	idx := 0
-	connectionCtxs.Range(func(_, cc interface{}) bool {
+	connectionCtxs.Range(func(_, cc any) bool {
 		j := rand.Intn(idx + 1)
 		if j < 1 {
 			connectionCtx = cc.(*tsoConnectionContext)
@@ -587,7 +587,7 @@ func (c *tsoClient) tryConnectToTSO(
 			cc.(*tsoConnectionContext).cancel()
 			connectionCtxs.Store(newAddr, connectionCtx)
 		}
-		connectionCtxs.Range(func(addr, cc interface{}) bool {
+		connectionCtxs.Range(func(addr, cc any) bool {
 			if addr.(string) != newAddr {
 				cc.(*tsoConnectionContext).cancel()
 				connectionCtxs.Delete(addr)
@@ -700,7 +700,7 @@ func (c *tsoClient) tryConnectToTSOWithProxy(dispatcherCtx context.Context, dc s
 		return errors.Errorf("cannot find the allocator leader in %s", dc)
 	}
 	// GC the stale one.
-	connectionCtxs.Range(func(addr, cc interface{}) bool {
+	connectionCtxs.Range(func(addr, cc any) bool {
 		if _, ok := tsoStreamBuilders[addr.(string)]; !ok {
 			cc.(*tsoConnectionContext).cancel()
 			connectionCtxs.Delete(addr)

client/tso_service_discovery.go

@@ -231,7 +231,7 @@ func (c *tsoServiceDiscovery) Close() {
 	c.cancel()
 	c.wg.Wait()
 
-	c.clientConns.Range(func(key, cc interface{}) bool {
+	c.clientConns.Range(func(key, cc any) bool {
 		if err := cc.(*grpc.ClientConn).Close(); err != nil {
 			log.Error("[tso] failed to close gRPC clientConn", errs.ZapError(errs.ErrCloseGRPCConn, err))
 		}