Mon Aug 15 01:31:47 PDT 2016

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/TableValuedFunctions.scala

@@ -60,7 +60,7 @@ object ResolveTableValuedFunctions extends Rule[LogicalPlan] {
   private type TVF = Map[ArgumentList, Seq[Any] => LogicalPlan]
 
   /**
-   * Internal registry of table-valued-functions. TODO(ekl) we should have a proper registry
+   * Internal registry of table-valued functions. TODO(ekl) we should have a proper registry
    */
   private val builtinFunctions: Map[String, TVF] = Map(
     "range" -> Map(
@@ -109,7 +109,7 @@ object ResolveTableValuedFunctions extends Rule[LogicalPlan] {
               |${tvf.keys.map(_.toString).toSeq.sorted.map(x => s" ($x)").mkString("\n")}
               |cannot be applied to: (${argTypes})""".stripMargin)
         case _ =>
-          u.failAnalysis(s"could not resolve `${u.functionName}` to a table valued function")
+          u.failAnalysis(s"could not resolve `${u.functionName}` to a table-valued function")
       }
   }
 }

sql/core/src/test/scala/org/apache/spark/sql/TableValuedFunctionSuite.scala

@@ -20,7 +20,13 @@ package org.apache.spark.sql
 import org.apache.spark.sql.test.SharedSQLContext
 
 class TableValuedFunctionSuite extends QueryTest with SharedSQLContext {
-  import testImplicits._
+
+  test("unresolvable function") {
+    val error = intercept[AnalysisException] {
+      sql("select * from dummy(3)")
+    }
+    assert(error.getMessage.contains("could not resolve `dummy` to a table-valued function"))
+  }
 
   test("built-in range") {
     checkAnswer(