ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2026-03-10 18:17:30 +01:00
Code Issues Packages Releases Activity

fix ranged filter GT and LT conditions, reduce energy filter preset

Browse Source
This commit is contained in:
Christoph Kluge
2026-03-09 11:28:30 +01:00
parent d0ebba5b4a
commit d2bc046fc6
2 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
internal/repository/jobQuery.go
View File

@@ -276,28 +276,26 @@ func BuildWhereClause(filter *model.JobFilter, query sq.SelectBuilder) sq.Select
return query return query
} }
// buildIntCondition creates a BETWEEN clause for integer range filters. // buildIntCondition creates clauses for integer range filters, using BETWEEN only if required.
// Reminder: BETWEEN Queries are slower and dont use indices as frequently: Only use if both conditions required
func buildIntCondition(field string, cond *config.IntRange, query sq.SelectBuilder) sq.SelectBuilder { func buildIntCondition(field string, cond *config.IntRange, query sq.SelectBuilder) sq.SelectBuilder {
if cond.From != 0 && cond.To != 0 { if cond.From != 1 && cond.To != 0 {
return query.Where(field+" BETWEEN ? AND ?", cond.From, cond.To) return query.Where(field+" BETWEEN ? AND ?", cond.From, cond.To)
} else if cond.From != 0 { } else if cond.From != 1 && cond.To == 0 {
return query.Where(field+" >= ?", cond.From) return query.Where(field+" >= ?", cond.From)
} else if cond.To != 0 { } else if cond.From == 1 && cond.To != 0 {
return query.Where(field+" <= ?", cond.To) return query.Where(field+" <= ?", cond.To)
} else { } else {
return query return query
} }
} }
// buildFloatCondition creates a BETWEEN clause for float range filters. // buildFloatCondition creates a clauses for float range filters, using BETWEEN only if required.
// Reminder: BETWEEN Queries are slower and dont use indices as frequently: Only use if both conditions required
func buildFloatCondition(field string, cond *model.FloatRange, query sq.SelectBuilder) sq.SelectBuilder { func buildFloatCondition(field string, cond *model.FloatRange, query sq.SelectBuilder) sq.SelectBuilder {
if cond.From != 0.0 && cond.To != 0.0 { if cond.From != 1.0 && cond.To != 0.0 {
return query.Where(field+" BETWEEN ? AND ?", cond.From, cond.To) return query.Where(field+" BETWEEN ? AND ?", cond.From, cond.To)
} else if cond.From != 0.0 { } else if cond.From != 1.0 && cond.To == 0.0 {
return query.Where(field+" >= ?", cond.From) return query.Where(field+" >= ?", cond.From)
} else if cond.To != 0.0 { } else if cond.From == 1.0 && cond.To != 0.0 {
return query.Where(field+" <= ?", cond.To) return query.Where(field+" <= ?", cond.To)
} else { } else {
return query return query
@@ -336,16 +334,15 @@ func buildTimeCondition(field string, cond *config.TimeRange, query sq.SelectBui
} }
} }
// buildFloatJSONCondition creates a filter on a numeric field within the footprint JSON column. // buildFloatJSONCondition creates a filter on a numeric field within the footprint JSON column, using BETWEEN only if required.
// Reminder: BETWEEN Queries are slower and dont use indices as frequently: Only use if both conditions required func buildFloatJSONCondition(field string, cond *model.FloatRange, query sq.SelectBuilder) sq.SelectBuilder {
func buildFloatJSONCondition(condName string, condRange *model.FloatRange, query sq.SelectBuilder) sq.SelectBuilder {
query = query.Where("JSON_VALID(footprint)") query = query.Where("JSON_VALID(footprint)")
if condRange.From != 0.0 && condRange.To != 0.0 { if cond.From != 1.0 && cond.To != 0.0 {
return query.Where("JSON_EXTRACT(footprint, \"$."+condName+"\") BETWEEN ? AND ?", condRange.From, condRange.To) return query.Where("JSON_EXTRACT(footprint, \"$."+field+"\") BETWEEN ? AND ?", cond.From, cond.To)
} else if condRange.From != 0.0 { } else if cond.From != 1.0 && cond.To == 0.0 {
return query.Where("JSON_EXTRACT(footprint, \"$."+condName+"\") >= ?", condRange.From) return query.Where("JSON_EXTRACT(footprint, \"$."+field+"\") >= ?", cond.From)
} else if condRange.To != 0.0 { } else if cond.From == 1.0 && cond.To != 0.0 {
return query.Where("JSON_EXTRACT(footprint, \"$."+condName+"\") <= ?", condRange.To) return query.Where("JSON_EXTRACT(footprint, \"$."+field+"\") <= ?", cond.To)
} else { } else {
return query return query
} }

2
web/frontend/src/generic/filters/Energy.svelte
View File

@@ -29,7 +29,7 @@
/* Const */ /* Const */
const minEnergyPreset = 1; const minEnergyPreset = 1;
const maxEnergyPreset = 1000; const maxEnergyPreset = 100;
/* Derived */ /* Derived */
// Pending // Pending