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/02 12:05:59 UTC
[hive] branch master updated: HIVE-23315 Remove empty line from the
end of SHOW EXTENDED TABLES and SHOW MATERIALIZED VIEWS (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 5c675ac HIVE-23315 Remove empty line from the end of SHOW EXTENDED TABLES and SHOW MATERIALIZED VIEWS (Miklos Gergely, reviewed by Zoltan Haindrich)
5c675ac is described below
commit 5c675acea490ed6d907d516a647b66fb7d77d1c9
Author: miklosgergely <mg...@cloudera.com>
AuthorDate: Sun Feb 23 18:22:52 2020 +0100
HIVE-23315 Remove empty line from the end of SHOW EXTENDED TABLES and SHOW MATERIALIZED VIEWS (Miklos Gergely, reviewed by Zoltan Haindrich)
---
.../hive/ql/metadata/formatting/TextMetaDataFormatter.java | 2 --
.../results/clientpositive/llap/show_materialized_views.q.out | 10 ----------
ql/src/test/results/clientpositive/llap/show_tables.q.out | 3 ---
3 files changed, 15 deletions(-)
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java
index 4700573..d64ae44 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java
@@ -149,7 +149,6 @@ class TextMetaDataFormatter implements MetaDataFormatter {
// In case the query is served by HiveServer2, don't pad it with spaces,
// as HiveServer2 output is consumed by JDBC/ODBC clients.
out.write(mdt.renderTable(!SessionState.get().isHiveServerQuery()).getBytes("UTF-8"));
- out.write(terminator);
} catch (IOException e) {
throw new HiveException(e);
}
@@ -198,7 +197,6 @@ class TextMetaDataFormatter implements MetaDataFormatter {
// In case the query is served by HiveServer2, don't pad it with spaces,
// as HiveServer2 output is consumed by JDBC/ODBC clients.
out.write(mdt.renderTable(!SessionState.get().isHiveServerQuery()).getBytes("UTF-8"));
- out.write(terminator);
} catch (IOException e) {
throw new HiveException(e);
}
diff --git a/ql/src/test/results/clientpositive/llap/show_materialized_views.q.out b/ql/src/test/results/clientpositive/llap/show_materialized_views.q.out
index 57bd93b..d377f97 100644
--- a/ql/src/test/results/clientpositive/llap/show_materialized_views.q.out
+++ b/ql/src/test/results/clientpositive/llap/show_materialized_views.q.out
@@ -149,7 +149,6 @@ POSTHOOK: type: SHOWMATERIALIZEDVIEWS
shtb_full_view2 Yes Manual refresh (Valid for 5min)
shtb_test1_view1 No Manual refresh
shtb_test1_view2 Yes Manual refresh (Valid always)
-
PREHOOK: query: EXPLAIN SHOW MATERIALIZED VIEWS '*test*'
PREHOOK: type: SHOWMATERIALIZEDVIEWS
POSTHOOK: query: EXPLAIN SHOW MATERIALIZED VIEWS '*test*'
@@ -177,7 +176,6 @@ POSTHOOK: type: SHOWMATERIALIZEDVIEWS
# MV Name Rewriting Enabled Mode
shtb_test1_view1 No Manual refresh
shtb_test1_view2 Yes Manual refresh (Valid always)
-
PREHOOK: query: SHOW MATERIALIZED VIEWS '*view2'
PREHOOK: type: SHOWMATERIALIZEDVIEWS
POSTHOOK: query: SHOW MATERIALIZED VIEWS '*view2'
@@ -185,7 +183,6 @@ POSTHOOK: type: SHOWMATERIALIZEDVIEWS
# MV Name Rewriting Enabled Mode
shtb_full_view2 Yes Manual refresh (Valid for 5min)
shtb_test1_view2 Yes Manual refresh (Valid always)
-
PREHOOK: query: EXPLAIN SHOW MATERIALIZED VIEWS LIKE 'shtb_test1_view1|shtb_test1_view2'
PREHOOK: type: SHOWMATERIALIZEDVIEWS
POSTHOOK: query: EXPLAIN SHOW MATERIALIZED VIEWS LIKE 'shtb_test1_view1|shtb_test1_view2'
@@ -213,7 +210,6 @@ POSTHOOK: type: SHOWMATERIALIZEDVIEWS
# MV Name Rewriting Enabled Mode
shtb_test1_view1 No Manual refresh
shtb_test1_view2 Yes Manual refresh (Valid always)
-
PREHOOK: query: USE test2
PREHOOK: type: SWITCHDATABASE
PREHOOK: Input: database:test2
@@ -227,7 +223,6 @@ POSTHOOK: type: SHOWMATERIALIZEDVIEWS
# MV Name Rewriting Enabled Mode
shtb_test1_view1 No Manual refresh
shtb_test2_view2 No Manual refresh
-
PREHOOK: query: USE default
PREHOOK: type: SWITCHDATABASE
PREHOOK: Input: database:default
@@ -261,7 +256,6 @@ POSTHOOK: type: SHOWMATERIALIZEDVIEWS
shtb_full_view2 Yes Manual refresh (Valid for 5min)
shtb_test1_view1 No Manual refresh
shtb_test1_view2 Yes Manual refresh (Valid always)
-
PREHOOK: query: SHOW MATERIALIZED VIEWS FROM test2
PREHOOK: type: SHOWMATERIALIZEDVIEWS
POSTHOOK: query: SHOW MATERIALIZED VIEWS FROM test2
@@ -269,7 +263,6 @@ POSTHOOK: type: SHOWMATERIALIZEDVIEWS
# MV Name Rewriting Enabled Mode
shtb_test1_view1 No Manual refresh
shtb_test2_view2 No Manual refresh
-
PREHOOK: query: EXPLAIN SHOW MATERIALIZED VIEWS IN test1
PREHOOK: type: SHOWMATERIALIZEDVIEWS
POSTHOOK: query: EXPLAIN SHOW MATERIALIZED VIEWS IN test1
@@ -297,7 +290,6 @@ POSTHOOK: type: SHOWMATERIALIZEDVIEWS
shtb_full_view2 Yes Manual refresh (Valid for 5min)
shtb_test1_view1 No Manual refresh
shtb_test1_view2 Yes Manual refresh (Valid always)
-
PREHOOK: query: SHOW MATERIALIZED VIEWS IN default
PREHOOK: type: SHOWMATERIALIZEDVIEWS
POSTHOOK: query: SHOW MATERIALIZED VIEWS IN default
@@ -329,7 +321,6 @@ POSTHOOK: type: SHOWMATERIALIZEDVIEWS
# MV Name Rewriting Enabled Mode
shtb_test1_view1 No Manual refresh
shtb_test1_view2 Yes Manual refresh (Valid always)
-
PREHOOK: query: DESCRIBE FORMATTED test1.shtb_full_view2
PREHOOK: type: DESCTABLE
PREHOOK: Input: test1@shtb_full_view2
@@ -504,7 +495,6 @@ POSTHOOK: query: SHOW MATERIALIZED VIEWS FROM `database` LIKE "fooview"
POSTHOOK: type: SHOWMATERIALIZEDVIEWS
# MV Name Rewriting Enabled Mode
fooview Yes Manual refresh (Valid until source tables modified)
-
PREHOOK: query: DESCRIBE FORMATTED `database`.`fooview`
PREHOOK: type: DESCTABLE
PREHOOK: Input: database@fooview
diff --git a/ql/src/test/results/clientpositive/llap/show_tables.q.out b/ql/src/test/results/clientpositive/llap/show_tables.q.out
index 342ebd4..ade1690 100644
--- a/ql/src/test/results/clientpositive/llap/show_tables.q.out
+++ b/ql/src/test/results/clientpositive/llap/show_tables.q.out
@@ -195,7 +195,6 @@ bar_n0 MANAGED_TABLE
baz MANAGED_TABLE
foo_n4 MANAGED_TABLE
test_view_n100 VIRTUAL_VIEW
-
PREHOOK: query: EXPLAIN SHOW TABLES IN test_db
PREHOOK: type: SHOWTABLES
PREHOOK: Input: database:test_db
@@ -260,7 +259,6 @@ bar_n0 MANAGED_TABLE
baz MANAGED_TABLE
foo_n4 MANAGED_TABLE
test_view_n100 VIRTUAL_VIEW
-
PREHOOK: query: EXPLAIN SHOW TABLES IN test_db "test*"
PREHOOK: type: SHOWTABLES
PREHOOK: Input: database:test_db
@@ -380,7 +378,6 @@ POSTHOOK: type: SHOWTABLES
POSTHOOK: Input: database:test_db
# Table Name Table Type
test_view_n100 VIRTUAL_VIEW
-
PREHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE foo_n4
PREHOOK: type: SHOW_TABLESTATUS
POSTHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE foo_n4