Skip to content

[inline-learn lib 2/3] Reconcile multi-query inline expectations #23012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
d10c wants to merge 3 commits into from
Draft

[inline-learn lib 2/3] Reconcile multi-query inline expectations #23012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5911685
Reconcile inline expectations across query cohorts
d10c Sep 9, 2026
d8270c1
Preserve cohort producer provenance
d10c Nov 3, 2026
3baabf9
Preserve cohort ownership for unsupported atoms
d10c Nov 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query-invalid-qualifier/code.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package p

func emptyQualifierTarget() {} // $ hit[go/test/q1] hit[go/test/q2]

func repeatedQualifierTarget() {} // $ hit[go/test/q1] hit[go/test/q2]
5 changes: 5 additions & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query-invalid-qualifier/code.go.invalid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package p

func emptyQualifierTarget() {} // $ hit[]

func repeatedQualifierTarget() {} // $ hit[go/test/q1][go/test/q2]
2 changes: 2 additions & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query-invalid-qualifier/q1.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
| code.go:3:6:3:25 | emptyQualifierTarget |
| code.go:5:6:5:28 | repeatedQualifierTarget |
9 changes: 9 additions & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query-invalid-qualifier/q1.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/**
* @id go/test/q1
*/

private import go

query predicate hit(Function function) {
function.getName() = ["emptyQualifierTarget", "repeatedQualifierTarget"]
}
2 changes: 2 additions & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query-invalid-qualifier/q1.qlref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
query: q1.ql
postprocess: utils/test/InlineExpectationsTestQuery.ql
2 changes: 2 additions & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query-invalid-qualifier/q2.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
| code.go:3:6:3:25 | emptyQualifierTarget |
| code.go:5:6:5:28 | repeatedQualifierTarget |
9 changes: 9 additions & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query-invalid-qualifier/q2.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/**
* @id go/test/q2
*/

private import go

query predicate hit(Function function) {
function.getName() = ["emptyQualifierTarget", "repeatedQualifierTarget"]
}
2 changes: 2 additions & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query-invalid-qualifier/q2.qlref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
query: q2.ql
postprocess: utils/test/InlineExpectationsTestQuery.ql
3 changes: 3 additions & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query-problem/code.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package p

func sharedTarget() {} // $ Alert unrelated=value
1 change: 1 addition & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query-problem/q1.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
| code.go:3:6:3:17 | sharedTarget | problem |
10 changes: 10 additions & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query-problem/q1.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/**
* @kind problem
* @id go/test/problem-q1
*/

import go

from Function function
where function.getName() = "sharedTarget"
select function, "problem"
2 changes: 2 additions & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query-problem/q1.qlref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
query: q1.ql
postprocess: utils/test/InlineExpectationsTestQuery.ql
1 change: 1 addition & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query-problem/q2.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
| code.go:3:6:3:17 | sharedTarget | problem |
10 changes: 10 additions & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query-problem/q2.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/**
* @kind problem
* @id go/test/problem-q2
*/

import go

from Function function
where function.getName() = "sharedTarget"
select function, "problem"
2 changes: 2 additions & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query-problem/q2.qlref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
query: q2.ql
postprocess: utils/test/InlineExpectationsTestQuery.ql
27 changes: 27 additions & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query/code.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package p

func sharedTarget() {} // $ hit

func qualifiedTarget() {} // $ hit[go/test/q1] hit[go/test/q2]

func valuedTarget() {} // $ mark[go/test/q1]=q1 mark[go/test/q2]=q2

func q1Target() {} // $ one[go/test/q1]

func q2Target() {} // $ two[go/test/q2]

func survivingSiblingTarget() {} // $ two[go/test/q2]

func foreignTarget() {} // $ hit hit[go/test/other]

func missingTarget() {} // $ MISSING: absent[go/test/q1] absent[go/test/q2]

func spuriousTarget() {} // $ SPURIOUS: spurious[go/test/q1]

func suppressedSiblingTarget() {} // $ hit[go/test/q2] SPURIOUS: hit[go/test/q1]

func namedMissingTarget() {} // $ hit[go/test/q1] MISSING: hit[go/test/q2]

func namedSpuriousTarget() {} // $ SPURIOUS: hit[go/test/q2]

func noteTarget() {} // $ hit // trailing note
13 changes: 13 additions & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query/q1.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
hit
| code.go:3:6:3:17 | sharedTarget |
| code.go:5:6:5:20 | qualifiedTarget |
| code.go:15:6:15:18 | foreignTarget |
| code.go:21:6:21:28 | suppressedSiblingTarget |
| code.go:23:6:23:23 | namedMissingTarget |
| code.go:27:6:27:15 | noteTarget |
mark
| code.go:7:6:7:17 | valuedTarget | q1 |
one
| code.go:9:6:9:13 | q1Target |
spurious
| code.go:19:6:19:19 | spuriousTarget |
24 changes: 24 additions & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query/q1.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/**
* @id go/test/q1
*/

private import go

private predicate isFixtureFunction(Function function, string name) { function.getName() = name }

query predicate hit(Function function) {
isFixtureFunction(function,
[
"sharedTarget", "qualifiedTarget", "foreignTarget", "suppressedSiblingTarget",
"namedMissingTarget", "noteTarget"
])
}

query predicate mark(Function function, string value) {
isFixtureFunction(function, "valuedTarget") and
value = "q1"
}

query predicate one(Function function) { isFixtureFunction(function, "q1Target") }

query predicate spurious(Function function) { isFixtureFunction(function, "spuriousTarget") }
2 changes: 2 additions & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query/q1.qlref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
query: q1.ql
postprocess: utils/test/InlineExpectationsTestQuery.ql
12 changes: 12 additions & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query/q2.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
hit
| code.go:3:6:3:17 | sharedTarget |
| code.go:5:6:5:20 | qualifiedTarget |
| code.go:15:6:15:18 | foreignTarget |
| code.go:21:6:21:28 | suppressedSiblingTarget |
| code.go:25:6:25:24 | namedSpuriousTarget |
| code.go:27:6:27:15 | noteTarget |
mark
| code.go:7:6:7:17 | valuedTarget | q2 |
two
| code.go:11:6:11:13 | q2Target |
| code.go:13:6:13:27 | survivingSiblingTarget |
24 changes: 24 additions & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query/q2.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/**
* @id go/test/q2
*/

private import go

private predicate isFixtureFunction(Function function, string name) { function.getName() = name }

query predicate hit(Function function) {
isFixtureFunction(function,
[
"sharedTarget", "qualifiedTarget", "foreignTarget", "suppressedSiblingTarget",
"namedSpuriousTarget", "noteTarget"
])
}

query predicate mark(Function function, string value) {
isFixtureFunction(function, "valuedTarget") and
value = "q2"
}

query predicate two(Function function) {
isFixtureFunction(function, ["q2Target", "survivingSiblingTarget"])
}
2 changes: 2 additions & 0 deletions go/ql/test/library-tests/inline-expectations/multi-query/q2.qlref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
query: q2.ql
postprocess: utils/test/InlineExpectationsTestQuery.ql
Loading
Loading