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

feat(unified-storage): return guid, group and resource on read/list (#104121)

Browse Source
This commit is contained in:
Jean-Philippe Quéméner
2025-04-17 12:58:58 +02:00
committed by GitHub
parent a02ff218df
commit 3380ea441a
34 changed files with 106 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/storage/unified/sql/testdata/mysql--resource_history_get-read object history.sql
Vendored
+3
View File
@@ -1,6 +1,9 @@
SELECT
`guid`,
`resource_version`,
`namespace`,
`group`,
`resource`,
`name`,
`folder`,
`value`
pkg/storage/unified/sql/testdata/mysql--resource_history_get-read trash second page.sql
Vendored
+3
View File
@@ -1,6 +1,9 @@
SELECT
`guid`,
`resource_version`,
`namespace`,
`group`,
`resource`,
`name`,
`folder`,
`value`
pkg/storage/unified/sql/testdata/mysql--resource_history_get-read trash.sql
Vendored
+3
View File
@@ -1,6 +1,9 @@
SELECT
`guid`,
`resource_version`,
`namespace`,
`group`,
`resource`,
`name`,
`folder`,
`value`
pkg/storage/unified/sql/testdata/mysql--resource_history_list-single path.sql
Vendored
+6 -3
View File
@@ -1,17 +1,20 @@
SELECT
kv.`guid`,
kv.`resource_version`,
kv.`namespace`,
kv.`group`,
kv.`resource`,
kv.`name`,
kv.`folder`,
kv.`value`
FROM `resource_history` as kv
FROM `resource_history` as kv
INNER JOIN (
SELECT `namespace`, `group`, `resource`, `name`, max(`resource_version`) AS `resource_version`
FROM `resource_history` AS mkv
WHERE 1 = 1
AND `resource_version` <= 0
AND `namespace` = 'ns'
GROUP BY mkv.`namespace`, mkv.`group`, mkv.`resource`, mkv.`name`
GROUP BY mkv.`namespace`, mkv.`group`, mkv.`resource`, mkv.`name`
) AS maxkv
ON
maxkv.`resource_version` = kv.`resource_version`
@@ -19,7 +22,7 @@ SELECT
AND maxkv.`group` = kv.`group`
AND maxkv.`resource` = kv.`resource`
AND maxkv.`name` = kv.`name`
WHERE kv.`action` != 3
WHERE kv.`action` != 3
AND kv.`namespace` = 'ns'
ORDER BY kv.`namespace` ASC, kv.`name` ASC
LIMIT 10 OFFSET 0
pkg/storage/unified/sql/testdata/mysql--resource_history_poll-single path.sql
Vendored
+1
View File
@@ -1,4 +1,5 @@
SELECT
`guid`,
`resource_version`,
`namespace`,
`group`,
pkg/storage/unified/sql/testdata/mysql--resource_history_read-single path.sql
Vendored
+1
View File
@@ -1,4 +1,5 @@
SELECT
`guid`,
`namespace`,
`group`,
`resource`,
pkg/storage/unified/sql/testdata/mysql--resource_list-filter_on_namespace.sql
Vendored
+3
View File
@@ -1,6 +1,9 @@
SELECT
`guid`,
`resource_version`,
`namespace`,
`group`,
`resource`,
`name`,
`folder`,
`value`
pkg/storage/unified/sql/testdata/mysql--resource_read-without_resource_version.sql
Vendored
+1
View File
@@ -1,4 +1,5 @@
SELECT
`guid`,
`namespace`,
`group`,
`resource`,
pkg/storage/unified/sql/testdata/postgres--resource_history_get-read object history.sql
Vendored
+3
View File
@@ -1,6 +1,9 @@
SELECT
"guid",
"resource_version",
"namespace",
"group",
"resource",
"name",
"folder",
"value"
pkg/storage/unified/sql/testdata/postgres--resource_history_get-read trash second page.sql
Vendored
+3
View File
@@ -1,6 +1,9 @@
SELECT
"guid",
"resource_version",
"namespace",
"group",
"resource",
"name",
"folder",
"value"
pkg/storage/unified/sql/testdata/postgres--resource_history_get-read trash.sql
Vendored
+3
View File
@@ -1,6 +1,9 @@
SELECT
"guid",
"resource_version",
"namespace",
"group",
"resource",
"name",
"folder",
"value"
pkg/storage/unified/sql/testdata/postgres--resource_history_list-single path.sql
Vendored
+6 -3
View File
@@ -1,17 +1,20 @@
SELECT
kv."guid",
kv."resource_version",
kv."namespace",
kv."group",
kv."resource",
kv."name",
kv."folder",
kv."value"
FROM "resource_history" as kv
FROM "resource_history" as kv
INNER JOIN (
SELECT "namespace", "group", "resource", "name", max("resource_version") AS "resource_version"
FROM "resource_history" AS mkv
WHERE 1 = 1
AND "resource_version" <= 0
AND "namespace" = 'ns'
GROUP BY mkv."namespace", mkv."group", mkv."resource", mkv."name"
GROUP BY mkv."namespace", mkv."group", mkv."resource", mkv."name"
) AS maxkv
ON
maxkv."resource_version" = kv."resource_version"
@@ -19,7 +22,7 @@ SELECT
AND maxkv."group" = kv."group"
AND maxkv."resource" = kv."resource"
AND maxkv."name" = kv."name"
WHERE kv."action" != 3
WHERE kv."action" != 3
AND kv."namespace" = 'ns'
ORDER BY kv."namespace" ASC, kv."name" ASC
LIMIT 10 OFFSET 0
pkg/storage/unified/sql/testdata/postgres--resource_history_poll-single path.sql
Vendored
+1
View File
@@ -1,4 +1,5 @@
SELECT
"guid",
"resource_version",
"namespace",
"group",
pkg/storage/unified/sql/testdata/postgres--resource_history_read-single path.sql
Vendored
+1
View File
@@ -1,4 +1,5 @@
SELECT
"guid",
"namespace",
"group",
"resource",
pkg/storage/unified/sql/testdata/postgres--resource_list-filter_on_namespace.sql
Vendored
+3
View File
@@ -1,6 +1,9 @@
SELECT
"guid",
"resource_version",
"namespace",
"group",
"resource",
"name",
"folder",
"value"
pkg/storage/unified/sql/testdata/postgres--resource_read-without_resource_version.sql
Vendored
+1
View File
@@ -1,4 +1,5 @@
SELECT
"guid",
"namespace",
"group",
"resource",
pkg/storage/unified/sql/testdata/sqlite--resource_history_get-read object history.sql
Vendored
+3
View File
@@ -1,6 +1,9 @@
SELECT
"guid",
"resource_version",
"namespace",
"group",
"resource",
"name",
"folder",
"value"
pkg/storage/unified/sql/testdata/sqlite--resource_history_get-read trash second page.sql
Vendored
+3
View File
@@ -1,6 +1,9 @@
SELECT
"guid",
"resource_version",
"namespace",
"group",
"resource",
"name",
"folder",
"value"
pkg/storage/unified/sql/testdata/sqlite--resource_history_get-read trash.sql
Vendored
+3
View File
@@ -1,6 +1,9 @@
SELECT
"guid",
"resource_version",
"namespace",
"group",
"resource",
"name",
"folder",
"value"
pkg/storage/unified/sql/testdata/sqlite--resource_history_list-single path.sql
Vendored
+6 -3
View File
@@ -1,17 +1,20 @@
SELECT
kv."guid",
kv."resource_version",
kv."namespace",
kv."group",
kv."resource",
kv."name",
kv."folder",
kv."value"
FROM "resource_history" as kv
FROM "resource_history" as kv
INNER JOIN (
SELECT "namespace", "group", "resource", "name", max("resource_version") AS "resource_version"
FROM "resource_history" AS mkv
WHERE 1 = 1
AND "resource_version" <= 0
AND "namespace" = 'ns'
GROUP BY mkv."namespace", mkv."group", mkv."resource", mkv."name"
GROUP BY mkv."namespace", mkv."group", mkv."resource", mkv."name"
) AS maxkv
ON
maxkv."resource_version" = kv."resource_version"
@@ -19,7 +22,7 @@ SELECT
AND maxkv."group" = kv."group"
AND maxkv."resource" = kv."resource"
AND maxkv."name" = kv."name"
WHERE kv."action" != 3
WHERE kv."action" != 3
AND kv."namespace" = 'ns'
ORDER BY kv."namespace" ASC, kv."name" ASC
LIMIT 10 OFFSET 0
pkg/storage/unified/sql/testdata/sqlite--resource_history_poll-single path.sql
Vendored
+1
View File
@@ -1,4 +1,5 @@
SELECT
"guid",
"resource_version",
"namespace",
"group",
pkg/storage/unified/sql/testdata/sqlite--resource_history_read-single path.sql
Vendored
+1
View File
@@ -1,4 +1,5 @@
SELECT
"guid",
"namespace",
"group",
"resource",
pkg/storage/unified/sql/testdata/sqlite--resource_list-filter_on_namespace.sql
Vendored
+3
View File
@@ -1,6 +1,9 @@
SELECT
"guid",
"resource_version",
"namespace",
"group",
"resource",
"name",
"folder",
"value"
pkg/storage/unified/sql/testdata/sqlite--resource_read-without_resource_version.sql
Vendored
+1
View File
@@ -1,4 +1,5 @@
SELECT
"guid",
"namespace",
"group",
"resource",