From d4562e96d98a6d20685eaefe5691134979b29df0 Mon Sep 17 00:00:00 2001
From: Huaxin Gao <huaxing@us.ibm.com>
Date: Sat, 27 Jul 2019 23:33:43 -0700
Subject: [PATCH] [SPARK-28277][SQL][PYTHON][TESTS][FOLLOW-UP] Re-enable
 commented out test

---
 .../sql-tests/inputs/udf/udf-except.sql       | 23 +++++++++----------
 .../sql-tests/results/udf/udf-except.sql.out  | 20 +++++++++++++++-
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/sql/core/src/test/resources/sql-tests/inputs/udf/udf-except.sql b/sql/core/src/test/resources/sql-tests/inputs/udf/udf-except.sql
index 17e24880ea1bd..378b5bbf2df8a 100644
--- a/sql/core/src/test/resources/sql-tests/inputs/udf/udf-except.sql
+++ b/sql/core/src/test/resources/sql-tests/inputs/udf/udf-except.sql
@@ -45,15 +45,14 @@ SELECT (SELECT udf(min(k)) FROM t2) abs_min_t2 FROM t1 WHERE  t1.k = udf('one');
 
 
 -- Except operation that will be replaced by left anti join
---- [SPARK-28441] udf(max(udf(column))) throws java.lang.UnsupportedOperationException: Cannot evaluate expression: udf(null)
---- SELECT t1.k
---- FROM   t1
---- WHERE  t1.v <= (SELECT   udf(max(udf(t2.v)))
----                 FROM     t2
----                 WHERE    udf(t2.k) = udf(t1.k))
---- MINUS
---- SELECT t1.k
---- FROM   t1
---- WHERE  udf(t1.v) >= (SELECT   min(udf(t2.v))
----                 FROM     t2
----                 WHERE    t2.k = t1.k);
+SELECT t1.k
+FROM   t1
+WHERE  t1.v <= (SELECT   udf(max(udf(t2.v)))
+                FROM     t2
+                WHERE    udf(t2.k) = udf(t1.k))
+MINUS
+SELECT t1.k
+FROM   t1
+WHERE  udf(t1.v) >= (SELECT   min(udf(t2.v))
+                FROM     t2
+                WHERE    t2.k = t1.k);
diff --git a/sql/core/src/test/resources/sql-tests/results/udf/udf-except.sql.out b/sql/core/src/test/resources/sql-tests/results/udf/udf-except.sql.out
index cb8a4e84a95cf..0badaf050e194 100644
--- a/sql/core/src/test/resources/sql-tests/results/udf/udf-except.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/udf/udf-except.sql.out
@@ -1,5 +1,5 @@
 -- Automatically generated by SQLQueryTestSuite
--- Number of queries: 8
+-- Number of queries: 9
 
 
 -- !query 0
@@ -85,3 +85,21 @@ struct<min_t2:string>
 -- !query 7 output
 NULL
 two
+
+
+-- !query 8
+SELECT t1.k
+FROM   t1
+WHERE  t1.v <= (SELECT   udf(max(udf(t2.v)))
+                FROM     t2
+                WHERE    udf(t2.k) = udf(t1.k))
+MINUS
+SELECT t1.k
+FROM   t1
+WHERE  udf(t1.v) >= (SELECT   min(udf(t2.v))
+                FROM     t2
+                WHERE    t2.k = t1.k)
+-- !query 8 schema
+struct<k:string>
+-- !query 8 output
+two