You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2014/11/21 00:46:34 UTC
spark git commit: [SPARK-2918] [SQL] Support the CTAS in EXPLAIN
command
Repository: spark
Updated Branches:
refs/heads/master 2c2e7a44d -> 6aa0fc9f4
[SPARK-2918] [SQL] Support the CTAS in EXPLAIN command
Hive supports the `explain` the CTAS, which was supported by Spark SQL previously, however, seems it was reverted after the code refactoring in HiveQL.
Author: Cheng Hao <ha...@intel.com>
Closes #3357 from chenghao-intel/explain and squashes the following commits:
7aace63 [Cheng Hao] Support the CTAS in EXPLAIN command
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6aa0fc9f
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6aa0fc9f
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6aa0fc9f
Branch: refs/heads/master
Commit: 6aa0fc9f4d95f09383cbcb5f79166c60697e6683
Parents: 2c2e7a4
Author: Cheng Hao <ha...@intel.com>
Authored: Thu Nov 20 15:46:00 2014 -0800
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Thu Nov 20 15:46:00 2014 -0800
----------------------------------------------------------------------
.../org/apache/spark/sql/hive/HiveQl.scala | 6 +++-
.../sql/hive/execution/HiveExplainSuite.scala | 36 ++++++++++++++++++++
2 files changed, 41 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/6aa0fc9f/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala
----------------------------------------------------------------------
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala
index 1ca0403..b9283f6 100644
--- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala
+++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala
@@ -124,7 +124,6 @@ private[hive] object HiveQl {
// Commands that we do not need to explain.
protected val noExplainCommands = Seq(
- "TOK_CREATETABLE",
"TOK_DESCTABLE",
"TOK_TRUNCATETABLE" // truncate table" is a NativeCommand, does not need to explain.
) ++ nativeCommands
@@ -421,6 +420,11 @@ private[hive] object HiveQl {
case Token("TOK_EXPLAIN", explainArgs)
if noExplainCommands.contains(explainArgs.head.getText) =>
ExplainCommand(NoRelation)
+ case Token("TOK_EXPLAIN", explainArgs)
+ if "TOK_CREATETABLE" == explainArgs.head.getText =>
+ val Some(crtTbl) :: _ :: extended :: Nil =
+ getClauses(Seq("TOK_CREATETABLE", "FORMATTED", "EXTENDED"), explainArgs)
+ ExplainCommand(nodeToPlan(crtTbl), extended != None)
case Token("TOK_EXPLAIN", explainArgs) =>
// Ignore FORMATTED if present.
val Some(query) :: _ :: extended :: Nil =
http://git-wip-us.apache.org/repos/asf/spark/blob/6aa0fc9f/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveExplainSuite.scala
----------------------------------------------------------------------
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveExplainSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveExplainSuite.scala
index a68fc2a..6972112 100644
--- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveExplainSuite.scala
+++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveExplainSuite.scala
@@ -38,4 +38,40 @@ class HiveExplainSuite extends QueryTest {
"== Physical Plan ==",
"Code Generation", "== RDD ==")
}
+
+ test("explain create table command") {
+ checkExistence(sql("explain create table temp__b as select * from src limit 2"), true,
+ "== Physical Plan ==",
+ "InsertIntoHiveTable",
+ "Limit",
+ "src")
+
+ checkExistence(sql("explain extended create table temp__b as select * from src limit 2"), true,
+ "== Parsed Logical Plan ==",
+ "== Analyzed Logical Plan ==",
+ "== Optimized Logical Plan ==",
+ "== Physical Plan ==",
+ "CreateTableAsSelect",
+ "InsertIntoHiveTable",
+ "Limit",
+ "src")
+
+ checkExistence(sql(
+ """
+ | EXPLAIN EXTENDED CREATE TABLE temp__b
+ | ROW FORMAT SERDE "org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe"
+ | WITH SERDEPROPERTIES("serde_p1"="p1","serde_p2"="p2")
+ | STORED AS RCFile
+ | TBLPROPERTIES("tbl_p1"="p11", "tbl_p2"="p22")
+ | AS SELECT * FROM src LIMIT 2
+ """.stripMargin), true,
+ "== Parsed Logical Plan ==",
+ "== Analyzed Logical Plan ==",
+ "== Optimized Logical Plan ==",
+ "== Physical Plan ==",
+ "CreateTableAsSelect",
+ "InsertIntoHiveTable",
+ "Limit",
+ "src")
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org