Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 70 additions & 4 deletions internal/pkg/heimdall/job_dal.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (
_ "embed"
"encoding/json"
"fmt"
"strconv"
"strings"
"time"

"github.com/hladush/go-telemetry/pkg/telemetry"
Expand Down Expand Up @@ -88,8 +90,16 @@ var (
Join: `, `,
Value: `js.job_status_name in ({{ .Slice }})`,
},
`cursor`: {
Value: `j.system_job_id < $%d`,
Comment thread
prasadlohakpure marked this conversation as resolved.
},
},
}

// tag filters use correlated EXISTS — one clause per value, all must match (AND semantics)
jobsTagsFilterConfig = map[string]string{
`tags`: `exists (select 1 from job_tags jt where jt.system_job_id = j.system_job_id and jt.job_tag = $%d)`,
}
)

type jobRequest struct {
Expand Down Expand Up @@ -218,12 +228,55 @@ func (h *Heimdall) getJob(ctx context.Context, j *jobRequest) (any, error) {

}

const defaultPageSize = 101

func injectTagsFilter(f *database.Filter, key, existsTemplate string, query string, args []any) (string, []any) {
v, ok := (*f)[key]
if !ok {
return query, args
}
delete(*f, key)

var clauses []string
for _, t := range strings.Split(v, `,`) {
if t = strings.TrimSpace(t); t != `` {
clauses = append(clauses, fmt.Sprintf(existsTemplate, len(args)+1))
args = append(args, t)
}
}
if len(clauses) == 0 {
return query, args
}

idx := strings.Index(query, "\norder by")
if idx < 0 {
return query, args
}
before, after, clause := query[:idx], query[idx:], strings.Join(clauses, " and\n ")
if strings.Contains(before, "where") {
return before + " and\n " + clause + after, args
}
return before + "\nwhere\n " + clause + after, args
}

func (h *Heimdall) getJobs(ctx context.Context, f *database.Filter) (any, error) {

// Track DB connection for jobs list operation
defer getJobsMethod.RecordLatency(time.Now())
getJobsMethod.CountRequest()

// extract limit before rendering WHERE clause (it is not a filter condition)
pageSize := defaultPageSize
if v, ok := (*f)[`limit`]; ok {
if n, err := strconv.Atoi(v); err == nil && n > 0 {
if n > defaultPageSize {
n = defaultPageSize
}
pageSize = n
}
delete(*f, `limit`)
}

// open connection
sess, err := h.Database.NewSession(false)
if err != nil {
Expand All @@ -238,14 +291,22 @@ func (h *Heimdall) getJobs(ctx context.Context, f *database.Filter) (any, error)
return nil, err
}

for key, tmpl := range jobsTagsFilterConfig {
query, args = injectTagsFilter(f, key, tmpl, query, args)
}

// append LIMIT; fetch one extra row to detect whether a next page exists
query = fmt.Sprintf("%s\nlimit $%d", strings.TrimRight(query, "\n; \t"), len(args)+1)
args = append(args, pageSize+1)

Comment thread
prasadlohakpure marked this conversation as resolved.
rows, err := sess.Query(query, args...)
if err != nil {
getJobsMethod.LogAndCountError(err, "query")
return nil, err
}
defer rows.Close()

result := make([]*job.Job, 0, 100)
result := make([]*job.Job, 0, pageSize+1)

for rows.Next() {

Expand All @@ -267,10 +328,15 @@ func (h *Heimdall) getJobs(ctx context.Context, f *database.Filter) (any, error)

}

rs := &resultset{Data: result}
if len(result) > pageSize {
rs.HasMore = true
rs.NextCursor = result[pageSize-1].SystemID
rs.Data = result[:pageSize]
}

getJobsMethod.CountSuccess()
return &resultset{
Data: result,
}, nil
return rs, nil

}

Expand Down
3 changes: 0 additions & 3 deletions internal/pkg/heimdall/queries/job/select_jobs.sql
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,3 @@ where
{{ .Clause }}{{end}}
order by
j.system_job_id desc
limit
101
;
4 changes: 3 additions & 1 deletion internal/pkg/heimdall/result.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package heimdall

type resultset struct {
Data any `yaml:"data,omitempty" json:"data,omitempty"`
Data any `json:"data,omitempty"`
HasMore bool `json:"has_more,omitempty"`
NextCursor int64 `json:"next_cursor,omitempty"`
}
Loading