blackteay/gf
1
0
Fork 0
mirror of https://github.com/gogf/gf.git synced 2025-04-05 11:18:50 +08:00
Code Issues Projects Releases Wiki Activity

perf(database/gdb): performance improvement for struct scanning when with feature disabled (#3677)

Browse Source
This commit is contained in:
wln32 2024-09-12 15:38:18 +08:00 committed by GitHub
parent 6b3fb607cf
commit 9b318bb57f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
database/gdb/gdb_model_soft_time.go
View File

@ -15,12 +15,11 @@ import (
"github.com/gogf/gf/v2/errors/gcode"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/internal/intlog"
"github.com/gogf/gf/v2/internal/utils"
"github.com/gogf/gf/v2/os/gcache"
"github.com/gogf/gf/v2/os/gtime"
"github.com/gogf/gf/v2/text/gregex"
"github.com/gogf/gf/v2/text/gstr"
"github.com/gogf/gf/v2/util/gconv"
"github.com/gogf/gf/v2/util/gutil"
)
// SoftTimeType custom defines the soft time field type.
@ -206,9 +205,7 @@ func (m *softTimeMaintainer) getSoftFieldNameAndType(
return nil, nil
}
for _, checkFiledName := range checkFiledNames {
fieldName, _ = gutil.MapPossibleItemByKey(
gconv.Map(fieldsMap), checkFiledName,
)
fieldName = searchFieldNameFromMap(fieldsMap, checkFiledName)
if fieldName != "" {
fieldType, _ = m.db.CheckLocalTypeForField(
ctx, fieldsMap[fieldName].Type, nil,
@ -238,6 +235,23 @@ func (m *softTimeMaintainer) getSoftFieldNameAndType(
return
}
func searchFieldNameFromMap(fieldsMap map[string]*TableField, key string) string {
if len(fieldsMap) == 0 {
return ""
}
_, ok := fieldsMap[key]
if ok {
return key
}
key = utils.RemoveSymbols(key)
for k := range fieldsMap {
if strings.EqualFold(utils.RemoveSymbols(k), key) {
return k
}
}
return ""
}
// GetWhereConditionForDelete retrieves and returns the condition string for soft deleting.
// It supports multiple tables string like:
// "user u, user_detail ud"

6
database/gdb/gdb_model_with.go
View File

@ -67,6 +67,9 @@ func (m *Model) WithAll() *Model {
// doWithScanStruct handles model association operations feature for single struct.
func (m *Model) doWithScanStruct(pointer interface{}) error {
if len(m.withArray) == 0 && m.withAll == false {
return nil
}
var (
err error
allowedTypeStrArray = make([]string, 0)
@ -183,6 +186,9 @@ func (m *Model) doWithScanStruct(pointer interface{}) error {
// doWithScanStructs handles model association operations feature for struct slice.
// Also see doWithScanStruct.
func (m *Model) doWithScanStructs(pointer interface{}) error {
if len(m.withArray) == 0 && m.withAll == false {
return nil
}
if v, ok := pointer.(reflect.Value); ok {
pointer = v.Interface()
}