You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by mg...@apache.org on 2020/05/21 13:17:37 UTC
[hive] branch master updated: HIVE-23508 Do not show parameters
column for non-extended desc database (Miklos Gergely,
reviewed by Zoltan Haindrich)
This is an automated email from the ASF dual-hosted git repository.
mgergely pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new fb7d52e HIVE-23508 Do not show parameters column for non-extended desc database (Miklos Gergely, reviewed by Zoltan Haindrich)
fb7d52e is described below
commit fb7d52ec577daef859722eab551463ad10f981aa
Author: miklosgergely <mg...@cloudera.com>
AuthorDate: Tue May 19 17:34:00 2020 +0200
HIVE-23508 Do not show parameters column for non-extended desc database (Miklos Gergely, reviewed by Zoltan Haindrich)
---
.../ql/ddl/database/desc/DescDatabaseAnalyzer.java | 2 +-
.../ql/ddl/database/desc/DescDatabaseDesc.java | 19 +++++--
.../ddl/database/desc/DescDatabaseOperation.java | 2 +-
.../queries/clientpositive/describe_database.q | 14 +++--
.../clientpositive/beeline/escape_comments.q.out | 2 +-
.../clientpositive/llap/alter_db_owner.q.out | 6 +-
.../llap/authorization_owner_actions_db.q.out | 2 +-
.../clientpositive/llap/database_properties.q.out | 2 +-
.../clientpositive/llap/db_ddl_explain.q.out | 2 +-
.../clientpositive/llap/describe_database.q.out | 66 +++++++++++++++++++---
.../clientpositive/tez/explainanalyze_3.q.out | 2 +-
.../results/clientpositive/tez/explainuser_3.q.out | 2 +-
12 files changed, 93 insertions(+), 28 deletions(-)
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/desc/DescDatabaseAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/desc/DescDatabaseAnalyzer.java
index b460811..6b4860b 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/desc/DescDatabaseAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/desc/DescDatabaseAnalyzer.java
@@ -56,6 +56,6 @@ public class DescDatabaseAnalyzer extends BaseSemanticAnalyzer {
rootTasks.add(task);
task.setFetchSource(true);
- setFetchTask(createFetchTask(DescDatabaseDesc.DESC_DATABASE_SCHEMA));
+ setFetchTask(createFetchTask(desc.getSchema()));
}
}
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/desc/DescDatabaseDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/desc/DescDatabaseDesc.java
index b92ed21..09751ee 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/desc/DescDatabaseDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/desc/DescDatabaseDesc.java
@@ -33,21 +33,26 @@ public class DescDatabaseDesc implements DDLDesc, Serializable {
private static final long serialVersionUID = 1L;
public static final String DESC_DATABASE_SCHEMA =
+ "db_name,comment,location,managedLocation,owner_name,owner_type#string:string:string:string:string:string";
+
+ public static final String DESC_DATABASE_SCHEMA_EXTENDED =
"db_name,comment,location,managedLocation,owner_name,owner_type,parameters#" +
"string:string:string:string:string:string:string";
private final String resFile;
private final String dbName;
- private final boolean isExt;
+ private final boolean isExtended;
- public DescDatabaseDesc(Path resFile, String dbName, boolean isExt) {
+ public DescDatabaseDesc(Path resFile, String dbName, boolean isExtended) {
this.resFile = resFile.toString();
this.dbName = dbName;
- this.isExt = isExt;
+ this.isExtended = isExtended;
}
- public boolean isExt() {
- return isExt;
+ @Explain(displayName = "extended", displayOnlyOnTrue=true,
+ explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
+ public boolean isExtended() {
+ return isExtended;
}
@Explain(displayName = "database", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
@@ -59,4 +64,8 @@ public class DescDatabaseDesc implements DDLDesc, Serializable {
public String getResFile() {
return resFile;
}
+
+ public String getSchema() {
+ return isExtended ? DESC_DATABASE_SCHEMA_EXTENDED : DESC_DATABASE_SCHEMA;
+ }
}
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/desc/DescDatabaseOperation.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/desc/DescDatabaseOperation.java
index 406397d..52b7eb9 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/desc/DescDatabaseOperation.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/desc/DescDatabaseOperation.java
@@ -48,7 +48,7 @@ public class DescDatabaseOperation extends DDLOperation<DescDatabaseDesc> {
}
SortedMap<String, String> params = null;
- if (desc.isExt()) {
+ if (desc.isExtended()) {
params = new TreeMap<>(database.getParameters());
}
diff --git a/ql/src/test/queries/clientpositive/describe_database.q b/ql/src/test/queries/clientpositive/describe_database.q
index 961bf55..15bbca0 100644
--- a/ql/src/test/queries/clientpositive/describe_database.q
+++ b/ql/src/test/queries/clientpositive/describe_database.q
@@ -1,4 +1,10 @@
-create database test_db with dbproperties ('key1' = 'value1', 'key2' = 'value2');
-desc database extended test_db;
-desc schema extended test_db;
-drop database test_db;
+CREATE DATABASE test_db WITH dbproperties ('key1' = 'value1', 'key2' = 'value2');
+
+EXPLAIN DESC DATABASE test_db;
+DESC DATABASE test_db;
+
+EXPLAIN DESC DATABASE EXTENDED test_db;
+DESC DATABASE EXTENDED test_db;
+DESC SCHEMA EXTENDED test_db;
+
+DROP DATABASE test_db;
diff --git a/ql/src/test/results/clientpositive/beeline/escape_comments.q.out b/ql/src/test/results/clientpositive/beeline/escape_comments.q.out
index bc0c88c..64b13f0 100644
--- a/ql/src/test/results/clientpositive/beeline/escape_comments.q.out
+++ b/ql/src/test/results/clientpositive/beeline/escape_comments.q.out
@@ -49,7 +49,7 @@ PREHOOK: Input: database:escape_comments_db
POSTHOOK: query: describe database escape_comments_db
POSTHOOK: type: DESCDATABASE
POSTHOOK: Input: database:escape_comments_db
-escape_comments_db a\nb location/in/test user USER
+escape_comments_db a\nb location/in/test user USER
PREHOOK: query: show create table escape_comments_tbl1
PREHOOK: type: SHOW_CREATETABLE
PREHOOK: Input: escape_comments_db@escape_comments_tbl1
diff --git a/ql/src/test/results/clientpositive/llap/alter_db_owner.q.out b/ql/src/test/results/clientpositive/llap/alter_db_owner.q.out
index a6118f2..e7434ba 100644
--- a/ql/src/test/results/clientpositive/llap/alter_db_owner.q.out
+++ b/ql/src/test/results/clientpositive/llap/alter_db_owner.q.out
@@ -10,7 +10,7 @@ PREHOOK: Input: database:db_alter_onr
POSTHOOK: query: describe database db_alter_onr
POSTHOOK: type: DESCDATABASE
POSTHOOK: Input: database:db_alter_onr
-db_alter_onr location/in/test hive_test_user USER
+db_alter_onr location/in/test hive_test_user USER
#### A masked pattern was here ####
PREHOOK: type: ALTERDATABASE_OWNER
PREHOOK: Output: database:db_alter_onr
@@ -40,7 +40,7 @@ PREHOOK: Input: database:db_alter_onr
POSTHOOK: query: describe database db_alter_onr
POSTHOOK: type: DESCDATABASE
POSTHOOK: Input: database:db_alter_onr
-db_alter_onr location/in/test user1 USER
+db_alter_onr location/in/test user1 USER
#### A masked pattern was here ####
PREHOOK: type: ALTERDATABASE_OWNER
PREHOOK: Output: database:db_alter_onr
@@ -53,4 +53,4 @@ PREHOOK: Input: database:db_alter_onr
POSTHOOK: query: describe database db_alter_onr
POSTHOOK: type: DESCDATABASE
POSTHOOK: Input: database:db_alter_onr
-db_alter_onr location/in/test role1 ROLE
+db_alter_onr location/in/test role1 ROLE
diff --git a/ql/src/test/results/clientpositive/llap/authorization_owner_actions_db.q.out b/ql/src/test/results/clientpositive/llap/authorization_owner_actions_db.q.out
index bc48051..0267f86 100644
--- a/ql/src/test/results/clientpositive/llap/authorization_owner_actions_db.q.out
+++ b/ql/src/test/results/clientpositive/llap/authorization_owner_actions_db.q.out
@@ -28,7 +28,7 @@ PREHOOK: Input: database:testdb
POSTHOOK: query: desc database testdb
POSTHOOK: type: DESCDATABASE
POSTHOOK: Input: database:testdb
-testdb location/in/test testrole ROLE
+testdb location/in/test testrole ROLE
PREHOOK: query: use testdb
PREHOOK: type: SWITCHDATABASE
PREHOOK: Input: database:testdb
diff --git a/ql/src/test/results/clientpositive/llap/database_properties.q.out b/ql/src/test/results/clientpositive/llap/database_properties.q.out
index 5b0c857..2febbd8 100644
--- a/ql/src/test/results/clientpositive/llap/database_properties.q.out
+++ b/ql/src/test/results/clientpositive/llap/database_properties.q.out
@@ -28,7 +28,7 @@ PREHOOK: Input: database:db2
POSTHOOK: query: describe database db2
POSTHOOK: type: DESCDATABASE
POSTHOOK: Input: database:db2
-db2 location/in/test hive_test_user USER
+db2 location/in/test hive_test_user USER
PREHOOK: query: describe database extended db2
PREHOOK: type: DESCDATABASE
PREHOOK: Input: database:db2
diff --git a/ql/src/test/results/clientpositive/llap/db_ddl_explain.q.out b/ql/src/test/results/clientpositive/llap/db_ddl_explain.q.out
index ae8982c..955dbf6 100644
--- a/ql/src/test/results/clientpositive/llap/db_ddl_explain.q.out
+++ b/ql/src/test/results/clientpositive/llap/db_ddl_explain.q.out
@@ -69,7 +69,7 @@ PREHOOK: Input: database:d
POSTHOOK: query: DESCRIBE DATABASE d
POSTHOOK: type: DESCDATABASE
POSTHOOK: Input: database:d
-d location/in/test hive_test_user USER
+d location/in/test hive_test_user USER
PREHOOK: query: EXPLAIN ALTER DATABASE d SET dbproperties('test'='yesthisis')
PREHOOK: type: ALTERDATABASE
PREHOOK: Output: database:d
diff --git a/ql/src/test/results/clientpositive/llap/describe_database.q.out b/ql/src/test/results/clientpositive/llap/describe_database.q.out
index 8d1e44a..6ceea5d 100644
--- a/ql/src/test/results/clientpositive/llap/describe_database.q.out
+++ b/ql/src/test/results/clientpositive/llap/describe_database.q.out
@@ -1,28 +1,78 @@
-PREHOOK: query: create database test_db with dbproperties ('key1' = 'value1', 'key2' = 'value2')
+PREHOOK: query: CREATE DATABASE test_db WITH dbproperties ('key1' = 'value1', 'key2' = 'value2')
PREHOOK: type: CREATEDATABASE
PREHOOK: Output: database:test_db
-POSTHOOK: query: create database test_db with dbproperties ('key1' = 'value1', 'key2' = 'value2')
+POSTHOOK: query: CREATE DATABASE test_db WITH dbproperties ('key1' = 'value1', 'key2' = 'value2')
POSTHOOK: type: CREATEDATABASE
POSTHOOK: Output: database:test_db
-PREHOOK: query: desc database extended test_db
+PREHOOK: query: EXPLAIN DESC DATABASE test_db
PREHOOK: type: DESCDATABASE
PREHOOK: Input: database:test_db
-POSTHOOK: query: desc database extended test_db
+POSTHOOK: query: EXPLAIN DESC DATABASE test_db
+POSTHOOK: type: DESCDATABASE
+POSTHOOK: Input: database:test_db
+STAGE DEPENDENCIES:
+ Stage-0 is a root stage
+ Stage-1 depends on stages: Stage-0
+
+STAGE PLANS:
+ Stage: Stage-0
+ Describe Database
+ database: test_db
+
+ Stage: Stage-1
+ Fetch Operator
+ limit: -1
+ Processor Tree:
+ ListSink
+
+PREHOOK: query: DESC DATABASE test_db
+PREHOOK: type: DESCDATABASE
+PREHOOK: Input: database:test_db
+POSTHOOK: query: DESC DATABASE test_db
+POSTHOOK: type: DESCDATABASE
+POSTHOOK: Input: database:test_db
+test_db location/in/test hive_test_user USER
+PREHOOK: query: EXPLAIN DESC DATABASE EXTENDED test_db
+PREHOOK: type: DESCDATABASE
+PREHOOK: Input: database:test_db
+POSTHOOK: query: EXPLAIN DESC DATABASE EXTENDED test_db
+POSTHOOK: type: DESCDATABASE
+POSTHOOK: Input: database:test_db
+STAGE DEPENDENCIES:
+ Stage-0 is a root stage
+ Stage-1 depends on stages: Stage-0
+
+STAGE PLANS:
+ Stage: Stage-0
+ Describe Database
+ database: test_db
+ extended: true
+
+ Stage: Stage-1
+ Fetch Operator
+ limit: -1
+ Processor Tree:
+ ListSink
+
+PREHOOK: query: DESC DATABASE EXTENDED test_db
+PREHOOK: type: DESCDATABASE
+PREHOOK: Input: database:test_db
+POSTHOOK: query: DESC DATABASE EXTENDED test_db
POSTHOOK: type: DESCDATABASE
POSTHOOK: Input: database:test_db
test_db location/in/test hive_test_user USER {key1=value1, key2=value2}
-PREHOOK: query: desc schema extended test_db
+PREHOOK: query: DESC SCHEMA EXTENDED test_db
PREHOOK: type: DESCDATABASE
PREHOOK: Input: database:test_db
-POSTHOOK: query: desc schema extended test_db
+POSTHOOK: query: DESC SCHEMA EXTENDED test_db
POSTHOOK: type: DESCDATABASE
POSTHOOK: Input: database:test_db
test_db location/in/test hive_test_user USER {key1=value1, key2=value2}
-PREHOOK: query: drop database test_db
+PREHOOK: query: DROP DATABASE test_db
PREHOOK: type: DROPDATABASE
PREHOOK: Input: database:test_db
PREHOOK: Output: database:test_db
-POSTHOOK: query: drop database test_db
+POSTHOOK: query: DROP DATABASE test_db
POSTHOOK: type: DROPDATABASE
POSTHOOK: Input: database:test_db
POSTHOOK: Output: database:test_db
diff --git a/ql/src/test/results/clientpositive/tez/explainanalyze_3.q.out b/ql/src/test/results/clientpositive/tez/explainanalyze_3.q.out
index dad999a..5af43de 100644
--- a/ql/src/test/results/clientpositive/tez/explainanalyze_3.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainanalyze_3.q.out
@@ -119,7 +119,7 @@ Stage-1
Fetch Operator
limit:-1
Stage-0
- Describe Database{"database:":"newDB"}
+ Describe Database{"database:":"newDB","extended:":"true"}
PREHOOK: query: describe database extended newDB
PREHOOK: type: DESCDATABASE
diff --git a/ql/src/test/results/clientpositive/tez/explainuser_3.q.out b/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
index 5218c90..d886a26 100644
--- a/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
@@ -137,7 +137,7 @@ Stage-1
Fetch Operator
limit:-1
Stage-0
- Describe Database{"database:":"newDB"}
+ Describe Database{"database:":"newDB","extended:":"true"}
PREHOOK: query: describe database extended newDB
PREHOOK: type: DESCDATABASE