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

UNION column type coercion #14245

Merged
merged 12 commits into from
Oct 12, 2023
Merged

UNION column type coercion #14245

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b127a70
feat: coerce column types in GetFields for UNION
systay Oct 10, 2023
66a05c6
feat: coerce UNION columns when not streaming
systay Oct 11, 2023
6c15016
license
systay Oct 11, 2023
1365b7d
coerce the fields and row values on concatenation
harshit-gangal Oct 11, 2023
39f73c0
feat: handle UNION column type coercion when inside transactions
systay Oct 11, 2023
18fbcd0
refactor: extract common code
systay Oct 11, 2023
78fa5c6
test: add end2end test for new feature
systay Oct 11, 2023
7189987
imports
systay Oct 11, 2023
3bd57bb
test: add test that shows that this query structure works well
systay Oct 11, 2023
1df6001
take a lock before append on sequencial stream
harshit-gangal Oct 12, 2023
fbfd2cc
run e2e for 19+ version
harshit-gangal Oct 12, 2023
09c55d9
fix: try to create the QP before panicking
systay Oct 12, 2023
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
4 changes: 4 additions & 0 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 @@ -118,6 +118,7 @@ func TestUnionAll(t *testing.T) {
func TestUnion(t *testing.T) {
mcmp, closer := start(t)
defer closer()
mcmp.Exec("insert into t1(id1, id2) values(1, 1), (2, 2)")

mcmp.AssertMatches(`SELECT 1 UNION SELECT 1 UNION SELECT 1`, `[[INT64(1)]]`)
mcmp.AssertMatches(`SELECT 1,'a' UNION SELECT 1,'a' UNION SELECT 1,'a' ORDER BY 1`, `[[INT64(1) VARCHAR("a")]]`)
Expand All @@ -126,4 +127,7 @@ func TestUnion(t *testing.T) {
mcmp.AssertMatches(`(SELECT 1,'a') UNION ALL (SELECT 1,'a') UNION ALL (SELECT 1,'a') ORDER BY 1`, `[[INT64(1) VARCHAR("a")] [INT64(1) VARCHAR("a")] [INT64(1) VARCHAR("a")]]`)
mcmp.AssertMatches(`(SELECT 1,'a') ORDER BY 1`, `[[INT64(1) VARCHAR("a")]]`)
mcmp.AssertMatches(`(SELECT 1,'a' order by 1) union (SELECT 1,'a' ORDER BY 1)`, `[[INT64(1) VARCHAR("a")]]`)
if utils.BinaryIsAtVersion(19, "vtgate") {
Copy link
Member

Choose a reason for hiding this comment

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

Just realised this is a terrible name BinaryIsAtVersion 😅

Copy link
Member

Choose a reason for hiding this comment

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

Will be addressed by #14269

mcmp.AssertMatches(`(SELECT id2,'a' from t1 where id1 = 1) union (SELECT 'a',id2 from t1 where id1 = 2)`, `[[VARCHAR("1") VARCHAR("a")] [VARCHAR("a") VARCHAR("2")]]`)
}
}
Loading
Loading