fixed vtexplain and vttablet tests

Signed-off-by: Manan Gupta <manan@planetscale.com>
planetscale · Sep 20, 2021 · 96496d2 · 96496d2
1 parent 198ba77
commit 96496d2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/go/vt/vtexplain/testdata/multi-output/selectsharded-output.txt b/go/vt/vtexplain/testdata/multi-output/selectsharded-output.txt
@@ -180,7 +180,7 @@ select id, case when substr(name, 1, 5) = 'alice' then 'ALICE' when name = 'bob'
 ----------------------------------------------------------------------
 select id, 'abc' as test from user where id = 1 union all select id, 'def' as test from user where id = 1 union all select id, 'ghi' as test from user where id = 1 /* union all */
 
-1 ks_sharded/-40: (select id, 'abc' as test from `user` where id = 1) union all (select id, 'def' as test from `user` where id = 1) union all (select id, 'ghi' as test from `user` where id = 1) limit 10001 /* union all */
+1 ks_sharded/-40: select id, 'abc' as test from `user` where id = 1 union all select id, 'def' as test from `user` where id = 1 union all select id, 'ghi' as test from `user` where id = 1 limit 10001 /* union all */
 
 ----------------------------------------------------------------------
 select id from user where not id in (select col from music where music.user_id = 42) and id in (select col from music where music.user_id = 411)

diff --git a/go/vt/vttablet/endtoend/queries_test.go b/go/vt/vttablet/endtoend/queries_test.go
@@ -36,7 +36,7 @@ Result mismatch:
 '[[2 1] [1 2]]'
 RowsReturned mismatch: 2, want 1
 Rewritten mismatch:
-'["(select eid, id from vitess_a where 1 != 1) union (select eid, id from vitess_b where 1 != 1)" "(select /* fail */ eid, id from vitess_a) union (select eid, id from vitess_b) limit 10001"]' does not match
+'["select eid, id from vitess_a where 1 != 1 union select eid, id from vitess_b where 1 != 1" "select /* fail */ eid, id from vitess_a union select eid, id from vitess_b limit 10001"]' does not match
 '["select eid id from vitess_a where 1 != 1 union select eid, id from vitess_b where 1 != 1" "select /* fail */ eid, id from vitess_a union select eid, id from vitess_b"]'
 Plan mismatch: Select, want aa`
 
@@ -72,8 +72,8 @@ var TestQueryCases = []framework.Testable{
 			{"1", "2"},
 		},
 		Rewritten: []string{
-			"(select eid, id from vitess_a where 1 != 1) union (select eid, id from vitess_b where 1 != 1)",
-			"(select /* union */ eid, id from vitess_a) union (select eid, id from vitess_b) limit 10001",
+			"select eid, id from vitess_a where 1 != 1 union select eid, id from vitess_b where 1 != 1",
+			"select /* union */ eid, id from vitess_a union select eid, id from vitess_b limit 10001",
 		},
 		RowsReturned: 2,
 	},
@@ -85,8 +85,8 @@ var TestQueryCases = []framework.Testable{
 			{"1", "2"},
 		},
 		Rewritten: []string{
-			"(select eid, id from vitess_a where 1 != 1) union (select eid, id from vitess_b where 1 != 1) union (select eid, id from vitess_d where 1 != 1)",
-			"(select /* double union */ eid, id from vitess_a) union (select eid, id from vitess_b) union (select eid, id from vitess_d) limit 10001",
+			"select eid, id from vitess_a where 1 != 1 union select eid, id from vitess_b where 1 != 1 union select eid, id from vitess_d where 1 != 1",
+			"select /* double union */ eid, id from vitess_a union select eid, id from vitess_b union select eid, id from vitess_d limit 10001",
 		},
 		RowsReturned: 2,
 	},