fix bugs in autoupdater query builder returns

This commit is contained in:
Christoph Kluge 2024-09-25 18:05:04 +02:00
parent 05517fcbcd
commit f53fc088ec

View File

@ -460,7 +460,7 @@ func (r *JobRepository) FindRunningJobs(cluster string) ([]*schema.Job, error) {
query := sq.Select(jobColumns...).From("job"). query := sq.Select(jobColumns...).From("job").
Where(fmt.Sprintf("job.cluster = '%s'", cluster)). Where(fmt.Sprintf("job.cluster = '%s'", cluster)).
Where("job.job_state = 'running'"). Where("job.job_state = 'running'").
Where("job.duration>600") Where("job.duration > 600")
rows, err := query.RunWith(r.stmtCache).Query() rows, err := query.RunWith(r.stmtCache).Query()
if err != nil { if err != nil {
@ -592,10 +592,7 @@ func (r *JobRepository) UpdateEnergy(
return stmt, err return stmt, err
} }
stmt.Set("energy_footprint", rawFootprint). return stmt.Set("energy_footprint", rawFootprint).Set("energy", totalEnergy), nil
Set("energy", totalEnergy)
return stmt, nil
} }
func (r *JobRepository) UpdateFootprint( func (r *JobRepository) UpdateFootprint(
@ -617,7 +614,7 @@ func (r *JobRepository) UpdateFootprint(
} }
name := fmt.Sprintf("%s_%s", fp, statType) name := fmt.Sprintf("%s_%s", fp, statType)
footprint[fp] = LoadJobStat(jobMeta, name, statType) footprint[name] = LoadJobStat(jobMeta, fp, statType)
} }
var rawFootprint []byte var rawFootprint []byte
@ -627,6 +624,5 @@ func (r *JobRepository) UpdateFootprint(
return stmt, err return stmt, err
} }
stmt.Set("footprint", rawFootprint) return stmt.Set("footprint", rawFootprint), nil
return stmt, nil
} }