sql: rename NewFakeSessionData to NewInternalSessionData

Release note: None

pkg/bench/bench_test.go

@@ -1474,7 +1474,7 @@ func BenchmarkFuncExprTypeCheck(b *testing.B) {
 
 	ctx := context.Background()
 	execCfg := s.ExecutorConfig().(sql.ExecutorConfig)
-	sd := sql.NewFakeSessionData(ctx, execCfg.Settings, "type-check-benchmark")
+	sd := sql.NewInternalSessionData(ctx, execCfg.Settings, "type-check-benchmark")
 	sd.Database = "defaultdb"
 	p, cleanup := sql.NewInternalPlanner(
 		"type-check-benchmark",

pkg/ccl/changefeedccl/scheduled_changefeed_test.go

@@ -707,7 +707,7 @@ func TestCheckScheduleAlreadyExists(t *testing.T) {
 
 	ctx := context.Background()
 
-	sd := sql.NewFakeSessionData(ctx, execCfg.Settings, "test")
+	sd := sql.NewInternalSessionData(ctx, execCfg.Settings, "test")
 	sd.Database = "d"
 	p, cleanup := sql.NewInternalPlanner("test",
 		execCfg.DB.NewTxn(ctx, "test-planner"),
@@ -742,7 +742,7 @@ func TestFullyQualifyTables(t *testing.T) {
 	require.NoError(t, err)
 	createChangeFeedStmt := stmt.AST.(*tree.CreateChangefeed)
 
-	sd := sql.NewFakeSessionData(ctx, execCfg.Settings, "test")
+	sd := sql.NewInternalSessionData(ctx, execCfg.Settings, "test")
 	sd.Database = "ocean"
 	p, cleanupPlanHook := sql.NewInternalPlanner("test",
 		execCfg.DB.NewTxn(ctx, "test-planner"),

pkg/server/admin_test.go

@@ -3237,7 +3237,7 @@ func TestAdminPrivilegeChecker(t *testing.T) {
 			username.RootUserName(),
 			&sql.MemoryMetrics{},
 			&execCfg,
-			sql.NewFakeSessionData(ctx, execCfg.Settings, opName),
+			sql.NewInternalSessionData(ctx, execCfg.Settings, opName),
 		)
 	}
 

pkg/server/server.go

@@ -1065,7 +1065,7 @@ func NewServer(cfg Config, stopper *stop.Stopper) (*Server, error) {
 			username.RootUserName(),
 			&sql.MemoryMetrics{},
 			sqlServer.execCfg,
-			sql.NewFakeSessionData(ctx, sqlServer.execCfg.Settings, opName),
+			sql.NewInternalSessionData(ctx, sqlServer.execCfg.Settings, opName),
 		)
 	}
 

pkg/server/server_internal_executor_factory_test.go

@@ -33,7 +33,7 @@ func TestInternalExecutorClearsMonitorMemory(t *testing.T) {
 
 	mon := s.(*TestServer).sqlServer.internalDBMemMonitor
 	ief := s.ExecutorConfig().(sql.ExecutorConfig).InternalDB
-	sessionData := sql.NewFakeSessionData(ctx, s.ClusterSettings(), "TestInternalExecutorClearsMonitorMemory")
+	sessionData := sql.NewInternalSessionData(ctx, s.ClusterSettings(), "TestInternalExecutorClearsMonitorMemory")
 	ie := ief.NewInternalExecutor(sessionData)
 	rows, err := ie.QueryIteratorEx(ctx, "test", nil, sessiondata.NodeUserSessionDataOverride, `SELECT 1`)
 	require.NoError(t, err)

pkg/server/server_sql.go

@@ -1191,7 +1191,7 @@ func newSQLServer(ctx context.Context, cfg sqlServerArgs) (*SQLServer, error) {
 		sql.ValidateForwardIndexes,
 		sql.ValidateInvertedIndexes,
 		sql.ValidateConstraint,
-		sql.NewFakeSessionData,
+		sql.NewInternalSessionData,
 	)
 
 	jobsInternalDB := sql.NewInternalDBWithSessionDataOverrides(internalDB, func(sd *sessiondata.SessionData) {
@@ -1662,7 +1662,7 @@ func (s *SQLServer) preStart(
 					user,
 					&sql.MemoryMetrics{},
 					s.execCfg,
-					sql.NewFakeSessionData(ctx, s.execCfg.Settings, opName),
+					sql.NewInternalSessionData(ctx, s.execCfg.Settings, opName),
 				)
 			},
 		},

pkg/server/tenant.go

@@ -367,7 +367,7 @@ func newTenantServer(
 			username.RootUserName(),
 			&sql.MemoryMetrics{},
 			sqlServer.execCfg,
-			sql.NewFakeSessionData(ctx, sqlServer.execCfg.Settings, opName),
+			sql.NewInternalSessionData(ctx, sqlServer.execCfg.Settings, opName),
 		)
 	}
 

pkg/sql/backfill.go

@@ -795,7 +795,7 @@ func (sc *SchemaChanger) validateConstraints(
 				semaCtx.TypeResolver = &resolver
 				semaCtx.NameResolver = NewSkippingCacheSchemaResolver(
 					txn.Descriptors(),
-					sessiondata.NewStack(NewFakeSessionData(ctx, sc.settings, "validate constraint")),
+					sessiondata.NewStack(NewInternalSessionData(ctx, sc.settings, "validate constraint")),
 					txn.KV(),
 					nil, /* authAccessor */
 				)
@@ -1055,7 +1055,7 @@ func (sc *SchemaChanger) distIndexBackfill(
 		if err != nil {
 			return err
 		}
-		sd := NewFakeSessionData(ctx, sc.execCfg.Settings, "dist-index-backfill")
+		sd := NewInternalSessionData(ctx, sc.execCfg.Settings, "dist-index-backfill")
 		evalCtx = createSchemaChangeEvalCtx(ctx, sc.execCfg, sd, txn.KV().ReadTimestamp(), txn.Descriptors())
 		planCtx = sc.distSQLPlanner.NewPlanningCtx(ctx, &evalCtx, nil, /* planner */
 			txn.KV(), DistributionTypeSystemTenantOnly)
@@ -1351,7 +1351,7 @@ func (sc *SchemaChanger) distColumnBackfill(
 				return nil
 			}
 			cbw := MetadataCallbackWriter{rowResultWriter: &errOnlyResultWriter{}, fn: metaFn}
-			sd := NewFakeSessionData(ctx, sc.execCfg.Settings, "dist-column-backfill")
+			sd := NewInternalSessionData(ctx, sc.execCfg.Settings, "dist-column-backfill")
 			evalCtx := createSchemaChangeEvalCtx(ctx, sc.execCfg, sd, txn.KV().ReadTimestamp(), txn.Descriptors())
 			recv := MakeDistSQLReceiver(
 				ctx,

pkg/sql/catalog/descs/collection_test.go

@@ -856,7 +856,7 @@ parent schema name   id  kind     version dropped public
 `, formatCatalog(allDescs.OrderedDescriptors()))
 		return nil
 	}
-	sd := sql.NewFakeSessionData(&s0.ClusterSettings().SV, "TestGetAllDescriptorsInDatabase")
+	sd := sql.NewInternalSessionData(&s0.ClusterSettings().SV, "TestGetAllDescriptorsInDatabase")
 	sd.Database = "db"
 	require.NoError(t, tm.DescsTxn(ctx, run, isql.WithSessionData(sd)))
 }

pkg/sql/distsql_plan_changefeed_test.go

@@ -82,7 +82,7 @@ CREATE TABLE foo (
 
 	ctx := context.Background()
 	execCfg := s.ExecutorConfig().(ExecutorConfig)
-	sd := NewFakeSessionData(ctx, execCfg.Settings, "test")
+	sd := NewInternalSessionData(ctx, execCfg.Settings, "test")
 	sd.Database = "defaultdb"
 
 	p, cleanup := NewInternalPlanner("test", kv.NewTxn(ctx, kvDB, s.NodeID()),
@@ -464,7 +464,7 @@ func TestChangefeedStreamsResults(t *testing.T) {
 
 	ctx := context.Background()
 	execCfg := s.ExecutorConfig().(ExecutorConfig)
-	sd := NewFakeSessionData(ctx, execCfg.Settings, "test")
+	sd := NewInternalSessionData(ctx, execCfg.Settings, "test")
 	sd.Database = "defaultdb"
 	p, cleanup := NewInternalPlanner("test", kv.NewTxn(ctx, kvDB, s.NodeID()),
 		username.RootUserName(), &MemoryMetrics{}, &execCfg, sd,
@@ -511,7 +511,7 @@ FAMILY extra (extra)
 
 	ctx := context.Background()
 	execCfg := s.ExecutorConfig().(ExecutorConfig)
-	sd := NewFakeSessionData(ctx, execCfg.Settings, "test")
+	sd := NewInternalSessionData(ctx, execCfg.Settings, "test")
 	sd.Database = "defaultdb"
 	p, cleanup := NewInternalPlanner("test", kv.NewTxn(ctx, kvDB, s.NodeID()),
 		username.RootUserName(), &MemoryMetrics{}, &execCfg, sd,

pkg/sql/distsql_running_test.go

@@ -76,7 +76,7 @@ func TestDistSQLRunningInAbortedTxn(t *testing.T) {
 
 	// Plan a statement.
 	execCfg := s.ExecutorConfig().(ExecutorConfig)
-	sd := NewFakeSessionData(ctx, execCfg.Settings, "test")
+	sd := NewInternalSessionData(ctx, execCfg.Settings, "test")
 	internalPlanner, cleanup := NewInternalPlanner(
 		"test",
 		kv.NewTxn(ctx, db, s.NodeID()),
@@ -252,7 +252,7 @@ func TestDistSQLRunningParallelFKChecksAfterAbort(t *testing.T) {
 
 	createPlannerAndRunQuery := func(ctx context.Context, txn *kv.Txn, query string) error {
 		execCfg := s.ExecutorConfig().(ExecutorConfig)
-		sd := NewFakeSessionData(ctx, execCfg.Settings, "test")
+		sd := NewInternalSessionData(ctx, execCfg.Settings, "test")
 		// Plan the statement.
 		internalPlanner, cleanup := NewInternalPlanner(
 			"test",

pkg/sql/explain_tree_test.go

@@ -60,7 +60,7 @@ func TestPlanToTreeAndPlanToString(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			sd := NewFakeSessionData(ctx, execCfg.Settings, "test")
+			sd := NewInternalSessionData(ctx, execCfg.Settings, "test")
 			internalPlanner, cleanup := NewInternalPlanner(
 				"test",
 				kv.NewTxn(ctx, db, s.NodeID()),

pkg/sql/flowinfra/flow_test.go

@@ -56,7 +56,7 @@ func BenchmarkFlowSetup(b *testing.B) {
 				if vectorize {
 					vectorizeMode = sessiondatapb.VectorizeOn
 				}
-				sd := sql.NewFakeSessionData(ctx, execCfg.Settings, "test")
+				sd := sql.NewInternalSessionData(ctx, execCfg.Settings, "test")
 				sd.VectorizeMode = vectorizeMode
 				b.ResetTimer()
 				for i := 0; i < b.N; i++ {

pkg/sql/index_backfiller.go

@@ -174,7 +174,7 @@ func (ib *IndexBackfillPlanner) plan(
 	if err := DescsTxn(ctx, ib.execCfg, func(
 		ctx context.Context, txn isql.Txn, descriptors *descs.Collection,
 	) error {
-		sd := NewFakeSessionData(ctx, ib.execCfg.Settings, "plan-index-backfill")
+		sd := NewInternalSessionData(ctx, ib.execCfg.Settings, "plan-index-backfill")
 		evalCtx = createSchemaChangeEvalCtx(ctx, ib.execCfg, sd, nowTimestamp, descriptors)
 		planCtx = ib.execCfg.DistSQLPlanner.NewPlanningCtx(ctx, &evalCtx,
 			nil /* planner */, txn.KV(), DistributionTypeSystemTenantOnly)

pkg/sql/internal.go

@@ -49,6 +49,46 @@ import (
 	"github.com/cockroachdb/logtags"
 )
 
+// NewInternalSessionData returns a session data for use in internal queries
+// that are not run on behalf of a user session, such as those run during the
+// steps of background jobs and schema changes. Each session variable is
+// initialized using the correct default value.
+func NewInternalSessionData(
+	ctx context.Context, settings *cluster.Settings, opName string,
+) *sessiondata.SessionData {
+	appName := catconstants.InternalAppNamePrefix
+	if opName != "" {
+		appName = catconstants.InternalAppNamePrefix + "-" + opName
+	}
+
+	sd := &sessiondata.SessionData{}
+	sds := sessiondata.NewStack(sd)
+	defaults := SessionDefaults(map[string]string{
+		"application_name": appName,
+	})
+	sdMutIterator := makeSessionDataMutatorIterator(sds, defaults, settings)
+
+	sdMutIterator.applyOnEachMutator(func(m sessionDataMutator) {
+		for varName, v := range varGen {
+			if v.Set != nil {
+				hasDefault, defVal := getSessionVarDefaultString(varName, v, m.sessionDataMutatorBase)
+				if hasDefault {
+					if err := v.Set(ctx, m, defVal); err != nil {
+						panic(err)
+					}
+				}
+			}
+		}
+	})
+
+	sd.UserProto = username.NodeUserName().EncodeProto()
+	sd.Internal = true
+	sd.SearchPath = sessiondata.DefaultSearchPathForUser(username.NodeUserName())
+	sd.SequenceState = sessiondata.NewSequenceState()
+	sd.Location = time.UTC
+	return sd
+}
+
 var _ isql.Executor = &InternalExecutor{}
 
 // InternalExecutor can be used internally by code modules to execute SQL
@@ -1384,7 +1424,7 @@ func (ief *InternalDB) newInternalExecutorWithTxn(
 	// than the actual user, a security boundary should be added to the error
 	// handling of internal executor.
 	if sd == nil {
-		sd = NewFakeSessionData(ctx, settings, "" /* opName */)
+		sd = NewInternalSessionData(ctx, settings, "" /* opName */)
 		sd.UserProto = username.RootUserName().EncodeProto()
 	}
 

pkg/sql/job_exec_context.go

@@ -44,7 +44,7 @@ func MakeJobExecContext(
 		user,
 		memMetrics,
 		execCfg,
-		NewFakeSessionData(ctx, execCfg.Settings, opName),
+		NewInternalSessionData(ctx, execCfg.Settings, opName),
 	)
 	p := plannerInterface.(*planner)
 	return &plannerJobExecContext{p: p}, close

pkg/sql/mvcc_backfiller.go

@@ -126,7 +126,7 @@ func (im *IndexBackfillerMergePlanner) plan(
 	if err := DescsTxn(ctx, im.execCfg, func(
 		ctx context.Context, txn isql.Txn, descriptors *descs.Collection,
 	) error {
-		sd := NewFakeSessionData(ctx, im.execCfg.Settings, "plan-index-backfill-merge")
+		sd := NewInternalSessionData(ctx, im.execCfg.Settings, "plan-index-backfill-merge")
 		evalCtx = createSchemaChangeEvalCtx(ctx, im.execCfg, sd, txn.KV().ReadTimestamp(), descriptors)
 		planCtx = im.execCfg.DistSQLPlanner.NewPlanningCtx(ctx, &evalCtx, nil /* planner */, txn.KV(),
 			DistributionTypeSystemTenantOnly)

pkg/sql/plan_opt_test.go

@@ -656,7 +656,7 @@ func TestPlanGistControl(t *testing.T) {
 	s, _, db := serverutils.StartServer(t, base.TestServerArgs{})
 	defer s.Stopper().Stop(ctx)
 	execCfg := s.ExecutorConfig().(ExecutorConfig)
-	sd := NewFakeSessionData(ctx, execCfg.Settings, "test")
+	sd := NewInternalSessionData(ctx, execCfg.Settings, "test")
 	internalPlanner, cleanup := NewInternalPlanner(
 		"test",
 		kv.NewTxn(ctx, db, s.NodeID()),

pkg/sql/reference_provider.go

@@ -160,7 +160,7 @@ func NewReferenceProviderFactoryForTest(
 	execCfg *ExecutorConfig,
 	curDB string,
 ) (scbuild.ReferenceProviderFactory, func()) {
-	sd := NewFakeSessionData(ctx, execCfg.Settings, opName)
+	sd := NewInternalSessionData(ctx, execCfg.Settings, opName)
 	sd.Database = "defaultdb"
 	ip, cleanup := newInternalPlanner(opName, txn, user, &MemoryMetrics{}, execCfg, sd)
 	return &referenceProviderFactory{p: ip}, cleanup

pkg/sql/schema_changer.go

@@ -48,7 +48,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/parser"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror"
-	"github.com/cockroachdb/cockroach/pkg/sql/sem/catconstants"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/eval"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
 	"github.com/cockroachdb/cockroach/pkg/sql/sessiondata"
@@ -288,7 +287,7 @@ func (sc *SchemaChanger) backfillQueryIntoTable(
 			username.RootUserName(),
 			&MemoryMetrics{},
 			sc.execCfg,
-			NewFakeSessionData(ctx, sc.execCfg.Settings, "backfillQueryIntoTable"),
+			NewInternalSessionData(ctx, sc.execCfg.Settings, "backfillQueryIntoTable"),
 		)
 
 		defer cleanup()
@@ -2522,45 +2521,6 @@ func createSchemaChangeEvalCtx(
 	return evalCtx
 }
 
-// NewFakeSessionData returns "fake" session data for use in internal queries
-// that are not run on behalf of a user session, such as those run during the
-// steps of background jobs and schema changes.
-func NewFakeSessionData(
-	ctx context.Context, settings *cluster.Settings, opName string,
-) *sessiondata.SessionData {
-	appName := catconstants.InternalAppNamePrefix
-	if opName != "" {
-		appName = catconstants.InternalAppNamePrefix + "-" + opName
-	}
-
-	sd := &sessiondata.SessionData{}
-	sds := sessiondata.NewStack(sd)
-	defaults := SessionDefaults(map[string]string{
-		"application_name": appName,
-	})
-	sdMutIterator := makeSessionDataMutatorIterator(sds, defaults, settings)
-
-	sdMutIterator.applyOnEachMutator(func(m sessionDataMutator) {
-		for varName, v := range varGen {
-			if v.Set != nil {
-				hasDefault, defVal := getSessionVarDefaultString(varName, v, m.sessionDataMutatorBase)
-				if hasDefault {
-					if err := v.Set(ctx, m, defVal); err != nil {
-						panic(err)
-					}
-				}
-			}
-		}
-	})
-
-	sd.UserProto = username.NodeUserName().EncodeProto()
-	sd.Internal = true
-	sd.SearchPath = sessiondata.DefaultSearchPathForUser(username.NodeUserName())
-	sd.SequenceState = sessiondata.NewSequenceState()
-	sd.Location = time.UTC
-	return sd
-}
-
 type schemaChangeResumer struct {
 	job *jobs.Job
 }

pkg/sql/schemachanger/scdeps/sctestutils/sctestutils.go

@@ -50,7 +50,7 @@ func WithBuilderDependenciesFromTestServer(
 ) {
 	ctx := context.Background()
 	execCfg := s.ExecutorConfig().(sql.ExecutorConfig)
-	sd := sql.NewFakeSessionData(ctx, execCfg.Settings, "test")
+	sd := sql.NewInternalSessionData(ctx, execCfg.Settings, "test")
 	sd.Database = "defaultdb"
 	ip, cleanup := sql.NewInternalPlanner(
 		"test",

pkg/upgrade/upgradejob/upgrade_job.go

@@ -105,7 +105,7 @@ func (r resumer) Resume(ctx context.Context, execCtxI interface{}) error {
 			txn *kv.Txn, descriptors *descs.Collection, currDb string,
 		) (resolver.SchemaResolver, func(), error) {
 			opName := "internal-planner-for-upgrades"
-			sd := sql.NewFakeSessionData(ctx, execCtx.ExecCfg().Settings, opName)
+			sd := sql.NewInternalSessionData(ctx, execCtx.ExecCfg().Settings, opName)
 			sd.Database = currDb
 			internalPlanner, cleanup := sql.NewInternalPlanner(
 				opName,