Merge #91186

91186: sql: let `extendedEvalContext.QueueJob()` use txn from planner r=ZhouXing19 a=ZhouXing19 This commit is part of the effort to reduce usages of `eval.Context.txn`. We now let `*kv.Txn` be passed in as a parameter to `extendedEvalContext.QueueJob()`. Informs: #91004 Release note: None Co-authored-by: Jane Xing <zhouxing@uchicago.edu>
cockroachdb · Nov 7, 2022 · 11618b1 · 11618b1
2 parents f783b08 + d954eac
commit 11618b1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git a/pkg/jobs/jobs_test.go b/pkg/jobs/jobs_test.go
@@ -2355,14 +2355,11 @@ func TestJobInTxn(t *testing.T) {
 			}
 			fn := func(ctx context.Context, _ []sql.PlanNode, _ chan<- tree.Datums) error {
 				var err error
-				job, err = execCtx.ExtendedEvalContext().QueueJob(
-					ctx,
-					jobs.Record{
-						Description: st.String(),
-						Details:     jobspb.BackupDetails{},
-						Progress:    jobspb.BackupProgress{},
-					},
-				)
+				job, err = execCtx.ExtendedEvalContext().QueueJob(ctx, execCtx.Txn(), jobs.Record{
+					Description: st.String(),
+					Details:     jobspb.BackupDetails{},
+					Progress:    jobspb.BackupProgress{},
+				})
 				return err
 			}
 			return fn, nil, nil, false, nil
@@ -2397,14 +2394,11 @@ func TestJobInTxn(t *testing.T) {
 			}
 			fn := func(ctx context.Context, _ []sql.PlanNode, _ chan<- tree.Datums) error {
 				var err error
-				job, err = execCtx.ExtendedEvalContext().QueueJob(
-					ctx,
-					jobs.Record{
-						Description: "RESTORE",
-						Details:     jobspb.RestoreDetails{},
-						Progress:    jobspb.RestoreProgress{},
-					},
-				)
+				job, err = execCtx.ExtendedEvalContext().QueueJob(ctx, execCtx.Txn(), jobs.Record{
+					Description: "RESTORE",
+					Details:     jobspb.RestoreDetails{},
+					Progress:    jobspb.RestoreProgress{},
+				})
 				return err
 			}
 			return fn, nil, nil, false, nil

diff --git a/pkg/sql/drop_schema.go b/pkg/sql/drop_schema.go
@@ -250,7 +250,7 @@ func (p *planner) createDropSchemaJob(
 		typeIDs = append(typeIDs, t.ID)
 	}
 
-	_, err := p.extendedEvalCtx.QueueJob(ctx, jobs.Record{
+	_, err := p.extendedEvalCtx.QueueJob(ctx, p.Txn(), jobs.Record{
 		Description:   jobDesc,
 		Username:      p.User(),
 		DescriptorIDs: schemas,

diff --git a/pkg/sql/planner.go b/pkg/sql/planner.go
@@ -143,14 +143,14 @@ func (evalCtx *extendedEvalContext) copy() *extendedEvalContext {
 // QueueJob creates a new job from record and queues it for execution after
 // the transaction commits.
 func (evalCtx *extendedEvalContext) QueueJob(
-	ctx context.Context, record jobs.Record,
+	ctx context.Context, txn *kv.Txn, record jobs.Record,
 ) (*jobs.Job, error) {
 	jobID := evalCtx.ExecCfg.JobRegistry.MakeJobID()
 	job, err := evalCtx.ExecCfg.JobRegistry.CreateJobWithTxn(
 		ctx,
 		record,
 		jobID,
-		evalCtx.Txn,
+		txn,
 	)
 	if err != nil {
 		return nil, err

diff --git a/pkg/sql/table.go b/pkg/sql/table.go
@@ -68,7 +68,7 @@ func (p *planner) createDropDatabaseJob(
 		Progress:      jobspb.SchemaChangeProgress{},
 		NonCancelable: true,
 	}
-	newJob, err := p.extendedEvalCtx.QueueJob(ctx, jobRecord)
+	newJob, err := p.extendedEvalCtx.QueueJob(ctx, p.Txn(), jobRecord)
 	if err != nil {
 		return err
 	}
@@ -93,7 +93,7 @@ func (p *planner) createNonDropDatabaseChangeJob(
 		Progress:      jobspb.SchemaChangeProgress{},
 		NonCancelable: true,
 	}
-	newJob, err := p.extendedEvalCtx.QueueJob(ctx, jobRecord)
+	newJob, err := p.extendedEvalCtx.QueueJob(ctx, p.Txn(), jobRecord)
 	if err != nil {
 		return err
 	}