ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2024-11-10 08:57:25 +01:00
Code Issues Packages Releases Activity

Fix using crossjoin arguments not used

Browse Source
This commit is contained in:
Christoph Kluge 2023-12-12 15:07:23 +01:00
parent ee4097a2dd
commit 119637cb9b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/repository/stats.go
View File

@ -587,7 +587,7 @@ func (r *JobRepository) jobsMetricStatisticsHistogram(
crossJoinQuery = BuildWhereClause(f, crossJoinQuery) crossJoinQuery = BuildWhereClause(f, crossJoinQuery)
} }
crossJoinQuerySql, _, sqlerr := crossJoinQuery.ToSql() crossJoinQuerySql, crossJoinQueryArgs, sqlerr := crossJoinQuery.ToSql()
if sqlerr != nil { if sqlerr != nil {
return nil, sqlerr return nil, sqlerr
} }
@ -601,7 +601,7 @@ func (r *JobRepository) jobsMetricStatisticsHistogram(
fmt.Sprintf(`CAST(((value.max / %d) * (%s )) as INTEGER ) as min`, bins, binQuery), fmt.Sprintf(`CAST(((value.max / %d) * (%s )) as INTEGER ) as min`, bins, binQuery),
fmt.Sprintf(`CAST(((value.max / %d) * (%s + 1 )) as INTEGER ) as max`, bins, binQuery), fmt.Sprintf(`CAST(((value.max / %d) * (%s + 1 )) as INTEGER ) as max`, bins, binQuery),
).From("job").CrossJoin( ).From("job").CrossJoin(
fmt.Sprintf(`(%s) as value`, crossJoinQuerySql), fmt.Sprintf(`(%s) as value`, crossJoinQuerySql), crossJoinQueryArgs...,
).Where(fmt.Sprintf(`job.%s is not null and job.%s <= %f`, dbMetric, dbMetric, peak)) ).Where(fmt.Sprintf(`job.%s is not null and job.%s <= %f`, dbMetric, dbMetric, peak))
mainQuery, qerr := SecurityCheck(ctx, mainQuery) mainQuery, qerr := SecurityCheck(ctx, mainQuery)