From 249febf8bd3bc7d3911cd65f0c656b1bc0c18b3a Mon Sep 17 00:00:00 2001
From: gatorsmile <gatorsmile@gmail.com>
Date: Mon, 4 Apr 2016 18:14:31 -0700
Subject: [PATCH] address comments.

---
 .../sql/catalyst/parser/AstBuilder.scala      |  3 +-
 .../apache/spark/sql/hive/HiveQlSuite.scala   | 43 +++++++++----------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
index 73e9d95ff4f55..42abb3e2fdbc8 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
@@ -418,8 +418,7 @@ class AstBuilder extends SqlBaseBaseVisitor[AnyRef] with Logging {
       outRowFormat: RowFormatContext,
       recordReader: Token,
       schemaLess: Boolean): ScriptInputOutputSchema = {
-    throw new ParseException(
-      "Script Transform is not supported in SQLContext. Use a HiveContext instead", ctx)
+    throw new ParseException("Script Transform is not supported", ctx)
   }
 
   /**
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveQlSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveQlSuite.scala
index 371a937641ea0..a8a0d6b8de364 100644
--- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveQlSuite.scala
+++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveQlSuite.scala
@@ -22,11 +22,13 @@ import org.apache.hadoop.hive.serde.serdeConstants
 import org.apache.spark.sql.AnalysisException
 import org.apache.spark.sql.catalyst.analysis.UnresolvedAttribute
 import org.apache.spark.sql.catalyst.catalog.{CatalogColumn, CatalogTable, CatalogTableType}
-import org.apache.spark.sql.catalyst.expressions.{AttributeReference, JsonTuple}
+import org.apache.spark.sql.catalyst.dsl.expressions._
+import org.apache.spark.sql.catalyst.dsl.plans
+import org.apache.spark.sql.catalyst.dsl.plans.DslLogicalPlan
+import org.apache.spark.sql.catalyst.expressions.JsonTuple
 import org.apache.spark.sql.catalyst.plans.PlanTest
 import org.apache.spark.sql.catalyst.plans.logical.{Generate, ScriptTransformation}
 import org.apache.spark.sql.hive.execution.HiveSqlParser
-import org.apache.spark.sql.types.{DecimalType, IntegerType, StringType}
 
 class HiveQlSuite extends PlanTest {
   val parser = HiveSqlParser
@@ -203,28 +205,23 @@ class HiveQlSuite extends PlanTest {
   }
 
   test("transform query spec") {
-    val plan1 = parser.parsePlan("select transform(a, b) using 'func' as c, d from e")
+    val plan1 = parser.parsePlan("select transform(a, b) using 'func' from e where f < 10")
+      .asInstanceOf[ScriptTransformation].copy(ioschema = null)
     val plan2 = parser.parsePlan("map a, b using 'func' as c, d from e")
-    val plan3 = parser.parsePlan("reduce a, b using 'func' as c, d from e")
-    comparePlans(plan1, plan2)
-    comparePlans(plan2, plan3)
-
-    assert(plan1.isInstanceOf[ScriptTransformation])
-    assert(plan1.asInstanceOf[ScriptTransformation].input
-      == Seq(UnresolvedAttribute("a"), UnresolvedAttribute("b")))
-    assert(plan1.asInstanceOf[ScriptTransformation].script
-      == "func")
-    assert(plan1.asInstanceOf[ScriptTransformation].output.map(_.name)
-      == Seq("c", "d"))
-    assert(plan1.asInstanceOf[ScriptTransformation].output.map(_.dataType)
-      == Seq(StringType, StringType))
-
-    val plan4 = parser.parsePlan("reduce a, b using 'func' as (c: int, d decimal(10, 0)) from e")
-    assert(plan4.isInstanceOf[ScriptTransformation])
-    assert(plan1.asInstanceOf[ScriptTransformation].output.map(_.name)
-      == Seq("c", "d"))
-    assert(plan4.asInstanceOf[ScriptTransformation].output.map(_.dataType)
-      == Seq(IntegerType, DecimalType(10, 0)))
+      .asInstanceOf[ScriptTransformation].copy(ioschema = null)
+    val plan3 = parser.parsePlan("reduce a, b using 'func' as (c: int, d decimal(10, 0)) from e")
+      .asInstanceOf[ScriptTransformation].copy(ioschema = null)
+
+    val p = ScriptTransformation(
+      Seq(UnresolvedAttribute("a"), UnresolvedAttribute("b")),
+      "func", Seq.empty, plans.table("e"), null)
+
+    comparePlans(plan1,
+      p.copy(child = p.child.where('f < 10), output = Seq('key.string, 'value.string)))
+    comparePlans(plan2,
+      p.copy(output = Seq('c.string, 'd.string)))
+    comparePlans(plan3,
+      p.copy(output = Seq('c.int, 'd.decimal(10, 0))))
   }
 
   test("use backticks in output of Script Transform") {