opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-24 12:32:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: need more args in CustomizedTotalCount (#15718)

Browse Source 
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
This commit is contained in:
Jian Qiu
2023-01-06 03:33:53 +08:00
committed by GitHub
co-authored by Qiu Jian
parent e11a1a83b3
commit edd4695dbd
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/db_dispatcher.go
+1 -1
View File
@@ -652,7 +652,7 @@ func ListItems(manager IModelManager, ctx context.Context, userCred mcclient.Tok
if pagingConf == nil {
// calculate total
totalQ := q.CountQuery()
totalCnt, totalJson, err = manager.CustomizedTotalCount(totalQ)
totalCnt, totalJson, err = manager.CustomizedTotalCount(ctx, userCred, query, totalQ)
if err != nil {
return nil, errors.Wrap(err, "CustomizedTotalCount")
}
pkg/cloudcommon/db/interface.go
+1 -1
View File
@@ -139,7 +139,7 @@ type IModelManager interface {
CreateByInsertOrUpdate() bool
CustomizedTotalCount(totalQ *sqlchemy.SQuery) (int, jsonutils.JSONObject, error)
CustomizedTotalCount(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, totalQ *sqlchemy.SQuery) (int, jsonutils.JSONObject, error)
}
type IModel interface {
pkg/cloudcommon/db/modelbase.go
+1 -1
View File
@@ -539,7 +539,7 @@ func (manager *SModelBaseManager) PerformPurgeSplitable(ctx context.Context, use
return jsonutils.Marshal(map[string][]string{"tables": ret}), nil
}
func (manager *SModelBaseManager) CustomizedTotalCount(totalQ *sqlchemy.SQuery) (int, jsonutils.JSONObject, error) {
func (manager *SModelBaseManager) CustomizedTotalCount(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, totalQ *sqlchemy.SQuery) (int, jsonutils.JSONObject, error) {
ret := apis.TotalCountBase{}
err := totalQ.First(&ret)
if err != nil {
pkg/compute/models/guests.go
+1 -1
View File
@@ -6361,7 +6361,7 @@ type SGuestTotalCount struct {
DiskCount int
}
func (manager *SGuestManager) CustomizedTotalCount(totalQ *sqlchemy.SQuery) (int, jsonutils.JSONObject, error) {
func (manager *SGuestManager) CustomizedTotalCount(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, totalQ *sqlchemy.SQuery) (int, jsonutils.JSONObject, error) {
results := SGuestTotalCount{}
totalQ = totalQ.AppendField(sqlchemy.SUM("cpu_count", totalQ.Field("vcpu_count")))