Merge branch 'master' into avro-design

pingcap · May 18, 2022 · a6c9702 · a6c9702
2 parents 9033520 + 02b0dfb
commit a6c9702
Show file tree

Hide file tree

Showing 7 changed files with 233 additions and 58 deletions.
diff --git a/cdc/entry/mounter.go b/cdc/entry/mounter.go
@@ -270,12 +270,14 @@ func datum2Column(tableInfo *model.TableInfo, datums map[int64]types.Datum, fill
 		if warn != "" {
 			log.Warn(warn, zap.String("table", tableInfo.TableName.String()), zap.String("column", colInfo.Name.String()))
 		}
+		defaultValue := getDDLDefaultDefinition(colInfo)
 		colSize += size
 		cols[tableInfo.RowColumnsOffset[colInfo.ID]] = &model.Column{
 			Name:    colName,
 			Type:    colInfo.Tp,
 			Charset: colInfo.Charset,
 			Value:   colValue,
+			Default: defaultValue,
 			Flag:    tableInfo.ColumnsFlag[colInfo.ID],
 			// ApproximateBytes = column data size + column struct size
 			ApproximateBytes: colSize + sizeOfEmptyColumn,
@@ -489,6 +491,15 @@ func getDefaultOrZeroValue(col *timodel.ColumnInfo) (interface{}, int, string, e
 	return formatColVal(d, col)
 }
 
+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)