Repository: spark
Updated Branches:
refs/heads/branch-1.3 cc66a3cb7 -> 0fc35dafe
[SPARK-5324][SQL] Results of describe can't be queried
Make below code works.
```
sql("DESCRIBE test").registerTempTable("describeTest")
sql("SELECT * FROM describeTest").collect()
```
Author: OopsOutOfMemory <victorshen...@126.com>
Author: Sheng, Li <oopsoutofmem...@users.noreply.github.com>
Closes #4249 from OopsOutOfMemory/desc_query and squashes the following commits:
6fee13d [OopsOutOfMemory] up-to-date
e71430a [Sheng, Li] Update HiveOperatorQueryableSuite.scala
3ba1058 [OopsOutOfMemory] change to default argument
aac7226 [OopsOutOfMemory] Merge branch 'master' into desc_query
68eb6dd [OopsOutOfMemory] Merge branch 'desc_query' of
github.com:OopsOutOfMemory/spark into desc_query
354ad71 [OopsOutOfMemory] query describe command
d541a35 [OopsOutOfMemory] refine test suite
e1da481 [OopsOutOfMemory] refine test suite
a780539 [OopsOutOfMemory] Merge branch 'desc_query' of
github.com:OopsOutOfMemory/spark into desc_query
0015f82 [OopsOutOfMemory] code style
dd0aaef [OopsOutOfMemory] code style
c7d606d [OopsOutOfMemory] rename test suite
75f2342 [OopsOutOfMemory] refine code and test suite
f942c9b [OopsOutOfMemory] initial
11559ae [OopsOutOfMemory] code style
c5fdecf [OopsOutOfMemory] code style
aeaea5f [OopsOutOfMemory] rename test suite
ac2c3bb [OopsOutOfMemory] refine code and test suite
544573e [OopsOutOfMemory] initial
(cherry picked from commit 0b7eb3f3b700080bf6cb810d092709a8a468e5db)
Signed-off-by: Michael Armbrust <mich...@databricks.com>
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0fc35daf
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0fc35daf
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0fc35daf
Branch: refs/heads/branch-1.3
Commit: 0fc35dafe94df515c32f8dd1273431b23d63601b
Parents: cc66a3c
Author: OopsOutOfMemory <victorshen...@126.com>
Authored: Fri Feb 6 12:33:20 2015 -0800
Committer: Michael Armbrust <mich...@databricks.com>
Committed: Fri Feb 6 12:33:27 2015 -0800
----------------------------------------------------------------------
.../org/apache/spark/sql/sources/ddl.scala | 11 +++--
.../org/apache/spark/sql/hive/HiveQl.scala | 5 +-
.../execution/HiveOperatorQueryableSuite.scala | 51 ++++++++++++++++++++
.../sql/hive/execution/HiveQuerySuite.scala | 2 +-
4 files changed, 61 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/0fc35daf/sql/core/src/main/scala/org/apache/spark/sql/sources/ddl.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/sources/ddl.scala
b/sql/core/src/main/scala/org/apache/spark/sql/sources/ddl.scala
index 9c37e01..a692ef5 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/sources/ddl.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/sources/ddl.scala
@@ -296,11 +296,14 @@ private[sql] case class ResolvedDataSource(provider:
Class[_], relation: BaseRel
private[sql] case class DescribeCommand(
table: LogicalPlan,
isExtended: Boolean) extends Command {
- override def output = Seq(
+ override val output = Seq(
// Column names are based on Hive.
- AttributeReference("col_name", StringType, nullable = false)(),
- AttributeReference("data_type", StringType, nullable = false)(),
- AttributeReference("comment", StringType, nullable = false)())
+ AttributeReference("col_name", StringType, nullable = false,
+ new MetadataBuilder().putString("comment", "name of the
column").build())(),
+ AttributeReference("data_type", StringType, nullable = false,
+ new MetadataBuilder().putString("comment", "data type of the
column").build())(),
+ AttributeReference("comment", StringType, nullable = false,
+ new MetadataBuilder().putString("comment", "comment of the
column").build())())
}
private[sql] case class CreateTableUsing(
http://git-wip-us.apache.org/repos/asf/spark/blob/0fc35daf/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 be63aa1..4b7fa06 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
@@ -497,15 +497,14 @@
https://cwiki.apache.org/confluence/display/Hive/Enhanced+Aggregation%2C+Cube%2C
// TODO: Actually, a user may mean tableName.columnName. Need
to resolve this issue.
val tableIdent = extractTableIdent(nameParts.head)
DescribeCommand(
- UnresolvedRelation(tableIdent, None), extended.isDefined)
+ UnresolvedRelation(tableIdent, None), isExtended =
extended.isDefined)
case Token(".", dbName :: tableName :: colName :: Nil) =>
// It is describing a column with the format like "describe
db.table column".
NativePlaceholder
case tableName =>
// It is describing a table with the format like "describe
table".
DescribeCommand(
- UnresolvedRelation(Seq(tableName.getText), None),
- extended.isDefined)
+ UnresolvedRelation(Seq(tableName.getText), None), isExtended
= extended.isDefined)
}
}
// All other cases.
http://git-wip-us.apache.org/repos/asf/spark/blob/0fc35daf/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveOperatorQueryableSuite.scala
----------------------------------------------------------------------
diff --git
a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveOperatorQueryableSuite.scala
b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveOperatorQueryableSuite.scala
new file mode 100644
index 0000000..efbef68
--- /dev/null
+++
b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveOperatorQueryableSuite.scala
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.hive.execution
+
+import org.apache.spark.sql.{Row, QueryTest}
+import org.apache.spark.sql.hive.test.TestHive._
+
+/**
+ * A set of tests that validates commands can also be queried by like a table
+ */
+class HiveOperatorQueryableSuite extends QueryTest {
+ test("SPARK-5324 query result of describe command") {
+ loadTestTable("src")
+
+ // register a describe command to be a temp table
+ sql("desc src").registerTempTable("mydesc")
+ checkAnswer(
+ sql("desc mydesc"),
+ Seq(
+ Row("col_name", "string", "name of the column"),
+ Row("data_type", "string", "data type of the column"),
+ Row("comment", "string", "comment of the column")))
+
+ checkAnswer(
+ sql("select * from mydesc"),
+ Seq(
+ Row("key", "int", null),
+ Row("value", "string", null)))
+
+ checkAnswer(
+ sql("select col_name, data_type, comment from mydesc"),
+ Seq(
+ Row("key", "int", null),
+ Row("value", "string", null)))
+ }
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/0fc35daf/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
----------------------------------------------------------------------
diff --git
a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
index d16a1e0..27047ce 100644
---
a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
+++
b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
@@ -59,7 +59,7 @@ class HiveQuerySuite extends HiveComparisonTest with
BeforeAndAfter {
Locale.setDefault(originalLocale)
}
- test("SPARK-4908: concurent hive native commands") {
+ test("SPARK-4908: concurrent hive native commands") {
(1 to 100).par.map { _ =>
sql("USE default")
sql("SHOW TABLES")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
