github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-03 14:59:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: [AH-745] fix summary page sql query for sqlite | Gitness (#3110)

Browse Source 
* fix: [AH-745] Added sql query in logs
* feat: [AH-745] Added Separate Queries for Postgres & Sqlite
* fix: [AH-745] fix summary page sql query for sqlite
This commit is contained in:
Ritek Rounak 2024-12-09 18:08:32 +00:00 committed by Harness
parent ff1cbd654e
commit f463f8f7f5
1 changed files with 64 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
registry/app/store/database/tag.go
View File

@ -34,6 +34,7 @@ import (
sq "github.com/Masterminds/squirrel" sq "github.com/Masterminds/squirrel"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rs/zerolog/log"
) )
const ( const (
@ -539,44 +540,76 @@ func (t tagDao) GetLatestTagMetadata(
repoKey string, repoKey string,
imageName string, imageName string,
) (*types.ArtifactMetadata, error) { ) (*types.ArtifactMetadata, error) {
q := databaseg.Builder.Select( // Precomputed download count subquery
`r.registry_name as repo_name, downloadCountSubquery := `
r.registry_package_type as package_type, t.tag_image_name as name, SELECT
t.tag_name as latest_version, t.tag_created_at as created_at, i.image_name,
t.tag_updated_at as modified_at, ar.image_labels as labels, i.image_registry_id,
COALESCE(t2.download_count, 0) as download_count`, SUM(COALESCE(dc.download_count, 0)) AS download_count
). FROM
From("tags t"). images i
Join("registries r ON t.tag_registry_id = r.registry_id"). // nolint:goconst LEFT JOIN (
Join( SELECT
"images ar ON ar.image_registry_id = t.tag_registry_id "+ a.artifact_image_id,
"AND ar.image_name = t.tag_image_name", COUNT(d.download_stat_id) AS download_count
FROM
artifacts a
JOIN
download_stats d ON d.download_stat_artifact_id = a.artifact_id
GROUP BY
a.artifact_image_id
) AS dc ON i.image_id = dc.artifact_image_id
GROUP BY
i.image_name, i.image_registry_id
`
var q sq.SelectBuilder
if t.db.DriverName() == SQLITE3 {
q = databaseg.Builder.Select(
`r.registry_name AS repo_name, r.registry_package_type AS package_type,
t.tag_image_name AS name, t.tag_name AS latest_version,
t.tag_created_at AS created_at, t.tag_updated_at AS modified_at,
ar.image_labels AS labels, COALESCE(dc_subquery.download_count, 0) AS download_count`,
). ).
LeftJoin( From("tags t").
`LATERAL (SELECT i.image_name, SUM(COALESCE(t1.download_count, 0)) as download_count Join("registries r ON t.tag_registry_id = r.registry_id"). // nolint:goconst
FROM Join("images ar ON ar.image_registry_id = t.tag_registry_id AND ar.image_name = t.tag_image_name").
(SELECT a.artifact_image_id, COUNT(d.download_stat_id) as download_count LeftJoin(fmt.Sprintf("(%s) AS dc_subquery ON dc_subquery.image_name = t.tag_image_name "+
FROM artifacts a "AND dc_subquery.image_registry_id = r.registry_id", downloadCountSubquery)).
JOIN download_stats d Where(
ON d.download_stat_artifact_id = a.artifact_id "r.registry_parent_id = ? AND r.registry_name = ? AND t.tag_image_name = ?",
GROUP BY a.artifact_image_id) as t1 parentID, repoKey, imageName,
JOIN images i ).
ON i.image_id = t1.artifact_image_id OrderBy("t.tag_updated_at DESC").Limit(1)
WHERE i.image_registry_id = r.registry_id } else {
GROUP BY i.image_name) as t2 q = databaseg.Builder.Select(
ON t.tag_image_name = t2.image_name`, `r.registry_name AS repo_name,
r.registry_package_type AS package_type,
t.tag_image_name AS name,
t.tag_name AS latest_version,
t.tag_created_at AS created_at,
t.tag_updated_at AS modified_at,
ar.image_labels AS labels,
COALESCE(t2.download_count, 0) AS download_count`,
). ).
Where( From("tags t").
"r.registry_parent_id = ? AND r.registry_name = ?"+ Join("registries r ON t.tag_registry_id = r.registry_id"). // nolint:goconst
" AND t.tag_image_name = ?", parentID, repoKey, imageName, Join("images ar ON ar.image_registry_id = t.tag_registry_id AND ar.image_name = t.tag_image_name").
). LeftJoin(fmt.Sprintf("LATERAL (%s) AS t2 ON t.tag_image_name = t2.image_name", downloadCountSubquery)).
OrderBy("t.tag_updated_at DESC").Limit(1) Where(
"r.registry_parent_id = ? AND r.registry_name = ? AND t.tag_image_name = ?",
parentID, repoKey, imageName,
).
OrderBy("t.tag_updated_at DESC").Limit(1)
}
sql, args, err := q.ToSql() sql, args, err := q.ToSql()
if err != nil { if err != nil {
return nil, errors.Wrap(err, "Failed to convert query to sql") return nil, errors.Wrap(err, "Failed to convert query to sql")
} }
// Log the final sql query
finalQuery := util.FormatQuery(sql, args)
log.Ctx(ctx).Debug().Str("sql", finalQuery).Msg("Executing GetLatestTagMetadata query")
// Execute query
db := dbtx.GetAccessor(ctx, t.db) db := dbtx.GetAccessor(ctx, t.db)
dst := new(artifactMetadataDB) dst := new(artifactMetadataDB)