diff --git a/pkg/spanconfig/spanconfigtestutils/spanconfigtestcluster/cluster.go b/pkg/spanconfig/spanconfigtestutils/spanconfigtestcluster/cluster.go index 48c9a4f47ec8..8e01fb70bfcc 100644 --- a/pkg/spanconfig/spanconfigtestutils/spanconfigtestcluster/cluster.go +++ b/pkg/spanconfig/spanconfigtestutils/spanconfigtestcluster/cluster.go @@ -71,6 +71,9 @@ func (h *Handle) InitializeTenant(ctx context.Context, tenID roachpb.TenantID) * SpanConfig: h.scKnobs, GCJob: &tenantGCJobKnobs, UpgradeManager: serverUpgradeKnobs, + SQLExecutor: &sql.ExecutorTestingKnobs{ + UseTransactionalDescIDGenerator: true, + }, }, } var err error diff --git a/pkg/sql/planner.go b/pkg/sql/planner.go index 78b083c0e39e..18b3359ffde6 100644 --- a/pkg/sql/planner.go +++ b/pkg/sql/planner.go @@ -24,6 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/catalog" "github.com/cockroachdb/cockroach/pkg/sql/catalog/catsessiondata" "github.com/cockroachdb/cockroach/pkg/sql/catalog/colinfo" + "github.com/cockroachdb/cockroach/pkg/sql/catalog/descidgen" "github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb" "github.com/cockroachdb/cockroach/pkg/sql/catalog/descs" "github.com/cockroachdb/cockroach/pkg/sql/catalog/lease" @@ -458,6 +459,9 @@ func newInternalPlanner( p.extendedEvalCtx.Locality = execCfg.Locality p.extendedEvalCtx.OriginalLocality = execCfg.Locality p.extendedEvalCtx.DescIDGenerator = execCfg.DescIDGenerator + if execCfg.TestingKnobs.UseTransactionalDescIDGenerator && txn != nil { + p.extendedEvalCtx.DescIDGenerator = descidgen.NewTransactionalGenerator(execCfg.Settings, execCfg.Codec, txn) + } p.sessionDataMutatorIterator = smi