Skip to content

Correctly identify which secondary indexes need to be updated during a merge #10407

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
nicktobey merged 4 commits into from
Feb 4, 2026
Merged

Correctly identify which secondary indexes need to be updated during a merge #10407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d35d6bf
Add additional schema merge tests.
nicktobey Jan 31, 2026
b93099c
For secondary indexes on text types, use the correct schema when dete…
nicktobey Jan 31, 2026
7d6f719
Fix missing parameter in call to GetKeyDescriptor
nicktobey Feb 3, 2026
5a9d002
Add missing columns in test expected values.
nicktobey Feb 3, 2026
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
2 changes: 1 addition & 1 deletion go/libraries/doltcore/merge/mutable_secondary_index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func GetMutableSecondaryIdxsWithPending(ctx *sql.Context, ns tree.NodeStore, our
idxKeyDesc = idxKeyDesc.PrefixDesc(idxKeyDesc.Count() - 1)
}

if !idxKeyDesc.Equals(index.Schema().GetKeyDescriptorWithNoConversion(ns)) {
if !idxKeyDesc.Equals(index.Schema().GetKeyDescriptor(ns)) {
continue
}

Expand Down
159 changes: 151 additions & 8 deletions go/libraries/doltcore/sqle/enginetest/dolt_queries_schema_merge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1503,18 +1503,67 @@ var SchemaChangeTestsTypeChanges = []MergeScriptTest{
},
},
},
{
Name: "TEXT index without schema change",
AncSetUpScript: []string{
"set autocommit = 0;",
"CREATE TABLE t (pk INT NOT NULL PRIMARY KEY, col1 VARCHAR(255) NOT NULL, col2 text);",
"CREATE INDEX idx ON t (col2(255));",
"INSERT INTO t VALUES (1, 'aa01010aa', 'aa01010aa');",
"INSERT INTO t VALUES (2, 'bb01010bb', 'bb01010bb');",
},
RightSetUpScript: []string{
"INSERT INTO t VALUES (3, 'cc01010cc', 'cc01010cc');",
},
LeftSetUpScript: []string{
"INSERT INTO t VALUES (4, 'dd01010dd', 'dd01010dd');",
},
Assertions: []queries.ScriptTestAssertion{
{
Query: "call dolt_merge('right');",
Expected: []sql.Row{{doltCommit, 0, 0, "merge successful"}},
},
{
Query: "SELECT * FROM t WHERE (col2 LIKE '%01010%') ORDER BY col2;",
Expected: []sql.Row{
{1, "aa01010aa", "aa01010aa"},
{2, "bb01010bb", "bb01010bb"},
{3, "cc01010cc", "cc01010cc"},
{4, "dd01010dd", "dd01010dd"},
},
},
{
Query: "select * from t order by pk;",
Expected: []sql.Row{
{1, "aa01010aa", "aa01010aa"},
{2, "bb01010bb", "bb01010bb"},
{3, "cc01010cc", "cc01010cc"},
{4, "dd01010dd", "dd01010dd"},
},
},
{
Query: "select col1 from t order by col1;",
Expected: []sql.Row{
{"aa01010aa"},
{"bb01010bb"},
{"cc01010cc"},
{"dd01010dd"},
},
},
},
},
{
Name: "VARCHAR to TEXT widening with right side modification",
AncSetUpScript: []string{
"set autocommit = 0;",
"CREATE table t (pk int primary key, col1 varchar(10), col2 int);",
"INSERT into t values (1, '123', 10);",
"INSERT into t values (1, '54321', 10);",
"alter table t add index idx1 (col1(10));",
},
RightSetUpScript: []string{
"alter table t modify column col1 TEXT;",
"UPDATE t SET col2 = 40 WHERE col2 = 10",
"INSERT into t values (2, '12345678901234567890', 20);",
"INSERT into t values (2, '43210000000', 20);",
},
LeftSetUpScript: []string{
"INSERT into t values (3, '321', 30);",
Expand All @@ -1527,24 +1576,32 @@ var SchemaChangeTestsTypeChanges = []MergeScriptTest{
{
Query: "select * from t order by pk;",
Expected: []sql.Row{
{1, "123", 40},
{2, "12345678901234567890", 20},
{1, "54321", 40},
{2, "43210000000", 20},
{3, "321", 30},
},
},
{
Query: "select col1 from t order by col1;",
Expected: []sql.Row{
{"321"},
{"43210000000"},
{"54321"},
},
},
},
},
{
Name: "VARCHAR to TEXT widening",
AncSetUpScript: []string{
"set autocommit = 0;",
"CREATE table t (pk int primary key, col1 varchar(10));",
"INSERT into t values (1, '123');",
"INSERT into t values (1, '54321');",
"alter table t add index idx1 (col1(10));",
},
RightSetUpScript: []string{
"alter table t modify column col1 TEXT;",
"INSERT into t values (2, '12345678901234567890');",
"INSERT into t values (2, '43210000000');",
},
LeftSetUpScript: []string{
"INSERT into t values (3, '321');",
Expand All @@ -1561,11 +1618,97 @@ var SchemaChangeTestsTypeChanges = []MergeScriptTest{
{
Query: "select * from t order by pk;",
Expected: []sql.Row{
{1, "123"},
{2, "12345678901234567890"},
{1, "54321"},
{2, "43210000000"},
{3, "321"},
},
},
{
Query: "select col1 from t order by col1;",
Expected: []sql.Row{
{"321"},
{"43210000000"},
{"54321"},
},
},
},
},
{
Name: "VARCHAR index with prefix narrowing",
AncSetUpScript: []string{
"set autocommit = 0;",
"CREATE table t (pk int primary key, col1 varchar(10));",
"INSERT into t values (1, '987654321');",
"alter table t add index idx1 (col1(10));",
},
RightSetUpScript: []string{
"DROP INDEX idx1 ON t;",
"alter table t add index idx1 (col1(5));",
"INSERT into t values (2, '87654321');",
},
LeftSetUpScript: []string{
"INSERT into t values (3, '7654321');",
},
Assertions: []queries.ScriptTestAssertion{
{
Query: "call dolt_merge('right');",
Expected: []sql.Row{{doltCommit, 0, 0, "merge successful"}},
},
{
Query: "select * from t order by pk;",
Expected: []sql.Row{
{1, "987654321"},
{2, "87654321"},
{3, "7654321"},
},
},
{
Query: "select col1 from t order by col1;",
Expected: []sql.Row{
{"7654321"},
{"87654321"},
{"987654321"},
},
},
},
},
{
Name: "TEXT index with prefix narrowing",
AncSetUpScript: []string{
"set autocommit = 0;",
"CREATE table t (pk int primary key, col1 text);",
"INSERT into t values (1, '987654321');",
"alter table t add index idx1 (col1(10));",
},
RightSetUpScript: []string{
"DROP INDEX idx1 ON t;",
"alter table t add index idx1 (col1(5));",
"INSERT into t values (2, '87654321');",
},
LeftSetUpScript: []string{
"INSERT into t values (3, '7654321');",
},
Assertions: []queries.ScriptTestAssertion{
{
Query: "call dolt_merge('right');",
Expected: []sql.Row{{doltCommit, 0, 0, "merge successful"}},
},
{
Query: "select * from t order by pk;",
Expected: []sql.Row{
{1, "987654321"},
{2, "87654321"},
{3, "7654321"},
},
},
{
Query: "select col1 from t order by col1;",
Expected: []sql.Row{
{"7654321"},
{"87654321"},
{"987654321"},
},
},
},
},
{
Expand Down
Loading