HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化性能：减少func (session *Session) slice2Bean方法中的strings.ToLower调用次数以及减少map创建和访问次数（对应issue为: https://gitea.com/xorm/xorm/issues/2243）

This commit is contained in:
洪坤安 2023-04-19 08:09:48 +08:00
parent 486fd42549
commit 923fbf47e5
4 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rows.go
View File

@ -129,9 +129,12 @@ func (rows *Rows) Scan(beans ...interface{}) error {
return err return err
} }
allColumn := ParseQueryRows(fields, types) columnsSchema, parseError := ParseColumnsSchema(fields, types, rows.session.statement.RefTable)
if parseError != nil {
return parseError
}
if err := rows.session.scan(rows.rows, rows.session.statement.RefTable, beanKind, beans, allColumn, types, fields); err != nil { if err := rows.session.scan(rows.rows, rows.session.statement.RefTable, beanKind, beans, columnsSchema, types, fields); err != nil {
return err return err
} }

12
session.go
View File

@ -416,7 +416,7 @@ func getField(dataStruct *reflect.Value, table *schemas.Table, field *QueryedFie
// Cell cell is a result of one column field // Cell cell is a result of one column field
type Cell *interface{} type Cell *interface{}
func (session *Session) rows2Beans(rows *core.Rows, allColumn *AllColumn, fields []string, types []*sql.ColumnType, func (session *Session) rows2Beans(rows *core.Rows, columnsSchema *ColumnsSchema, fields []string, types []*sql.ColumnType,
table *schemas.Table, newElemFunc func([]string) reflect.Value, table *schemas.Table, newElemFunc func([]string) reflect.Value,
sliceValueSetFunc func(*reflect.Value, schemas.PK) error, sliceValueSetFunc func(*reflect.Value, schemas.PK) error,
) error { ) error {
@ -426,11 +426,11 @@ func (session *Session) rows2Beans(rows *core.Rows, allColumn *AllColumn, fields
dataStruct := newValue.Elem() dataStruct := newValue.Elem()
// handle beforeClosures // handle beforeClosures
scanResults, err := session.row2Slice(rows, allColumn, fields, types, bean) scanResults, err := session.row2Slice(rows, fields, types, bean)
if err != nil { if err != nil {
return err return err
} }
pk, err := session.slice2Bean(scanResults, allColumn, fields, bean, &dataStruct, table) pk, err := session.slice2Bean(scanResults, columnsSchema, fields, bean, &dataStruct, table)
if err != nil { if err != nil {
return err return err
} }
@ -445,7 +445,7 @@ func (session *Session) rows2Beans(rows *core.Rows, allColumn *AllColumn, fields
return rows.Err() return rows.Err()
} }
func (session *Session) row2Slice(rows *core.Rows, allColumn *AllColumn, fields []string, types []*sql.ColumnType, bean interface{}) ([]interface{}, error) { func (session *Session) row2Slice(rows *core.Rows, fields []string, types []*sql.ColumnType, bean interface{}) ([]interface{}, error) {
for _, closure := range session.beforeClosures { for _, closure := range session.beforeClosures {
closure(bean) closure(bean)
} }
@ -703,7 +703,7 @@ func (session *Session) convertBeanField(col *schemas.Column, fieldValue *reflec
return convert.AssignValue(fieldValue.Addr(), scanResult) return convert.AssignValue(fieldValue.Addr(), scanResult)
} }
func (session *Session) slice2Bean(scanResults []interface{}, allColum *AllColumn, fields []string, bean interface{}, dataStruct *reflect.Value, table *schemas.Table) (schemas.PK, error) { func (session *Session) slice2Bean(scanResults []interface{}, columnsSchema *ColumnsSchema, fields []string, bean interface{}, dataStruct *reflect.Value, table *schemas.Table) (schemas.PK, error) {
defer func() { defer func() {
executeAfterSet(bean, fields, scanResults) executeAfterSet(bean, fields, scanResults)
}() }()
@ -711,7 +711,7 @@ func (session *Session) slice2Bean(scanResults []interface{}, allColum *AllColum
buildAfterProcessors(session, bean) buildAfterProcessors(session, bean)
var pk schemas.PK var pk schemas.PK
for i, field := range allColum.Fields { for i, field := range columnsSchema.Fields {
col, fieldValue, err := getField(dataStruct, table, field) col, fieldValue, err := getField(dataStruct, table, field)
if _, ok := err.(ErrFieldIsNotExist); ok { if _, ok := err.(ErrFieldIsNotExist); ok {
continue continue

29
session_find.go
View File

@ -171,14 +171,14 @@ type QueryedField struct {
ColumnSchema *schemas.Column ColumnSchema *schemas.Column
} }
type AllColumn struct { type ColumnsSchema struct {
Fields []*QueryedField Fields []*QueryedField
FieldNames []string FieldNames []string
Types []*sql.ColumnType Types []*sql.ColumnType
} }
func (allColumn *AllColumn) ParseTableSchema(table *schemas.Table) error { func (columnsSchema *ColumnsSchema) ParseTableSchema(table *schemas.Table) error {
for _, field := range allColumn.Fields { for _, field := range columnsSchema.Fields {
col := table.GetColumnIdx(field.FieldName, field.TempIndex) col := table.GetColumnIdx(field.FieldName, field.TempIndex)
if col == nil { if col == nil {
return ErrFieldIsNotExist{FieldName: field.FieldName, TableName: table.Name} return ErrFieldIsNotExist{FieldName: field.FieldName, TableName: table.Name}
@ -190,8 +190,8 @@ func (allColumn *AllColumn) ParseTableSchema(table *schemas.Table) error {
return nil return nil
} }
func ParseQueryRows(fieldNames []string, types []*sql.ColumnType) *AllColumn { func ParseColumnsSchema(fieldNames []string, types []*sql.ColumnType, table *schemas.Table) (*ColumnsSchema, error) {
var allColumn AllColumn var columnsSchema ColumnsSchema
fields := make([]*QueryedField, 0, len(fieldNames)) fields := make([]*QueryedField, 0, len(fieldNames))
@ -204,7 +204,7 @@ func ParseQueryRows(fieldNames []string, types []*sql.ColumnType) *AllColumn {
fields = append(fields, field) fields = append(fields, field)
} }
allColumn.Fields = fields columnsSchema.Fields = fields
tempMap := make(map[string]int) tempMap := make(map[string]int)
for _, field := range fields { for _, field := range fields {
@ -221,7 +221,12 @@ func ParseQueryRows(fieldNames []string, types []*sql.ColumnType) *AllColumn {
field.TempIndex = idx field.TempIndex = idx
} }
return &allColumn err := columnsSchema.ParseTableSchema(table)
if err != nil {
return nil, err
}
return &columnsSchema, nil
} }
func (session *Session) noCacheFind(table *schemas.Table, containerValue reflect.Value, sqlStr string, args ...interface{}) error { func (session *Session) noCacheFind(table *schemas.Table, containerValue reflect.Value, sqlStr string, args ...interface{}) error {
@ -251,8 +256,6 @@ func (session *Session) noCacheFind(table *schemas.Table, containerValue reflect
return err return err
} }
allColumn := ParseQueryRows(fields, types)
newElemFunc := func(fields []string) reflect.Value { newElemFunc := func(fields []string) reflect.Value {
return utils.New(elemType, len(fields), len(fields)) return utils.New(elemType, len(fields), len(fields))
} }
@ -304,12 +307,12 @@ func (session *Session) noCacheFind(table *schemas.Table, containerValue reflect
return err return err
} }
parseTableSchemaError := allColumn.ParseTableSchema(tb) columnsSchema, parseError := ParseColumnsSchema(fields, types, tb)
if parseTableSchemaError != nil { if parseError != nil {
return parseTableSchemaError return parseError
} }
err = session.rows2Beans(rows, allColumn, fields, types, tb, newElemFunc, containerValueSetFunc) err = session.rows2Beans(rows, columnsSchema, fields, types, tb, newElemFunc, containerValueSetFunc)
rows.Close() rows.Close()
if err != nil { if err != nil {
return err return err

13
session_get.go
View File

@ -164,9 +164,12 @@ func (session *Session) nocacheGet(beanKind reflect.Kind, table *schemas.Table,
return true, err return true, err
} }
allColumn := ParseQueryRows(fields, types) columnsSchema, parseError := ParseColumnsSchema(fields, types, table)
if parseError != nil {
return true, parseError
}
if err := session.scan(rows, table, beanKind, beans, allColumn, types, fields); err != nil { if err := session.scan(rows, table, beanKind, beans, columnsSchema, types, fields); err != nil {
return true, err return true, err
} }
rows.Close() rows.Close()
@ -174,7 +177,7 @@ func (session *Session) nocacheGet(beanKind reflect.Kind, table *schemas.Table,
return true, session.executeProcessors() return true, session.executeProcessors()
} }
func (session *Session) scan(rows *core.Rows, table *schemas.Table, firstBeanKind reflect.Kind, beans []interface{}, allColumn *AllColumn, types []*sql.ColumnType, fields []string) error { func (session *Session) scan(rows *core.Rows, table *schemas.Table, firstBeanKind reflect.Kind, beans []interface{}, columnsSchema *ColumnsSchema, types []*sql.ColumnType, fields []string) error {
if len(beans) == 1 { if len(beans) == 1 {
bean := beans[0] bean := beans[0]
switch firstBeanKind { switch firstBeanKind {
@ -182,13 +185,13 @@ func (session *Session) scan(rows *core.Rows, table *schemas.Table, firstBeanKin
if !isScannableStruct(bean, len(types)) { if !isScannableStruct(bean, len(types)) {
break break
} }
scanResults, err := session.row2Slice(rows, allColumn, fields, types, bean) scanResults, err := session.row2Slice(rows, fields, types, bean)
if err != nil { if err != nil {
return err return err
} }
dataStruct := utils.ReflectValue(bean) dataStruct := utils.ReflectValue(bean)
_, err = session.slice2Bean(scanResults, allColumn, fields, bean, &dataStruct, table) _, err = session.slice2Bean(scanResults, columnsSchema, fields, bean, &dataStruct, table)
return err return err
case reflect.Slice: case reflect.Slice:
return session.getSlice(rows, types, fields, bean) return session.getSlice(rows, types, fields, bean)