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

sync_diff_inspector: use hex to compare blob data #709

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+58 −27
Open

sync_diff_inspector: use hex to compare blob data #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e01d6c9
use hex to compare blob data
erwadba Mar 7, 2023
b1004b0
check str1 == str2 first
erwadba Mar 15, 2023
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
10 changes: 10 additions & 0 deletions pkg/dbutil/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,13 @@ func IsTimeTypeAndNeedDecode(tp byte) bool {
}
return false
}

// IsBLOBType returns true if tp is Blob type
func IsBLOBType(tp byte) bool {
switch tp {
case mysql.TypeTinyBlob, mysql.TypeMediumBlob, mysql.TypeBlob, mysql.TypeLongBlob:
return true
}

return false
}
75 changes: 48 additions & 27 deletions sync_diff_inspector/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,11 @@ func GenerateReplaceDML(data map[string]*dbutil.ColumnData, table *model.TableIn
}

if NeedQuotes(col.FieldType.GetType()) {
values = append(values, fmt.Sprintf("'%s'", strings.Replace(string(data[col.Name.O].Data), "'", "\\'", -1)))
if dbutil.IsBLOBType(col.FieldType.GetType()) {
values = append(values, fmt.Sprintf("x'%x'", data[col.Name.O].Data))
} else {
values = append(values, fmt.Sprintf("'%s'", strings.Replace(string(data[col.Name.O].Data), "'", "\\'", -1)))
}
} else {
values = append(values, string(data[col.Name.O].Data))
}
Expand Down Expand Up @@ -217,7 +221,11 @@ func GenerateReplaceDMLWithAnnotation(source, target map[string]*dbutil.ColumnDa
value1 = "NULL"
} else {
if NeedQuotes(col.FieldType.GetType()) {
value1 = fmt.Sprintf("'%s'", strings.Replace(string(data1.Data), "'", "\\'", -1))
if dbutil.IsBLOBType(col.FieldType.GetType()) {
value1 = fmt.Sprintf("x'%x'", data1.Data)
} else {
value1 = fmt.Sprintf("'%s'", strings.Replace(string(data1.Data), "'", "\\'", -1))
}
} else {
value1 = string(data1.Data)
}
Expand All @@ -238,7 +246,11 @@ func GenerateReplaceDMLWithAnnotation(source, target map[string]*dbutil.ColumnDa
values2 = append(values2, "NULL")
} else {
if NeedQuotes(col.FieldType.GetType()) {
values2 = append(values2, fmt.Sprintf("'%s'", strings.Replace(string(data2.Data), "'", "\\'", -1)))
if dbutil.IsBLOBType(col.FieldType.GetType()) {
values2 = append(values2, fmt.Sprintf("x'%x'", data1.Data))
} else {
values2 = append(values2, fmt.Sprintf("'%s'", strings.Replace(string(data2.Data), "'", "\\'", -1)))
}
} else {
values2 = append(values2, string(data2.Data))
}
Expand Down Expand Up @@ -274,7 +286,11 @@ func GenerateDeleteDML(data map[string]*dbutil.ColumnData, table *model.TableInf
}

if NeedQuotes(col.FieldType.GetType()) {
kvs = append(kvs, fmt.Sprintf("%s = '%s'", dbutil.ColumnName(col.Name.O), strings.Replace(string(data[col.Name.O].Data), "'", "\\'", -1)))
if dbutil.IsBLOBType(col.FieldType.GetType()) {
kvs = append(kvs, fmt.Sprintf("%s = x'%x'", dbutil.ColumnName(col.Name.O), data[col.Name.O].Data))
} else {
kvs = append(kvs, fmt.Sprintf("%s = '%s'", dbutil.ColumnName(col.Name.O), strings.Replace(string(data[col.Name.O].Data), "'", "\\'", -1)))
}
} else {
kvs = append(kvs, fmt.Sprintf("%s = %s", dbutil.ColumnName(col.Name.O), string(data[col.Name.O].Data)))
}
Expand Down Expand Up @@ -538,10 +554,14 @@ func CompareData(map1, map2 map[string]*dbutil.ColumnData, orderKeyCols, columns
}
str1 = string(data1.Data)
str2 = string(data2.Data)
if column.FieldType.GetType() == mysql.TypeFloat || column.FieldType.GetType() == mysql.TypeDouble {
if data1.IsNull && data2.IsNull {
if data1.IsNull && data2.IsNull {
continue
} else if !data1.IsNull && !data2.IsNull {
if str1 == str2 {
continue
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When data1 and data2 are nil, str1 == str2 is always true?

} else if !data1.IsNull && !data2.IsNull {
}
switch column.FieldType.GetType() {
case mysql.TypeFloat, mysql.TypeDouble:
num1, err1 := strconv.ParseFloat(str1, 64)
num2, err2 := strconv.ParseFloat(str2, 64)
if err1 != nil || err2 != nil {
Expand All @@ -551,26 +571,23 @@ func CompareData(map1, map2 map[string]*dbutil.ColumnData, orderKeyCols, columns
if math.Abs(num1-num2) <= 1e-6 {
continue
}
}
} else if column.FieldType.GetType() == mysql.TypeJSON {
if (str1 == str2) || (data1.IsNull && data2.IsNull) {
continue
}
var v1, v2 any
err := json.Unmarshal(data1.Data, &v1)
if err != nil {
return false, 0, errors.Errorf("unmarshal json %s failed, error %v", str1, err)
}
err = json.Unmarshal(data2.Data, &v2)
if err != nil {
return false, 0, errors.Errorf("unmarshal json %s failed, error %v", str2, err)
}
if reflect.DeepEqual(v1, v2) {
continue
}
} else {
if (str1 == str2) && (data1.IsNull == data2.IsNull) {
continue
case mysql.TypeJSON:
var v1, v2 any
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check whether str1 == str2 first?

err := json.Unmarshal(data1.Data, &v1)
if err != nil {
return false, 0, errors.Errorf("unmarshal json %s failed, error %v", str1, err)
}
err = json.Unmarshal(data2.Data, &v2)
if err != nil {
return false, 0, errors.Errorf("unmarshal json %s failed, error %v", str2, err)
}
if reflect.DeepEqual(v1, v2) {
continue
}
case mysql.TypeTinyBlob, mysql.TypeMediumBlob, mysql.TypeBlob, mysql.TypeLongBlob:
if fmt.Sprintf("%x", data1.Data) == fmt.Sprintf("%x", data2.Data) {
continue
}
}
}

Expand All @@ -597,6 +614,10 @@ func CompareData(map1, map2 map[string]*dbutil.ColumnData, orderKeyCols, columns
if NeedQuotes(col.FieldType.GetType()) {
strData1 := string(data1.Data)
strData2 := string(data2.Data)
if dbutil.IsBLOBType(col.FieldType.GetType()) {
strData1 = fmt.Sprintf("%x", data1.Data)
strData2 = fmt.Sprintf("%x", data2.Data)
}

if len(strData1) == len(strData2) && strData1 == strData2 {
continue
Expand Down