From 923e183a676d237ccf65a27d420a689906961a40 Mon Sep 17 00:00:00 2001
From: "meilin.huang" <954537473@qq.com>
Date: Fri, 26 Jan 2024 17:17:26 +0800
Subject: [PATCH] refactor: code review

---
 .../src/components/crontab/CrontabInput.vue   |  2 +-
 mayfly_go_web/src/views/ops/db/db.ts          |  2 +-
 server/go.mod                                 |  2 +-
 server/internal/db/api/db.go                  |  2 +-
 server/internal/db/dbm/dbi/conn.go            |  5 +++
 server/internal/db/dbm/dbi/dialect.go         |  3 --
 server/internal/db/dbm/dm/dialect.go          |  5 ---
 server/internal/db/dbm/mysql/dialect.go       |  5 ---
 server/internal/db/dbm/mysql/program.go       |  5 ++-
 server/internal/db/dbm/oracle/dialect.go      |  5 ---
 server/internal/db/dbm/postgres/dialect.go    |  5 ---
 server/internal/db/dbm/sqlite/dialect.go      |  5 ---
 server/pkg/ioc/ioc.go                         | 40 ++++++++++++++++---
 server/pkg/logx/logx.go                       |  2 +-
 14 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/mayfly_go_web/src/components/crontab/CrontabInput.vue b/mayfly_go_web/src/components/crontab/CrontabInput.vue
index 9d8cb555..8b2379c8 100644
--- a/mayfly_go_web/src/components/crontab/CrontabInput.vue
+++ b/mayfly_go_web/src/components/crontab/CrontabInput.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-input v-model="cron" placeholder="可点击左边按钮进行可视化配置">
+    <el-input v-model="cron" placeholder="可点击左边按钮配置">
         <template #prepend>
             <el-button @click="showCron = true" icon="Pointer"></el-button>
         </template>
diff --git a/mayfly_go_web/src/views/ops/db/db.ts b/mayfly_go_web/src/views/ops/db/db.ts
index ba81424f..fc583486 100644
--- a/mayfly_go_web/src/views/ops/db/db.ts
+++ b/mayfly_go_web/src/views/ops/db/db.ts
@@ -363,7 +363,7 @@ export class DbInst {
             return value;
         }
         if (!dbDialect) {
-            return `${value}`;
+            return `'${value}'`;
         }
         return dbDialect.wrapStrValue(columnType, value);
     }
