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

Jump to bottom

Online DDL/Vreplication suite: fix test for no shared UK #8334

Merged
merged 5 commits into from
Jun 29, 2021
Merged

Online DDL/Vreplication suite: fix test for no shared UK #8334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d3c4398
Be strict about PK matching on before&after tables
shlomi-noach Jun 15, 2021
cc9e5ad
Adding fail-no-shared-uk test, which currently checks for PK. In the …
shlomi-noach Jun 15, 2021
b13a7b2
whoops. Restoring validation that PK length > 0
shlomi-noach Jun 15, 2021
62789f1
Merge branch 'main' into online-ddl-vrepl-suite-no-shared-uk
shlomi-noach Jun 15, 2021
c7efbd6
Merge branch 'main' into online-ddl-vrepl-suite-no-shared-uk
shlomi-noach Jun 15, 2021
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
0 ..._suite/untestdata/fail-no-shared-uk/alter → ...pl_suite/testdata/fail-no-shared-uk/alter
View file
Open in desktop
File renamed without changes.
0 ...e/untestdata/fail-no-shared-uk/create.sql → ...ite/testdata/fail-no-shared-uk/create.sql
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions go/test/endtoend/onlineddl/vrepl_suite/testdata/fail-no-shared-uk/expect_failure
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Found no shared
1 change: 0 additions & 1 deletion go/test/endtoend/onlineddl/vrepl_suite/untestdata/enum-to-varchar/alter
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions go/test/endtoend/onlineddl/vrepl_suite/untestdata/enum-to-varchar/create.sql
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion go/test/endtoend/onlineddl/vrepl_suite/untestdata/fail-no-shared-uk/expect_failure
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions go/vt/vttablet/onlineddl/vrepl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,9 +369,9 @@ func (v *VRepl) analyzeTables(ctx context.Context, conn *dbconnpool.DBConnection
v.sourceSharedColumns, v.targetSharedColumns, v.sharedColumnsMap = v.getSharedColumns(sourceColumns, targetColumns, sourceVirtualColumns, targetVirtualColumns, v.parser.ColumnRenameMap())

v.sharedPKColumns = v.getSharedPKColumns(sourcePKColumns, targetPKColumns, v.parser.ColumnRenameMap())
if v.sharedPKColumns.Len() == 0 {
// TODO(shlomi): need to carefully examine what happens when we extend/reduce a PRIMARY KEY
// is a column subset OK?
pkMatches := (v.sharedPKColumns.Len() > 0 && v.sharedPKColumns.Len() == sourcePKColumns.Len() && v.sharedPKColumns.Len() == targetPKColumns.Len())
if !pkMatches {
// Has to be a 1:1 mapping for all columns
return fmt.Errorf("Found no shared PRIMARY KEY columns between `%s` and `%s`", v.sourceTable, v.targetTable)
}

Expand Down