Skip to content

Commit a09df4b

Browse files
committed
Addressing PR comments
1 parent b1d1d6b commit a09df4b

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

sql/core/src/test/resources/sql-tests/inputs/udf/udf-except-all.sql

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ MINUS ALL
3232
SELECT * FROM tab2;
3333

3434
-- EXCEPT ALL same table in both branches
35+
-- Note that there will one less NULL in the result compared to the non-udf result
36+
-- because udf converts null to a string "null".
3537
SELECT * FROM tab1
3638
EXCEPT ALL
3739
SELECT * FROM tab2 WHERE udf(c1) IS NOT NULL;
@@ -128,29 +130,29 @@ FROM (SELECT udf(tab3.k),
128130
udf(tab4.v)
129131
FROM tab3
130132
JOIN tab4
131-
ON tab3.k = tab4.k)
133+
ON udf(tab3.k) = udf(tab4.k))
132134
EXCEPT ALL
133135
SELECT *
134136
FROM (SELECT udf(tab3.k),
135137
udf(tab4.v)
136138
FROM tab3
137139
JOIN tab4
138-
ON tab3.k = tab4.k);
140+
ON udf(tab3.k) = udf(tab4.k));
139141

140142
-- Join under except all (2)
141143
SELECT *
142144
FROM (SELECT udf(tab3.k),
143145
udf(tab4.v)
144146
FROM tab3
145147
JOIN tab4
146-
ON tab3.k = tab4.k)
148+
ON udf(tab3.k) = udf(tab4.k))
147149
EXCEPT ALL
148150
SELECT *
149151
FROM (SELECT udf(tab4.v) AS k,
150152
udf(tab3.k) AS v
151153
FROM tab3
152154
JOIN tab4
153-
ON tab3.k = tab4.k);
155+
ON udf(tab3.k) = udf(tab4.k));
154156

155157
-- Group by under ExceptAll
156158
SELECT udf(v) FROM tab3 GROUP BY v

sql/core/src/test/resources/sql-tests/results/udf/udf-except-all.sql.out

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,14 +263,14 @@ FROM (SELECT udf(tab3.k),
263263
udf(tab4.v)
264264
FROM tab3
265265
JOIN tab4
266-
ON tab3.k = tab4.k)
266+
ON udf(tab3.k) = udf(tab4.k))
267267
EXCEPT ALL
268268
SELECT *
269269
FROM (SELECT udf(tab3.k),
270270
udf(tab4.v)
271271
FROM tab3
272272
JOIN tab4
273-
ON tab3.k = tab4.k)
273+
ON udf(tab3.k) = udf(tab4.k))
274274
-- !query 20 schema
275275
struct<udf(k):string,udf(v):string>
276276
-- !query 20 output
@@ -283,14 +283,14 @@ FROM (SELECT udf(tab3.k),
283283
udf(tab4.v)
284284
FROM tab3
285285
JOIN tab4
286-
ON tab3.k = tab4.k)
286+
ON udf(tab3.k) = udf(tab4.k))
287287
EXCEPT ALL
288288
SELECT *
289289
FROM (SELECT udf(tab4.v) AS k,
290290
udf(tab3.k) AS v
291291
FROM tab3
292292
JOIN tab4
293-
ON tab3.k = tab4.k)
293+
ON udf(tab3.k) = udf(tab4.k))
294294
-- !query 21 schema
295295
struct<udf(k):string,udf(v):string>
296296
-- !query 21 output

0 commit comments

Comments
 (0)