diff --git a/cdc/entry/mounter.go b/cdc/entry/mounter.go index b75be1f7df0..38b67ccfefc 100644 --- a/cdc/entry/mounter.go +++ b/cdc/entry/mounter.go @@ -384,7 +384,6 @@ func datum2Column( zap.String("column", colInfo.Name.String())) } - defaultValue := GetDDLDefaultDefinition(colInfo) offset := tableInfo.RowColumnsOffset[colID] rawCols[offset] = colDatums cols[offset] = &model.Column{ @@ -393,7 +392,7 @@ func datum2Column( Charset: colInfo.GetCharset(), Collation: colInfo.GetCollate(), Value: colValue, - Default: defaultValue, + Default: colInfo.GetDefaultValue(), Flag: tableInfo.ColumnsFlag[colID], // ApproximateBytes = column data size + column struct size ApproximateBytes: size + sizeOfEmptyColumn, @@ -775,16 +774,6 @@ func getDefaultOrZeroValue(col *timodel.ColumnInfo, tz *time.Location) (types.Da return d, v, size, warn, err } -// GetDDLDefaultDefinition returns the default definition of a column. -func GetDDLDefaultDefinition(col *timodel.ColumnInfo) interface{} { - defaultValue := col.GetDefaultValue() - if defaultValue == nil { - defaultValue = col.GetOriginDefaultValue() - } - defaultDatum := types.NewDatum(defaultValue) - return defaultDatum.GetValue() -} - // DecodeTableID decodes the raw key to a table ID func DecodeTableID(key []byte) (model.TableID, error) { _, physicalTableID, err := decodeTableID(key) diff --git a/cdc/entry/mounter_test.go b/cdc/entry/mounter_test.go index 2cfd272f8bb..3ea873986d4 100644 --- a/cdc/entry/mounter_test.go +++ b/cdc/entry/mounter_test.go @@ -1384,13 +1384,13 @@ func TestNewDMRowChange(t *testing.T) { cdcTableInfo := model.WrapTableInfo(0, "test", 0, originTI) cols := []*model.Column{ { - Name: "id", Type: 3, Charset: "binary", Flag: 65, Value: 1, Default: nil, + Name: "id", Type: 3, Charset: "binary", Flag: 65, Value: 1, }, { - Name: "a1", Type: 3, Charset: "binary", Flag: 51, Value: 1, Default: nil, + Name: "a1", Type: 3, Charset: "binary", Flag: 51, Value: 1, }, { - Name: "a3", Type: 3, Charset: "binary", Flag: 51, Value: 2, Default: nil, + Name: "a3", Type: 3, Charset: "binary", Flag: 51, Value: 2, }, } recoveredTI := model.BuildTiDBTableInfo(cols, cdcTableInfo.IndexColumnsOffset) diff --git a/pkg/sink/cloudstorage/table_definition.go b/pkg/sink/cloudstorage/table_definition.go index 42954bf77cd..649d9f6ab24 100644 --- a/pkg/sink/cloudstorage/table_definition.go +++ b/pkg/sink/cloudstorage/table_definition.go @@ -23,7 +23,6 @@ import ( timodel "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/parser/mysql" "github.com/pingcap/tidb/parser/types" - "github.com/pingcap/tiflow/cdc/entry" "github.com/pingcap/tiflow/cdc/model" "github.com/pingcap/tiflow/pkg/errors" "github.com/pingcap/tiflow/pkg/hash" @@ -73,7 +72,7 @@ func (t *TableCol) FromTiColumnInfo(col *timodel.ColumnInfo) { if mysql.HasNotNullFlag(col.GetFlag()) { t.Nullable = "false" } - t.Default = entry.GetDDLDefaultDefinition(col) + t.Default = col.GetDefaultValue() switch col.GetType() { case mysql.TypeTimestamp, mysql.TypeDatetime, mysql.TypeDuration: