luckyimnotanigger/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-06-24 10:00:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Upgrade xorm to v1.0.0 (#10646)

Browse source 
* Upgrade xorm to v1.0.0

* small nit

* Fix tests

* Update xorm

* Update xorm

* fix go.sum

* fix test

* Fix bug when dump

* Fix bug

* update xorm to latest

* Fix migration test

* update xorm to latest

* Fix import order

* Use xorm tag
This commit is contained in:
Lunny Xiao 2020-03-22 23:12:55 +08:00 • committed by GitHub
parent dcaa5643d7
commit c61b902538
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
154 changed files with 7195 additions and 5962 deletions
Download patch file Download diff file Expand all files Collapse all files

47
vendor/xorm.io/xorm/session_iterate.go generated vendored
View file

@ -4,7 +4,11 @@
package xorm
import "reflect"
import (
"reflect"
"xorm.io/xorm/internal/utils"
)
// IterFunc only use by Iterate
type IterFunc func(idx int, bean interface{}) error
@ -23,11 +27,11 @@ func (session *Session) Iterate(bean interface{}, fun IterFunc) error {
defer session.Close()
}
if session.statement.lastError != nil {
return session.statement.lastError
if session.statement.LastError != nil {
return session.statement.LastError
}
if session.statement.bufferSize > 0 {
if session.statement.BufferSize > 0 {
return session.bufferIterate(bean, fun)
}
@ -55,27 +59,28 @@ func (session *Session) Iterate(bean interface{}, fun IterFunc) error {
// BufferSize sets the buffersize for iterate
func (session *Session) BufferSize(size int) *Session {
session.statement.bufferSize = size
session.statement.BufferSize = size
return session
}
func (session *Session) bufferIterate(bean interface{}, fun IterFunc) error {
if session.isAutoClose {
defer session.Close()
}
var bufferSize = session.statement.bufferSize
var limit = session.statement.LimitN
if limit > 0 && bufferSize > limit {
bufferSize = limit
var bufferSize = session.statement.BufferSize
var pLimitN = session.statement.LimitN
if pLimitN != nil && bufferSize > *pLimitN {
bufferSize = *pLimitN
}
var start = session.statement.Start
v := rValue(bean)
v := utils.ReflectValue(bean)
sliceType := reflect.SliceOf(v.Type())
var idx = 0
for {
session.autoResetStatement = false
defer func() {
session.autoResetStatement = true
}()
for bufferSize > 0 {
slice := reflect.New(sliceType)
if err := session.Limit(bufferSize, start).find(slice.Interface(), bean); err != nil {
if err := session.NoCache().Limit(bufferSize, start).find(slice.Interface(), bean); err != nil {
return err
}
@ -86,13 +91,13 @@ func (session *Session) bufferIterate(bean interface{}, fun IterFunc) error {
idx++
}
start = start + slice.Elem().Len()
if limit > 0 && idx+bufferSize > limit {
bufferSize = limit - idx
if bufferSize > slice.Elem().Len() {
break
}
if bufferSize <= 0 || slice.Elem().Len() < bufferSize || idx == limit {
break
start = start + slice.Elem().Len()
if pLimitN != nil && start+bufferSize > *pLimitN {
bufferSize = *pLimitN - start
}
}