Merge pull request cockroachdb#24482 from danhhz/cdc

changefeedccl: add prototype of EXPERIMENTAL_CHANGEFEED
dt · Apr 6, 2018 · c49273d · c49273d
2 parents cc882bf + b6dd0ab
commit c49273d
Show file tree

Hide file tree

Showing 20 changed files with 1,343 additions and 147 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/docs/generated/sql/bnf/stmt_block.bnf b/docs/generated/sql/bnf/stmt_block.bnf
@@ -646,10 +646,12 @@ unreserved_keyword ::=
 	| 'DISCARD'
 	| 'DOUBLE'
 	| 'DROP'
+	| 'EMIT'
 	| 'ENCODING'
 	| 'EXECUTE'
 	| 'EXPERIMENTAL'
 	| 'EXPERIMENTAL_AUDIT'
+	| 'EXPERIMENTAL_CHANGEFEED'
 	| 'EXPERIMENTAL_FINGERPRINTS'
 	| 'EXPERIMENTAL_REPLICA'
 	| 'EXPLAIN'

diff --git a/pkg/ccl/backupccl/backup.go b/pkg/ccl/backupccl/backup.go
@@ -526,7 +526,9 @@ func loadAllDescs(
 	return allDescs, nil
 }
 
-func resolveTargetsToDescriptors(
+// ResolveTargetsToDescriptors performs name resolution on a set of targets and
+// returns the resulting descriptors.
+func ResolveTargetsToDescriptors(
 	ctx context.Context, p sql.PlanHookState, endTime hlc.Timestamp, targets tree.TargetList,
 ) ([]sqlbase.Descriptor, []sqlbase.ID, error) {
 	allDescs, err := loadAllDescs(ctx, p.ExecCfg().DB, endTime)
@@ -859,7 +861,7 @@ func backupPlanHook(
 			requireVersion2 = true
 		}
 
-		targetDescs, completeDBs, err := resolveTargetsToDescriptors(ctx, p, endTime, backupStmt.Targets)
+		targetDescs, completeDBs, err := ResolveTargetsToDescriptors(ctx, p, endTime, backupStmt.Targets)
 		if err != nil {
 			return err
 		}

diff --git a/pkg/ccl/ccl_init.go b/pkg/ccl/ccl_init.go
@@ -15,6 +15,7 @@ import (
 	// ccl init hooks
 	_ "github.com/cockroachdb/cockroach/pkg/ccl/backupccl"
 	_ "github.com/cockroachdb/cockroach/pkg/ccl/buildccl"
+	_ "github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl"
 	_ "github.com/cockroachdb/cockroach/pkg/ccl/cliccl"
 	_ "github.com/cockroachdb/cockroach/pkg/ccl/importccl"
 	_ "github.com/cockroachdb/cockroach/pkg/ccl/partitionccl"