Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sink(ticdc): Add DDL query into schema.json file #7834

Merged
merged 10 commits into from
Dec 8, 2022
Merged

sink(ticdc): Add DDL query into schema.json file #7834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
24777a3
initial commit
zhaoxinyu Dec 7, 2022
583c7a0
fix a panic issue
zhaoxinyu Dec 7, 2022
50ad7ae
Merge branch 'master' into add_ddl_query
zhaoxinyu Dec 7, 2022
0bde035
fix a lint problem
zhaoxinyu Dec 7, 2022
8ce099a
fix a failed ut
zhaoxinyu Dec 7, 2022
3afa96f
Merge branch 'master' into add_ddl_query
zhaoxinyu Dec 7, 2022
cd565b8
fix a failed ut
zhaoxinyu Dec 7, 2022
7f98bf3
address comments
zhaoxinyu Dec 7, 2022
6c4453d
address comments
zhaoxinyu Dec 7, 2022
80e99b6
Merge branch 'master' into add_ddl_query
zhaoxinyu Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions cdc/model/schema_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,10 @@ func WrapTableInfo(schemaID int64, schemaName string, version uint64, info *mode
TableInfo: info,
SchemaID: schemaID,
TableName: TableName{
Schema: schemaName,
Table: info.Name.O,
TableID: info.ID,
Schema: schemaName,
Table: info.Name.O,
TableID: info.ID,
IsPartition: info.GetPartitionInfo() != nil,
},
Version: version,
columnsOffset: make(map[int64]int, len(info.Columns)),
Expand Down
10 changes: 5 additions & 5 deletions cdc/sinkv2/ddlsink/cloudstorage/cloud_storage_ddl_sink.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,24 +68,24 @@ func NewCloudStorageDDLSink(ctx context.Context, sinkURI *url.URL) (*ddlSink, er
return d, nil
}

func (d *ddlSink) generateSchemaPath(def cloudstorage.TableDetail) string {
return fmt.Sprintf("%s/%s/%d/schema.json", def.Schema, def.Table, def.Version)
func generateSchemaPath(def cloudstorage.TableDefinition) string {
return fmt.Sprintf("%s/%s/%d/schema.json", def.Schema, def.Table, def.TableVersion)
}

func (d *ddlSink) WriteDDLEvent(ctx context.Context, ddl *model.DDLEvent) error {
var def cloudstorage.TableDetail
var def cloudstorage.TableDefinition

if ddl.TableInfo.TableInfo == nil {
return nil
}

def.FromTableInfo(ddl.TableInfo)
def.FromDDLEvent(ddl)
encodedDef, err := json.MarshalIndent(def, "", " ")
if err != nil {
return errors.Trace(err)
}

path := d.generateSchemaPath(def)
path := generateSchemaPath(def)
err = d.statistics.RecordDDLExecution(func() error {
err1 := d.storage.WriteFile(ctx, path, encodedDef)
if err1 != nil {
Expand Down
7 changes: 6 additions & 1 deletion cdc/sinkv2/ddlsink/cloudstorage/cloud_storage_ddl_sink_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ func TestWriteDDLEvent(t *testing.T) {
require.Nil(t, err)

ddlEvent := &model.DDLEvent{
Type: timodel.ActionAddColumn,
Query: "alter table test.table1 add col2 varchar(64)",
TableInfo: &model.TableInfo{
Version: 100,
TableName: model.TableName{
Expand Down Expand Up @@ -70,7 +72,10 @@ func TestWriteDDLEvent(t *testing.T) {
require.JSONEq(t, `{
"Table": "table1",
"Schema": "test",
"Version": 100,
"Version": 1,
"TableVersion": 100,
"Query": "alter table test.table1 add col2 varchar(64)",
"Type": 5,
"TableColumns": [
{
"ColumnName": "col1",
Expand Down
Loading