cybercyst/drone
1
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-05 15:32:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: [AH-889]: Updated query Registry.GetByIDIn() (#3264)

Browse Source 
* [AH-889]: Updated query Registry.GetByIDIn()
This commit is contained in:
Arvind Choudhary 2025-01-14 21:56:04 +00:00 committed by Harness
parent 4337a9be4b
commit 90858bcbaa
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
registry/app/pkg/core_controller.go
View File

@ -72,7 +72,7 @@ func (c *CoreController) GetOrderedRepos(
result = append(result, *registry)
proxies := registry.UpstreamProxies
if len(proxies) > 0 {
upstreamRepos, _ := c.RegistryDao.GetByIDIn(ctx, artInfo.ParentID, proxies)
upstreamRepos, _ := c.RegistryDao.GetByIDIn(ctx, proxies)
result = append(result, *upstreamRepos...)
}
} else {

3
registry/app/store/database.go
View File

@ -338,8 +338,7 @@ type RegistryRepository interface {
Get(ctx context.Context, id int64) (repository *types.Registry, err error)
// GetByName gets the repository specified by name
GetByIDIn(
ctx context.Context, parentID int64,
ids []int64,
ctx context.Context, ids []int64,
) (registries *[]types.Registry, err error)
// GetByName gets the repository specified by parent id and name
GetByParentIDAndName(

15
registry/app/store/database/registry.go
View File

@ -189,11 +189,10 @@ func (r registryDao) FetchUpstreamProxyKeys(
return dst, nil
}
func (r registryDao) GetByIDIn(ctx context.Context, parentID int64, ids []int64) (*[]types.Registry, error) {
func (r registryDao) GetByIDIn(ctx context.Context, ids []int64) (*[]types.Registry, error) {
stmt := databaseg.Builder.
Select(util.ArrToStringByDelimiter(util.GetDBTagsFromStruct(registryDB{}), ",")).
From("registries").
Where("registry_parent_id = ?", parentID).
Where(sq.Eq{"registry_id": ids})
db := dbtx.GetAccessor(ctx, r.db)
@ -285,8 +284,10 @@ func (r registryDao) GetAll(
LeftJoin("upstream_proxy_configs u ON r.registry_id = u.upstream_proxy_config_registry_id").
LeftJoin(fmt.Sprintf("(%s) AS artifact_count ON r.registry_id = artifact_count.image_registry_id",
artifactCountSubquery)).
LeftJoin(fmt.Sprintf("(%s) AS blob_sizes ON r.registry_id = blob_sizes.rblob_registry_id", blobSizesSubquery)).
LeftJoin(fmt.Sprintf("(%s) AS download_stats ON r.registry_id = download_stats.registry_id", downloadStatsSubquery))
LeftJoin(fmt.Sprintf("(%s) AS blob_sizes ON r.registry_id = blob_sizes.rblob_registry_id",
blobSizesSubquery)).
LeftJoin(fmt.Sprintf("(%s) AS download_stats ON r.registry_id = download_stats.registry_id",
downloadStatsSubquery))
} else {
query = databaseg.Builder.
Select(selectFields).
@ -294,8 +295,10 @@ func (r registryDao) GetAll(
LeftJoin("upstream_proxy_configs u ON r.registry_id = u.upstream_proxy_config_registry_id").
LeftJoin(fmt.Sprintf("(%s) AS artifact_count ON r.registry_id = artifact_count.image_registry_id",
artifactCountSubquery)).
LeftJoin(fmt.Sprintf("(%s) AS blob_sizes ON r.registry_id = blob_sizes.rblob_registry_id", blobSizesSubquery)).
LeftJoin(fmt.Sprintf("(%s) AS download_stats ON r.registry_id = download_stats.registry_id", downloadStatsSubquery)).
LeftJoin(fmt.Sprintf("(%s) AS blob_sizes ON r.registry_id = blob_sizes.rblob_registry_id",
blobSizesSubquery)).
LeftJoin(fmt.Sprintf("(%s) AS download_stats ON r.registry_id = download_stats.registry_id",
downloadStatsSubquery)).
Where("r.registry_parent_id = ?", parentID)
}
// Apply search filter