From a3bd52b6d96ca3b339402047ca612f638fa1e9fb Mon Sep 17 00:00:00 2001
From: Yuming Wang <wgyumg@gmail.com>
Date: Tue, 4 Jul 2017 20:59:21 +0800
Subject: [PATCH 1/4] catch AnalysisException

---
 .../org/apache/spark/sql/hive/HiveSessionCatalog.scala    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveSessionCatalog.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveSessionCatalog.scala
index 0d0269f694300..b9ce8215ed824 100644
--- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveSessionCatalog.scala
+++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveSessionCatalog.scala
@@ -99,6 +99,14 @@ private[sql] class HiveSessionCatalog(
           throw new AnalysisException(s"No handler for Hive UDF '${clazz.getCanonicalName}'")
         }
       } catch {
+        case ise: IllegalStateException =>
+          val analysisException =
+            new AnalysisException(s"No handler for Hive UDF '${clazz.getCanonicalName}': $ise. \n" +
+              s"If you create a UDTF, please make sure your function override " +
+              s"`public StructObjectInspector initialize(ObjectInspector[] args)`, " +
+              s"per: SPARK-21101")
+          analysisException.setStackTrace(ise.getStackTrace)
+          throw analysisException
         case ae: AnalysisException =>
           throw ae
         case NonFatal(e) =>

From 188ed85b5ed32ab31e74ab3938f68de5bfa53f83 Mon Sep 17 00:00:00 2001
From: Yuming Wang <wgyumg@gmail.com>
Date: Wed, 5 Jul 2017 09:24:39 +0800
Subject: [PATCH 2/4] Remove duplicate

---
 .../apache/spark/sql/hive/HiveSessionCatalog.scala  | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveSessionCatalog.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveSessionCatalog.scala
index b9ce8215ed824..29e1d62f1d69c 100644
--- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveSessionCatalog.scala
+++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveSessionCatalog.scala
@@ -99,19 +99,14 @@ private[sql] class HiveSessionCatalog(
           throw new AnalysisException(s"No handler for Hive UDF '${clazz.getCanonicalName}'")
         }
       } catch {
-        case ise: IllegalStateException =>
-          val analysisException =
-            new AnalysisException(s"No handler for Hive UDF '${clazz.getCanonicalName}': $ise. \n" +
-              s"If you create a UDTF, please make sure your function override " +
-              s"`public StructObjectInspector initialize(ObjectInspector[] args)`, " +
-              s"per: SPARK-21101")
-          analysisException.setStackTrace(ise.getStackTrace)
-          throw analysisException
         case ae: AnalysisException =>
           throw ae
         case NonFatal(e) =>
           val analysisException =
-            new AnalysisException(s"No handler for Hive UDF '${clazz.getCanonicalName}': $e")
+            new AnalysisException(s"No handler for Hive UDF '${clazz.getCanonicalName}': $e.\n" +
+              s"If you create a UDTF, please make sure your function override " +
+              s"`public StructObjectInspector initialize(ObjectInspector[] args)`, " +
+              s"per: SPARK-21101")
           analysisException.setStackTrace(e.getStackTrace)
           throw analysisException
       }

From 479fd4439fed92d2daadce6dd344c68cff00ce2a Mon Sep 17 00:00:00 2001
From: Yuming Wang <wgyumg@gmail.com>
Date: Wed, 5 Jul 2017 14:47:40 +0800
Subject: [PATCH 3/4] Add test

---
 .../src/test/resources/SPARK-21101-1.0.jar    | Bin 0 -> 7439 bytes
 .../sql/hive/execution/SQLQuerySuite.scala    |  26 ++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 sql/hive/src/test/resources/SPARK-21101-1.0.jar

diff --git a/sql/hive/src/test/resources/SPARK-21101-1.0.jar b/sql/hive/src/test/resources/SPARK-21101-1.0.jar
new file mode 100644
index 0000000000000000000000000000000000000000..768b2334db5c3aa8b1e4186af5fde86120d3231b
GIT binary patch
literal 7439
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
M<peIf<Um9F50R`vMF0Q*

literal 0
HcmV?d00001

diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala
index a949e5e829e14..147ee83c0f999 100644
--- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala
+++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala
@@ -2021,4 +2021,30 @@ class SQLQuerySuite extends QueryTest with SQLTestUtils with TestHiveSingleton {
       checkAnswer(table.filter($"p" === "p1\" and q=\"q1").select($"a"), Row(4))
     }
   }
+
+  test("SPARK-21101 UDTF should override initialize(ObjectInspector[] args)") {
+    withUserDefinedFunction("udtf_stack1" -> true, "udtf_stack2" -> true) {
+      sql(
+        s"""
+           |CREATE TEMPORARY FUNCTION udtf_stack1
+           |AS 'org.apache.spark.sql.hive.execution.UDTFStack'
+           |USING JAR '${hiveContext.getHiveFile("SPARK-21101-1.0.jar").toURI}'
+        """.stripMargin)
+      val cnt =
+        sql("SELECT udtf_stack1(2, 'A', 10, date '2015-01-01', 'B', 20, date '2016-01-01')").count()
+      assert(cnt === 2)
+
+      sql(
+        s"""
+           |CREATE TEMPORARY FUNCTION udtf_stack2
+           |AS 'org.apache.spark.sql.hive.execution.UDTFStack2'
+           |USING JAR '${hiveContext.getHiveFile("SPARK-21101-1.0.jar").toURI}'
+        """.stripMargin)
+      val e = intercept[org.apache.spark.sql.AnalysisException] {
+        sql("SELECT udtf_stack2(2, 'A', 10, date '2015-01-01', 'B', 20, date '2016-01-01')")
+      }
+      assert(
+        e.getMessage.contains("public StructObjectInspector initialize(ObjectInspector[] args)"))
+    }
+  }
 }

From f5e895b1dbdf0b42c274f217150abbe3f4a20bde Mon Sep 17 00:00:00 2001
From: Yuming Wang <wgyumg@gmail.com>
Date: Wed, 25 Oct 2017 04:23:39 +0800
Subject: [PATCH 4/4] Fix review comments

---
 .../apache/spark/sql/hive/HiveSessionCatalog.scala | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveSessionCatalog.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveSessionCatalog.scala
index c4873748d9e94..1f11adbd4f62e 100644
--- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveSessionCatalog.scala
+++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveSessionCatalog.scala
@@ -94,11 +94,15 @@ private[sql] class HiveSessionCatalog(
         }
       } catch {
         case NonFatal(e) =>
-          val analysisException =
-            new AnalysisException(s"No handler for UDF/UDAF/UDTF '${clazz.getCanonicalName}': $e" +
-              s"\nIf you create a UDTF, please make sure your function override " +
-              s"`public StructObjectInspector initialize(ObjectInspector[] args)`, " +
-              s"per: SPARK-21101")
+          val noHandlerMsg = s"No handler for UDF/UDAF/UDTF '${clazz.getCanonicalName}': $e"
+          val errorMsg =
+            if (classOf[GenericUDTF].isAssignableFrom(clazz)) {
+              s"$noHandlerMsg\nPlease make sure your function overrides " +
+                "`public StructObjectInspector initialize(ObjectInspector[] args)`."
+            } else {
+              noHandlerMsg
+            }
+          val analysisException = new AnalysisException(errorMsg)
           analysisException.setStackTrace(e.getStackTrace)
           throw analysisException
       }