rancher/steve
1
0
Fork 0
mirror of https://github.com/rancher/steve.git synced 2025-09-23 04:19:37 +00:00
Code Issues Projects Releases Wiki Activity

#50968 - Single SQL Transaction for projectsornamespaces filter (#758)

Browse Source 
* working for positive case

* changed to custom code

* removed comment

* added tests

* fixing ci error

* one more fix

* Update proxy_store tests for projectornamespace parsing.

Since we no longer need to execute a db query, and just return a filter,
we can drop a lot of code.

* added distinct back to conform with other queries

* one more fix

---------

Co-authored-by: Eric Promislow <epromislow@suse.com>
This commit is contained in:
Felipe Gehrke
2025-08-08 16:07:54 -03:00
committed by GitHub
parent dbd2818d22
commit 3cac88141b
7 changed files with 324 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
pkg/sqlcache/informer/listoption_indexer_test.go
View File

@@ -1528,6 +1528,138 @@ func TestConstructQuery(t *testing.T) {
expectedStmtArgs: []any{"somevalue"},
expectedErr: nil,
})
tests = append(tests, testCase{
description: "TestConstructQuery: handles ProjectOrNamespaces IN",
listOptions: sqltypes.ListOptions{
ProjectsOrNamespaces: sqltypes.OrFilter{
Filters: []sqltypes.Filter{
sqltypes.Filter{
Field: []string{"metadata", "name"},
Matches: []string{"some_namespace"},
Op: sqltypes.In,
},
sqltypes.Filter{
Field: []string{"metadata", "labels", "field.cattle.io/projectId"},
Matches: []string{"some_namespace"},
Op: sqltypes.In,
},
},
},
Filters: []sqltypes.OrFilter{},
},
partitions: []partition.Partition{
{
All: true,
},
},
ns: "",
expectedStmt: `SELECT DISTINCT o.object, o.objectnonce, o.dekid FROM "something" o
JOIN "something_fields" f ON o.key = f.key
JOIN "_v1_Namespace_fields" nsf ON f."metadata.namespace" = nsf."metadata.name"
LEFT OUTER JOIN "_v1_Namespace_labels" lt1 ON nsf.key = lt1.key
WHERE
((nsf."metadata.name" IN (?)) OR (lt1.label = ? AND lt1.value IN (?)))
ORDER BY f."metadata.name" ASC `,
expectedStmtArgs: []any{"some_namespace", "field.cattle.io/projectId", "some_namespace"},
expectedErr: nil,
})
tests = append(tests, testCase{
description: "TestConstructQuery: handles ProjectOrNamespaces multiple IN",
listOptions: sqltypes.ListOptions{
ProjectsOrNamespaces: sqltypes.OrFilter{
Filters: []sqltypes.Filter{
sqltypes.Filter{
Field: []string{"metadata", "name"},
Matches: []string{"some_namespace", "p-example"},
Op: sqltypes.In,
},
sqltypes.Filter{
Field: []string{"metadata", "labels", "field.cattle.io/projectId"},
Matches: []string{"some_namespace", "p-example"},
Op: sqltypes.In,
},
},
},
Filters: []sqltypes.OrFilter{},
},
partitions: []partition.Partition{
{
All: true,
},
},
ns: "",
expectedStmt: `SELECT DISTINCT o.object, o.objectnonce, o.dekid FROM "something" o
JOIN "something_fields" f ON o.key = f.key
JOIN "_v1_Namespace_fields" nsf ON f."metadata.namespace" = nsf."metadata.name"
LEFT OUTER JOIN "_v1_Namespace_labels" lt1 ON nsf.key = lt1.key
WHERE
((nsf."metadata.name" IN (?, ?)) OR (lt1.label = ? AND lt1.value IN (?, ?)))
ORDER BY f."metadata.name" ASC `,
expectedStmtArgs: []any{"some_namespace", "p-example", "field.cattle.io/projectId", "some_namespace", "p-example"},
expectedErr: nil,
})
tests = append(tests, testCase{
description: "TestConstructQuery: handles ProjectOrNamespaces NOT IN",
listOptions: sqltypes.ListOptions{
ProjectsOrNamespaces: sqltypes.OrFilter{
Filters: []sqltypes.Filter{
sqltypes.Filter{
Field: []string{"metadata", "name"},
Matches: []string{"some_namespace"},
Op: sqltypes.NotIn,
},
sqltypes.Filter{
Field: []string{"metadata", "labels", "field.cattle.io/projectId"},
Matches: []string{"some_namespace"},
Op: sqltypes.NotIn,
},
},
},
Filters: []sqltypes.OrFilter{},
},
partitions: []partition.Partition{{All: true}},
ns: "",
expectedStmt: `SELECT DISTINCT o.object, o.objectnonce, o.dekid FROM "something" o
JOIN "something_fields" f ON o.key = f.key
JOIN "_v1_Namespace_fields" nsf ON f."metadata.namespace" = nsf."metadata.name"
LEFT OUTER JOIN "_v1_Namespace_labels" lt1 ON nsf.key = lt1.key
WHERE
((nsf."metadata.name" NOT IN (?)) AND (lt1.label = ? AND lt1.value NOT IN (?)))
ORDER BY f."metadata.name" ASC `,
expectedStmtArgs: []any{"some_namespace", "field.cattle.io/projectId", "some_namespace"},
expectedErr: nil,
})
tests = append(tests, testCase{
description: "TestConstructQuery: handles ProjectOrNamespaces multiple NOT IN",
listOptions: sqltypes.ListOptions{
ProjectsOrNamespaces: sqltypes.OrFilter{
Filters: []sqltypes.Filter{
sqltypes.Filter{
Field: []string{"metadata", "name"},
Matches: []string{"some_namespace", "p-example"},
Op: sqltypes.NotIn,
},
sqltypes.Filter{
Field: []string{"metadata", "labels", "field.cattle.io/projectId"},
Matches: []string{"some_namespace", "p-example"},
Op: sqltypes.NotIn,
},
},
},
Filters: []sqltypes.OrFilter{},
},
partitions: []partition.Partition{{All: true}},
ns: "",
expectedStmt: `SELECT DISTINCT o.object, o.objectnonce, o.dekid FROM "something" o
JOIN "something_fields" f ON o.key = f.key
JOIN "_v1_Namespace_fields" nsf ON f."metadata.namespace" = nsf."metadata.name"
LEFT OUTER JOIN "_v1_Namespace_labels" lt1 ON nsf.key = lt1.key
WHERE
((nsf."metadata.name" NOT IN (?, ?)) AND (lt1.label = ? AND lt1.value NOT IN (?, ?)))
ORDER BY f."metadata.name" ASC `,
expectedStmtArgs: []any{"some_namespace", "p-example", "field.cattle.io/projectId", "some_namespace", "p-example"},
expectedErr: nil,
})
tests = append(tests, testCase{
description: "TestConstructQuery: handles EXISTS statements",
listOptions: sqltypes.ListOptions{Filters: []sqltypes.OrFilter{
@@ -2176,7 +2308,7 @@ SELECT DISTINCT o.object, o.objectnonce, o.dekid FROM "something" o
}
lii := &ListOptionIndexer{
Indexer: i,
indexedFields: []string{"metadata.queryField1", "status.queryField2", "spec.containers.image"},
indexedFields: []string{"metadata.queryField1", "status.queryField2", "spec.containers.image", "metadata.name"},
}
queryInfo, err := lii.constructQuery(&test.listOptions, test.partitions, test.ns, "something")
if test.expectedErr != nil {