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.

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

only inserted fields #719

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 2 deletions pkg/datasource/sql/exec/at/insert_executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,12 @@ func (i *insertExecutor) buildAfterImageSQL(ctx context.Context) (string, []driv
}
// build check sql
sb := strings.Builder{}
sb.WriteString("SELECT * FROM " + tableName)
suffix := strings.Builder{}
sb.WriteString("SELECT " + strings.Join(pkColumnNameList, ", "))
Copy link
Contributor

Choose a reason for hiding this comment

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

这里只 select 主键字段吗?应该是选择 insert 中带的字段比较合理?

Copy link
Contributor

Choose a reason for hiding this comment

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

另外,除了要把 insert 的字段查出来,还需要把有默认值的字段也查出来?这些字段的修改也可能导致脏回滚

suffix.WriteString(" FROM " + tableName)
whereSQL := i.buildWhereConditionByPKs(pkColumnNameList, len(pkValuesMap[pkColumnNameList[0]]), "mysql", maxInSize)
sb.WriteString(" WHERE " + whereSQL + " ")
suffix.WriteString(" WHERE " + whereSQL + " ")
sb.WriteString(suffix.String())
return sb.String(), i.buildPKParams(pkRowImages, pkColumnNameList), nil
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,12 @@ func (u *MySQLInsertUndoLogBuilder) buildAfterImageSQL(ctx context.Context, exec
}
// build check sql
sb := strings.Builder{}
sb.WriteString("SELECT * FROM " + tableName)
suffix := strings.Builder{}
sb.WriteString("SELECT " + strings.Join(pkColumnNameList, ", "))
Copy link
Contributor

Choose a reason for hiding this comment

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

同理如上

suffix.WriteString(" FROM " + tableName)
whereSQL := u.buildWhereConditionByPKs(pkColumnNameList, len(pkValuesMap[pkColumnNameList[0]]), "mysql", maxInSize)
sb.WriteString(" WHERE " + whereSQL + " ")
suffix.WriteString(" WHERE " + whereSQL + " ")
sb.WriteString(suffix.String())
return sb.String(), u.buildPKParams(pkRowImages, pkColumnNameList), nil
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,26 @@ func (u *MySQLMultiUpdateUndoLogBuilder) AfterImage(ctx context.Context, execCtx

func (u *MySQLMultiUpdateUndoLogBuilder) buildAfterImageSQL(beforeImage *types.RecordImage, meta types.TableMeta) (string, []driver.Value) {
sb := strings.Builder{}
// todo use ONLY_CARE_UPDATE_COLUMNS to judge select all columns or not
sb.WriteString("SELECT * FROM " + meta.TableName + " ")
var selectFieldsStr string
selectFields := make([]string, 0, len(meta.ColumnNames))
var fieldsExits = make(map[string]struct{})
if undo.UndoConfig.OnlyCareUpdateColumns {
for _, row := range beforeImage.Rows {
for _, column := range row.Columns {
if _, exist := fieldsExits[column.ColumnName]; exist {
continue
}

fieldsExits[column.ColumnName] = struct{}{}
selectFields = append(selectFields, column.ColumnName)
}
}
selectFieldsStr = strings.Join(selectFields, ",")
} else {
selectFieldsStr = strings.Join(meta.ColumnNames, ",")
}

sb.WriteString("SELECT " + selectFieldsStr + " FROM " + meta.TableName + " ")
Copy link
Contributor

@luky116 luky116 Dec 7, 2024

Choose a reason for hiding this comment

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

insert_test 单元测试得修改下

whereSQL := u.buildWhereConditionByPKs(meta.GetPrimaryKeyOnlyName(), len(beforeImage.Rows), "mysql", maxInSize)
sb.WriteString(" " + whereSQL + " ")
return sb.String(), u.buildPKParams(beforeImage.Rows, meta.GetPrimaryKeyOnlyName())
Expand Down
Loading