diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Cast.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Cast.scala index 05b4fbef2b697..7c4316fe08433 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Cast.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Cast.scala @@ -251,7 +251,10 @@ abstract class CastBase extends UnaryExpression with TimeZoneAwareExpression wit def dataType: DataType - override def toString: String = s"cast($child as ${dataType.simpleString})" + override def toString: String = { + val ansi = if (ansiEnabled) "ansi_" else "" + s"${ansi}cast($child as ${dataType.simpleString})" + } override def checkInputDataTypes(): TypeCheckResult = { if (Cast.canCast(child.dataType, dataType)) { diff --git a/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-aggregates_part1.sql.out b/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-aggregates_part1.sql.out index d65c56774eafd..adf434b1bde95 100644 --- a/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-aggregates_part1.sql.out +++ b/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-aggregates_part1.sql.out @@ -77,7 +77,7 @@ struct -- !query SELECT stddev_pop(udf(b)) FROM aggtest -- !query schema -struct +struct -- !query output 131.10703231895047 @@ -85,7 +85,7 @@ struct -- !query SELECT udf(stddev_samp(b)) FROM aggtest -- !query schema -struct +struct -- !query output 151.38936080399804 @@ -93,7 +93,7 @@ struct +struct -- !query output 17189.053923482323 @@ -101,7 +101,7 @@ struct -- !query SELECT udf(var_samp(b)) FROM aggtest -- !query schema -struct +struct -- !query output 22918.738564643096 @@ -109,7 +109,7 @@ struct -- !query SELECT udf(stddev_pop(CAST(b AS Decimal(38,0)))) FROM aggtest -- !query schema -struct +struct -- !query output 131.18117242958306 @@ -117,7 +117,7 @@ struct +struct -- !query output 151.47497042966097 @@ -125,7 +125,7 @@ struct +struct -- !query output 17208.5 @@ -133,7 +133,7 @@ struct +struct -- !query output 22944.666666666668 @@ -141,7 +141,7 @@ struct +struct -- !query output 0.0 NaN @@ -149,7 +149,7 @@ struct +struct -- !query output 0.0 NaN @@ -157,7 +157,7 @@ struct +struct -- !query output NULL @@ -165,7 +165,7 @@ NULL -- !query select sum(udf(CAST(null AS long))) from range(1,4) -- !query schema -struct +struct -- !query output NULL @@ -173,7 +173,7 @@ NULL -- !query select sum(udf(CAST(null AS Decimal(38,0)))) from range(1,4) -- !query schema -struct +struct -- !query output NULL @@ -181,7 +181,7 @@ NULL -- !query select sum(udf(CAST(null AS DOUBLE))) from range(1,4) -- !query schema -struct +struct -- !query output NULL @@ -189,7 +189,7 @@ NULL -- !query select avg(udf(CAST(null AS int))) from range(1,4) -- !query schema -struct +struct -- !query output NULL @@ -197,7 +197,7 @@ NULL -- !query select avg(udf(CAST(null AS long))) from range(1,4) -- !query schema -struct +struct -- !query output NULL @@ -205,7 +205,7 @@ NULL -- !query select avg(udf(CAST(null AS Decimal(38,0)))) from range(1,4) -- !query schema -struct +struct -- !query output NULL @@ -213,7 +213,7 @@ NULL -- !query select avg(udf(CAST(null AS DOUBLE))) from range(1,4) -- !query schema -struct +struct -- !query output NULL @@ -221,7 +221,7 @@ NULL -- !query select sum(CAST(udf('NaN') AS DOUBLE)) from range(1,4) -- !query schema -struct +struct -- !query output NaN @@ -229,7 +229,7 @@ NaN -- !query select avg(CAST(udf('NaN') AS DOUBLE)) from range(1,4) -- !query schema -struct +struct -- !query output NaN @@ -238,7 +238,7 @@ NaN SELECT avg(CAST(udf(x) AS DOUBLE)), var_pop(CAST(udf(x) AS DOUBLE)) FROM (VALUES ('Infinity'), ('1')) v(x) -- !query schema -struct +struct -- !query output Infinity NaN @@ -247,7 +247,7 @@ Infinity NaN SELECT avg(CAST(udf(x) AS DOUBLE)), var_pop(CAST(udf(x) AS DOUBLE)) FROM (VALUES ('Infinity'), ('Infinity')) v(x) -- !query schema -struct +struct -- !query output Infinity NaN @@ -256,7 +256,7 @@ Infinity NaN SELECT avg(CAST(udf(x) AS DOUBLE)), var_pop(CAST(udf(x) AS DOUBLE)) FROM (VALUES ('-Infinity'), ('Infinity')) v(x) -- !query schema -struct +struct -- !query output NaN NaN @@ -265,7 +265,7 @@ NaN NaN SELECT avg(udf(CAST(x AS DOUBLE))), udf(var_pop(CAST(x AS DOUBLE))) FROM (VALUES (100000003), (100000004), (100000006), (100000007)) v(x) -- !query schema -struct +struct -- !query output 1.00000005E8 2.5 @@ -274,7 +274,7 @@ struct +struct -- !query output 7.000000000006E12 1.0 @@ -282,7 +282,7 @@ struct +struct -- !query output 653.6289553875104 871.5052738500139 @@ -290,7 +290,7 @@ struct +struct -- !query output 0.1396345165178734 @@ -315,7 +315,7 @@ struct select ten, udf(count(*)), sum(udf(four)) from onek group by ten order by ten -- !query schema -struct +struct -- !query output 0 100 100 1 100 200 @@ -333,7 +333,7 @@ struct +struct -- !query output 0 100 2 1 100 4 @@ -352,7 +352,7 @@ select ten, udf(sum(distinct four)) from onek a group by ten having exists (select 1 from onek b where udf(sum(distinct a.four)) = b.four) -- !query schema -struct +struct -- !query output 0 2 2 2 @@ -372,7 +372,7 @@ struct<> org.apache.spark.sql.AnalysisException Aggregate/Window/Generate expressions are not valid in where clause of the query. -Expression in where clause: [(sum(DISTINCT CAST((outer() + b.`four`) AS BIGINT)) = CAST(CAST(udf(cast(four as string)) AS INT) AS BIGINT))] +Expression in where clause: [(sum(DISTINCT CAST((outer() + b.`four`) AS BIGINT)) = CAST(CAST(udf(ansi_cast(four as string)) AS INT) AS BIGINT))] Invalid expressions: [sum(DISTINCT CAST((outer() + b.`four`) AS BIGINT))]; diff --git a/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-aggregates_part2.sql.out b/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-aggregates_part2.sql.out index c10fe9b51dd72..d4941d0a0b768 100644 --- a/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-aggregates_part2.sql.out +++ b/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-aggregates_part2.sql.out @@ -161,7 +161,7 @@ true true false NULL false true -- !query select min(udf(unique1)) from tenk1 -- !query schema -struct +struct -- !query output 0 @@ -169,7 +169,7 @@ struct -- !query select udf(max(unique1)) from tenk1 -- !query schema -struct +struct -- !query output 9999 @@ -217,7 +217,7 @@ struct -- !query select distinct max(udf(unique2)) from tenk1 -- !query schema -struct +struct -- !query output 9999 @@ -241,7 +241,7 @@ struct -- !query select udf(max(udf(unique2))) from tenk1 order by udf(max(unique2))+1 -- !query schema -struct +struct -- !query output 9999 @@ -249,7 +249,7 @@ struct +struct -- !query output 9999 3 9999 2 @@ -259,6 +259,6 @@ struct -- !query select udf(max(100)) from tenk1 -- !query schema -struct +struct -- !query output 100 diff --git a/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-case.sql.out b/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-case.sql.out index 04c4f54b02a3e..6c733e916d734 100755 --- a/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-case.sql.out +++ b/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-case.sql.out @@ -176,7 +176,7 @@ struct -- !query SELECT CASE WHEN udf(1=0) THEN 1/0 WHEN 1=1 THEN 1 ELSE 2/0 END -- !query schema -struct +struct -- !query output 1.0 @@ -184,7 +184,7 @@ struct +struct -- !query output 1.0 @@ -192,7 +192,7 @@ struct 100 THEN udf(1/0) ELSE udf(0) END FROM case_tbl -- !query schema -struct 100) THEN CAST(udf(cast((cast(1 as double) / cast(0 as double)) as string)) AS DOUBLE) ELSE CAST(CAST(udf(cast(0 as string)) AS INT) AS DOUBLE) END:double> +struct 100) THEN CAST(udf(ansi_cast((ansi_cast(1 as double) / ansi_cast(0 as double)) as string)) AS DOUBLE) ELSE CAST(CAST(udf(ansi_cast(0 as string)) AS INT) AS DOUBLE) END:double> -- !query output 0.0 0.0 @@ -203,7 +203,7 @@ struct 100) THEN CAST(udf(cast((cast(1 as double) / cast(0 as dou -- !query SELECT CASE 'a' WHEN 'a' THEN udf(1) ELSE udf(2) END -- !query schema -struct +struct -- !query output 1 @@ -294,7 +294,7 @@ struct SELECT udf(COALESCE(a.f, b.i, b.j)) FROM CASE_TBL a, CASE2_TBL b -- !query schema -struct +struct -- !query output -30.3 -30.3 diff --git a/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-join.sql.out b/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-join.sql.out index f113aee6d3b51..3cc14ff04b1ba 100644 --- a/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-join.sql.out +++ b/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-join.sql.out @@ -243,7 +243,7 @@ struct<> SELECT udf('') AS `xxx`, udf(i), udf(j), udf(t) FROM J1_TBL AS tx -- !query schema -struct +struct -- !query output 0 NULL zero 1 4 one @@ -262,7 +262,7 @@ struct +struct -- !query output 0 NULL zero 1 4 one @@ -281,7 +281,7 @@ struct +struct -- !query output 0 NULL zero 1 4 one @@ -300,7 +300,7 @@ struct +struct -- !query output 0 NULL zero 1 4 one @@ -319,7 +319,7 @@ struct +struct -- !query output 0 NULL zero 0 NULL 0 NULL zero 1 -1 @@ -543,7 +543,7 @@ Reference 'i' is ambiguous, could be: default.j1_tbl.i, default.j2_tbl.i.; line SELECT udf('') AS `xxx`, udf(t1.i) AS i, udf(k), udf(t) FROM J1_TBL t1 CROSS JOIN J2_TBL t2 -- !query schema -struct +struct -- !query output 0 -1 zero 0 -3 zero @@ -651,7 +651,7 @@ SELECT udf(udf('')) AS `xxx`, udf(udf(ii)) AS ii, udf(udf(tt)) AS tt, udf(udf(kk FROM (J1_TBL CROSS JOIN J2_TBL) AS tx (ii, jj, tt, ii2, kk) -- !query schema -struct +struct -- !query output 0 zero -1 0 zero -3 @@ -758,7 +758,7 @@ struct +struct -- !query output 0 NULL zero 0 NULL 0 NULL 0 NULL zero 0 NULL 1 -1 @@ -1657,7 +1657,7 @@ struct +struct -- !query output 0 NULL zero NULL 1 4 one -1 @@ -1672,7 +1672,7 @@ struct +struct -- !query output 0 NULL zero NULL 1 4 one -1 @@ -1703,7 +1703,7 @@ struct SELECT udf(udf('')) AS `xxx`, udf(i), udf(j), udf(t), udf(k) FROM J1_TBL NATURAL JOIN J2_TBL -- !query schema -struct +struct -- !query output 0 NULL zero NULL 1 4 one -1 @@ -1718,7 +1718,7 @@ struct +struct -- !query output 0 NULL zero NULL 1 4 one -1 @@ -1733,7 +1733,7 @@ struct +struct -- !query output 0 NULL zero NULL 2 3 two 2 @@ -1744,7 +1744,7 @@ struct +struct -- !query output 0 NULL zero 0 NULL 1 4 one 1 -1 @@ -1759,7 +1759,7 @@ struct +struct -- !query output 0 NULL zero NULL 0 2 3 two 2 2 @@ -1770,7 +1770,7 @@ struct +struct -- !query output 0 NULL zero 2 2 0 NULL zero 2 4 @@ -1788,7 +1788,7 @@ SELECT udf(udf('')) AS `xxx`, udf(i), udf(j), udf(t), udf(k) FROM J1_TBL LEFT OUTER JOIN J2_TBL USING (i) ORDER BY udf(udf(i)), udf(k), udf(t) -- !query schema -struct +struct -- !query output NULL NULL null NULL NULL 0 zero NULL @@ -1810,7 +1810,7 @@ SELECT udf('') AS `xxx`, udf(i), udf(j), udf(t), udf(k) FROM J1_TBL LEFT JOIN J2_TBL USING (i) ORDER BY udf(i), udf(udf(k)), udf(t) -- !query schema -struct +struct -- !query output NULL NULL null NULL NULL 0 zero NULL @@ -1831,7 +1831,7 @@ struct +struct -- !query output 0 NULL zero NULL 1 4 one -1 @@ -1848,7 +1848,7 @@ struct +struct -- !query output 0 NULL zero NULL 1 4 one -1 @@ -1866,7 +1866,7 @@ SELECT udf('') AS `xxx`, udf(i), udf(j), udf(udf(t)), udf(k) FROM J1_TBL FULL OUTER JOIN J2_TBL USING (i) ORDER BY udf(udf(i)), udf(k), udf(t) -- !query schema -struct +struct -- !query output NULL NULL NULL NULL NULL NULL null NULL @@ -1890,7 +1890,7 @@ SELECT udf('') AS `xxx`, udf(i), udf(j), t, udf(udf(k)) FROM J1_TBL FULL JOIN J2_TBL USING (i) ORDER BY udf(udf(i)), udf(k), udf(udf(t)) -- !query schema -struct +struct -- !query output NULL NULL NULL NULL NULL NULL null NULL @@ -1913,7 +1913,7 @@ struct +struct -- !query output @@ -1922,7 +1922,7 @@ struct +struct -- !query output 1 4 one -1 @@ -2052,7 +2052,7 @@ FULL JOIN (SELECT * FROM t3) s3 USING (name) -- !query schema -struct +struct -- !query output bb 12 13 cc 22 23 @@ -2138,7 +2138,7 @@ NATURAL FULL JOIN (SELECT name, udf(udf(n)) as s3_n FROM t3) as s3 ) ss2 -- !query schema -struct +struct -- !query output bb 11 12 13 cc NULL 22 23 @@ -2171,7 +2171,7 @@ FULL JOIN (SELECT name, 2 as s2_n FROM t2) as s2 ON (udf(udf(s1_n)) = udf(s2_n)) -- !query schema -struct +struct -- !query output NULL NULL bb 2 NULL NULL cc 2 @@ -2202,7 +2202,7 @@ struct<> -- !query select udf(udf(x1)), udf(x2) from x -- !query schema -struct +struct -- !query output 1 11 2 22 @@ -2214,7 +2214,7 @@ struct +struct -- !query output 1 111 2 222 @@ -2336,7 +2336,7 @@ select udf(udf(count(*))) from tenk1 a where udf(udf(unique1)) in (select udf(unique1) from tenk1 b join tenk1 c using (unique1) where udf(udf(b.unique2)) = udf(42)) -- !query schema -struct +struct -- !query output 1 @@ -2347,7 +2347,7 @@ select udf(count(*)) from tenk1 x where udf(x.unique1) = 0 and udf(x.unique1) in (select aa.f1 from int4_tbl aa,float8_tbl bb where aa.f1=udf(udf(bb.f1))) -- !query schema -struct +struct -- !query output 1 @@ -2358,7 +2358,7 @@ select udf(udf(count(*))) from tenk1 x where udf(x.unique1) = 0 and udf(udf(x.unique1)) in (select udf(aa.f1) from int4_tbl aa,float8_tbl bb where udf(aa.f1)=udf(udf(bb.f1))) -- !query schema -struct +struct -- !query output 1 @@ -2388,7 +2388,7 @@ from tenk1 t5 where udf(t4.thousand) = udf(t5.unique1) and udf(udf(ss.x1)) = t4.tenthous and udf(ss.x2) = udf(udf(t5.stringu1)) -- !query schema -struct +struct -- !query output 1000 @@ -2400,7 +2400,7 @@ select udf(a.f1), udf(b.f1), udf(t.thousand), udf(t.tenthous) from (select udf(sum(udf(f1))) as f1 from int4_tbl i4b) b where b.f1 = udf(t.thousand) and udf(a.f1) = udf(b.f1) and udf((udf(a.f1)+udf(b.f1)+999)) = udf(udf(t.tenthous)) -- !query schema -struct +struct -- !query output @@ -2441,7 +2441,7 @@ select udf(count(*)) from (select * from tenk1 y order by udf(y.unique2)) y on udf(x.thousand) = y.unique2 and x.twothousand = udf(y.hundred) and x.fivethous = y.unique2 -- !query schema -struct +struct -- !query output 10000 @@ -2530,7 +2530,7 @@ struct select udf(count(*)) from tenk1 a, tenk1 b where udf(a.hundred) = b.thousand and udf(udf((b.fivethous % 10)) < 10) -- !query schema -struct +struct -- !query output 100000 @@ -2727,7 +2727,7 @@ from tenk1 a left join tenk1 b on a.unique2 = udf(b.tenthous) where udf(a.unique1) = 42 and ((udf(b.unique2) is null and udf(a.ten) = 2) or udf(udf(b.hundred)) = udf(udf(3))) -- !query schema -struct +struct -- !query output @@ -2761,7 +2761,7 @@ select udf(t1.q2), udf(count(t2.*)) from int8_tbl t1 left join int8_tbl t2 on (udf(udf(t1.q2)) = t2.q1) group by udf(t1.q2) order by 1 -- !query schema -struct +struct -- !query output -4567890123456789 0 123 2 @@ -2774,7 +2774,7 @@ select udf(udf(t1.q2)), udf(count(t2.*)) from int8_tbl t1 left join (select * from int8_tbl) t2 on (udf(udf(t1.q2)) = udf(t2.q1)) group by udf(udf(t1.q2)) order by 1 -- !query schema -struct +struct -- !query output -4567890123456789 0 123 2 @@ -2789,7 +2789,7 @@ from int8_tbl t1 left join on (udf(t1.q2) = udf(t2.q1)) group by t1.q2 order by 1 -- !query schema -struct +struct -- !query output -4567890123456789 0 123 2 @@ -2838,7 +2838,7 @@ from c left join on (udf(udf(c.a)) = udf(ss.code)) order by c.name -- !query schema -struct +struct -- !query output A p 2 -1 B q 0 -1 @@ -2884,7 +2884,7 @@ LEFT JOIN ) sub2 ON sub1.key1 = udf(udf(sub2.key3)) -- !query schema -struct +struct -- !query output 1 1 1 1 @@ -2898,7 +2898,7 @@ SELECT udf(qq), udf(udf(unique1)) USING (qq) INNER JOIN tenk1 c ON udf(qq) = udf(unique2) -- !query schema -struct +struct -- !query output 123 4596 123 4596 @@ -2948,7 +2948,7 @@ from nt3 as nt3 on udf(ss2.id) = nt3.nt2_id where udf(nt3.id) = 1 and udf(ss2.b3) -- !query schema -struct +struct -- !query output 1 @@ -3008,7 +3008,7 @@ select udf(count(*)) from left join tenk1 c on udf(a.unique2) = udf(b.unique1) and udf(c.thousand) = udf(udf(a.thousand)) join int4_tbl on udf(b.thousand) = f1 -- !query schema -struct +struct -- !query output 10 @@ -3021,7 +3021,7 @@ select udf(b.unique1) from right join int4_tbl i2 on udf(udf(i2.f1)) = udf(b.tenthous) order by udf(1) -- !query schema -struct +struct -- !query output NULL NULL @@ -3039,7 +3039,7 @@ select * from where udf(fault) = udf(122) order by udf(fault) -- !query schema -struct +struct -- !query output NULL 123 122 @@ -3049,7 +3049,7 @@ select udf(q1), udf(unique2), udf(thousand), udf(hundred) from int8_tbl a left join tenk1 b on udf(q1) = udf(unique2) where udf(coalesce(thousand,123)) = udf(q1) and udf(q1) = udf(udf(coalesce(hundred,123))) -- !query schema -struct +struct -- !query output @@ -3059,7 +3059,7 @@ select udf(f1), udf(unique2), case when udf(udf(unique2)) is null then udf(f1) e from int4_tbl a left join tenk1 b on udf(f1) = udf(udf(unique2)) where (case when udf(unique2) is null then udf(f1) else 0 end) = 0 -- !query schema -struct +struct -- !query output 0 0 0 @@ -3069,7 +3069,7 @@ select udf(a.unique1), udf(b.unique1), udf(c.unique1), udf(coalesce(b.twothousan from tenk1 a left join tenk1 b on udf(b.thousand) = a.unique1 left join tenk1 c on udf(c.unique2) = udf(coalesce(b.twothousand, a.twothousand)) where a.unique2 < udf(10) and udf(udf(coalesce(b.twothousand, a.twothousand))) = udf(44) -- !query schema -struct +struct -- !query output @@ -3107,7 +3107,7 @@ select udf(a.q2), udf(b.q1) from int8_tbl a left join int8_tbl b on udf(a.q2) = coalesce(b.q1, 1) where udf(udf(coalesce(b.q1, 1)) > 0) -- !query schema -struct +struct -- !query output -4567890123456789 NULL 123 123 @@ -3237,7 +3237,7 @@ SELECT * FROM FROM int8_tbl LEFT JOIN innertab ON udf(udf(q2)) = id) ss2 ON true -- !query schema -struct +struct -- !query output 1 123 456 123 1 123 4567890123456789 123 diff --git a/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-select_having.sql.out b/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-select_having.sql.out index 68113afdfae30..bb108a29f75ce 100644 --- a/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-select_having.sql.out +++ b/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-select_having.sql.out @@ -94,7 +94,7 @@ struct<> SELECT udf(b), udf(c) FROM test_having GROUP BY b, c HAVING udf(count(*)) = 1 ORDER BY udf(b), udf(c) -- !query schema -struct +struct -- !query output 1 XXXX 3 bbbb @@ -104,7 +104,7 @@ struct +struct -- !query output 3 BBBB 3 bbbb @@ -115,7 +115,7 @@ SELECT udf(c), max(udf(a)) FROM test_having GROUP BY c HAVING udf(count(*)) > 2 OR udf(min(a)) = udf(max(a)) ORDER BY c -- !query schema -struct +struct -- !query output XXXX 0 bbbb 5 @@ -124,7 +124,7 @@ bbbb 5 -- !query SELECT udf(udf(min(udf(a)))), udf(udf(max(udf(a)))) FROM test_having HAVING udf(udf(min(udf(a)))) = udf(udf(max(udf(a)))) -- !query schema -struct +struct -- !query output @@ -132,7 +132,7 @@ struct +struct -- !query output 0 9 diff --git a/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-select_implicit.sql.out b/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-select_implicit.sql.out index 11cb682ee1494..66e6c20a2f6f2 100755 --- a/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-select_implicit.sql.out +++ b/sql/core/src/test/resources/sql-tests/results/udf/postgreSQL/udf-select_implicit.sql.out @@ -95,7 +95,7 @@ SELECT udf(c), udf(count(*)) FROM test_missing_target GROUP BY udf(test_missing_target.c) ORDER BY udf(c) -- !query schema -struct +struct -- !query output ABAB 2 BBBB 2 @@ -109,7 +109,7 @@ cccc 2 SELECT udf(count(*)) FROM test_missing_target GROUP BY udf(test_missing_target.c) ORDER BY udf(c) -- !query schema -struct +struct -- !query output 2 2 @@ -125,13 +125,13 @@ SELECT udf(count(*)) FROM test_missing_target GROUP BY udf(a) ORDER BY udf(b) struct<> -- !query output org.apache.spark.sql.AnalysisException -cannot resolve '`b`' given input columns: [CAST(udf(cast(count(1) as string)) AS BIGINT)]; line 1 pos 75 +cannot resolve '`b`' given input columns: [CAST(udf(ansi_cast(count(1) as string)) AS BIGINT)]; line 1 pos 75 -- !query SELECT udf(count(*)) FROM test_missing_target GROUP BY udf(b) ORDER BY udf(b) -- !query schema -struct +struct -- !query output 1 2 @@ -143,7 +143,7 @@ struct SELECT udf(test_missing_target.b), udf(count(*)) FROM test_missing_target GROUP BY udf(b) ORDER BY udf(b) -- !query schema -struct +struct -- !query output 1 1 2 2 @@ -154,7 +154,7 @@ struct +struct -- !query output XXXX ABAB @@ -171,7 +171,7 @@ CCCC -- !query SELECT udf(count(*)) FROM test_missing_target GROUP BY udf(b) ORDER BY udf(b) desc -- !query schema -struct +struct -- !query output 4 3 @@ -182,7 +182,7 @@ struct -- !query SELECT udf(count(*)) FROM test_missing_target ORDER BY udf(1) desc -- !query schema -struct +struct -- !query output 10 @@ -190,7 +190,7 @@ struct -- !query SELECT udf(c), udf(count(*)) FROM test_missing_target GROUP BY 1 ORDER BY 1 -- !query schema -struct +struct -- !query output ABAB 2 BBBB 2 @@ -224,7 +224,7 @@ Reference 'b' is ambiguous, could be: x.b, y.b.; line 3 pos 14 SELECT udf(a), udf(a) FROM test_missing_target ORDER BY udf(a) -- !query schema -struct +struct -- !query output 0 0 1 1 @@ -242,7 +242,7 @@ struct +struct -- !query output 0.0 0.0 0.5 0.5 @@ -260,7 +260,7 @@ struct +struct -- !query output 0.0 0.0 0.5 0.5 @@ -279,7 +279,7 @@ SELECT udf(x.b), udf(count(*)) FROM test_missing_target x, test_missing_target y WHERE udf(x.a) = udf(y.a) GROUP BY udf(x.b) ORDER BY udf(x.b) -- !query schema -struct +struct -- !query output 1 1 2 2 @@ -292,7 +292,7 @@ SELECT udf(count(*)) FROM test_missing_target x, test_missing_target y WHERE udf(x.a) = udf(y.a) GROUP BY udf(x.b) ORDER BY udf(x.b) -- !query schema -struct +struct -- !query output 1 2 @@ -305,7 +305,7 @@ SELECT udf(a%2), udf(count(udf(b))) FROM test_missing_target GROUP BY udf(test_missing_target.a%2) ORDER BY udf(test_missing_target.a%2) -- !query schema -struct +struct -- !query output 0 5 1 5 @@ -316,7 +316,7 @@ SELECT udf(count(c)) FROM test_missing_target GROUP BY udf(lower(test_missing_target.c)) ORDER BY udf(lower(test_missing_target.c)) -- !query schema -struct +struct -- !query output 2 3 @@ -330,13 +330,13 @@ SELECT udf(count(udf(a))) FROM test_missing_target GROUP BY udf(a) ORDER BY udf( struct<> -- !query output org.apache.spark.sql.AnalysisException -cannot resolve '`b`' given input columns: [CAST(udf(cast(count(cast(udf(cast(a as string)) as int)) as string)) AS BIGINT)]; line 1 pos 80 +cannot resolve '`b`' given input columns: [CAST(udf(ansi_cast(count(ansi_cast(udf(ansi_cast(a as string)) as int)) as string)) AS BIGINT)]; line 1 pos 80 -- !query SELECT udf(count(b)) FROM test_missing_target GROUP BY udf(b/2) ORDER BY udf(b/2) -- !query schema -struct +struct -- !query output 1 2 @@ -348,7 +348,7 @@ struct SELECT udf(lower(test_missing_target.c)), udf(count(udf(c))) FROM test_missing_target GROUP BY udf(lower(c)) ORDER BY udf(lower(c)) -- !query schema -struct +struct -- !query output abab 2 bbbb 3 @@ -359,7 +359,7 @@ xxxx 1 -- !query SELECT udf(a) FROM test_missing_target ORDER BY udf(upper(udf(d))) -- !query schema -struct +struct -- !query output 0 1 @@ -377,7 +377,7 @@ struct SELECT udf(count(b)) FROM test_missing_target GROUP BY udf((b + 1) / 2) ORDER BY udf((b + 1) / 2) desc -- !query schema -struct +struct -- !query output 4 3 @@ -402,7 +402,7 @@ test_missing_target y WHERE udf(x.a) = udf(y.a) GROUP BY udf(x.b/2) ORDER BY udf(x.b/2) -- !query schema -struct +struct -- !query output 0.5 1 1.0 2