Skip to content

Commit b0b21c7

Browse files
committed
apply fix
Signed-off-by: Yuan <[email protected]>
1 parent d5a7251 commit b0b21c7

27 files changed

+212
-213
lines changed

gluten-ut/spark40/src/test/resources/backends-velox/sql-tests/inputs/charvarchar.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@ select split(c7, 'e'), split(c8, 'e'), split(v, 'a'), split(s, 'e') from char_tb
107107
select substring(c7, 2), substring(c8, 2), substring(v, 3), substring(s, 2) from char_tbl4;
108108
select left(c7, 2), left(c8, 2), left(v, 3), left(s, 2) from char_tbl4;
109109
select right(c7, 2), right(c8, 2), right(v, 3), right(s, 2) from char_tbl4;
110+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.NullPropagation;
110111
select typeof(c7), typeof(c8), typeof(v), typeof(s) from char_tbl4 limit 1;
112+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.ConstantFolding,org.apache.spark.sql.catalyst.optimizer.NullPropagation;
111113
select cast(c7 as char(1)), cast(c8 as char(10)), cast(v as char(1)), cast(v as varchar(1)), cast(s as char(5)) from char_tbl4;
112114

113115
-- char_tbl has renamed to char_tbl1

gluten-ut/spark40/src/test/resources/backends-velox/sql-tests/inputs/count.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,12 @@ SELECT count(distinct 0.8), percentile_approx(distinct a, 0.8) FROM testData;
3838

3939
-- legacy behavior: allow calling function count without parameters
4040
set spark.sql.legacy.allowParameterlessCount=true;
41+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.ConstantFolding;
4142
SELECT count() FROM testData;
4243

4344
-- count without expressions
4445
set spark.sql.legacy.allowParameterlessCount=false;
46+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.ConstantFolding,org.apache.spark.sql.catalyst.optimizer.NullPropagation;
4547
SELECT count() FROM testData;
4648

4749
-- legacy behavior: allow count(testData.*)

gluten-ut/spark40/src/test/resources/backends-velox/sql-tests/inputs/cte.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,12 @@ SELECT * FROM same_name, (SELECT 10) AS same_name;
9898
WITH same_name(x) AS (SELECT 42)
9999
SELECT same_name.x FROM (SELECT 10) AS same_name(x), same_name;
100100

101+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.NullPropagation;
101102
-- Test behavior with an unknown-type literal in the WITH
102103
WITH q AS (SELECT 'foo' AS x)
103104
SELECT x, typeof(x) FROM q;
104105

106+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.ConstantFolding,org.apache.spark.sql.catalyst.optimizer.NullPropagation;
105107
-- The following tests are ported from ZetaSQL
106108
-- Alias inside the with hides the underlying column name, should fail
107109
with cte as (select id as id_alias from t)