diff --git a/server/go.mod b/server/go.mod
index ad3efc6d..937b95a9 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -31,6 +31,7 @@ require (
 	go.mongodb.org/mongo-driver v1.13.1 // mongo
 	golang.org/x/crypto v0.18.0 // ssh
 	golang.org/x/oauth2 v0.15.0
+	golang.org/x/sync v0.6.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/yaml.v3 v3.0.1
 	// gorm
@@ -84,7 +85,6 @@ require (
 	golang.org/x/exp v0.0.0-20230519143937-03e91628a987 // indirect
 	golang.org/x/image v0.13.0 // indirect
 	golang.org/x/net v0.19.0 // indirect
-	golang.org/x/sync v0.1.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
diff --git a/server/internal/db/api/db.go b/server/internal/db/api/db.go
index 1e318ea2..fff38878 100644
--- a/server/internal/db/api/db.go
+++ b/server/internal/db/api/db.go
@@ -355,7 +355,7 @@ func (d *Db) dumpDb(writer *gzipWriter, dbId uint64, dbName string, tables []str
 			writer.WriteString("BEGIN;\n")
 		}
 		insertSql := "INSERT INTO %s VALUES (%s);\n"
-		dbMeta.WalkTableRecord(table, func(record map[string]any, columns []*dbi.QueryColumn) error {
+		dbConn.WalkTableRows(context.TODO(), table, func(record map[string]any, columns []*dbi.QueryColumn) error {
 			var values []string
 			writer.TryFlush()
 			for _, column := range columns {
diff --git a/server/internal/db/dbm/dbi/conn.go b/server/internal/db/dbm/dbi/conn.go
index b887490a..7b605a92 100644
--- a/server/internal/db/dbm/dbi/conn.go
+++ b/server/internal/db/dbm/dbi/conn.go
@@ -77,6 +77,11 @@ func (d *DbConn) WalkQueryRows(ctx context.Context, querySql string, walkFn Walk
 	return walkQueryRows(ctx, d.db, querySql, walkFn, args...)
 }
 
+// 游标方式遍历指定表的结果集, walkFn返回error不为nil, 则跳出遍历
+func (d *DbConn) WalkTableRows(ctx context.Context, tableName string, walkFn WalkQueryRowsFunc) error {
+	return d.WalkQueryRows(ctx, fmt.Sprintf("SELECT * FROM %s", tableName), walkFn)
+}
+
 // 执行 update, insert, delete，建表等sql
 // 返回影响条数和错误
 func (d *DbConn) Exec(sql string, args ...any) (int64, error) {
diff --git a/server/internal/db/dbm/dbi/dialect.go b/server/internal/db/dbm/dbi/dialect.go
index 35373cea..3eeb879f 100644
--- a/server/internal/db/dbm/dbi/dialect.go
+++ b/server/internal/db/dbm/dbi/dialect.go
@@ -104,9 +104,6 @@ type Dialect interface {
 	// 获取建表ddl
 	GetTableDDL(tableName string) (string, error)
 
-	// WalkTableRecord 遍历指定表的数据
-	WalkTableRecord(tableName string, walkFn WalkQueryRowsFunc) error
-
 	GetSchemas() ([]string, error)
 
 	// GetDbProgram 获取数据库程序模块，用于数据库备份与恢复
diff --git a/server/internal/db/dbm/dm/dialect.go b/server/internal/db/dbm/dm/dialect.go
index f146ea2a..b94daee8 100644
--- a/server/internal/db/dbm/dm/dialect.go
+++ b/server/internal/db/dbm/dm/dialect.go
@@ -1,7 +1,6 @@
 package dm
 
 import (
-	"context"
 	"database/sql"
 	"fmt"
 	"mayfly-go/internal/db/dbm/dbi"
@@ -233,10 +232,6 @@ func (dd *DMDialect) GetTableDDL(tableName string) (string, error) {
 	return builder.String(), nil
 }
 
-func (dd *DMDialect) WalkTableRecord(tableName string, walkFn dbi.WalkQueryRowsFunc) error {
-	return dd.dc.WalkQueryRows(context.Background(), fmt.Sprintf("SELECT * FROM %s", tableName), walkFn)
-}
-
 // 获取DM当前连接的库可访问的schemaNames
 func (dd *DMDialect) GetSchemas() ([]string, error) {
 	sql := dbi.GetLocalSql(DM_META_FILE, DM_DB_SCHEMAS)
diff --git a/server/internal/db/dbm/mysql/dialect.go b/server/internal/db/dbm/mysql/dialect.go
index 342d6f77..9723384c 100644
--- a/server/internal/db/dbm/mysql/dialect.go
+++ b/server/internal/db/dbm/mysql/dialect.go
@@ -1,7 +1,6 @@
 package mysql
 
 import (
-	"context"
 	"database/sql"
 	"fmt"
 	"mayfly-go/internal/db/dbm/dbi"
@@ -164,10 +163,6 @@ func (md *MysqlDialect) GetTableDDL(tableName string) (string, error) {
 	return anyx.ConvString(res[0]["Create Table"]) + ";", nil
 }
 
-func (md *MysqlDialect) WalkTableRecord(tableName string, walkFn dbi.WalkQueryRowsFunc) error {
-	return md.dc.WalkQueryRows(context.Background(), fmt.Sprintf("SELECT * FROM %s", tableName), walkFn)
-}
-
 func (md *MysqlDialect) GetSchemas() ([]string, error) {
 	return nil, nil
 }
diff --git a/server/internal/db/dbm/mysql/program.go b/server/internal/db/dbm/mysql/program.go
index c613719e..c239497c 100644
--- a/server/internal/db/dbm/mysql/program.go
+++ b/server/internal/db/dbm/mysql/program.go
@@ -15,11 +15,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/pkg/errors"
 	"mayfly-go/internal/db/config"
 	"mayfly-go/internal/db/dbm/dbi"
 	"mayfly-go/internal/db/domain/entity"
 	"mayfly-go/pkg/logx"
+
+	"github.com/pkg/errors"
 )
 
 var _ dbi.DbProgram = (*DbProgramMysql)(nil)
@@ -584,7 +585,7 @@ func (svc *DbProgramMysql) ReplayBinlog(ctx context.Context, originalDatabase, t
 		_ = mysqlbinlogCmd.Cancel()
 		if err := mysqlbinlogCmd.Wait(); err != nil {
 			if mysqlbinlogErr.Len() > 0 {
-				logx.Errorf("运行 mysqlbinlog 程序失败", mysqlbinlogErr.String())
+				logx.Errorf("运行 mysqlbinlog 程序失败: %s", mysqlbinlogErr.String())
 				if replayErr != nil {
 					replayErr = errors.Wrap(replayErr, "运行 mysqlbinlog 程序失败: "+mysqlbinlogErr.String())
 				} else {
diff --git a/server/internal/db/dbm/oracle/dialect.go b/server/internal/db/dbm/oracle/dialect.go
index 766818c4..a4ac48e8 100644
--- a/server/internal/db/dbm/oracle/dialect.go
+++ b/server/internal/db/dbm/oracle/dialect.go
@@ -1,7 +1,6 @@
 package oracle
 
 import (
-	"context"
 	"database/sql"
 	"fmt"
 	"mayfly-go/internal/db/dbm/dbi"
@@ -233,10 +232,6 @@ func (od *OracleDialect) GetTableDDL(tableName string) (string, error) {
 	return builder.String(), nil
 }
 
-func (od *OracleDialect) WalkTableRecord(tableName string, walkFn dbi.WalkQueryRowsFunc) error {
-	return od.dc.WalkQueryRows(context.Background(), fmt.Sprintf("SELECT * FROM %s", tableName), walkFn)
-}
-
 // 获取DM当前连接的库可访问的schemaNames
 func (od *OracleDialect) GetSchemas() ([]string, error) {
 	sql := dbi.GetLocalSql(ORACLE_META_FILE, ORACLE_DB_SCHEMAS)
diff --git a/server/internal/db/dbm/postgres/dialect.go b/server/internal/db/dbm/postgres/dialect.go
index ce00c6e7..f465c733 100644
--- a/server/internal/db/dbm/postgres/dialect.go
+++ b/server/internal/db/dbm/postgres/dialect.go
@@ -1,7 +1,6 @@
 package postgres
 
 import (
-	"context"
 	"database/sql"
 	"fmt"
 	"mayfly-go/internal/db/dbm/dbi"
@@ -173,10 +172,6 @@ func (md *PgsqlDialect) GetTableDDL(tableName string) (string, error) {
 	return res[0]["sql"].(string), nil
 }
 
-func (md *PgsqlDialect) WalkTableRecord(tableName string, walkFn dbi.WalkQueryRowsFunc) error {
-	return md.dc.WalkQueryRows(context.Background(), fmt.Sprintf("SELECT * FROM %s", tableName), walkFn)
-}
-
 // 获取pgsql当前连接的库可访问的schemaNames
 func (md *PgsqlDialect) GetSchemas() ([]string, error) {
 	sql := dbi.GetLocalSql(PGSQL_META_FILE, PGSQL_DB_SCHEMAS)
diff --git a/server/internal/db/dbm/sqlite/dialect.go b/server/internal/db/dbm/sqlite/dialect.go
index 8bbb94d0..8db6f2ff 100644
--- a/server/internal/db/dbm/sqlite/dialect.go
+++ b/server/internal/db/dbm/sqlite/dialect.go
@@ -1,7 +1,6 @@
 package sqlite
 
 import (
-	"context"
 	"database/sql"
 	"errors"
 	"fmt"
@@ -183,10 +182,6 @@ func (sd *SqliteDialect) GetTableDDL(tableName string) (string, error) {
 	return builder.String(), nil
 }
 
-func (sd *SqliteDialect) WalkTableRecord(tableName string, walkFn dbi.WalkQueryRowsFunc) error {
-	return sd.dc.WalkQueryRows(context.Background(), fmt.Sprintf("SELECT * FROM %s", tableName), walkFn)
-}
-
 func (sd *SqliteDialect) GetSchemas() ([]string, error) {
 	return nil, nil
 }
diff --git a/server/pkg/ioc/ioc.go b/server/pkg/ioc/ioc.go
index 40cddbf2..07e759fa 100644
--- a/server/pkg/ioc/ioc.go
+++ b/server/pkg/ioc/ioc.go
@@ -1,16 +1,22 @@
 package ioc
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"mayfly-go/pkg/logx"
+	"mayfly-go/pkg/utils/collx"
 	"mayfly-go/pkg/utils/structx"
 	"reflect"
 	"strings"
+	"sync"
+
+	"golang.org/x/sync/errgroup"
 )
 
 // 容器
 type Container struct {
+	mu         sync.RWMutex
 	components map[string]*Component
 }
 
@@ -22,6 +28,9 @@ func NewContainer() *Container {
 
 // 注册实例至实例容器
 func (c *Container) Register(bean any, opts ...ComponentOption) {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+
 	component := NewComponent(bean, opts...)
 
 	componentName := component.Name
@@ -32,7 +41,7 @@ func (c *Container) Register(bean any, opts ...ComponentOption) {
 		component.Name = componentName
 	}
 
-	if _, err := c.Get(componentName); err == nil {
+	if _, ok := c.components[componentName]; ok {
 		logx.Warnf("组件名[%s]已经注册至容器, 重复注册...", componentName)
 	}
 
@@ -58,16 +67,37 @@ func (c *Container) Inject(obj any) error {
 
 // 对所有组件实例执行Inject。即为实例字段注入依赖的组件实例
 func (c *Container) InjectComponents() error {
-	for _, v := range c.components {
-		if err := c.Inject(v.Value); err != nil {
-			return err
-		}
+	componentsGroups := collx.ArraySplit[*Component](collx.MapValues(c.components), 10)
+
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	errGroup, _ := errgroup.WithContext(ctx)
+
+	for _, components := range componentsGroups {
+		components := components // 创建局部变量以在闭包中使用
+		errGroup.Go(func() error {
+			for _, v := range components {
+				if err := c.Inject(v.Value); err != nil {
+					cancel() // 取消所有协程的执行
+					return err
+				}
+			}
+			return nil
+		})
 	}
+
+	if err := errGroup.Wait(); err != nil {
+		return err
+	}
+
 	return nil
 }
 
 // 根据组件实例名，获取对应实例信息
 func (c *Container) Get(name string) (any, error) {
+	c.mu.RLock()
+	defer c.mu.RUnlock()
+
 	component, ok := c.components[name]
 	if !ok {
 		return nil, errors.New("component not found: " + name)
diff --git a/server/pkg/logx/logx.go b/server/pkg/logx/logx.go
index 8522f5b8..44208a98 100644
--- a/server/pkg/logx/logx.go
+++ b/server/pkg/logx/logx.go
@@ -116,7 +116,7 @@ func ErrorTrace(msg string, err any) {
 	default:
 		errMsg = fmt.Sprintf("%v", t)
 	}
-	Log(context.Background(), slog.LevelError, fmt.Sprintf(msg+"\n%s\n%s", errMsg, runtimex.StatckStr(2, 10)))
+	Log(context.Background(), slog.LevelError, fmt.Sprintf(msg+"\n%s\n%s", errMsg, runtimex.StatckStr(2, 20)))
 }
 
 func ErrorWithFields(ctx context.Context, msg string, mapFields map[string]any) {