gilles/scrutiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: page smart attribute queries with limit and sort (#869)

Browse Source
This commit is contained in:
Alliot
2026-02-22 13:04:33 +08:00
committed by GitHub
parent 3a06920354
commit fb5d4818b0
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/backend/pkg/database/scrutiny_repository_device_smart_attributes.go
+5 -3
View File
@@ -177,7 +177,7 @@ func (sr *scrutinyRepository) aggregateSmartAttributesQuery(wwn string, duration
`|> sort(columns: ["_time"], desc: true)`, `|> sort(columns: ["_time"], desc: true)`,
}...) }...)
if selectEntries > 0 { if selectEntries > 0 {
partialQueryStr = append(partialQueryStr, fmt.Sprintf(`|> tail(n: %d, offset: %d)`, selectEntries, selectEntriesOffset)) partialQueryStr = append(partialQueryStr, fmt.Sprintf(`|> limit(n: %d, offset: %d)`, selectEntries, selectEntriesOffset))
} }
partialQueryStr = append(partialQueryStr, `|> yield(name: "last")`) partialQueryStr = append(partialQueryStr, `|> yield(name: "last")`)
@@ -196,9 +196,11 @@ func (sr *scrutinyRepository) generateSmartAttributesSubquery(wwn string, durati
} }
partialQueryStr = append(partialQueryStr, `|> aggregateWindow(every: 1d, fn: last, createEmpty: false)`) partialQueryStr = append(partialQueryStr, `|> aggregateWindow(every: 1d, fn: last, createEmpty: false)`)
// ensure we are selecting the latest entries when paging
partialQueryStr = append(partialQueryStr, `|> sort(columns: ["_time"], desc: true)`)
if selectEntries > 0 { if selectEntries > 0 {
partialQueryStr = append(partialQueryStr, fmt.Sprintf(`|> tail(n: %d, offset: %d)`, selectEntries, selectEntriesOffset)) partialQueryStr = append(partialQueryStr, fmt.Sprintf(`|> limit(n: %d, offset: %d)`, selectEntries, selectEntriesOffset))
} }
partialQueryStr = append(partialQueryStr, "|> schema.fieldsAsCols()") partialQueryStr = append(partialQueryStr, "|> schema.fieldsAsCols()")