diff --git a/go.mod b/go.mod index b6ec1b5734..29eabbd7dd 100644 --- a/go.mod +++ b/go.mod @@ -95,7 +95,7 @@ require ( yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900 yunion.io/x/pkg v1.10.1-0.20240127153242-cdf9dc071f4f yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e - yunion.io/x/sqlchemy v1.1.3-0.20240210082039-494595ecac04 + yunion.io/x/sqlchemy v1.1.3-0.20240210161427-e48bb9a658b7 yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c ) diff --git a/go.sum b/go.sum index 0296f8ad4d..83c318e48e 100644 --- a/go.sum +++ b/go.sum @@ -1220,7 +1220,7 @@ yunion.io/x/pkg v1.10.1-0.20240127153242-cdf9dc071f4f h1:nLMBj8S3/ev2pB1wzGSi6hO yunion.io/x/pkg v1.10.1-0.20240127153242-cdf9dc071f4f/go.mod h1:ksCJVQ+DwKrJ5QBEoU8pzrDFfDaZVAFH/iJ6yQCYxJk= yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e h1:v+EzIadodSwkdZ/7bremd7J8J50Cise/HCylsOJngmo= yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e/go.mod h1:0iFKpOs1y4lbCxeOmq3Xx/0AcQoewVPwj62eRluioEo= -yunion.io/x/sqlchemy v1.1.3-0.20240210082039-494595ecac04 h1:30AHnjPBnE/bvyQu8px71/IP6mFsfNBnCYOsBVldIJc= -yunion.io/x/sqlchemy v1.1.3-0.20240210082039-494595ecac04/go.mod h1:uuPVZEyEq3sWd5vf9VjGSy6lZzof22X87OEHw9sddJQ= +yunion.io/x/sqlchemy v1.1.3-0.20240210161427-e48bb9a658b7 h1:T/lJOFh353MbMon3k+gzGbrmTOV1a6I8/dIlrEdwV9I= +yunion.io/x/sqlchemy v1.1.3-0.20240210161427-e48bb9a658b7/go.mod h1:uuPVZEyEq3sWd5vf9VjGSy6lZzof22X87OEHw9sddJQ= yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c h1:QuLab2kSRECZRxo4Lo2KcYn6XjQFDGaZ1+x0pYDVVwQ= yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c/go.mod h1:EP6NSv2C0zzqBDTKumv8hPWLb3XvgMZDHQRfyuOrQng= diff --git a/pkg/cloudcommon/db/standalone_anon.go b/pkg/cloudcommon/db/standalone_anon.go index d3f74bcd68..9a9f018a8c 100644 --- a/pkg/cloudcommon/db/standalone_anon.go +++ b/pkg/cloudcommon/db/standalone_anon.go @@ -990,7 +990,7 @@ func GetTagValueCountMap( query jsonutils.JSONObject, ) ([]map[string]string, error) { var err error - objQ := manager.Query() + objQ := manager.NewQuery(ctx, userCred, query, false) objQ, err = ListItemQueryFilters(manager, ctx, objQ, userCred, query, policy.PolicyActionList) if err != nil { return nil, errors.Wrap(err, "ListItemQueryFilters") @@ -1006,8 +1006,10 @@ func GetTagValueCountMap( } objSubQ = objSubQ.AppendField(sumFieldQ) + objSubQ.DebugQuery2("GetTagValueCountMap objSubQ") + q := objSubQ.SubQuery().Query() - q = q.AppendField(sqlchemy.SUM(tagValueCountKey, objSubQ.Field("_sub_count_"))) + q = q.AppendField(sqlchemy.SUM(tagValueCountKey, q.Field("_sub_count_"))) metadataMan := GetMetadaManagerInContext(ctx) metadataSQ := metadataMan.Query().Equals("obj_type", tagObjType).In("key", keys).SubQuery() @@ -1026,6 +1028,8 @@ func GetTagValueCountMap( } q = q.GroupBy(groupBy...) + q.DebugQuery2("GetTagValueCountMap") + valueMap, err := q.AllStringMap() if err != nil { return nil, errors.Wrap(err, "AllStringAmp") diff --git a/vendor/modules.txt b/vendor/modules.txt index eece485c0d..13e8c939b1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1616,7 +1616,7 @@ yunion.io/x/pkg/utils # yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e ## explicit; go 1.12 yunion.io/x/s3cli -# yunion.io/x/sqlchemy v1.1.3-0.20240210082039-494595ecac04 +# yunion.io/x/sqlchemy v1.1.3-0.20240210161427-e48bb9a658b7 ## explicit; go 1.17 yunion.io/x/sqlchemy yunion.io/x/sqlchemy/backends diff --git a/vendor/yunion.io/x/sqlchemy/update.go b/vendor/yunion.io/x/sqlchemy/update.go index 6dac487556..fb1ea59f79 100644 --- a/vendor/yunion.io/x/sqlchemy/update.go +++ b/vendor/yunion.io/x/sqlchemy/update.go @@ -224,7 +224,6 @@ func (us *SUpdateSession) SaveUpdateSql(dt interface{}) (*SUpdateSQLResult, erro if DEBUG_SQLCHEMY { log.Infof("Update: %s", _sqlDebug(updateSql, vars)) } - log.Infof("Update: %s", _sqlDebug(updateSql, vars)) return &SUpdateSQLResult{ Sql: updateSql,