opt/bench: properly set EvalCtx.Annotations in the harness

yuzefovich · yuzefovich · commit 2249061fbb98 · 2025-09-18T15:30:03.000+02:00
This was exposed recently via 8d77202 that triggered some warnings in a couple of benchmarks (before this patch we'd crash with "no Annotations provided" error since we forgot to properly initialize the eval context). Release note: None
diff --git a/pkg/sql/opt/bench/bench_test.go b/pkg/sql/opt/bench/bench_test.go
@@ -854,6 +854,7 @@ func newHarness(tb testing.TB, query benchQuery, schemas []string) *harness {
 		semaCtx: tree.MakeSemaContext(nil /* resolver */),
 		evalCtx: eval.MakeTestingEvalContext(cluster.MakeTestingClusterSettings()),
 	}
+	h.evalCtx.Annotations = &h.semaCtx.Annotations
 
 	// Set session settings to their global defaults.
 	if err := sql.TestingResetSessionVariables(h.ctx, h.evalCtx); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -854,6 +854,7 @@ func newHarness(tb testing.TB, query benchQuery, schemas []string) *harness {`
`854`	`854`	`semaCtx: tree.MakeSemaContext(nil /* resolver */),`
`855`	`855`	`evalCtx: eval.MakeTestingEvalContext(cluster.MakeTestingClusterSettings()),`
`856`	`856`	`}`
	`857`	`+ h.evalCtx.Annotations = &h.semaCtx.Annotations`
`857`	`858`
`858`	`859`	`// Set session settings to their global defaults.`
`859`	`860`	`if err := sql.TestingResetSessionVariables(h.ctx, h.evalCtx); err != nil {`