changefeedccl: rename TableID to DescID

KeithCh · KeithCh · commit 894535e90408 · 2025-07-11T11:13:10.000-04:00
To support changefeed database and schema targets, it would be more accurate to use DescID instead of TableID in the ChangefeedTargetSpecification and Target structs. Epic: CRDB-1421 Resolves: #147370 Release note: None
diff --git a/pkg/ccl/changefeedccl/alter_changefeed_stmt.go b/pkg/ccl/changefeedccl/alter_changefeed_stmt.go
@@ -450,15 +450,15 @@ func generateAndValidateNewTargets(
 	prevTargets := AllTargets(prevDetails)
 	noLongerExist := make(map[string]descpb.ID)
 	if err := prevTargets.EachTarget(func(targetSpec changefeedbase.Target) error {
-		k := targetKey{TableID: targetSpec.TableID, FamilyName: tree.Name(targetSpec.FamilyName)}
+		k := targetKey{TableID: targetSpec.DescID, FamilyName: tree.Name(targetSpec.FamilyName)}
 		var desc catalog.TableDescriptor
-		if d, exists := descResolver.DescByID[targetSpec.TableID]; exists {
+		if d, exists := descResolver.DescByID[targetSpec.DescID]; exists {
 			desc = d.(catalog.TableDescriptor)
 		} else {
 			// Table was dropped; that's okay since the changefeed likely
 			// will handle DROP alter command below; and if not, then we'll resume
 			// the changefeed, which will promptly fail if the table no longer exist.
-			noLongerExist[string(targetSpec.StatementTimeName)] = targetSpec.TableID
+			noLongerExist[string(targetSpec.StatementTimeName)] = targetSpec.DescID
 			return nil
 		}
 
@@ -477,11 +477,11 @@ func generateAndValidateNewTargets(
 			FamilyName: tree.Name(targetSpec.FamilyName),
 		}
 		newTargets[k] = newTarget
-		newTableDescs[targetSpec.TableID] = descResolver.DescByID[targetSpec.TableID]
+		newTableDescs[targetSpec.DescID] = descResolver.DescByID[targetSpec.DescID]
 
 		originalSpecs[newTarget] = jobspb.ChangefeedTargetSpecification{
 			Type:              targetSpec.Type,
-			TableID:           targetSpec.TableID,
+			DescID:            targetSpec.DescID,
 			FamilyName:        targetSpec.FamilyName,
 			StatementTimeName: string(targetSpec.StatementTimeName),
 		}
diff --git a/pkg/ccl/changefeedccl/cdceval/compat_test.go b/pkg/ccl/changefeedccl/cdceval/compat_test.go
@@ -35,7 +35,7 @@ func TestCompatRewrite(t *testing.T) {
 	execCfg := s.ExecutorConfig().(sql.ExecutorConfig)
 	fooDesc := cdctest.GetHydratedTableDescriptor(t, s.ExecutorConfig(), "foo")
 	target := changefeedbase.Target{
-		TableID: fooDesc.GetID(),
+		DescID: fooDesc.GetID(),
 	}
 	fooRef := fmt.Sprintf("[%d AS foo]", fooDesc.GetID())
 
diff --git a/pkg/ccl/changefeedccl/cdceval/expr_eval_test.go b/pkg/ccl/changefeedccl/cdceval/expr_eval_test.go
@@ -545,7 +545,7 @@ $$`)
 			targets := changefeedbase.Targets{}
 			target := changefeedbase.Target{
 				Type:       targetType,
-				TableID:    desc.GetID(),
+				DescID:     desc.GetID(),
 				FamilyName: tc.familyName,
 			}
 			targets.Add(target)
@@ -647,7 +647,7 @@ func TestUnsupportedCDCFunctions(t *testing.T) {
 	sqlDB.Exec(t, "CREATE TABLE foo (a INT PRIMARY KEY, b STRING)")
 	desc := cdctest.GetHydratedTableDescriptor(t, s.ExecutorConfig(), "foo")
 	target := changefeedbase.Target{
-		TableID:    desc.GetID(),
+		DescID:     desc.GetID(),
 		FamilyName: desc.GetFamilies()[0].Name,
 	}
 	for fnCall, errFn := range map[string]string{
@@ -776,7 +776,7 @@ func newEvaluatorWithNormCheck(
 		context.Background(), execCfg, username.RootUserName(), defaultDBSessionData, desc, schemaTS,
 		jobspb.ChangefeedTargetSpecification{
 			Type:       target.Type,
-			TableID:    target.TableID,
+			DescID:     target.DescID,
 			FamilyName: target.FamilyName,
 		},
 		sc, splitFamilies,
diff --git a/pkg/ccl/changefeedccl/cdceval/plan_test.go b/pkg/ccl/changefeedccl/cdceval/plan_test.go
@@ -261,7 +261,7 @@ FAMILY extra (extra)
 				return
 			}
 			target := jobspb.ChangefeedTargetSpecification{
-				TableID:           tc.desc.GetID(),
+				DescID:            tc.desc.GetID(),
 				StatementTimeName: tc.desc.GetName(),
 				FamilyName:        tc.targetFamily,
 			}
diff --git a/pkg/ccl/changefeedccl/cdceval/validation.go b/pkg/ccl/changefeedccl/cdceval/validation.go
@@ -83,9 +83,9 @@ func normalizeAndValidateSelectForTarget(
 	}
 
 	// Sanity check target and descriptor refer to the same table.
-	if target.TableID != desc.GetID() {
+	if target.DescID != desc.GetID() {
 		return nil, errors.AssertionFailedf("target table id (%d) does not match descriptor id (%d)",
-			target.TableID, desc.GetID())
+			target.DescID, desc.GetID())
 	}
 
 	columnVisitor := checkColumnsVisitor{
diff --git a/pkg/ccl/changefeedccl/cdceval/validation_test.go b/pkg/ccl/changefeedccl/cdceval/validation_test.go
@@ -228,7 +228,7 @@ func TestNormalizeAndValidate(t *testing.T) {
 				return
 			}
 			target := jobspb.ChangefeedTargetSpecification{
-				TableID:           tc.desc.GetID(),
+				DescID:            tc.desc.GetID(),
 				StatementTimeName: tc.desc.GetName(),
 			}
 
@@ -354,7 +354,7 @@ func TestSelectClauseRequiresPrev(t *testing.T) {
 			sc, err := ParseChangefeedExpression(tc.stmt)
 			require.NoError(t, err)
 			target := jobspb.ChangefeedTargetSpecification{
-				TableID:           tc.desc.GetID(),
+				DescID:            tc.desc.GetID(),
 				StatementTimeName: tc.desc.GetName(),
 			}
 
diff --git a/pkg/ccl/changefeedccl/cdcevent/event_test.go b/pkg/ccl/changefeedccl/cdcevent/event_test.go
@@ -526,7 +526,7 @@ CREATE TABLE foo (
 			targets := changefeedbase.Targets{}
 			targets.Add(changefeedbase.Target{
 				Type:       targetType,
-				TableID:    tableDesc.GetID(),
+				DescID:     tableDesc.GetID(),
 				FamilyName: tc.familyName,
 			})
 			execCfg := s.ExecutorConfig().(sql.ExecutorConfig)
@@ -770,7 +770,7 @@ func TestEventColumnOrderingWithSchemaChanges(t *testing.T) {
 			targets := changefeedbase.Targets{}
 			targets.Add(changefeedbase.Target{
 				Type:       targetType,
-				TableID:    tableDesc.GetID(),
+				DescID:     tableDesc.GetID(),
 				FamilyName: tc.familyName,
 			})
 			execCfg := s.ExecutorConfig().(sql.ExecutorConfig)
@@ -1059,7 +1059,7 @@ CREATE TABLE foo (
 
 	targets := changefeedbase.Targets{}
 	targets.Add(changefeedbase.Target{
-		TableID: tableDesc.GetID(),
+		DescID: tableDesc.GetID(),
 	})
 	execCfg := s.ExecutorConfig().(sql.ExecutorConfig)
 	ctx := context.Background()
diff --git a/pkg/ccl/changefeedccl/cdcevent/rowfetcher_cache.go b/pkg/ccl/changefeedccl/cdcevent/rowfetcher_cache.go
@@ -185,7 +185,7 @@ func watchedFamilesFromTarget(targets changefeedbase.Targets) (map[watchedFamily
 	}
 	watchedFamilies := make(map[watchedFamily]struct{}, targets.Size)
 	err := targets.EachTarget(func(t changefeedbase.Target) error {
-		watchedFamilies[watchedFamily{tableID: t.TableID, familyName: t.FamilyName}] = struct{}{}
+		watchedFamilies[watchedFamily{tableID: t.DescID, familyName: t.FamilyName}] = struct{}{}
 		return nil
 	})
 	if err != nil {
diff --git a/pkg/ccl/changefeedccl/cdcevent/rowfetcher_test.go b/pkg/ccl/changefeedccl/cdcevent/rowfetcher_test.go
@@ -62,7 +62,7 @@ func TestRowFetcherCache(t *testing.T) {
 	targets := changefeedbase.Targets{}
 	targets.Add(changefeedbase.Target{
 		Type:       targetType,
-		TableID:    tableDesc.GetID(),
+		DescID:     tableDesc.GetID(),
 		FamilyName: family,
 	})
 	cFamilyID := descpb.FamilyID(1)
diff --git a/pkg/ccl/changefeedccl/changefeed.go b/pkg/ccl/changefeedccl/changefeed.go
@@ -54,13 +54,13 @@ func AllTargets(cd jobspb.ChangefeedDetails) (targets changefeedbase.Targets) {
 	// TODO: Use a version gate for this once we have CDC version gates
 	if len(cd.TargetSpecifications) > 0 {
 		for _, ts := range cd.TargetSpecifications {
-			if ts.TableID > 0 {
+			if ts.DescID > 0 {
 				if ts.StatementTimeName == "" {
-					ts.StatementTimeName = cd.Tables[ts.TableID].StatementTimeName
+					ts.StatementTimeName = cd.Tables[ts.DescID].StatementTimeName
 				}
 				targets.Add(changefeedbase.Target{
 					Type:              ts.Type,
-					TableID:           ts.TableID,
+					DescID:            ts.DescID,
 					FamilyName:        ts.FamilyName,
 					StatementTimeName: changefeedbase.StatementTimeName(ts.StatementTimeName),
 				})
@@ -70,7 +70,7 @@ func AllTargets(cd jobspb.ChangefeedDetails) (targets changefeedbase.Targets) {
 		for id, t := range cd.Tables {
 			targets.Add(changefeedbase.Target{
 				Type:              jobspb.ChangefeedTargetSpecification_PRIMARY_FAMILY_ONLY,
-				TableID:           id,
+				DescID:            id,
 				StatementTimeName: changefeedbase.StatementTimeName(t.StatementTimeName),
 			})
 		}
diff --git a/pkg/ccl/changefeedccl/changefeed_stmt.go b/pkg/ccl/changefeedccl/changefeed_stmt.go
@@ -996,7 +996,7 @@ func getTargetsAndTables(
 			}
 			targets[i] = jobspb.ChangefeedTargetSpecification{
 				Type:              typ,
-				TableID:           td.GetID(),
+				DescID:            td.GetID(),
 				FamilyName:        string(ct.FamilyName),
 				StatementTimeName: tables[td.GetID()].StatementTimeName,
 			}
diff --git a/pkg/ccl/changefeedccl/changefeedbase/target.go b/pkg/ccl/changefeedccl/changefeedbase/target.go
@@ -14,7 +14,7 @@ import (
 // Target provides a version-agnostic wrapper around jobspb.ChangefeedTargetSpecification.
 type Target struct {
 	Type              jobspb.ChangefeedTargetSpecification_TargetType
-	TableID           descpb.ID
+	DescID            descpb.ID
 	FamilyName        string
 	StatementTimeName StatementTimeName
 }
@@ -71,7 +71,7 @@ func (ts *Targets) Add(t Target) {
 	if ts.m == nil {
 		ts.m = make(map[descpb.ID]targetsByTable)
 	}
-	ts.m[t.TableID] = ts.m[t.TableID].add(t)
+	ts.m[t.DescID] = ts.m[t.DescID].add(t)
 	ts.Size++
 }
 
diff --git a/pkg/ccl/changefeedccl/encoder_json_test.go b/pkg/ccl/changefeedccl/encoder_json_test.go
@@ -312,7 +312,7 @@ func mkTargets(tableDesc catalog.TableDescriptor) changefeedbase.Targets {
 	targets := changefeedbase.Targets{}
 	targets.Add(changefeedbase.Target{
 		Type:              jobspb.ChangefeedTargetSpecification_PRIMARY_FAMILY_ONLY,
-		TableID:           tableDesc.GetID(),
+		DescID:            tableDesc.GetID(),
 		StatementTimeName: changefeedbase.StatementTimeName(tableDesc.GetName()),
 	})
 	return targets
diff --git a/pkg/ccl/changefeedccl/encoder_test.go b/pkg/ccl/changefeedccl/encoder_test.go
@@ -232,7 +232,7 @@ func TestEncoders(t *testing.T) {
 			targets := changefeedbase.Targets{}
 			targets.Add(changefeedbase.Target{
 				Type:              jobspb.ChangefeedTargetSpecification_PRIMARY_FAMILY_ONLY,
-				TableID:           tableDesc.GetID(),
+				DescID:            tableDesc.GetID(),
 				StatementTimeName: changefeedbase.StatementTimeName(tableDesc.GetName()),
 			})
 
@@ -383,7 +383,7 @@ func TestAvroEncoderWithTLS(t *testing.T) {
 			targets := changefeedbase.Targets{}
 			targets.Add(changefeedbase.Target{
 				Type:              jobspb.ChangefeedTargetSpecification_PRIMARY_FAMILY_ONLY,
-				TableID:           tableDesc.GetID(),
+				DescID:            tableDesc.GetID(),
 				StatementTimeName: changefeedbase.StatementTimeName(tableDesc.GetName()),
 			})
 
@@ -963,7 +963,7 @@ func BenchmarkEncoders(b *testing.B) {
 	var targets changefeedbase.Targets
 	targets.Add(changefeedbase.Target{
 		Type:              0,
-		TableID:           42,
+		DescID:            42,
 		FamilyName:        "primary",
 		StatementTimeName: "table",
 	})
diff --git a/pkg/ccl/changefeedccl/enriched_source_provider.go b/pkg/ccl/changefeedccl/enriched_source_provider.go
@@ -59,7 +59,7 @@ func GetTableSchemaInfo(
 	schemaInfo := make(map[descpb.ID]tableSchemaInfo)
 	execCfg := cfg.ExecutorConfig.(*sql.ExecutorConfig)
 	err := targets.EachTarget(func(target changefeedbase.Target) error {
-		id := target.TableID
+		id := target.DescID
 		td, dbd, sd, err := getDescriptors(ctx, execCfg, id)
 		if err != nil {
 			return err
diff --git a/pkg/ccl/changefeedccl/event_processing_test.go b/pkg/ccl/changefeedccl/event_processing_test.go
@@ -78,7 +78,7 @@ func TestTopicForEvent(t *testing.T) {
 			details: jobspb.ChangefeedDetails{
 				TargetSpecifications: []jobspb.ChangefeedTargetSpecification{
 					{
-						TableID:           1,
+						DescID:            1,
 						StatementTimeName: "t1",
 					},
 				},
@@ -91,7 +91,7 @@ func TestTopicForEvent(t *testing.T) {
 			details: jobspb.ChangefeedDetails{
 				TargetSpecifications: []jobspb.ChangefeedTargetSpecification{
 					{
-						TableID:           1,
+						DescID:            1,
 						StatementTimeName: "old_name",
 					},
 				},
@@ -105,7 +105,7 @@ func TestTopicForEvent(t *testing.T) {
 				TargetSpecifications: []jobspb.ChangefeedTargetSpecification{
 					{
 						Type:              jobspb.ChangefeedTargetSpecification_COLUMN_FAMILY,
-						TableID:           1,
+						DescID:            1,
 						FamilyName:        "fam",
 						StatementTimeName: "t1",
 					},
@@ -120,13 +120,13 @@ func TestTopicForEvent(t *testing.T) {
 				TargetSpecifications: []jobspb.ChangefeedTargetSpecification{
 					{
 						Type:              jobspb.ChangefeedTargetSpecification_EACH_FAMILY,
-						TableID:           1,
+						DescID:            1,
 						FamilyName:        "fam",
 						StatementTimeName: "old_name",
 					},
 					{
 						Type:              jobspb.ChangefeedTargetSpecification_EACH_FAMILY,
-						TableID:           1,
+						DescID:            1,
 						FamilyName:        "fam2",
 						StatementTimeName: "old_name",
 					},
@@ -141,7 +141,7 @@ func TestTopicForEvent(t *testing.T) {
 				TargetSpecifications: []jobspb.ChangefeedTargetSpecification{
 					{
 						Type:              jobspb.ChangefeedTargetSpecification_COLUMN_FAMILY,
-						TableID:           1,
+						DescID:            1,
 						FamilyName:        "fam",
 						StatementTimeName: "t1",
 					},
diff --git a/pkg/ccl/changefeedccl/fetch_table_bytes.go b/pkg/ccl/changefeedccl/fetch_table_bytes.go
@@ -34,8 +34,8 @@ func FetchChangefeedUsageBytes(
 	// Inspired by AllTargets in changefeedccl/changefeed.go.
 	if len(details.TargetSpecifications) > 0 {
 		for _, ts := range details.TargetSpecifications {
-			if ts.TableID > 0 {
-				uniqueTableIDs[ts.TableID] = struct{}{}
+			if ts.DescID > 0 {
+				uniqueTableIDs[ts.DescID] = struct{}{}
 			}
 		}
 	} else {
diff --git a/pkg/ccl/changefeedccl/parquet_test.go b/pkg/ccl/changefeedccl/parquet_test.go
@@ -271,7 +271,7 @@ func makeRangefeedReaderAndDecoder(
 	targets := changefeedbase.Targets{}
 	targets.Add(changefeedbase.Target{
 		Type:       jobspb.ChangefeedTargetSpecification_PRIMARY_FAMILY_ONLY,
-		TableID:    tableDesc.GetID(),
+		DescID:     tableDesc.GetID(),
 		FamilyName: "primary",
 	})
 	sqlExecCfg := s.ExecutorConfig().(sql.ExecutorConfig)
diff --git a/pkg/ccl/changefeedccl/protected_timestamps_test.go b/pkg/ccl/changefeedccl/protected_timestamps_test.go
@@ -495,7 +495,7 @@ func TestPTSRecordProtectsTargetsAndSystemTables(t *testing.T) {
 	fooDescr := cdctest.GetHydratedTableDescriptor(t, s.ExecutorConfig(), "d", "foo")
 	var targets changefeedbase.Targets
 	targets.Add(changefeedbase.Target{
-		TableID: fooDescr.GetID(),
+		DescID: fooDescr.GetID(),
 	})
 
 	// We need to give our PTS record a legit job ID so the protected ts
diff --git a/pkg/ccl/changefeedccl/schemafeed/helpers_test.go b/pkg/ccl/changefeedccl/schemafeed/helpers_test.go
@@ -40,6 +40,6 @@ func PrintTableEventType(t tableEventType) string {
 
 func CreateChangefeedTargets(tableID descpb.ID) changefeedbase.Targets {
 	targets := changefeedbase.Targets{}
-	targets.Add(changefeedbase.Target{TableID: tableID})
+	targets.Add(changefeedbase.Target{DescID: tableID})
 	return targets
 }
diff --git a/pkg/ccl/changefeedccl/schemafeed/schema_feed_test.go b/pkg/ccl/changefeedccl/schemafeed/schema_feed_test.go
@@ -235,15 +235,15 @@ func TestFetchDescriptorVersionsCPULimiterPagination(t *testing.T) {
 		&tableID, &statementTimeName)
 	targets.Add(changefeedbase.Target{
 		Type:              jobspb.ChangefeedTargetSpecification_PRIMARY_FAMILY_ONLY,
-		TableID:           tableID,
+		DescID:            tableID,
 		FamilyName:        "primary",
 		StatementTimeName: statementTimeName,
 	})
 	sqlDB.QueryRow(t, "SELECT $1::regclass::int, $1::regclass::string", "bar").Scan(
 		&tableID, &statementTimeName)
 	targets.Add(changefeedbase.Target{
 		Type:              jobspb.ChangefeedTargetSpecification_PRIMARY_FAMILY_ONLY,
-		TableID:           tableID,
+		DescID:            tableID,
 		FamilyName:        "primary",
 		StatementTimeName: statementTimeName,
 	})
@@ -288,7 +288,7 @@ func TestSchemaFeedHandlesCascadeDatabaseDrop(t *testing.T) {
 	sqlDB.QueryRow(t, "SELECT 'test.foo'::regclass::int").Scan(&tableID)
 	targets.Add(changefeedbase.Target{
 		Type:              jobspb.ChangefeedTargetSpecification_PRIMARY_FAMILY_ONLY,
-		TableID:           tableID,
+		DescID:            tableID,
 		FamilyName:        "primary",
 		StatementTimeName: "foo",
 	})
diff --git a/pkg/ccl/changefeedccl/schemafeed/table_event_filter_datadriven_test.go b/pkg/ccl/changefeedccl/schemafeed/table_event_filter_datadriven_test.go
@@ -78,7 +78,7 @@ func TestDataDriven(t *testing.T) {
 					&tableID, &statementTimeName)
 				targets.Add(changefeedbase.Target{
 					Type:              jobspb.ChangefeedTargetSpecification_PRIMARY_FAMILY_ONLY,
-					TableID:           tableID,
+					DescID:            tableID,
 					FamilyName:        "primary",
 					StatementTimeName: statementTimeName,
 				})
diff --git a/pkg/ccl/changefeedccl/sink_cloudstorage_test.go b/pkg/ccl/changefeedccl/sink_cloudstorage_test.go
@@ -55,7 +55,7 @@ func makeTopic(name string) *tableDescriptorTopic {
 	desc := tabledesc.NewBuilder(&descpb.TableDescriptor{Name: name, ID: descpb.ID(id)}).BuildImmutableTable()
 	spec := changefeedbase.Target{
 		Type:              jobspb.ChangefeedTargetSpecification_PRIMARY_FAMILY_ONLY,
-		TableID:           desc.GetID(),
+		DescID:            desc.GetID(),
 		StatementTimeName: changefeedbase.StatementTimeName(name),
 	}
 	return &tableDescriptorTopic{Metadata: makeMetadata(desc), spec: spec}
diff --git a/pkg/ccl/changefeedccl/sink_test.go b/pkg/ccl/changefeedccl/sink_test.go
diff --git a/pkg/crosscluster/logical/dead_letter_queue_test.go b/pkg/crosscluster/logical/dead_letter_queue_test.go
diff --git a/pkg/crosscluster/logical/lww_kv_processor.go b/pkg/crosscluster/logical/lww_kv_processor.go
diff --git a/pkg/crosscluster/logical/lww_row_processor.go b/pkg/crosscluster/logical/lww_row_processor.go
diff --git a/pkg/jobs/jobspb/jobs.proto b/pkg/jobs/jobspb/jobs.proto

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func TestCompatRewrite(t *testing.T) {`
`35`	`35`	`execCfg := s.ExecutorConfig().(sql.ExecutorConfig)`
`36`	`36`	`fooDesc := cdctest.GetHydratedTableDescriptor(t, s.ExecutorConfig(), "foo")`
`37`	`37`	`target := changefeedbase.Target{`
`38`		`- TableID: fooDesc.GetID(),`
	`38`	`+ DescID: fooDesc.GetID(),`
`39`	`39`	`}`
`40`	`40`	`fooRef := fmt.Sprintf("[%d AS foo]", fooDesc.GetID())`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ FAMILY extra (extra)`
`261`	`261`	`return`
`262`	`262`	`}`
`263`	`263`	`target := jobspb.ChangefeedTargetSpecification{`
`264`		`- TableID: tc.desc.GetID(),`
	`264`	`+ DescID: tc.desc.GetID(),`
`265`	`265`	`StatementTimeName: tc.desc.GetName(),`
`266`	`266`	`FamilyName: tc.targetFamily,`
`267`	`267`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,9 +83,9 @@ func normalizeAndValidateSelectForTarget(`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`// Sanity check target and descriptor refer to the same table.`
`86`		`- if target.TableID != desc.GetID() {`
	`86`	`+ if target.DescID != desc.GetID() {`
`87`	`87`	`return nil, errors.AssertionFailedf("target table id (%d) does not match descriptor id (%d)",`
`88`		`- target.TableID, desc.GetID())`
	`88`	`+ target.DescID, desc.GetID())`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`columnVisitor := checkColumnsVisitor{`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ func TestNormalizeAndValidate(t *testing.T) {`
`228`	`228`	`return`
`229`	`229`	`}`
`230`	`230`	`target := jobspb.ChangefeedTargetSpecification{`
`231`		`- TableID: tc.desc.GetID(),`
	`231`	`+ DescID: tc.desc.GetID(),`
`232`	`232`	`StatementTimeName: tc.desc.GetName(),`
`233`	`233`	`}`
`234`	`234`
`@@ -354,7 +354,7 @@ func TestSelectClauseRequiresPrev(t *testing.T) {`
`354`	`354`	`sc, err := ParseChangefeedExpression(tc.stmt)`
`355`	`355`	`require.NoError(t, err)`
`356`	`356`	`target := jobspb.ChangefeedTargetSpecification{`
`357`		`- TableID: tc.desc.GetID(),`
	`357`	`+ DescID: tc.desc.GetID(),`
`358`	`358`	`StatementTimeName: tc.desc.GetName(),`
`359`	`359`	`}`
`360`	`360`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ func watchedFamilesFromTarget(targets changefeedbase.Targets) (map[watchedFamily`
`185`	`185`	`}`
`186`	`186`	`watchedFamilies := make(map[watchedFamily]struct{}, targets.Size)`
`187`	`187`	`err := targets.EachTarget(func(t changefeedbase.Target) error {`
`188`		`- watchedFamilies[watchedFamily{tableID: t.TableID, familyName: t.FamilyName}] = struct{}{}`
	`188`	`+ watchedFamilies[watchedFamily{tableID: t.DescID, familyName: t.FamilyName}] = struct{}{}`
`189`	`189`	`return nil`
`190`	`190`	`})`
`191`	`191`	`if err != nil {`