Skip to content

Fix adding variant column with properties #643

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

Merged
merged 1 commit into from
Sep 30, 2025
Merged

Fix adding variant column with properties #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions pkg/ccr/base/spec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1708,6 +1708,14 @@ func HandleSchemaChangeDefaultValue(sql string, lightningSchemaChange *record.Mo
return sql
}

func HandleSchemaChangeVariantProperties(sql string, lightningSchemaChange *record.ModifyTableAddOrDropColumns) string {
re := regexp.MustCompile(`variant<.*PROPERTIES\s*\(.*,\)>|VARIANT<.*PROPERTIES\s*\(.*,\)>`)
replaceFn := func(match string) string {
return strings.ReplaceAll(match, ",)>", ")>")
}
return re.ReplaceAllStringFunc(sql, replaceFn)
}

func NormalizeCreateViewSql(destDatabase string, srcDatabase string, createSql string) string {
log.Tracef("create view, use dest db name to replace source db name")
originSql := createSql
Expand Down
60 changes: 60 additions & 0 deletions pkg/ccr/base/spec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package base_test

import (
"fmt"
"reflect"
"testing"

Expand Down Expand Up @@ -225,3 +226,62 @@ func TestNormalizeCreateTableSql(t *testing.T) {
}
}
}

func TestHandleSchemaChangeVariantProperties(t *testing.T) {
data := `{
"dbId":1759183589184,
"tableId":1759183589229,
"baseIndexId":1759183589230,
"indexSchemaMap": {
"1759183589230":[{
"name":"id",
"type":{"clazz":"ScalarType","type":"INT","len":-1,"precision":0,"scale":0},
"isAggregationTypeImplicit":false,
"isKey":true,"isAllowNull":true,
"isAutoInc":false,
"autoIncInitValue":-1,
"comment":"",
"stats":{"avgSerializedSize":-1.0,"maxSize":-1,"numDistinctValues":-1,"numNulls":-1},
"children":[],"visible":true,"uniqueId":0,"clusterKeyId":-1,"hasOnUpdateDefaultValue":false,"gctt":[]
}, {
"name":"j","type":{"clazz":"ScalarType","type":"JSONB","len":-1,"precision":0,"scale":0},
"aggregationType":"NONE","isAggregationTypeImplicit":true,"isKey":false,"isAllowNull":true,
"isAutoInc":false,"autoIncInitValue":0,"comment":"",
"stats":{"avgSerializedSize":-1.0,"maxSize":-1,"numDistinctValues":-1,"numNulls":-1},
"children":[],"visible":true,"uniqueId":1,"clusterKeyId":-1,"hasOnUpdateDefaultValue":false,"gctt":[]
},{
"name":"v",
"type":{"clazz":"VariantType","fieldMap":{},"fields":[],"variantMaxSubcolumnsCount":2,"enableTypedPathsToSparse":false,
"variantMaxSparseColumnStatisticsSize":10000,"type":"VARIANT","len":-1,"precision":0,"scale":0},
"aggregationType":"NONE","isAggregationTypeImplicit":true,"isKey":false,"isAllowNull":true,"isAutoInc":false,"autoIncInitValue":0,
"comment":"",
"stats":{"avgSerializedSize":-1.0,"maxSize":-1,"numDistinctValues":-1,"numNulls":-1},
"children":[],"visible":true,"uniqueId":2,"clusterKeyId":-1,"hasOnUpdateDefaultValue":false,"gctt":[]
}]},
"oldIndexSchemaMap":{
"1759183589230":[
{"name":"id","type":{"clazz":"ScalarType","type":"INT","len":-1,"precision":0,"scale":0},
"isAggregationTypeImplicit":false,"isKey":true,"isAllowNull":true,"isAutoInc":false,"autoIncInitValue":-1,"comment":"",
"stats":{"avgSerializedSize":-1.0,"maxSize":-1,"numDistinctValues":-1,"numNulls":-1},
"children":[],"visible":true,"uniqueId":0,"clusterKeyId":-1,"hasOnUpdateDefaultValue":false,"gctt":[]},
{"name":"j","type":{"clazz":"ScalarType","type":"JSONB","len":-1,"precision":0,"scale":0},
"aggregationType":"NONE","isAggregationTypeImplicit":true,"isKey":false,"isAllowNull":true,"isAutoInc":false,
"autoIncInitValue":0,"comment":"","stats":{"avgSerializedSize":-1.0,"maxSize":-1,"numDistinctValues":-1,"numNulls":-1},
"children":[],"visible":true,"uniqueId":1,"clusterKeyId":-1,"hasOnUpdateDefaultValue":false,"gctt":[]}
]},"indexNameToId":{"tbl_332464610":1759183589230},
"indexes":[],"jobId":1759183590091,
"rawSql":"%s"}`

raw := "ALTER TABLE `regression_test_db_sync_cdt_column_add`.`tbl_332464610` ADD COLUMN `v` variant\\u003cPROPERTIES (\\\"variant_max_subcolumns_count\\\" \\u003d \\\"2\\\",)\u003e NULL COMMENT \\\"\\\""
expect := "ALTER TABLE `regression_test_db_sync_cdt_column_add`.`tbl_332464610` ADD COLUMN `v` variant<PROPERTIES (\"variant_max_subcolumns_count\" = \"2\")> NULL COMMENT \"\""

data = fmt.Sprintf(data, raw)
origin, err := record.NewModifyTableAddOrDropColumnsFromJson(data)
if err != nil {
t.Errorf("unmarshal json failed, err: %v", err)
return
}
if actual := base.HandleSchemaChangeVariantProperties(origin.RawSql, origin); actual != expect {
t.Errorf("case failed, expect %s, but got %s", expect, actual)
}
}
Loading