Merge #73793

73793: streamingccl: use roachpb.TenantID in job proto r=dt a=dt Not bothering with dual write/read old and new field, since there is no backwards compat concern for this unlaunched feature. Release note: none. Co-authored-by: David Taylor <[email protected]>
cockroachdb · Dec 14, 2021 · 7167b22 · 7167b22
2 parents 80472ce + 080ffae
commit 7167b22
Show file tree

Hide file tree

Showing 4 changed files with 530 additions and 510 deletions.
diff --git a/pkg/ccl/streamingccl/streamingest/stream_ingestion_job.go b/pkg/ccl/streamingccl/streamingest/stream_ingestion_job.go
@@ -88,11 +88,9 @@ func (s *streamIngestionResumer) Resume(resumeCtx context.Context, execCtx inter
 	details := s.job.Details().(jobspb.StreamIngestionDetails)
 	p := execCtx.(sql.JobExecContext)
 
-	tenantID := roachpb.MakeTenantID(details.TenantID)
-
 	// Start ingesting KVs from the replication stream.
 	streamAddress := streamingccl.StreamAddress(details.StreamAddress)
-	err := ingest(resumeCtx, p, streamAddress, tenantID, details.StartTime, s.job.Progress(), s.job.ID())
+	err := ingest(resumeCtx, p, streamAddress, details.TenantID, details.StartTime, s.job.Progress(), s.job.ID())
 	if err != nil {
 		return err
 	}

diff --git a/pkg/ccl/streamingccl/streamingest/stream_ingestion_planning.go b/pkg/ccl/streamingccl/streamingest/stream_ingestion_planning.go
@@ -114,7 +114,7 @@ func ingestionPlanHook(
 
 		streamIngestionDetails := jobspb.StreamIngestionDetails{
 			StreamAddress: string(streamAddress),
-			TenantID:      ingestionStmt.Targets.Tenant.ToUint64(),
+			TenantID:      ingestionStmt.Targets.Tenant,
 			Span:          roachpb.Span{Key: prefix, EndKey: prefix.PrefixEnd()},
 			StartTime:     startTime,
 		}