优化数据库相关代码

internal/db/db_test.go

@@ -3,6 +3,7 @@ package db
 import (
 	"database/sql"
 	"database/sql/driver"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/iwind/TeaGo/Tea"
 	_ "github.com/iwind/TeaGo/bootstrap"
@@ -42,3 +43,13 @@ func TestDB_Instance(t *testing.T) {
 	}
 	time.Sleep(100 * time.Second)
 }
+
+func TestDB_Reuse(t *testing.T) {
+	var dao = models.NewVersionDAO()
+	for i := 0; i < 20_000; i++ {
+		_, _, err := dao.Query(nil).Attr("version", i).Reuse(true).FindOne()
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+}

internal/db/models/db_node_initializer.go

@@ -237,7 +237,7 @@ func (this *DBNodeInitializer) loop() error {
 		}
 
 		if db == nil {
-			config := &dbs.DBConfig{
+			var config = &dbs.DBConfig{
 				Driver: "mysql",
 				Dsn:    dsn,
 				Prefix: "edge",

internal/db/models/http_access_log_manager_test.go

@@ -30,6 +30,9 @@ func TestNewHTTPAccessLogManager(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer func() {
+		_ = db.Close()
+	}()
 
 	var manager = models.SharedHTTPAccessLogManager
 	err = manager.CreateTable(db, "accessLog_1")
@@ -58,6 +61,9 @@ func TestHTTPAccessLogManager_FindTableNames(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer func() {
+		_ = db.Close()
+	}()
 
 	for i := 0; i < 3; i++ {
 		var before = time.Now()
@@ -74,7 +80,6 @@ func TestHTTPAccessLogManager_FindTableNames(t *testing.T) {
 	}
 }
 
-
 func TestHTTPAccessLogManager_FindTables(t *testing.T) {
 	var config = &dbs.DBConfig{
 		Driver: "mysql",
@@ -95,6 +100,9 @@ func TestHTTPAccessLogManager_FindTables(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer func() {
+		_ = db.Close()
+	}()
 
 	for i := 0; i < 3; i++ {
 		var before = time.Now()
@@ -131,6 +139,9 @@ func TestHTTPAccessLogManager_FindTable(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer func() {
+		_ = db.Close()
+	}()
 
 	for i := 0; i < 3; i++ {
 		var before = time.Now()

internal/db/utils/utils.go

@@ -3,11 +3,8 @@ package dbutils
 import (
 	"github.com/iwind/TeaGo/dbs"
 	"strings"
-	"sync"
 )
 
-var SharedCacheLocker = sync.RWMutex{}
-
 // NewQuery 构造Query
 func NewQuery(tx *dbs.Tx, dao dbs.DAOWrapper, adminId int64, userId int64) *dbs.Query {
 	query := dao.Object().Query(tx)