From d7bed1a2f0a18d9e3c289af018ed053208e29ca6 Mon Sep 17 00:00:00 2001 From: ioito Date: Thu, 9 May 2019 16:49:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=81=BF=E5=85=8D=E6=98=BE=E7=A4=BA=E8=84=8F?= =?UTF-8?q?=E7=9A=84image=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/cachedimages.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/compute/models/cachedimages.go b/pkg/compute/models/cachedimages.go index a470bcc569..5152c4a5d9 100644 --- a/pkg/compute/models/cachedimages.go +++ b/pkg/compute/models/cachedimages.go @@ -523,7 +523,7 @@ func (manager *SCachedimageManager) ListItemFilter(ctx context.Context, q *sqlch subq = subq.Join(storagecachedImages, sqlchemy.Equals(cachedImages.Field("id"), storagecachedImages.Field("cachedimage_id"))) subq = subq.Join(storageCaches, sqlchemy.Equals(storagecachedImages.Field("storagecache_id"), storageCaches.Field("id"))) subq = subq.Join(cloudproviders, sqlchemy.Equals(storageCaches.Field("manager_id"), cloudproviders.Field("id"))) - subq = subq.Filter(sqlchemy.Equals(cloudproviders.Field("provider"), providerStr)) + subq = subq.Filter(sqlchemy.Equals(cloudproviders.Field("provider"), providerStr)).Filter(sqlchemy.Equals(storagecachedImages.Field("status"), api.CACHED_IMAGE_STATUS_READY)) q = q.Filter(sqlchemy.In(q.Field("id"), subq.SubQuery())) } @@ -547,7 +547,7 @@ func (manager *SCachedimageManager) ListItemFilter(ctx context.Context, q *sqlch subq = subq.Join(storagecachedImages, sqlchemy.Equals(cachedImages.Field("id"), storagecachedImages.Field("cachedimage_id"))) subq = subq.Join(storageCaches, sqlchemy.Equals(storagecachedImages.Field("storagecache_id"), storageCaches.Field("id"))) subq = subq.Join(cloudproviders, sqlchemy.Equals(storageCaches.Field("manager_id"), cloudproviders.Field("id"))) - subq = subq.Filter(sqlchemy.Equals(cloudproviders.Field("cloudaccount_id"), accountObj.GetId())) + subq = subq.Filter(sqlchemy.Equals(cloudproviders.Field("cloudaccount_id"), accountObj.GetId())).Filter(sqlchemy.Equals(storagecachedImages.Field("status"), api.CACHED_IMAGE_STATUS_READY)) q = q.Filter(sqlchemy.In(q.Field("id"), subq.SubQuery())) } @@ -569,7 +569,7 @@ func (manager *SCachedimageManager) ListItemFilter(ctx context.Context, q *sqlch subq := cachedImages.Query(cachedImages.Field("id")) subq = subq.Join(storagecachedImages, sqlchemy.Equals(cachedImages.Field("id"), storagecachedImages.Field("cachedimage_id"))) subq = subq.Join(storageCaches, sqlchemy.Equals(storagecachedImages.Field("storagecache_id"), storageCaches.Field("id"))) - subq = subq.Filter(sqlchemy.Equals(storageCaches.Field("manager_id"), managerObj.GetId())) + subq = subq.Filter(sqlchemy.Equals(storageCaches.Field("manager_id"), managerObj.GetId())).Filter(sqlchemy.Equals(storagecachedImages.Field("status"), api.CACHED_IMAGE_STATUS_READY)) q = q.Filter(sqlchemy.In(q.Field("id"), subq.SubQuery())) } @@ -595,7 +595,7 @@ func (manager *SCachedimageManager) ListItemFilter(ctx context.Context, q *sqlch subq = subq.Join(storageCaches, sqlchemy.Equals(storagecachedImages.Field("storagecache_id"), storageCaches.Field("id"))) subq = subq.Join(storages, sqlchemy.Equals(storageCaches.Field("id"), storages.Field("storagecache_id"))) subq = subq.Join(zones, sqlchemy.Equals(storages.Field("zone_id"), zones.Field("id"))) - subq = subq.Filter(sqlchemy.Equals(zones.Field("cloudregion_id"), regionObj.GetId())) + subq = subq.Filter(sqlchemy.Equals(zones.Field("cloudregion_id"), regionObj.GetId())).Filter(sqlchemy.Equals(storagecachedImages.Field("status"), api.CACHED_IMAGE_STATUS_READY)) q = q.Filter(sqlchemy.In(q.Field("id"), subq.SubQuery())) } @@ -619,7 +619,7 @@ func (manager *SCachedimageManager) ListItemFilter(ctx context.Context, q *sqlch subq = subq.Join(storagecachedImages, sqlchemy.Equals(cachedImages.Field("id"), storagecachedImages.Field("cachedimage_id"))) subq = subq.Join(storageCaches, sqlchemy.Equals(storagecachedImages.Field("storagecache_id"), storageCaches.Field("id"))) subq = subq.Join(storages, sqlchemy.Equals(storageCaches.Field("id"), storages.Field("storagecache_id"))) - subq = subq.Filter(sqlchemy.Equals(storages.Field("zone_id"), zoneObj.GetId())) + subq = subq.Filter(sqlchemy.Equals(storages.Field("zone_id"), zoneObj.GetId())).Filter(sqlchemy.Equals(storagecachedImages.Field("status"), api.CACHED_IMAGE_STATUS_READY)) q = q.Filter(sqlchemy.In(q.Field("id"), subq.SubQuery())) }