Merge pull request #24 from testwill/fmt

chore: unnecessary use of fmt.Sprintf
polardb · Oct 20, 2023 · 996e35e · 996e35e
2 parents 9050ec5 + 8d33039
commit 996e35e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/pkg/hpfs/filestream/flowcontrol.go b/pkg/hpfs/filestream/flowcontrol.go
@@ -92,7 +92,7 @@ func (f *FlowControlManger) Stop() {
 
 func (f *FlowControlManger) LimitFlow(reader io.Reader, writer io.Writer, notifyWriter io.Writer) (int64, error) {
 	if !f.tryAcquire() {
-		return 0, errors.New(fmt.Sprintf("Throttled"))
+		return 0, errors.New("Throttled")
 	}
 	ctx, cancel := context.WithCancel(context.Background())
 	tokensChan := make(chan int, 2)

diff --git a/pkg/meta/core/gms/manager_impl.go b/pkg/meta/core/gms/manager_impl.go
@@ -1219,7 +1219,7 @@ func (meta *manager) ListCdcNodes() ([]CdcNodeInfo, error) {
 	}
 	defer dbutil.DeferClose(conn)
 
-	selectStmt := fmt.Sprintf("SELECT container_id, ip, daemon_port FROM binlog_node_info")
+	selectStmt := "SELECT container_id, ip, daemon_port FROM binlog_node_info"
 
 	rs, err := conn.QueryContext(meta.ctx, selectStmt)
 	if err != nil {

diff --git a/pkg/meta/core/group/group_manager.go b/pkg/meta/core/group/group_manager.go
@@ -427,7 +427,7 @@ func (m *groupManager) ListSchemas() ([]string, error) {
 		return nil, err
 	}
 
-	rs, err := db.QueryContext(m.ctx, fmt.Sprintf("SHOW DATABASES"))
+	rs, err := db.QueryContext(m.ctx, "SHOW DATABASES")
 	if err != nil {
 		return nil, err
 	}
@@ -466,7 +466,7 @@ func (m *groupManager) ListAllGroups() (map[string][]Group, error) {
 	}
 	defer dbutil.DeferClose(conn)
 
-	rs, err := conn.QueryContext(m.ctx, fmt.Sprintf("SHOW DS"))
+	rs, err := conn.QueryContext(m.ctx, "SHOW DS")
 	if err != nil {
 		return nil, err
 	}
@@ -741,7 +741,7 @@ func (m *groupManager) getCnVersion() (string, error) {
 	}
 
 	ver := ""
-	rs, err := db.Query(fmt.Sprint("select version()"))
+	rs, err := db.Query("select version()")
 	if err != nil {
 		return "", err
 	}
@@ -765,7 +765,7 @@ func (m *groupManager) getDnVersion() (string, error) {
 	}
 
 	ver := ""
-	rs, err := db.Query(fmt.Sprint("select @@version"))
+	rs, err := db.Query("select @@version")
 	if err != nil {
 		return "", err
 	}
@@ -800,7 +800,7 @@ func (m *groupManager) GetBinlogOffset() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	rs, err := db.Query(fmt.Sprint("show master status"))
+	rs, err := db.Query("show master status")
 	if err != nil {
 		return "", err
 	}
@@ -899,7 +899,7 @@ func (m *groupManager) ShowSlaveStatus() (*SlaveStatus, error) {
 	}
 	defer dbutil.DeferClose(conn)
 
-	rs, err := conn.QueryContext(m.ctx, fmt.Sprintf("SHOW SLAVE STATUS"))
+	rs, err := conn.QueryContext(m.ctx, "SHOW SLAVE STATUS")
 	if err != nil {
 		return nil, err
 	}
@@ -929,7 +929,7 @@ func (m *groupManager) ShowClusterStatus() ([]*ClusterStatus, error) {
 	}
 	defer dbutil.DeferClose(conn)
 
-	rs, err := conn.QueryContext(m.ctx, fmt.Sprintf("SELECT * FROM INFORMATION_SCHEMA.ALISQL_CLUSTER_GLOBAL"))
+	rs, err := conn.QueryContext(m.ctx, "SELECT * FROM INFORMATION_SCHEMA.ALISQL_CLUSTER_GLOBAL")
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/operator/v1/xstore/change/driver/plan/plan.go b/pkg/operator/v1/xstore/change/driver/plan/plan.go
@@ -91,7 +91,7 @@ func (step *Step) Priority() int {
 func (step *Step) Description() string {
 	switch step.Type {
 	case StepTypeSnapshot:
-		return fmt.Sprintf("Snapshot")
+		return "Snapshot"
 	case StepTypeBumpGen:
 		return fmt.Sprintf(
 			"BumpGen(%s, from: %d, to: %d)",

diff --git a/pkg/pitr/restore_binlog_test.go b/pkg/pitr/restore_binlog_test.go
@@ -79,7 +79,6 @@ func TestOssAliyunTest(t *testing.T) {
 	if err == nil {
 		err = ft.Wait()
 	}
-	fmt.Sprintf("sd")
 }
 
 func TestTimeZone(t *testing.T) {

diff --git a/pkg/webhook/polardbxcluster/validator.go b/pkg/webhook/polardbxcluster/validator.go
@@ -617,7 +617,7 @@ func (v *PolarDBXClusterV1Validator) validate(ctx context.Context, polardbx *pol
 			errList = append(errList, field.Invalid(
 				field.NewPath("spec", "primaryCluster"),
 				spec.PrimaryCluster,
-				fmt.Sprintf(`primaryCluster cannot be empty for readonly pxc`),
+				`primaryCluster cannot be empty for readonly pxc`,
 			))
 		}
 	}