Change interface and reintroduce caching

This commit is contained in:
Jan Eitzinger
2022-09-13 07:37:48 +02:00
parent 95f04f8ae9
commit fd100f28dd
4 changed files with 38 additions and 33 deletions

View File

@@ -7,41 +7,48 @@ package archive
import (
"encoding/json"
"io"
"time"
"github.com/ClusterCockpit/cc-backend/pkg/schema"
)
func DecodeJobData(r io.Reader) (schema.JobData, error) {
var d schema.JobData
if err := json.NewDecoder(r).Decode(&d); err != nil {
return d, err
func DecodeJobData(r io.Reader, k string) (schema.JobData, error) {
data := cache.Get(k, func() (value interface{}, ttl time.Duration, size int) {
var d schema.JobData
if err := json.NewDecoder(r).Decode(&d); err != nil {
return err, 0, 1000
}
return d, 1 * time.Hour, d.Size()
})
if err, ok := data.(error); ok {
return nil, err
}
// Sanitize parameters
return d, nil
return data.(schema.JobData), nil
}
func DecodeJobMeta(r io.Reader) (schema.JobMeta, error) {
func DecodeJobMeta(r io.Reader) (*schema.JobMeta, error) {
var d schema.JobMeta
if err := json.NewDecoder(r).Decode(&d); err != nil {
return d, err
return &d, err
}
// Sanitize parameters
return d, nil
return &d, nil
}
func DecodeCluster(r io.Reader) (schema.Cluster, error) {
func DecodeCluster(r io.Reader) (*schema.Cluster, error) {
var c schema.Cluster
if err := json.NewDecoder(r).Decode(&c); err != nil {
return c, err
return &c, err
}
// Sanitize parameters
return c, nil
return &c, nil
}
func EncodeJobData(w io.Writer, d *schema.JobData) error {