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

bug fixed for cacheFind

This commit is contained in:
Lunny Xiao 2013-10-14 21:39:36 +08:00
parent 22b4302e05
commit b6c2451bfa
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
session.go
View File

@ -574,6 +574,7 @@ func (session *Session) cacheFind(t reflect.Type, sql string, rowsSlicePtr inter
} }
sliceValue := reflect.Indirect(reflect.ValueOf(rowsSlicePtr)) sliceValue := reflect.Indirect(reflect.ValueOf(rowsSlicePtr))
pkFieldName := session.Statement.RefTable.PKColumn().FieldName
ididxes := make(map[int64]int) ididxes := make(map[int64]int)
var idxes []int = make([]int, 0) var idxes []int = make([]int, 0)
@ -588,6 +589,12 @@ func (session *Session) cacheFind(t reflect.Type, sql string, rowsSlicePtr inter
ididxes[id] = idx ididxes[id] = idx
} else { } else {
session.Engine.LogDebug("[xorm:cacheFind] cached bean:", tableName, id, bean) session.Engine.LogDebug("[xorm:cacheFind] cached bean:", tableName, id, bean)
sid := reflect.Indirect(reflect.ValueOf(bean)).FieldByName(pkFieldName).Int()
if sid != id {
session.Engine.LogError("[xorm:cacheFind] error cache", id, sid, bean)
return ErrCacheFailed
}
temps[idx] = bean temps[idx] = bean
} }
} }
@ -605,8 +612,6 @@ func (session *Session) cacheFind(t reflect.Type, sql string, rowsSlicePtr inter
return err return err
} }
pkFieldName := session.Statement.RefTable.PKColumn().FieldName
vs := reflect.Indirect(reflect.ValueOf(beans)) vs := reflect.Indirect(reflect.ValueOf(beans))
for i := 0; i < vs.Len(); i++ { for i := 0; i < vs.Len(); i++ {
rv := vs.Index(i) rv := vs.Index(i)
@ -618,8 +623,8 @@ func (session *Session) cacheFind(t reflect.Type, sql string, rowsSlicePtr inter
//bean := vs.Index(i).Addr().Interface() //bean := vs.Index(i).Addr().Interface()
temps[ididxes[id]] = bean temps[ididxes[id]] = bean
//temps[idxes[i]] = bean //temps[idxes[i]] = bean
session.Engine.LogDebug("[xorm:cacheFind] cache bean:", tableName, ides[i], bean) session.Engine.LogDebug("[xorm:cacheFind] cache bean:", tableName, id, bean)
cacher.PutBean(tableName, ides[i].(int64), bean) cacher.PutBean(tableName, id, bean)
} }
} }