gluten-ut/spark40/src/test/resources/backends-velox/sql-tests/inputs/date.sql

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ select UNIX_DATE(DATE('1970-01-01')), UNIX_DATE(DATE('2020-12-04')), UNIX_DATE(n
2727

2828
select to_date(null), to_date('2016-12-31'), to_date('2016-12-31', 'yyyy-MM-dd');
2929

30-
-- missing fields in `to_date`
31-
select to_date("16", "dd");
32-
-- invalid: there is no 29 in February, 1970
33-
select to_date("02-29", "MM-dd");
34-
3530
-- `dayofweek` accepts both date and timestamp ltz/ntz inputs.
3631
select dayofweek('2007-02-03'), dayofweek('2009-07-30'), dayofweek('2017-05-27'), dayofweek(null),
3732
dayofweek('1582-10-15 13:10:15'), dayofweek(timestamp_ltz'1582-10-15 13:10:15'), dayofweek(timestamp_ntz'1582-10-15 13:10:15');

gluten-ut/spark40/src/test/resources/backends-velox/sql-tests/inputs/misc-functions.sql

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
-- test for misc functions
2+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.NullPropagation;
23

34
-- typeof
45
select typeof(null);
@@ -9,6 +10,7 @@ select typeof(date '1986-05-23'), typeof(timestamp '1986-05-23'), typeof(interv
910
select typeof(x'ABCD'), typeof('SPARK');
1011
select typeof(array(1, 2)), typeof(map(1, 2)), typeof(named_struct('a', 1, 'b', 'spark'));
1112

13+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.ConstantFolding,org.apache.spark.sql.catalyst.optimizer.NullPropagation;
1214
-- Spark-32793: Rewrite AssertTrue with RaiseError
1315
SELECT assert_true(true), assert_true(boolean(1));
1416
SELECT assert_true(false);
@@ -40,4 +42,4 @@ SELECT raise_error(1);
4042
SET spark.sql.legacy.raiseErrorWithoutErrorClass=true;
4143
SELECT assert_true(false);
4244
SELECT raise_error('hello');
43-
SET spark.sql.legacy.raiseErrorWithoutErrorClass=false;
45+
SET spark.sql.legacy.raiseErrorWithoutErrorClass=false;

gluten-ut/spark40/src/test/resources/backends-velox/sql-tests/inputs/postgreSQL/window_part1.sql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ FROM tenk1 WHERE unique1 < 10;
214214
SELECT sum(unique1) over (rows between current row and unbounded following),
215215
unique1, four
216216
FROM tenk1 WHERE unique1 < 10;
217+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.NullPropagation;
217218

218219
SELECT sum(unique1) over (rows between 2 preceding and 2 following),
219220
unique1, four
@@ -272,6 +273,7 @@ FROM tenk1 WHERE unique1 < 10;
272273
SELECT sum(unique1) over (rows between 2 preceding and 1 preceding),
273274
unique1, four
274275
FROM tenk1 WHERE unique1 < 10;
276+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.ConstantFolding,org.apache.spark.sql.catalyst.optimizer.NullPropagation;
275277

276278
SELECT sum(unique1) over (rows between 1 following and 3 following),
277279
unique1, four
@@ -319,8 +321,10 @@ CREATE TEMP VIEW v_window AS
319321
SELECT i.id, sum(i.id) over (order by i.id rows between 1 preceding and 1 following) as sum_rows
320322
FROM range(1, 11) i;
321323

324+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.NullPropagation;
322325
SELECT * FROM v_window;
323326

327+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.ConstantFolding,org.apache.spark.sql.catalyst.optimizer.NullPropagation;
324328
-- [SPARK-28428] Spark `exclude` always expecting `()`
325329
-- CREATE OR REPLACE TEMP VIEW v_window AS
326330
-- SELECT i, sum(i) over (order by i rows between 1 preceding and 1 following

gluten-ut/spark40/src/test/resources/backends-velox/sql-tests/inputs/postgreSQL/window_part3.sql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,12 +262,14 @@ insert into datetimes values
262262
-- salary, enroll_date from empsalary;
263263

264264
-- Show differences in offset interpretation between ROWS, RANGE, and GROUPS
265+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.NullPropagation;
265266
WITH cte (x) AS (
266267
SELECT * FROM range(1, 36, 2)
267268
)
268269
SELECT x, (sum(x) over w)
269270
FROM cte
270271
WINDOW w AS (ORDER BY x rows between 1 preceding and 1 following);
272+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.ConstantFolding,org.apache.spark.sql.catalyst.optimizer.NullPropagation;
271273

272274
WITH cte (x) AS (
273275
SELECT * FROM range(1, 36, 2)
@@ -284,6 +286,7 @@ WINDOW w AS (ORDER BY x range between 1 preceding and 1 following);
284286
-- FROM cte
285287
-- WINDOW w AS (ORDER BY x groups between 1 preceding and 1 following);
286288

289+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.NullPropagation;
287290
WITH cte (x) AS (
288291
select 1 union all select 1 union all select 1 union all
289292
SELECT * FROM range(5, 50, 2)
@@ -292,6 +295,7 @@ SELECT x, (sum(x) over w)
292295
FROM cte
293296
WINDOW w AS (ORDER BY x rows between 1 preceding and 1 following);
294297

298+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.ConstantFolding,org.apache.spark.sql.catalyst.optimizer.NullPropagation;
295299
WITH cte (x) AS (
296300
select 1 union all select 1 union all select 1 union all
297301
SELECT * FROM range(5, 50, 2)

gluten-ut/spark40/src/test/resources/backends-velox/sql-tests/inputs/postgreSQL/window_part4.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,10 +362,12 @@ SELECT i,SUM(v) OVER (ORDER BY i ROWS BETWEEN CURRENT ROW AND CURRENT ROW)
362362

363363
SELECT i,SUM(v) OVER (ORDER BY i ROWS BETWEEN CURRENT ROW AND 1 FOLLOWING)
364364
FROM (VALUES(1,1),(2,2),(3,NULL),(4,NULL)) t(i,v);
365+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.NullPropagation;
365366

366367
SELECT i,SUM(v) OVER (ORDER BY i ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING)
367368
FROM (VALUES(1,1),(2,2),(3,3),(4,4)) t(i,v);
368369

370+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.ConstantFolding,org.apache.spark.sql.catalyst.optimizer.NullPropagation;
369371
-- [SPARK-29638] Spark handles 'NaN' as 0 in sums
370372
-- ensure aggregate over numeric properly recovers from NaN values
371373
SELECT a, b,

gluten-ut/spark40/src/test/resources/backends-velox/sql-tests/inputs/subquery/in-subquery/in-null-semantics.sql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@ select c, c not in (select e from t_empty) from t;
2222
select c, c not in (select e from v_empty) from v;
2323

2424
-- constant null IN (empty subquery) - rewritten by NullPropagation rule
25+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.ConstantFolding;
2526

2627
select null in (select e from t_empty);
2728
select null in (select e from v_empty);
2829
select null not in (select e from t_empty);
2930
select null not in (select e from v_empty);
3031

32+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.ConstantFolding,org.apache.spark.sql.catalyst.optimizer.NullPropagation;
3133
-- IN subquery which is not rewritten to join - here we use IN in the ON condition because that is a case that doesn't get rewritten to join in RewritePredicateSubquery, so we can observe the execution behavior of InSubquery directly
3234
-- Correct results: column t2.d should be NULL because the ON condition is always false
3335
select * from t left join t2 on (t.c in (select e from t_empty)) is null;
@@ -45,12 +47,14 @@ set spark.sql.legacy.nullInEmptyListBehavior = true;
4547
set spark.sql.optimizer.optimizeUncorrelatedInSubqueriesInJoinCondition.enabled=false;
4648

4749
-- constant null IN (empty subquery) - rewritten by NullPropagation rule
50+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.ConstantFolding;
4851

4952
select null in (select e from t_empty);
5053
select null in (select e from v_empty);
5154
select null not in (select e from t_empty);
5255
select null not in (select e from v_empty);
5356

57+
set spark.sql.optimizer.excludedRules=org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation,org.apache.spark.sql.catalyst.optimizer.ConstantFolding,org.apache.spark.sql.catalyst.optimizer.NullPropagation;
5458
-- IN subquery which is not rewritten to join - here we use IN in the ON condition because that is a case that doesn't get rewritten to join in RewritePredicateSubquery, so we can observe the execution behavior of InSubquery directly
5559
-- Correct results: column t2.d should be NULL because the ON condition is always false
5660
select * from t left join t2 on (t.c in (select e from t_empty)) is null;

gluten-ut/spark40/src/test/resources/backends-velox/sql-tests/inputs/timestamp-ntz.sql

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)