You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by sz...@apache.org on 2014/11/18 20:24:11 UTC
svn commit: r1640412 - in /hive/trunk/ql/src:
java/org/apache/hadoop/hive/ql/ java/org/apache/hadoop/hive/ql/parse/
test/queries/clientpositive/ test/results/clientpositive/
Author: szehon
Date: Tue Nov 18 19:24:10 2014
New Revision: 1640412
URL: http://svn.apache.org/r1640412
Log:
HIVE-8803 : DESC SCHEMA <DATABASE-NAME> is not working (Navis via Szehon)
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
hive/trunk/ql/src/test/queries/clientpositive/describe_database.q
hive/trunk/ql/src/test/queries/clientpositive/describe_database_json.q
hive/trunk/ql/src/test/results/clientpositive/describe_database.q.out
hive/trunk/ql/src/test/results/clientpositive/describe_database_json.q.out
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/Driver.java?rev=1640412&r1=1640411&r2=1640412&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/Driver.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/Driver.java Tue Nov 18 19:24:10 2014
@@ -520,8 +520,8 @@ public class Driver implements CommandPr
ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintStream ps = new PrintStream(baos);
try {
- task.getJSONPlan(ps, astStringTree, sem.getRootTasks(), sem.getFetchTask(),
- false, true, true);
+ List<Task<?>> rootTasks = sem.getRootTasks();
+ task.getJSONPlan(ps, astStringTree, rootTasks, sem.getFetchTask(), false, true, true);
ret = baos.toString();
} catch (Exception e) {
LOG.warn("Exception generating explain output: " + e, e);
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g?rev=1640412&r1=1640411&r2=1640412&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g Tue Nov 18 19:24:10 2014
@@ -1316,9 +1316,9 @@ descPartTypeExpr
descStatement
@init { pushMsg("describe statement", state); }
@after { popMsg(state); }
- : (KW_DESCRIBE|KW_DESC) (descOptions=KW_FORMATTED|descOptions=KW_EXTENDED|descOptions=KW_PRETTY)? (parttype=descPartTypeExpr) -> ^(TOK_DESCTABLE $parttype $descOptions?)
+ : (KW_DESCRIBE|KW_DESC) (KW_DATABASE|KW_SCHEMA) KW_EXTENDED? (dbName=identifier) -> ^(TOK_DESCDATABASE $dbName KW_EXTENDED?)
+ | (KW_DESCRIBE|KW_DESC) (descOptions=KW_FORMATTED|descOptions=KW_EXTENDED|descOptions=KW_PRETTY)? (parttype=descPartTypeExpr) -> ^(TOK_DESCTABLE $parttype $descOptions?)
| (KW_DESCRIBE|KW_DESC) KW_FUNCTION KW_EXTENDED? (name=descFuncNames) -> ^(TOK_DESCFUNCTION $name KW_EXTENDED?)
- | (KW_DESCRIBE|KW_DESC) (KW_DATABASE|KW_SCHEMA) KW_EXTENDED? (dbName=identifier) -> ^(TOK_DESCDATABASE $dbName KW_EXTENDED?)
;
Modified: hive/trunk/ql/src/test/queries/clientpositive/describe_database.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/describe_database.q?rev=1640412&r1=1640411&r2=1640412&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/describe_database.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/describe_database.q Tue Nov 18 19:24:10 2014
@@ -1,3 +1,4 @@
create database test_db with dbproperties ('key1' = 'value1', 'key2' = 'value2');
desc database extended test_db;
+desc schema extended test_db;
drop database test_db;
Modified: hive/trunk/ql/src/test/queries/clientpositive/describe_database_json.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/describe_database_json.q?rev=1640412&r1=1640411&r2=1640412&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/describe_database_json.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/describe_database_json.q Tue Nov 18 19:24:10 2014
@@ -6,6 +6,10 @@ DESCRIBE DATABASE jsondb1;
DESCRIBE DATABASE EXTENDED jsondb1;
+DESCRIBE SCHEMA jsondb1;
+
+DESCRIBE SCHEMA EXTENDED jsondb1;
+
SHOW DATABASES;
SHOW DATABASES LIKE 'json*';
Modified: hive/trunk/ql/src/test/results/clientpositive/describe_database.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/describe_database.q.out?rev=1640412&r1=1640411&r2=1640412&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/describe_database.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/describe_database.q.out Tue Nov 18 19:24:10 2014
@@ -9,6 +9,11 @@ PREHOOK: type: DESCDATABASE
POSTHOOK: query: desc database extended test_db
POSTHOOK: type: DESCDATABASE
test_db location/in/test hive_test_user USER {key2=value2, key1=value1}
+PREHOOK: query: desc schema extended test_db
+PREHOOK: type: DESCDATABASE
+POSTHOOK: query: desc schema extended test_db
+POSTHOOK: type: DESCDATABASE
+test_db location/in/test hive_test_user USER {key2=value2, key1=value1}
PREHOOK: query: drop database test_db
PREHOOK: type: DROPDATABASE
PREHOOK: Input: database:test_db
Modified: hive/trunk/ql/src/test/results/clientpositive/describe_database_json.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/describe_database_json.q.out?rev=1640412&r1=1640411&r2=1640412&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/describe_database_json.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/describe_database_json.q.out Tue Nov 18 19:24:10 2014
@@ -15,6 +15,16 @@ PREHOOK: type: DESCDATABASE
POSTHOOK: query: DESCRIBE DATABASE EXTENDED jsondb1
POSTHOOK: type: DESCDATABASE
#### A masked pattern was here ####
+PREHOOK: query: DESCRIBE SCHEMA jsondb1
+PREHOOK: type: DESCDATABASE
+POSTHOOK: query: DESCRIBE SCHEMA jsondb1
+POSTHOOK: type: DESCDATABASE
+#### A masked pattern was here ####
+PREHOOK: query: DESCRIBE SCHEMA EXTENDED jsondb1
+PREHOOK: type: DESCDATABASE
+POSTHOOK: query: DESCRIBE SCHEMA EXTENDED jsondb1
+POSTHOOK: type: DESCDATABASE
+#### A masked pattern was here ####
PREHOOK: query: SHOW DATABASES
PREHOOK: type: SHOWDATABASES
POSTHOOK: query: SHOW DATABASES