diff --git a/internal/importer/handleImport.go b/internal/importer/handleImport.go index 81a312f..c4d55ab 100644 --- a/internal/importer/handleImport.go +++ b/internal/importer/handleImport.go @@ -13,7 +13,6 @@ import ( "github.com/ClusterCockpit/cc-backend/internal/config" "github.com/ClusterCockpit/cc-backend/internal/repository" - "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/schema" @@ -78,7 +77,7 @@ func HandleImportFlag(flag string) error { job.Footprint = make(map[string]float64) for _, fp := range sc.Footprint { - job.Footprint[fp] = util.LoadJobStat(&job, fp) + job.Footprint[fp] = repository.LoadJobStat(&job, fp) } job.RawFootprint, err = json.Marshal(job.Footprint) if err != nil { diff --git a/internal/importer/initDB.go b/internal/importer/initDB.go index 468ebb1..4b9abab 100644 --- a/internal/importer/initDB.go +++ b/internal/importer/initDB.go @@ -11,7 +11,6 @@ import ( "time" "github.com/ClusterCockpit/cc-backend/internal/repository" - "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/schema" @@ -69,7 +68,7 @@ func InitDB() error { job.Footprint = make(map[string]float64) for _, fp := range sc.Footprint { - job.Footprint[fp] = util.LoadJobStat(jobMeta, fp) + job.Footprint[fp] = repository.LoadJobStat(jobMeta, fp) } job.RawFootprint, err = json.Marshal(job.Footprint) diff --git a/internal/repository/job.go b/internal/repository/job.go index 21540b2..33b619f 100644 --- a/internal/repository/job.go +++ b/internal/repository/job.go @@ -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 diff --git a/internal/repository/stats.go b/internal/repository/stats.go index 2e226ee..6865e18 100644 --- a/internal/repository/stats.go +++ b/internal/repository/stats.go @@ -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, diff --git a/internal/util/statistics.go b/internal/util/statistics.go index 9e23b15..d75224f 100644 --- a/internal/util/statistics.go +++ b/internal/util/statistics.go @@ -5,7 +5,6 @@ package util import ( - "github.com/ClusterCockpit/cc-backend/pkg/schema" "golang.org/x/exp/constraints" "fmt" @@ -27,18 +26,6 @@ func Max[T constraints.Ordered](a, b T) T { return b } -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 sortedCopy(input []float64) []float64 { sorted := make([]float64, len(input)) copy(sorted, input)