public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unified Storage: Fix legacy dashboard query when using continue token (#100244)

Browse Source 
* query for rows less than the continue token LastID since the queries are sorted by dash ID in DESC order

* run dashboard query tests
This commit is contained in:
owensmallwood
2025-02-07 12:16:41 -06:00
committed by GitHub
parent 79d7e11fa4
commit bf27e6d3ed
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/registry/apis/dashboard/legacy/query_dashboards.sql
+2 -2
View File
@@ -32,7 +32,7 @@ WHERE dashboard.is_folder = {{ .Arg .Query.GetFolders }}
{{ else if .Query.LastID }} {{ else if .Query.LastID }}
AND dashboard_version.version <= {{ .Arg .Query.LastID }} AND dashboard_version.version <= {{ .Arg .Query.LastID }}
{{ end }} {{ end }}
ORDER BY ORDER BY
dashboard_version.created DESC, dashboard_version.created DESC,
dashboard_version.version DESC, dashboard_version.version DESC,
dashboard.uid ASC dashboard.uid ASC
@@ -40,7 +40,7 @@ WHERE dashboard.is_folder = {{ .Arg .Query.GetFolders }}
{{ if .Query.UID }} {{ if .Query.UID }}
AND dashboard.uid = {{ .Arg .Query.UID }} AND dashboard.uid = {{ .Arg .Query.UID }}
{{ else if .Query.LastID }} {{ else if .Query.LastID }}
AND dashboard.id > {{ .Arg .Query.LastID }} AND dashboard.id < {{ .Arg .Query.LastID }}
{{ end }} {{ end }}
{{ if .Query.GetTrash }} {{ if .Query.GetTrash }}
AND dashboard.deleted IS NOT NULL AND dashboard.deleted IS NOT NULL
pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-dashboard_next_page.sql
Vendored
+1 -1
View File
@@ -15,6 +15,6 @@ LEFT OUTER JOIN `grafana`.`user` as created_user ON dashboard.created_by = creat
LEFT OUTER JOIN `grafana`.`user` as updated_user ON dashboard.updated_by = updated_user.id LEFT OUTER JOIN `grafana`.`user` as updated_user ON dashboard.updated_by = updated_user.id
WHERE dashboard.is_folder = FALSE WHERE dashboard.is_folder = FALSE
AND dashboard.org_id = 2 AND dashboard.org_id = 2
AND dashboard.id > 22 AND dashboard.id < 22
AND dashboard.deleted IS NULL AND dashboard.deleted IS NULL
ORDER BY dashboard.id DESC ORDER BY dashboard.id DESC
pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-history_uid_at_version.sql
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ WHERE dashboard.is_folder = FALSE
AND dashboard.org_id = 2 AND dashboard.org_id = 2
AND dashboard.uid = 'UUU' AND dashboard.uid = 'UUU'
AND dashboard_version.version = 3 AND dashboard_version.version = 3
ORDER BY ORDER BY
dashboard_version.created DESC, dashboard_version.created DESC,
dashboard_version.version DESC, dashboard_version.version DESC,
dashboard.uid ASC dashboard.uid ASC
pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-dashboard_next_page.sql
Vendored
+1 -1
View File
@@ -15,6 +15,6 @@ LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = creat
LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id
WHERE dashboard.is_folder = FALSE WHERE dashboard.is_folder = FALSE
AND dashboard.org_id = 2 AND dashboard.org_id = 2
AND dashboard.id > 22 AND dashboard.id < 22
AND dashboard.deleted IS NULL AND dashboard.deleted IS NULL
ORDER BY dashboard.id DESC ORDER BY dashboard.id DESC
pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-history_uid_at_version.sql
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ WHERE dashboard.is_folder = FALSE
AND dashboard.org_id = 2 AND dashboard.org_id = 2
AND dashboard.uid = 'UUU' AND dashboard.uid = 'UUU'
AND dashboard_version.version = 3 AND dashboard_version.version = 3
ORDER BY ORDER BY
dashboard_version.created DESC, dashboard_version.created DESC,
dashboard_version.version DESC, dashboard_version.version DESC,
dashboard.uid ASC dashboard.uid ASC
pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-dashboard_next_page.sql
Vendored
+1 -1
View File
@@ -15,6 +15,6 @@ LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = creat
LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id
WHERE dashboard.is_folder = FALSE WHERE dashboard.is_folder = FALSE
AND dashboard.org_id = 2 AND dashboard.org_id = 2
AND dashboard.id > 22 AND dashboard.id < 22
AND dashboard.deleted IS NULL AND dashboard.deleted IS NULL
ORDER BY dashboard.id DESC ORDER BY dashboard.id DESC
pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-history_uid_at_version.sql
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ WHERE dashboard.is_folder = FALSE
AND dashboard.org_id = 2 AND dashboard.org_id = 2
AND dashboard.uid = 'UUU' AND dashboard.uid = 'UUU'
AND dashboard_version.version = 3 AND dashboard_version.version = 3
ORDER BY ORDER BY
dashboard_version.created DESC, dashboard_version.created DESC,
dashboard_version.version DESC, dashboard_version.version DESC,
dashboard.uid ASC dashboard.uid ASC