Revert "sql,opt: pass tree.SemaContext to the execbuilder"

This reverts commit 25b4d57. No longer
needed as AsOfSystemTime is moved to EvalContext.

Release note: None

pkg/sql/opt/bench/bench_test.go

@@ -484,7 +484,6 @@ func (h *harness) runSimple(tb testing.TB, query benchQuery, phase Phase) {
 		execMemo,
 		nil, /* catalog */
 		root,
-		&h.semaCtx,
 		&h.evalCtx,
 		true, /* allowAutoCommit */
 	)
@@ -538,7 +537,6 @@ func (h *harness) runPrepared(tb testing.TB, phase Phase) {
 		execMemo,
 		nil, /* catalog */
 		root,
-		&h.semaCtx,
 		&h.evalCtx,
 		true, /* allowAutoCommit */
 	)

pkg/sql/opt/exec/execbuilder/builder.go

@@ -38,7 +38,6 @@ type Builder struct {
 	catalog          cat.Catalog
 	e                opt.Expr
 	disableTelemetry bool
-	semaCtx          *tree.SemaContext
 	evalCtx          *tree.EvalContext
 
 	// subqueries accumulates information about subqueries that are part of scalar
@@ -116,7 +115,6 @@ func New(
 	mem *memo.Memo,
 	catalog cat.Catalog,
 	e opt.Expr,
-	semaCtx *tree.SemaContext,
 	evalCtx *tree.EvalContext,
 	allowAutoCommit bool,
 ) *Builder {
@@ -126,7 +124,6 @@ func New(
 		mem:                    mem,
 		catalog:                catalog,
 		e:                      e,
-		semaCtx:                semaCtx,
 		evalCtx:                evalCtx,
 		allowAutoCommit:        allowAutoCommit,
 		initialAllowAutoCommit: allowAutoCommit,

pkg/sql/opt/exec/execbuilder/cascades.go

@@ -293,9 +293,7 @@ func (cb *cascadeBuilder) planCascade(
 	}
 
 	// 5. Execbuild the optimized expression.
-	eb := New(
-		execFactory, &o, factory.Memo(), cb.b.catalog, optimizedExpr, semaCtx, evalCtx, allowAutoCommit,
-	)
+	eb := New(execFactory, &o, factory.Memo(), cb.b.catalog, optimizedExpr, evalCtx, allowAutoCommit)
 	if bufferRef != nil {
 		// Set up the With binding.
 		eb.addBuiltWithExpr(cascadeInputWithID, bufferColMap, bufferRef)

pkg/sql/opt/exec/execbuilder/format.go

@@ -41,7 +41,6 @@ func fmtInterceptor(f *memo.ExprFmtCtx, scalar opt.ScalarExpr) string {
 		f.Memo,
 		nil, /* catalog */
 		scalar,
-		nil,   /* semaCtx */
 		nil,   /* evalCtx */
 		false, /* allowAutoCommit */
 	)

pkg/sql/opt/exec/execbuilder/relational.go

@@ -948,9 +948,7 @@ func (b *Builder) buildApplyJoin(join memo.RelExpr) (execPlan, error) {
 			return nil, err
 		}
 
-		eb := New(
-			ef, &o, f.Memo(), b.catalog, newRightSide, b.semaCtx, b.evalCtx, false, /* allowAutoCommit */
-		)
+		eb := New(ef, &o, f.Memo(), b.catalog, newRightSide, b.evalCtx, false /* allowAutoCommit */)
 		eb.disableTelemetry = true
 		eb.withExprs = withExprs
 		plan, err := eb.Build()

pkg/sql/opt/exec/execbuilder/statement.go

@@ -130,14 +130,7 @@ func (b *Builder) buildExplain(explain *memo.ExplainExpr) (execPlan, error) {
 		func(ef exec.ExplainFactory) (exec.Plan, error) {
 			// Create a separate builder for the explain query.
 			explainBld := New(
-				ef,
-				b.optimizer,
-				b.mem,
-				b.catalog,
-				explain.Input,
-				b.semaCtx,
-				b.evalCtx,
-				b.initialAllowAutoCommit,
+				ef, b.optimizer, b.mem, b.catalog, explain.Input, b.evalCtx, b.initialAllowAutoCommit,
 			)
 			explainBld.disableTelemetry = true
 			return explainBld.Build()

pkg/sql/opt/idxconstraint/index_constraints_test.go

@@ -135,7 +135,7 @@ func TestIndexConstraints(t *testing.T) {
 				if !remainingFilter.IsTrue() {
 					execBld := execbuilder.New(
 						nil /* execFactory */, nil /* optimizer */, f.Memo(), nil, /* catalog */
-						&remainingFilter, &semaCtx, &evalCtx, false, /* allowAutoCommit */
+						&remainingFilter, &evalCtx, false, /* allowAutoCommit */
 					)
 					expr, err := execBld.BuildScalar()
 					if err != nil {

pkg/sql/opt/partialidx/implicator_test.go

@@ -113,7 +113,7 @@ func TestImplicator(t *testing.T) {
 			} else {
 				execBld := execbuilder.New(
 					nil /* factory */, nil /* optimizer */, f.Memo(), nil, /* catalog */
-					&remainingFilters, &semaCtx, &evalCtx, false, /* allowAutoCommit */
+					&remainingFilters, &evalCtx, false, /* allowAutoCommit */
 				)
 				expr, err := execBld.BuildScalar()
 				if err != nil {

pkg/sql/plan_opt.go

@@ -210,7 +210,6 @@ func (p *planner) makeOptimizerPlan(ctx context.Context) error {
 			&p.stmt,
 			newDistSQLSpecExecFactory(p, planningMode),
 			execMemo,
-			p.SemaCtx(),
 			p.EvalContext(),
 			p.autoCommit,
 		)
@@ -245,7 +244,6 @@ func (p *planner) makeOptimizerPlan(ctx context.Context) error {
 					&p.stmt,
 					newDistSQLSpecExecFactory(p, distSQLLocalOnlyPlanning),
 					execMemo,
-					p.SemaCtx(),
 					p.EvalContext(),
 					p.autoCommit,
 				)
@@ -266,7 +264,6 @@ func (p *planner) makeOptimizerPlan(ctx context.Context) error {
 		&p.stmt,
 		newExecFactory(p),
 		execMemo,
-		p.SemaCtx(),
 		p.EvalContext(),
 		p.autoCommit,
 	)
@@ -557,7 +554,6 @@ func (opc *optPlanningCtx) runExecBuilder(
 	stmt *Statement,
 	f exec.Factory,
 	mem *memo.Memo,
-	semaCtx *tree.SemaContext,
 	evalCtx *tree.EvalContext,
 	allowAutoCommit bool,
 ) error {
@@ -567,9 +563,7 @@ func (opc *optPlanningCtx) runExecBuilder(
 	var containsFullIndexScan bool
 	if !planTop.instrumentation.ShouldBuildExplainPlan() {
 		// No instrumentation.
-		bld := execbuilder.New(
-			f, &opc.optimizer, mem, &opc.catalog, mem.RootExpr(), semaCtx, evalCtx, allowAutoCommit,
-		)
+		bld := execbuilder.New(f, &opc.optimizer, mem, &opc.catalog, mem.RootExpr(), evalCtx, allowAutoCommit)
 		plan, err := bld.Build()
 		if err != nil {
 			return err
@@ -582,14 +576,7 @@ func (opc *optPlanningCtx) runExecBuilder(
 		// Create an explain factory and record the explain.Plan.
 		explainFactory := explain.NewFactory(f)
 		bld := execbuilder.New(
-			explainFactory,
-			&opc.optimizer,
-			mem,
-			&opc.catalog,
-			mem.RootExpr(),
-			semaCtx,
-			evalCtx,
-			allowAutoCommit,
+			explainFactory, &opc.optimizer, mem, &opc.catalog, mem.RootExpr(), evalCtx, allowAutoCommit,
 		)
 		plan, err := bld.Build()
 		if err != nil {

pkg/sql/sem/tree/eval_test.go

@@ -104,7 +104,7 @@ func optBuildScalar(evalCtx *tree.EvalContext, e tree.Expr) (tree.TypedExpr, err
 
 	bld := execbuilder.New(
 		nil /* factory */, &o, o.Memo(), nil /* catalog */, o.Memo().RootExpr(),
-		&semaCtx, evalCtx, false, /* allowAutoCommit */
+		evalCtx, false, /* allowAutoCommit */
 	)
 	expr, err := bld.BuildScalar()
 	if err != nil {