531a0184f7
Replace old used-to-be-GORM datastructures (#104305) with sqlc-generated structs. This also makes it possible to use more specific structs that are more taylored to the specific queries, increasing efficiency. This commit deals with the remaining areas, like the job deleter, task timeout checker, and task state machine. And anything else to get things running again. Functional changes are kept to a minimum, as the API still serves the same data. Because this work covers so much of Flamenco's code, it's been split up into different commits. Each commit brings Flamenco to a state where it compiles and unit tests pass. Only the result of the final commit has actually been tested properly. Ref: #104343
64 lines
1.8 KiB
Go
64 lines
1.8 KiB
Go
// SPDX-License-Identifier: GPL-3.0-or-later
|
|
package persistence
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/rs/zerolog/log"
|
|
"projects.blender.org/studio/flamenco/internal/manager/persistence/sqlc"
|
|
"projects.blender.org/studio/flamenco/pkg/api"
|
|
)
|
|
|
|
type TaskSummary = sqlc.QueryJobTaskSummariesRow
|
|
|
|
// QueryJobTaskSummaries retrieves all tasks of the job, but not all fields of those tasks.
|
|
// Fields are synchronised with api.TaskSummary.
|
|
func (db *DB) QueryJobTaskSummaries(ctx context.Context, jobUUID string) ([]TaskSummary, error) {
|
|
logger := log.Ctx(ctx)
|
|
logger.Debug().Str("job", jobUUID).Msg("querying task summaries")
|
|
|
|
queries := db.queries()
|
|
summaries, err := queries.QueryJobTaskSummaries(ctx, jobUUID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
result := make([]TaskSummary, len(summaries))
|
|
for index, task := range summaries {
|
|
result[index] = TaskSummary{
|
|
ID: task.ID,
|
|
UpdatedAt: task.UpdatedAt,
|
|
UUID: task.UUID,
|
|
Name: task.Name,
|
|
Type: task.Type,
|
|
IndexInJob: task.IndexInJob,
|
|
Priority: task.Priority,
|
|
Status: api.TaskStatus(task.Status),
|
|
}
|
|
}
|
|
|
|
return result, nil
|
|
}
|
|
|
|
// JobStatusCount is a mapping from job status to the number of jobs in that status.
|
|
type JobStatusCount map[api.JobStatus]int
|
|
|
|
func (db *DB) SummarizeJobStatuses(ctx context.Context) (JobStatusCount, error) {
|
|
logger := log.Ctx(ctx)
|
|
logger.Debug().Msg("database: summarizing job statuses")
|
|
|
|
queries := db.queries()
|
|
result, err := queries.SummarizeJobStatuses(ctx)
|
|
if err != nil {
|
|
return nil, jobError(err, "summarizing job statuses")
|
|
}
|
|
|
|
// Convert the array-of-structs to a map that's easier to handle by the caller.
|
|
statusCounts := make(JobStatusCount)
|
|
for _, singleStatusCount := range result {
|
|
statusCounts[api.JobStatus(singleStatusCount.Status)] = int(singleStatusCount.StatusCount)
|
|
}
|
|
|
|
return statusCounts, nil
|
|
}
|