ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2024-12-26 05:19:05 +01:00
Code Issues Packages Releases Activity

Fix circular import after merge

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/importer/handleImport.go
View File

@ -13,7 +13,6 @@ import (
"github.com/ClusterCockpit/cc-backend/internal/config" "github.com/ClusterCockpit/cc-backend/internal/config"
"github.com/ClusterCockpit/cc-backend/internal/repository" "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/archive"
"github.com/ClusterCockpit/cc-backend/pkg/log" "github.com/ClusterCockpit/cc-backend/pkg/log"
"github.com/ClusterCockpit/cc-backend/pkg/schema" "github.com/ClusterCockpit/cc-backend/pkg/schema"
@ -78,7 +77,7 @@ func HandleImportFlag(flag string) error {
job.Footprint = make(map[string]float64) job.Footprint = make(map[string]float64)
for _, fp := range sc.Footprint { 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) job.RawFootprint, err = json.Marshal(job.Footprint)
if err != nil { if err != nil {

3
internal/importer/initDB.go
View File

@ -11,7 +11,6 @@ import (
"time" "time"
"github.com/ClusterCockpit/cc-backend/internal/repository" "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/archive"
"github.com/ClusterCockpit/cc-backend/pkg/log" "github.com/ClusterCockpit/cc-backend/pkg/log"
"github.com/ClusterCockpit/cc-backend/pkg/schema" "github.com/ClusterCockpit/cc-backend/pkg/schema"
@ -69,7 +68,7 @@ func InitDB() error {
job.Footprint = make(map[string]float64) job.Footprint = make(map[string]float64)
for _, fp := range sc.Footprint { 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) job.RawFootprint, err = json.Marshal(job.Footprint)

3
internal/repository/job.go
View File

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

12
internal/repository/stats.go
View File

@ -284,6 +284,18 @@ func (r *JobRepository) JobsStats(
return stats, nil 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( func (r *JobRepository) JobCountGrouped(
ctx context.Context, ctx context.Context,
filter []*model.JobFilter, filter []*model.JobFilter,

13
internal/util/statistics.go
View File

@ -5,7 +5,6 @@
package util package util
import ( import (
"github.com/ClusterCockpit/cc-backend/pkg/schema"
"golang.org/x/exp/constraints" "golang.org/x/exp/constraints"
"fmt" "fmt"
@ -27,18 +26,6 @@ func Max[T constraints.Ordered](a, b T) T {
return b 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 { func sortedCopy(input []float64) []float64 {
sorted := make([]float64, len(input)) sorted := make([]float64, len(input))
copy(sorted, input) copy(sorted, input)