Skip to content

Commit

Permalink
style: pass go lint check
Browse files Browse the repository at this point in the history
Signed-off-by: Jiawei Zhao <Phoenxi500526@163.com>
  • Loading branch information
Jiawei Zhao authored and Jiawei Zhao committed Jan 14, 2024
1 parent 5d88f70 commit 931569c
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 17 deletions.
3 changes: 2 additions & 1 deletion internal/discovery/sqlclient.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ package discovery
import (
"database/sql"
"fmt"

_ "github.com/go-sql-driver/mysql"
)

Expand Down Expand Up @@ -57,7 +58,7 @@ func ReadAllRowsAsString(rows *sql.Rows) []RowMap {
for rows.Next() {
columns := make([]any, len(cols))
columnPointers := make([]any, len(cols))
for i, _ := range columns {
for i := range columns {
columnPointers[i] = &columns[i]
}
_ = rows.Scan(columnPointers...)
Expand Down
33 changes: 24 additions & 9 deletions internal/discovery/sqlcommand.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,20 @@ import (
"database/sql"
"errors"
"fmt"

ut "github.com/al-assad/doris-operator/internal/util"
logf "sigs.k8s.io/controller-runtime/pkg/log"

u "github.com/rjNemo/underscore"
)

func ShowFrontendHosts(db *sql.DB) ([]string, error) {
rows, err := db.Query("show frontends")
defer rows.Close()
defer func() {
if err = rows.Close(); err != nil {
logf.Log.Error(err, "unable to close rows queried by 'show frontends' command")
}
}()

if err != nil {
return []string{}, ut.MergeErrors(errors.New("failed to execute sql 'show frontends'"), err)
Expand All @@ -42,7 +49,11 @@ func ShowFrontendHosts(db *sql.DB) ([]string, error) {

func ShowBackendHosts(db *sql.DB) ([]string, error) {
rows, err := db.Query("show backends")
defer rows.Close()
defer func() {
if err = rows.Close(); err != nil {
logf.Log.Error(err, "unable to close rows queried by 'show backends' command")
}
}()

if err != nil {
return []string{}, ut.MergeErrors(errors.New("failed to execute sql 'show backends'"), err)
Expand All @@ -57,7 +68,11 @@ func ShowBackendHosts(db *sql.DB) ([]string, error) {
// ShowBrokerNameHosts returns map structure: key is broker name, value is broker host
func ShowBrokerNameHosts(db *sql.DB) (map[string]string, error) {
rows, err := db.Query("show broker")
defer rows.Close()
defer func() {
if err = rows.Close(); err != nil {
logf.Log.Error(err, "unable to close rows queried by 'show broker' command")
}
}()

if err != nil {
return map[string]string{}, ut.MergeErrors(errors.New("failed to execute sql 'show broker'"), err)
Expand All @@ -74,7 +89,7 @@ func AddFrontend(db *sql.DB, feHostPort string) error {
addSql := fmt.Sprintf(`alter system add follower "%s"`, feHostPort)
_, err := db.Exec(addSql)
if err != nil {
return ut.MergeErrors(errors.New(fmt.Sprintf("failed to execute sql '%s'", addSql)), err)
return ut.MergeErrors(fmt.Errorf("failed to execute sql '%s'", addSql), err)
}
return nil
}
Expand All @@ -83,7 +98,7 @@ func AddBackend(db *sql.DB, beHostPort string) error {
addSql := fmt.Sprintf(`alter system add backend "%s"`, beHostPort)
_, err := db.Exec(addSql)
if err != nil {
return ut.MergeErrors(errors.New(fmt.Sprintf("failed to execute sql '%s'", addSql)), err)
return ut.MergeErrors(fmt.Errorf("failed to execute sql '%s'", addSql), err)
}
return nil
}
Expand All @@ -92,7 +107,7 @@ func AddBroker(db *sql.DB, brokerName string, brokerHost string) error {
addSql := fmt.Sprintf(`alter system add broker %s "%s"`, brokerName, brokerHost)
_, err := db.Exec(addSql)
if err != nil {
return ut.MergeErrors(errors.New(fmt.Sprintf("failed to execute sql '%s'", addSql)), err)
return ut.MergeErrors(fmt.Errorf("failed to execute sql '%s'", addSql), err)
}
return nil
}
Expand All @@ -101,7 +116,7 @@ func DropFrontend(db *sql.DB, feHostPort string) error {
addSql := fmt.Sprintf(`alter system drop follower "%s"`, feHostPort)
_, err := db.Exec(addSql)
if err != nil {
return ut.MergeErrors(errors.New(fmt.Sprintf("failed to execute sql '%s'", addSql)), err)
return ut.MergeErrors(fmt.Errorf("failed to execute sql '%s'", addSql), err)
}
return nil
}
Expand All @@ -110,7 +125,7 @@ func DropBackend(db *sql.DB, beHostPort string) error {
addSql := fmt.Sprintf(`alter system drop backend "%s"`, beHostPort)
_, err := db.Exec(addSql)
if err != nil {
return ut.MergeErrors(errors.New(fmt.Sprintf("failed to execute sql '%s'", addSql)), err)
return ut.MergeErrors(fmt.Errorf("failed to execute sql '%s'", addSql), err)
}
return nil
}
Expand All @@ -119,7 +134,7 @@ func DropBroker(db *sql.DB, brokerName string) error {
addSql := fmt.Sprintf(`alter system all broker %s`, brokerName)
_, err := db.Exec(addSql)
if err != nil {
return ut.MergeErrors(errors.New(fmt.Sprintf("failed to execute sql '%s'", addSql)), err)
return ut.MergeErrors(fmt.Errorf("failed to execute sql '%s'", addSql), err)
}
return nil
}
11 changes: 5 additions & 6 deletions internal/reconciler/autoscaler_reconciler.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
package reconciler

import (
"errors"
"fmt"

dapi "github.com/al-assad/doris-operator/api/v1beta1"
tran "github.com/al-assad/doris-operator/internal/transformer"
"github.com/al-assad/doris-operator/internal/util"
Expand Down Expand Up @@ -65,18 +65,17 @@ func (r *DorisAutoScalerReconciler) Reconcile() (dapi.AutoscalerRecStatus, error
return err
}
if !exist {
return errors.New(fmt.Sprintf("target DorisCluster[name=%s][namespace=%s] not exist",
clusterRef.Name, clusterRef.Name))
return fmt.Errorf("target DorisCluster[name=%s][namespace=%s] not exist",
clusterRef.Name, clusterRef.Name)
}
// check if target DorisCluster already bound another DorisAutoscaler
bound, bErr := r.FindRefDorisAutoScaler(clusterRef)
if bErr != nil {
return err
}
if bound != nil && bound.Name != r.CR.Name && bound.Namespace != r.CR.Namespace {
return errors.New(
fmt.Sprintf("target DorisCluster already bound another DorisAutoscaler[name=%s][namespace=%s]",
bound.Name, bound.Name))
return fmt.Errorf("target DorisCluster already bound another DorisAutoscaler[name=%s][namespace=%s]",
bound.Name, bound.Name)
}
// apply hpa resources
if cnUpHpa := tran.MakeCnScaleUpHpa(r.CR, r.Schema); cnUpHpa != nil {
Expand Down
2 changes: 1 addition & 1 deletion internal/util/value.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func ArrayFallback[T any](array []T, fallback []T) []T {
}

func MapFallback[K comparable, V any](mapValue map[K]V, fallback map[K]V) map[K]V {
if mapValue == nil || len(mapValue) == 0 {
if len(mapValue) == 0 {
return fallback
} else {
return mapValue
Expand Down

0 comments on commit 931569c

Please sign in to comment.