@@ -88,7 +88,7 @@ func init() {
88
88
89
89
type annotatedChangefeedStatement struct {
90
90
* tree.CreateChangefeed
91
- originalSpecs map [tree.ChangefeedTarget ]jobspb.ChangefeedTargetSpecification
91
+ originalSpecs map [tree.ChangefeedTableTarget ]jobspb.ChangefeedTargetSpecification
92
92
alterChangefeedAsOf hlc.Timestamp
93
93
CreatedByInfo * jobs.CreatedByInfo
94
94
}
@@ -226,6 +226,10 @@ func changefeedPlanHook(
226
226
}
227
227
opts := changefeedbase .MakeStatementOptions (rawOpts )
228
228
229
+ if changefeedStmt .Level == tree .ChangefeedLevelDatabase {
230
+ return nil , nil , false , errors .UnimplementedError (errors.IssueLink {}, "database-level changefeed is not implemented" )
231
+ }
232
+
229
233
description , err := makeChangefeedDescription (ctx , changefeedStmt .CreateChangefeed , sinkURI , opts )
230
234
if err != nil {
231
235
return nil , nil , false , err
@@ -539,7 +543,7 @@ func createChangefeedJobRecord(
539
543
}
540
544
541
545
tableOnlyTargetList := tree.BackupTargetList {}
542
- for _ , t := range changefeedStmt .Targets {
546
+ for _ , t := range changefeedStmt .TableTargets {
543
547
tableOnlyTargetList .Tables .TablePatterns = append (tableOnlyTargetList .Tables .TablePatterns , t .TableName )
544
548
}
545
549
@@ -558,8 +562,8 @@ func createChangefeedJobRecord(
558
562
}
559
563
}
560
564
561
- targets , tables , err := getTargetsAndTables (ctx , p , targetDescs , changefeedStmt .Targets ,
562
- changefeedStmt .originalSpecs , opts .ShouldUseFullStatementTimeName (), sinkURI )
565
+ targets , tables , err := getTargetsAndTables (ctx , p , targetDescs , changefeedStmt .TableTargets ,
566
+ changefeedStmt .originalSpecs , opts .ShouldUseFullStatementTimeName ())
563
567
564
568
if err != nil {
565
569
return nil , err
@@ -940,14 +944,13 @@ func getTargetsAndTables(
940
944
ctx context.Context ,
941
945
p sql.PlanHookState ,
942
946
targetDescs map [tree.TablePattern ]catalog.Descriptor ,
943
- rawTargets tree.ChangefeedTargets ,
944
- originalSpecs map [tree.ChangefeedTarget ]jobspb.ChangefeedTargetSpecification ,
947
+ rawTargets tree.ChangefeedTableTargets ,
948
+ originalSpecs map [tree.ChangefeedTableTarget ]jobspb.ChangefeedTargetSpecification ,
945
949
fullTableName bool ,
946
- sinkURI string ,
947
950
) ([]jobspb.ChangefeedTargetSpecification , jobspb.ChangefeedTargets , error ) {
948
951
tables := make (jobspb.ChangefeedTargets , len (targetDescs ))
949
952
targets := make ([]jobspb.ChangefeedTargetSpecification , len (rawTargets ))
950
- seen := make (map [jobspb.ChangefeedTargetSpecification ]tree.ChangefeedTarget )
953
+ seen := make (map [jobspb.ChangefeedTargetSpecification ]tree.ChangefeedTableTarget )
951
954
952
955
for i , ct := range rawTargets {
953
956
desc , ok := targetDescs [ct .TableName ]
@@ -1122,8 +1125,8 @@ func makeChangefeedDescription(
1122
1125
opts changefeedbase.StatementOptions ,
1123
1126
) (string , error ) {
1124
1127
c := & tree.CreateChangefeed {
1125
- Targets : changefeed .Targets ,
1126
- Select : changefeed .Select ,
1128
+ TableTargets : changefeed .TableTargets ,
1129
+ Select : changefeed .Select ,
1127
1130
}
1128
1131
1129
1132
if sinkURI != "" {
0 commit comments