Fix circular import after merge

This commit is contained in:
Christoph Kluge
2024-07-09 09:50:32 +02:00
parent 0240997257
commit bf6b87d65c
5 changed files with 15 additions and 19 deletions

View File

@@ -16,7 +16,6 @@ import (
"github.com/ClusterCockpit/cc-backend/internal/graph/model"
"github.com/ClusterCockpit/cc-backend/internal/metricdata"
"github.com/ClusterCockpit/cc-backend/internal/util"
"github.com/ClusterCockpit/cc-backend/pkg/archive"
"github.com/ClusterCockpit/cc-backend/pkg/log"
"github.com/ClusterCockpit/cc-backend/pkg/lrucache"
@@ -305,7 +304,7 @@ func (r *JobRepository) MarkArchived(
footprint := make(map[string]float64)
for _, fp := range sc.Footprint {
footprint[fp] = util.LoadJobStat(jobMeta, fp)
footprint[fp] = LoadJobStat(jobMeta, fp)
}
var rawFootprint []byte

View File

@@ -284,6 +284,18 @@ func (r *JobRepository) JobsStats(
return stats, nil
}
func LoadJobStat(job *schema.JobMeta, metric string) float64 {
if stats, ok := job.Statistics[metric]; ok {
if metric == "mem_used" {
return stats.Max
} else {
return stats.Avg
}
}
return 0.0
}
func (r *JobRepository) JobCountGrouped(
ctx context.Context,
filter []*model.JobFilter,