mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-31 12:19:08 -06:00
Code Issues Packages Projects Releases 125 Wiki Activity

Merge pull request #8821 from dolthub/zachmu/unique-index-commit-bug

Browse Source 
New skipped test for bug merging roots with overlapping index defs
This commit is contained in:
Zach Musgrave
2025-02-10 17:45:51 -08:00
committed by GitHub
parent 209e669ce2 3a3876b3ad
commit b4fef81937
2 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go
View File

@@ -1353,10 +1353,12 @@ func TestSingleTransactionScript(t *testing.T) {
sql.RunWithNowFunc(tcc.Now, func() error {
script := queries.TransactionTest{
Name: "Insert error with auto commit off",
Name: "non-ff commit merge with multiple indexes on a column",
SetUpScript: []string{
"create table t1 (pk int primary key, val int)",
"insert into t1 values (0,0)",
"create index i1 on t1 (val)",
"alter table t1 add unique key u1 (val)",
"insert into t1 values (1, 1)",
},
Assertions: []queries.ScriptTestAssertion{
{
@@ -1367,42 +1369,22 @@ func TestSingleTransactionScript(t *testing.T) {
Query: "/* client b */ set autocommit = off",
SkipResultsCheck: true,
},
{
Query: "/* client a */ insert into t1 values (1, 1)",
Expected: []sql.Row{{gmstypes.NewOkResult(1)}},
},
{
Query: "/* client a */ insert into t1 values (1, 2)",
ExpectedErr: sql.ErrPrimaryKeyViolation,
},
{
Query: "/* client a */ insert into t1 values (2, 2)",
Expected: []sql.Row{{gmstypes.NewOkResult(1)}},
},
{
Query: "/* client a */ select * from t1 order by pk",
Expected: []sql.Row{{0, 0}, {1, 1}, {2, 2}},
},
{
Query: "/* client b */ select * from t1 order by pk",
Expected: []sql.Row{{0, 0}},
Query: "/* client b */ insert into t1 values (3, 3)",
Expected: []sql.Row{{gmstypes.NewOkResult(1)}},
},
{
Query: "/* client a */ commit",
SkipResultsCheck: true,
},
{
Query: "/* client b */ start transaction",
Query: "/* client b */ commit",
SkipResultsCheck: true,
},
{
Query: "/* client b */ select * from t1 order by pk",
Expected: []sql.Row{{0, 0}, {1, 1}, {2, 2}},
},
{
Query: "/* client a */ select * from t1 order by pk",
Expected: []sql.Row{{0, 0}, {1, 1}, {2, 2}},
},
},
}

36
go/libraries/doltcore/sqle/enginetest/dolt_transaction_queries.go
View File

@@ -839,6 +839,42 @@ var DoltTransactionTests = []queries.TransactionTest{
},
},
},
{
Name: "non-ff commit merge with multiple indexes on a column",
SetUpScript: []string{
"create table t1 (pk int primary key, val int)",
"create index i1 on t1 (val)",
"alter table t1 add unique key u1 (val)",
"insert into t1 values (1, 1)",
},
Assertions: []queries.ScriptTestAssertion{
{
Query: "/* client a */ set autocommit = off",
SkipResultsCheck: true,
},
{
Query: "/* client b */ set autocommit = off",
SkipResultsCheck: true,
},
{
Query: "/* client a */ insert into t1 values (2, 2)",
Expected: []sql.Row{{types.NewOkResult(1)}},
},
{
Query: "/* client b */ insert into t1 values (3, 3)",
Expected: []sql.Row{{types.NewOkResult(1)}},
},
{
Query: "/* client a */ commit",
SkipResultsCheck: true,
},
{
Query: "/* client b */ commit",
Skip: true, // multiple indexes covering the same column set cannot be merged: 'i1' and 'u1'
SkipResultsCheck: true,
},
},
},
}
var DoltConflictHandlingTests = []queries.TransactionTest{