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

Alternate fix for concatenate panic #15465

Closed
wants to merge 1 commit into from
Closed

Alternate fix for concatenate panic #15465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions go/test/endtoend/vtgate/queries/union/union_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,11 @@ func TestUnionAll(t *testing.T) {
mcmp.AssertMatchesNoOrder("select tbl2.id1 FROM ((select id1 from t1 order by id1 limit 5) union all (select id1 from t1 order by id1 desc limit 5)) as tbl1 INNER JOIN t1 as tbl2 ON tbl1.id1 = tbl2.id1",
"[[INT64(1)] [INT64(2)] [INT64(2)] [INT64(1)]]")

// union all between two select unique in tables
mcmp.AssertMatchesNoOrder("select id1 from t1 where id1 in (1, 2, 3, 4, 5, 6, 7, 8) union all select id1 from t1 where id1 in (1, 2, 3, 4, 5, 6, 7, 8)",
"[[INT64(1)] [INT64(2)] [INT64(1)] [INT64(2)]]")
for i := 0; i < 5000; i++ {
// union all between two select unique in tables
mcmp.AssertMatchesNoOrder("select id1 from t1 where id1 in (1, 2, 3, 4, 5, 6, 7, 8) union all select id1 from t1 where id1 in (1, 2, 3, 4, 5, 6, 7, 8)",
"[[INT64(1)] [INT64(2)] [INT64(1)] [INT64(2)]]")
}

// 4 tables union all
mcmp.AssertMatchesNoOrder("select id1, id2 from t1 where id1 = 1 union all select id3,id4 from t2 where id3 = 3 union all select id1, id2 from t1 where id1 = 2 union all select id3,id4 from t2 where id3 = 4",
Expand Down
2 changes: 1 addition & 1 deletion go/vt/vtgate/engine/concatenate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ func (c *Concatenate) parallelStreamExec(inCtx context.Context, vcursor VCursor,
}
}
// Wait for fields from all sources.
for slices.Contains(rest, nil) {
for len(fieldTypes) == 0 {
condFields.Wait()
}
muFields.Unlock()
Expand Down
Loading