You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by kg...@apache.org on 2017/10/06 09:42:54 UTC
[01/21] hive git commit: HIVE-17519: Transpose column stats display
(Zoltan Haindrich, reviewed by Ashutosh Chauhan and Vineet Garg)
Repository: hive
Updated Branches:
refs/heads/master 2902c7cc2 -> 4cc0771d1
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/statsfs.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/statsfs.q.out b/ql/src/test/results/clientpositive/statsfs.q.out
index d070e9a..fef2040 100644
--- a/ql/src/test/results/clientpositive/statsfs.q.out
+++ b/ql/src/test/results/clientpositive/statsfs.q.out
@@ -47,13 +47,11 @@ POSTHOOK: query: describe formatted t1 partition (ds='2010')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -86,13 +84,11 @@ POSTHOOK: query: describe formatted t1 partition (ds='2011')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -161,13 +157,11 @@ POSTHOOK: query: describe formatted t1 partition (ds='2010')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -200,13 +194,11 @@ POSTHOOK: query: describe formatted t1 partition (ds='2011')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -271,7 +263,6 @@ POSTHOOK: query: describe formatted t1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t1
# col_name data_type comment
-
key string
value string
@@ -332,7 +323,6 @@ POSTHOOK: query: describe formatted t1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t1
# col_name data_type comment
-
key string
value string
@@ -410,13 +400,11 @@ POSTHOOK: query: describe formatted t1 partition (ds='2008-04-08',hr='11')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -450,13 +438,11 @@ POSTHOOK: query: describe formatted t1 partition (ds='2008-04-09',hr='12')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out b/ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out
index 1abe95d..1fb4842 100644
--- a/ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out
+++ b/ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out
@@ -55,9 +55,18 @@ PREHOOK: Input: default@uservisits_web_text_none
POSTHOOK: query: desc formatted UserVisits_web_text_none sourceIP
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-sourceIP string from deserializer
+col_name sourceIP
+data_type string
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
PREHOOK: query: explain
analyze table UserVisits_web_text_none compute statistics for columns sourceIP, avgTimeOnSite, adRevenue
PREHOOK: type: QUERY
@@ -242,27 +251,54 @@ PREHOOK: Input: default@uservisits_web_text_none
POSTHOOK: query: desc formatted UserVisits_web_text_none sourceIP
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-sourceIP string 0 55 12.763636363636364 13 HL from deserializer
+col_name sourceIP
+data_type string
+min
+max
+num_nulls 0
+distinct_count 55
+avg_col_len 12.763636363636364
+max_col_len 13
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: desc formatted UserVisits_web_text_none avgTimeOnSite
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@uservisits_web_text_none
POSTHOOK: query: desc formatted UserVisits_web_text_none avgTimeOnSite
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-avgTimeOnSite int 1 9 0 9 HL from deserializer
+col_name avgTimeOnSite
+data_type int
+min 1
+max 9
+num_nulls 0
+distinct_count 9
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: desc formatted UserVisits_web_text_none adRevenue
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@uservisits_web_text_none
POSTHOOK: query: desc formatted UserVisits_web_text_none adRevenue
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-adRevenue float 13.099044799804688 492.98870849609375 0 55 HL from deserializer
+col_name adRevenue
+data_type float
+min 13.099044799804688
+max 492.98870849609375
+num_nulls 0
+distinct_count 55
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: CREATE TEMPORARY TABLE empty_tab(
a int,
b double,
@@ -289,9 +325,18 @@ PREHOOK: Input: default@empty_tab
POSTHOOK: query: desc formatted empty_tab a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@empty_tab
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-a int from deserializer
+col_name a
+data_type int
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\",\"d\":\"true\",\"e\":\"true\"}}
PREHOOK: query: explain
analyze table empty_tab compute statistics for columns a,b,c,d,e
@@ -358,9 +403,18 @@ PREHOOK: Input: default@empty_tab
POSTHOOK: query: desc formatted empty_tab a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@empty_tab
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-a int 0 0 0 0 from deserializer
+col_name a
+data_type int
+min 0
+max 0
+num_nulls 0
+distinct_count 0
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\",\"d\":\"true\",\"e\":\"true\"}}
PREHOOK: query: desc formatted empty_tab b
PREHOOK: type: DESCTABLE
@@ -368,9 +422,18 @@ PREHOOK: Input: default@empty_tab
POSTHOOK: query: desc formatted empty_tab b
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@empty_tab
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-b double 0.0 0.0 0 0 from deserializer
+col_name b
+data_type double
+min 0.0
+max 0.0
+num_nulls 0
+distinct_count 0
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\",\"d\":\"true\",\"e\":\"true\"}}
PREHOOK: query: CREATE DATABASE test
PREHOOK: type: CREATEDATABASE
@@ -447,27 +510,54 @@ PREHOOK: Input: test@uservisits_web_text_none
POSTHOOK: query: desc formatted UserVisits_web_text_none sourceIP
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: test@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-sourceIP string from deserializer
+col_name sourceIP
+data_type string
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
PREHOOK: query: desc formatted test.UserVisits_web_text_none sourceIP
PREHOOK: type: DESCTABLE
PREHOOK: Input: test@uservisits_web_text_none
POSTHOOK: query: desc formatted test.UserVisits_web_text_none sourceIP
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: test@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-sourceIP string from deserializer
+col_name sourceIP
+data_type string
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
PREHOOK: query: desc formatted default.UserVisits_web_text_none sourceIP
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@uservisits_web_text_none
POSTHOOK: query: desc formatted default.UserVisits_web_text_none sourceIP
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-sourceIP string 0 55 12.763636363636364 13 HL from deserializer
+col_name sourceIP
+data_type string
+min
+max
+num_nulls 0
+distinct_count 55
+avg_col_len 12.763636363636364
+max_col_len 13
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: analyze table UserVisits_web_text_none compute statistics for columns sKeyword
PREHOOK: type: QUERY
PREHOOK: Input: test@uservisits_web_text_none
@@ -489,15 +579,33 @@ PREHOOK: Input: test@uservisits_web_text_none
POSTHOOK: query: desc formatted UserVisits_web_text_none sKeyword
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: test@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-sKeyword string 0 54 7.872727272727273 19 HL from deserializer
+col_name sKeyword
+data_type string
+min
+max
+num_nulls 0
+distinct_count 54
+avg_col_len 7.872727272727273
+max_col_len 19
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: desc formatted test.UserVisits_web_text_none sKeyword
PREHOOK: type: DESCTABLE
PREHOOK: Input: test@uservisits_web_text_none
POSTHOOK: query: desc formatted test.UserVisits_web_text_none sKeyword
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: test@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-sKeyword string 0 54 7.872727272727273 19 HL from deserializer
+col_name sKeyword
+data_type string
+min
+max
+num_nulls 0
+distinct_count 54
+avg_col_len 7.872727272727273
+max_col_len 19
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out b/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out
index 7f43645..7cdc5c9 100644
--- a/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out
@@ -192,7 +192,6 @@ POSTHOOK: query: describe formatted src_multi2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_multi2
# col_name data_type comment
-
key string default
value string default
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/truncate_column.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/truncate_column.q.out b/ql/src/test/results/clientpositive/truncate_column.q.out
index cc3bc89..3a3ea8c 100644
--- a/ql/src/test/results/clientpositive/truncate_column.q.out
+++ b/ql/src/test/results/clientpositive/truncate_column.q.out
@@ -25,7 +25,6 @@ POSTHOOK: query: DESC FORMATTED test_tab
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_tab
# col_name data_type comment
-
key string
value string
@@ -86,7 +85,6 @@ POSTHOOK: query: DESC FORMATTED test_tab
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_tab
# col_name data_type comment
-
key string
value string
@@ -156,7 +154,6 @@ POSTHOOK: query: DESC FORMATTED test_tab
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_tab
# col_name data_type comment
-
key string
value string
@@ -216,7 +213,6 @@ POSTHOOK: query: DESC FORMATTED test_tab
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_tab
# col_name data_type comment
-
key string
value string
@@ -286,7 +282,6 @@ POSTHOOK: query: DESC FORMATTED test_tab
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_tab
# col_name data_type comment
-
key string
value string
@@ -348,7 +343,6 @@ POSTHOOK: query: DESC FORMATTED test_tab
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_tab
# col_name data_type comment
-
key string
value string
@@ -409,7 +403,6 @@ POSTHOOK: query: DESC FORMATTED test_tab
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_tab
# col_name data_type comment
-
key string
value string
@@ -480,13 +473,11 @@ POSTHOOK: query: DESC FORMATTED test_tab_part PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_tab_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -547,13 +538,11 @@ POSTHOOK: query: DESC FORMATTED test_tab_part PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_tab_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/tunable_ndv.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tunable_ndv.q.out b/ql/src/test/results/clientpositive/tunable_ndv.q.out
index a7839ab..ba2a0ea 100644
--- a/ql/src/test/results/clientpositive/tunable_ndv.q.out
+++ b/ql/src/test/results/clientpositive/tunable_ndv.q.out
@@ -73,27 +73,54 @@ PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d partition(year=2000) locid
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-locid int 1 2 0 2 HL from deserializer
+col_name locid
+data_type int
+min 1
+max 2
+num_nulls 0
+distinct_count 2
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_1d partition(year=2001) locid
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d partition(year=2001) locid
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-locid int 1 4 0 4 HL from deserializer
+col_name locid
+data_type int
+min 1
+max 4
+num_nulls 0
+distinct_count 4
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_1d locid
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d locid
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-locid int 1 4 0 4 HL from deserializer
+col_name locid
+data_type int
+min 1
+max 4
+num_nulls 0
+distinct_count 4
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"locid\":\"true\"}}
PREHOOK: query: describe formatted loc_orc_1d locid
PREHOOK: type: DESCTABLE
@@ -101,9 +128,18 @@ PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d locid
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-locid int 1 4 0 4 HL from deserializer
+col_name locid
+data_type int
+min 1
+max 4
+num_nulls 0
+distinct_count 4
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"locid\":\"true\"}}
PREHOOK: query: describe formatted loc_orc_1d locid
PREHOOK: type: DESCTABLE
@@ -111,9 +147,18 @@ PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d locid
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-locid int 1 4 0 4 HL from deserializer
+col_name locid
+data_type int
+min 1
+max 4
+num_nulls 0
+distinct_count 4
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"locid\":\"true\"}}
PREHOOK: query: create table if not exists loc_orc_2d (
state string,
@@ -194,9 +239,18 @@ PREHOOK: Input: default@loc_orc_2d
POSTHOOK: query: describe formatted loc_orc_2d locid
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_2d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-locid int 1 4 0 4 HL from deserializer
+col_name locid
+data_type int
+min 1
+max 4
+num_nulls 0
+distinct_count 4
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"locid\":\"true\"}}
PREHOOK: query: describe formatted loc_orc_2d locid
PREHOOK: type: DESCTABLE
@@ -204,9 +258,18 @@ PREHOOK: Input: default@loc_orc_2d
POSTHOOK: query: describe formatted loc_orc_2d locid
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_2d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-locid int 1 4 0 4 HL from deserializer
+col_name locid
+data_type int
+min 1
+max 4
+num_nulls 0
+distinct_count 4
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"locid\":\"true\"}}
PREHOOK: query: describe formatted loc_orc_2d locid
PREHOOK: type: DESCTABLE
@@ -214,7 +277,16 @@ PREHOOK: Input: default@loc_orc_2d
POSTHOOK: query: describe formatted loc_orc_2d locid
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_2d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-locid int 1 4 0 4 HL from deserializer
+col_name locid
+data_type int
+min 1
+max 4
+num_nulls 0
+distinct_count 4
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"locid\":\"true\"}}
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/unicode_comments.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/unicode_comments.q.out b/ql/src/test/results/clientpositive/unicode_comments.q.out
index 764ea49..9a12c55 100644
--- a/ql/src/test/results/clientpositive/unicode_comments.q.out
+++ b/ql/src/test/results/clientpositive/unicode_comments.q.out
@@ -77,12 +77,10 @@ POSTHOOK: query: describe formatted unicode_comments_tbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: unicode_comments_db@unicode_comments_tbl1
# col_name data_type comment
-
col1 string 第一列
# Partition Information
# col_name data_type comment
-
p1 string 分割
# Detailed Table Information
@@ -125,7 +123,6 @@ POSTHOOK: query: describe formatted unicode_comments_view1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: unicode_comments_db@unicode_comments_view1
# col_name data_type comment
-
col1 string 第一列
# Detailed Table Information
@@ -155,8 +152,6 @@ PREHOOK: type: SHOWINDEXES
POSTHOOK: query: show formatted index on unicode_comments_tbl1
POSTHOOK: type: SHOWINDEXES
idx_name tab_name col_names idx_tab_name idx_type comment
-
-
index2 unicode_comments_tbl1 col1 unicode_comments_db__unicode_comments_tbl1_index2__ compact 索引
PREHOOK: query: drop database unicode_comments_db cascade
PREHOOK: type: DROPDATABASE
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/unicode_notation.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/unicode_notation.q.out b/ql/src/test/results/clientpositive/unicode_notation.q.out
index f216d72..9ac938e 100644
--- a/ql/src/test/results/clientpositive/unicode_notation.q.out
+++ b/ql/src/test/results/clientpositive/unicode_notation.q.out
@@ -13,7 +13,6 @@ POSTHOOK: query: desc formatted k1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@k1
# col_name data_type comment
-
a string
# Detailed Table Information
@@ -64,7 +63,6 @@ POSTHOOK: query: desc formatted k1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@k1
# col_name data_type comment
-
a string
# Detailed Table Information
@@ -115,7 +113,6 @@ POSTHOOK: query: desc formatted k1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@k1
# col_name data_type comment
-
a string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_pos_alias.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_pos_alias.q.out b/ql/src/test/results/clientpositive/union_pos_alias.q.out
index bb161f8..65e736f 100644
--- a/ql/src/test/results/clientpositive/union_pos_alias.q.out
+++ b/ql/src/test/results/clientpositive/union_pos_alias.q.out
@@ -328,7 +328,6 @@ POSTHOOK: query: desc formatted v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@v
# col_name data_type comment
-
k string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_1.q.out b/ql/src/test/results/clientpositive/union_remove_1.q.out
index d611a64..2e1c7e3 100644
--- a/ql/src/test/results/clientpositive/union_remove_1.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_1.q.out
@@ -161,7 +161,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_10.q.out b/ql/src/test/results/clientpositive/union_remove_10.q.out
index ef78a20..cc2c234 100644
--- a/ql/src/test/results/clientpositive/union_remove_10.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_10.q.out
@@ -212,7 +212,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_11.q.out b/ql/src/test/results/clientpositive/union_remove_11.q.out
index 89194d2..b355afb 100644
--- a/ql/src/test/results/clientpositive/union_remove_11.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_11.q.out
@@ -201,7 +201,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_12.q.out b/ql/src/test/results/clientpositive/union_remove_12.q.out
index 650fb8d..c5220f3 100644
--- a/ql/src/test/results/clientpositive/union_remove_12.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_12.q.out
@@ -202,7 +202,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_13.q.out b/ql/src/test/results/clientpositive/union_remove_13.q.out
index 95acdc3..0f5fa9a 100644
--- a/ql/src/test/results/clientpositive/union_remove_13.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_13.q.out
@@ -221,7 +221,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_14.q.out b/ql/src/test/results/clientpositive/union_remove_14.q.out
index 650fb8d..c5220f3 100644
--- a/ql/src/test/results/clientpositive/union_remove_14.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_14.q.out
@@ -202,7 +202,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_15.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_15.q.out b/ql/src/test/results/clientpositive/union_remove_15.q.out
index 206eda9..2934c4c 100644
--- a/ql/src/test/results/clientpositive/union_remove_15.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_15.q.out
@@ -174,13 +174,11 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_16.q.out b/ql/src/test/results/clientpositive/union_remove_16.q.out
index 8cc31f3..8be5ddd 100644
--- a/ql/src/test/results/clientpositive/union_remove_16.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_16.q.out
@@ -208,13 +208,11 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_17.q.out b/ql/src/test/results/clientpositive/union_remove_17.q.out
index 2450e95..4d35596 100644
--- a/ql/src/test/results/clientpositive/union_remove_17.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_17.q.out
@@ -135,13 +135,11 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_18.q.out b/ql/src/test/results/clientpositive/union_remove_18.q.out
index e592481..3e181e3 100644
--- a/ql/src/test/results/clientpositive/union_remove_18.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_18.q.out
@@ -186,13 +186,11 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_19.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_19.q.out b/ql/src/test/results/clientpositive/union_remove_19.q.out
index b7e7e5c..3e160dc 100644
--- a/ql/src/test/results/clientpositive/union_remove_19.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_19.q.out
@@ -161,7 +161,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_2.q.out b/ql/src/test/results/clientpositive/union_remove_2.q.out
index 088f1fd..84bd7a1 100644
--- a/ql/src/test/results/clientpositive/union_remove_2.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_2.q.out
@@ -170,7 +170,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_20.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_20.q.out b/ql/src/test/results/clientpositive/union_remove_20.q.out
index 25d8792..57a4951 100644
--- a/ql/src/test/results/clientpositive/union_remove_20.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_20.q.out
@@ -169,7 +169,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
values bigint
key string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_21.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_21.q.out b/ql/src/test/results/clientpositive/union_remove_21.q.out
index 0c845df..1cd4892 100644
--- a/ql/src/test/results/clientpositive/union_remove_21.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_21.q.out
@@ -154,7 +154,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_22.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_22.q.out b/ql/src/test/results/clientpositive/union_remove_22.q.out
index cf0b3b6..07feaec 100644
--- a/ql/src/test/results/clientpositive/union_remove_22.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_22.q.out
@@ -170,7 +170,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
values2 bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_23.q.out b/ql/src/test/results/clientpositive/union_remove_23.q.out
index 15a1417..a81ecc7 100644
--- a/ql/src/test/results/clientpositive/union_remove_23.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_23.q.out
@@ -209,7 +209,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_24.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_24.q.out b/ql/src/test/results/clientpositive/union_remove_24.q.out
index d50d9d1..44d1c36 100644
--- a/ql/src/test/results/clientpositive/union_remove_24.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_24.q.out
@@ -169,7 +169,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key double
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_25.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_25.q.out b/ql/src/test/results/clientpositive/union_remove_25.q.out
index 787783e..20ab809 100644
--- a/ql/src/test/results/clientpositive/union_remove_25.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_25.q.out
@@ -179,13 +179,11 @@ POSTHOOK: query: desc formatted outputTbl1 partition(ds='2004')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -382,13 +380,11 @@ POSTHOOK: query: desc formatted outputTbl2 partition(ds='2008-04-08')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl2
# col_name data_type comment
-
key string
values bigint
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -568,13 +564,11 @@ POSTHOOK: query: desc formatted outputTbl3 partition(ds='2008-04-08', hr='11')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl3
# col_name data_type comment
-
key string
values bigint
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_3.q.out b/ql/src/test/results/clientpositive/union_remove_3.q.out
index 5b43804..f4a4e4c 100644
--- a/ql/src/test/results/clientpositive/union_remove_3.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_3.q.out
@@ -159,7 +159,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_4.q.out b/ql/src/test/results/clientpositive/union_remove_4.q.out
index 98d0f85..0f28ff8 100644
--- a/ql/src/test/results/clientpositive/union_remove_4.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_4.q.out
@@ -205,7 +205,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_5.q.out b/ql/src/test/results/clientpositive/union_remove_5.q.out
index 3671058..7576c36 100644
--- a/ql/src/test/results/clientpositive/union_remove_5.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_5.q.out
@@ -214,7 +214,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_7.q.out b/ql/src/test/results/clientpositive/union_remove_7.q.out
index dbd9838..da71188 100644
--- a/ql/src/test/results/clientpositive/union_remove_7.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_7.q.out
@@ -161,7 +161,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_8.q.out b/ql/src/test/results/clientpositive/union_remove_8.q.out
index 83cf4b4..a2e1b36 100644
--- a/ql/src/test/results/clientpositive/union_remove_8.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_8.q.out
@@ -170,7 +170,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_remove_9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_9.q.out b/ql/src/test/results/clientpositive/union_remove_9.q.out
index e27b126..e87a890 100644
--- a/ql/src/test/results/clientpositive/union_remove_9.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_9.q.out
@@ -219,7 +219,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/union_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_stats.q.out b/ql/src/test/results/clientpositive/union_stats.q.out
index 9ea0b51..ae0ef9d 100644
--- a/ql/src/test/results/clientpositive/union_stats.q.out
+++ b/ql/src/test/results/clientpositive/union_stats.q.out
@@ -301,7 +301,6 @@ POSTHOOK: query: desc formatted t
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t
# col_name data_type comment
-
key string
value string
@@ -350,7 +349,6 @@ POSTHOOK: query: desc formatted tt
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tt
# col_name data_type comment
-
key string
value string
@@ -407,7 +405,6 @@ POSTHOOK: query: desc formatted tt
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tt
# col_name data_type comment
-
key string
value string
@@ -476,7 +473,6 @@ POSTHOOK: query: desc formatted t1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t1
# col_name data_type comment
-
key string default
value string default
@@ -511,7 +507,6 @@ POSTHOOK: query: desc formatted t2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t2
# col_name data_type comment
-
key string default
value string default
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/updateAccessTime.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/updateAccessTime.q.out b/ql/src/test/results/clientpositive/updateAccessTime.q.out
index 2dcd930..777e84a 100644
--- a/ql/src/test/results/clientpositive/updateAccessTime.q.out
+++ b/ql/src/test/results/clientpositive/updateAccessTime.q.out
@@ -103,7 +103,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -121,7 +120,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -139,7 +137,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -166,7 +163,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -184,7 +180,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -202,7 +197,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/view_alias.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/view_alias.q.out b/ql/src/test/results/clientpositive/view_alias.q.out
index 1582f06..6e3c2b5 100644
--- a/ql/src/test/results/clientpositive/view_alias.q.out
+++ b/ql/src/test/results/clientpositive/view_alias.q.out
@@ -21,7 +21,6 @@ POSTHOOK: query: desc formatted v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@v
# col_name data_type comment
-
key string
_c1 string
@@ -88,7 +87,6 @@ POSTHOOK: query: desc formatted v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@v
# col_name data_type comment
-
key string
_c1 string
@@ -156,7 +154,6 @@ POSTHOOK: query: desc formatted v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@v
# col_name data_type comment
-
key string
value string
_c1 string
@@ -225,7 +222,6 @@ POSTHOOK: query: desc formatted v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@v
# col_name data_type comment
-
key string
value string
_c121 string
@@ -293,7 +289,6 @@ POSTHOOK: query: desc formatted v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@v
# col_name data_type comment
-
key string
_c1 bigint
@@ -403,7 +398,6 @@ POSTHOOK: query: desc formatted v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@v
# col_name data_type comment
-
_c0 string
ca string
caa string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/view_cbo.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/view_cbo.q.out b/ql/src/test/results/clientpositive/view_cbo.q.out
index 95863c0..e10cb7a 100644
--- a/ql/src/test/results/clientpositive/view_cbo.q.out
+++ b/ql/src/test/results/clientpositive/view_cbo.q.out
@@ -113,7 +113,6 @@ POSTHOOK: query: desc formatted v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@v
# col_name data_type comment
-
key string
# Detailed Table Information
@@ -182,7 +181,6 @@ POSTHOOK: query: desc formatted v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@v
# col_name data_type comment
-
key string
c bigint
@@ -262,7 +260,6 @@ POSTHOOK: query: desc formatted v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@v
# col_name data_type comment
-
key string
value string
@@ -325,7 +322,6 @@ POSTHOOK: query: desc formatted v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@v
# col_name data_type comment
-
key string
# Detailed Table Information
@@ -374,7 +370,6 @@ POSTHOOK: query: desc formatted view15
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@view15
# col_name data_type comment
-
key string
value_count bigint
@@ -425,7 +420,6 @@ POSTHOOK: query: desc formatted view16
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@view16
# col_name data_type comment
-
value string
# Detailed Table Information
@@ -477,7 +471,6 @@ POSTHOOK: query: desc formatted v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@v
# col_name data_type comment
-
key string
# Detailed Table Information
@@ -528,7 +521,6 @@ POSTHOOK: query: desc formatted v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@v
# col_name data_type comment
-
key string
value string
@@ -580,7 +572,6 @@ POSTHOOK: query: desc formatted v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@v
# col_name data_type comment
-
key string
value string
@@ -632,7 +623,6 @@ POSTHOOK: query: desc formatted v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@v
# col_name data_type comment
-
key string
value string
[21/21] hive git commit: HIVE-15053: Beeline#addlocaldriver - reduce
classpath scanning (Zoltan Haindrich, reviewed by Ashutosh Chauhan)
Posted by kg...@apache.org.
HIVE-15053: Beeline#addlocaldriver - reduce classpath scanning (Zoltan Haindrich, reviewed by Ashutosh Chauhan)
Signed-off-by: Zoltan Haindrich <ki...@rxd.hu>
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/4cc0771d
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/4cc0771d
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/4cc0771d
Branch: refs/heads/master
Commit: 4cc0771d180299c917bf2adc60493fba8c9c9efd
Parents: 71004d2
Author: Zoltan Haindrich <ki...@rxd.hu>
Authored: Fri Oct 6 11:11:28 2017 +0200
Committer: Zoltan Haindrich <ki...@rxd.hu>
Committed: Fri Oct 6 11:11:28 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/hive/beeline/BeeLine.java | 110 +-------
.../apache/hive/beeline/ClassNameCompleter.java | 254 -------------------
.../hive/beeline/TestBeelineArgParsing.java | 13 +-
.../hive/beeline/TestClassNameCompleter.java | 76 ------
.../apache/hive/common/util/HiveTestUtils.java | 37 ++-
5 files changed, 47 insertions(+), 443 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/4cc0771d/beeline/src/java/org/apache/hive/beeline/BeeLine.java
----------------------------------------------------------------------
diff --git a/beeline/src/java/org/apache/hive/beeline/BeeLine.java b/beeline/src/java/org/apache/hive/beeline/BeeLine.java
index f2c346d..649edc0 100644
--- a/beeline/src/java/org/apache/hive/beeline/BeeLine.java
+++ b/beeline/src/java/org/apache/hive/beeline/BeeLine.java
@@ -67,6 +67,7 @@ import java.util.ListIterator;
import java.util.Map;
import java.util.Properties;
import java.util.ResourceBundle;
+import java.util.ServiceLoader;
import java.util.Set;
import java.util.SortedSet;
import java.util.StringTokenizer;
@@ -2111,122 +2112,21 @@ public class BeeLine implements Closeable {
return scanDrivers(false);
}
-
Driver[] scanDrivers(boolean knownOnly) throws IOException {
long start = System.currentTimeMillis();
- Set<String> classNames = new HashSet<String>();
-
- if (!knownOnly) {
- classNames.addAll(Arrays.asList(
- ClassNameCompleter.getClassNames()));
- }
-
- classNames.addAll(KNOWN_DRIVERS);
-
- Set driverClasses = new HashSet();
+ ServiceLoader<Driver> sqlDrivers = ServiceLoader.load(Driver.class);
- for (Iterator<String> i = classNames.iterator(); i.hasNext();) {
- String className = i.next().toString();
+ Set<Driver> driverClasses = new HashSet<>();
- if (className.toLowerCase().indexOf("driver") == -1) {
- continue;
- }
-
- try {
- Class c = Class.forName(className, false,
- Thread.currentThread().getContextClassLoader());
- if (!Driver.class.isAssignableFrom(c)) {
- continue;
- }
-
- if (Modifier.isAbstract(c.getModifiers())) {
- continue;
- }
-
- // now instantiate and initialize it
- driverClasses.add(c.newInstance());
- } catch (Throwable t) {
- }
+ for (Driver driver : sqlDrivers) {
+ driverClasses.add(driver);
}
info("scan complete in "
+ (System.currentTimeMillis() - start) + "ms");
return (Driver[]) driverClasses.toArray(new Driver[0]);
}
-
- private Driver[] scanDriversOLD(String line) {
- long start = System.currentTimeMillis();
-
- Set<String> paths = new HashSet<String>();
- Set driverClasses = new HashSet();
-
- for (StringTokenizer tok = new StringTokenizer(
- System.getProperty("java.ext.dirs"),
- System.getProperty("path.separator")); tok.hasMoreTokens();) {
- File[] files = new File(tok.nextToken()).listFiles();
- for (int i = 0; files != null && i < files.length; i++) {
- paths.add(files[i].getAbsolutePath());
- }
- }
-
- for (StringTokenizer tok = new StringTokenizer(
- System.getProperty("java.class.path"),
- System.getProperty("path.separator")); tok.hasMoreTokens();) {
- paths.add(new File(tok.nextToken()).getAbsolutePath());
- }
-
- for (Iterator<String> i = paths.iterator(); i.hasNext();) {
- File f = new File(i.next());
- output(getColorBuffer().pad(loc("scanning", f.getAbsolutePath()), 60),
- false);
-
- try (ZipFile zf = new ZipFile(f)) {
- int total = zf.size();
- int index = 0;
-
- for (Enumeration zfEnum = zf.entries(); zfEnum.hasMoreElements();) {
- ZipEntry entry = (ZipEntry) zfEnum.nextElement();
- String name = entry.getName();
- progress(index++, total);
-
- if (name.endsWith(".class")) {
- name = name.replace('/', '.');
- name = name.substring(0, name.length() - 6);
-
- try {
- // check for the string "driver" in the class
- // to see if we should load it. Not perfect, but
- // it is far too slow otherwise.
- if (name.toLowerCase().indexOf("driver") != -1) {
- Class c = Class.forName(name, false,
- getClass().getClassLoader());
- if (Driver.class.isAssignableFrom(c)
- && !(Modifier.isAbstract(
- c.getModifiers()))) {
- try {
- // load and initialize
- Class.forName(name);
- } catch (Exception e) {
- }
- driverClasses.add(c.newInstance());
- }
- }
- } catch (Throwable t) {
- }
- }
- }
- progress(total, total);
- } catch (Exception e) {
- }
- }
-
- info("scan complete in "
- + (System.currentTimeMillis() - start) + "ms");
- return (Driver[]) driverClasses.toArray(new Driver[0]);
- }
-
-
// /////////////////////////////////////
// ResultSet output formatting classes
// /////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/hive/blob/4cc0771d/beeline/src/java/org/apache/hive/beeline/ClassNameCompleter.java
----------------------------------------------------------------------
diff --git a/beeline/src/java/org/apache/hive/beeline/ClassNameCompleter.java b/beeline/src/java/org/apache/hive/beeline/ClassNameCompleter.java
deleted file mode 100644
index 65ac576..0000000
--- a/beeline/src/java/org/apache/hive/beeline/ClassNameCompleter.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/**
- * Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with
- * the distribution.
- *
- * Neither the name of JLine nor the names of its contributors
- * may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/**
- * 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.hive.beeline;
-
-import jline.console.completer.StringsCompleter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.FileInputStream;
-import java.net.JarURLConnection;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.URLConnection;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.Enumeration;
-import java.util.TreeSet;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipEntry;
-
-/**
- * the completer is original provided in JLine 0.9.94 and is being removed in 2.12. Add the
- * previous implement for usage of the beeline.
- */
-public class ClassNameCompleter extends StringsCompleter {
-
- private static final Logger LOG = LoggerFactory.getLogger(ClassNameCompleter.class.getName());
- public final static String clazzFileNameExtension = ".class";
- public final static String jarFileNameExtension = ".jar";
-
- public ClassNameCompleter(String... candidates) {
- super(candidates);
- }
-
- public static String[] getClassNames() throws IOException {
- Set urls = new HashSet();
-
- for (ClassLoader loader = Thread.currentThread().getContextClassLoader(); loader != null;
- loader = loader.getParent()) {
- if (!(loader instanceof URLClassLoader)) {
- continue;
- }
-
- urls.addAll(Arrays.asList(((URLClassLoader) loader).getURLs()));
- }
-
- // Now add the URL that holds java.lang.String. This is because
- // some JVMs do not report the core classes jar in the list of
- // class loaders.
- Class[] systemClasses = new Class[]{String.class, javax.swing.JFrame.class};
-
- for (int i = 0; i < systemClasses.length; i++) {
- URL classURL = systemClasses[i]
- .getResource("/" + systemClasses[i].getName().replace('.', '/') + clazzFileNameExtension);
-
- if (classURL != null) {
- URLConnection uc = classURL.openConnection();
-
- if (uc instanceof JarURLConnection) {
- urls.add(((JarURLConnection) uc).getJarFileURL());
- }
- }
- }
-
- Set classes = new HashSet();
-
- for (Iterator i = urls.iterator(); i.hasNext(); ) {
- URL url = (URL) i.next();
- try {
- File file = new File(url.getFile());
-
- if (file.isDirectory()) {
- Set files = getClassFiles(file.getAbsolutePath(), new HashSet(), file, new int[] { 200 });
- classes.addAll(files);
-
- continue;
- }
-
- if (!isJarFile(file)) {
- continue;
- }
-
- JarFile jf = new JarFile(file);
-
- for (Enumeration e = jf.entries(); e.hasMoreElements();) {
- JarEntry entry = (JarEntry) e.nextElement();
-
- if (entry == null) {
- continue;
- }
-
- String name = entry.getName();
-
- if (isClazzFile(name)) {
- /* only use class file */
- classes.add(name);
- } else if (isJarFile(name)) {
- classes.addAll(getClassNamesFromJar(name));
- } else {
- continue;
- }
- }
- } catch (IOException e) {
- throw new IOException(String.format("Error reading classpath entry: %s", url), e);
- }
- }
-
- // now filter classes by changing "/" to "." and trimming the
- // trailing ".class"
- Set classNames = new TreeSet();
-
- for (Iterator i = classes.iterator(); i.hasNext(); ) {
- String name = (String) i.next();
- classNames.add(name.replace('/', '.').substring(0, name.length() - 6));
- }
-
- return (String[]) classNames.toArray(new String[classNames.size()]);
- }
-
- private static Set getClassFiles(String root, Set holder, File directory, int[] maxDirectories) {
- // we have passed the maximum number of directories to scan
- if (maxDirectories[0]-- < 0) {
- return holder;
- }
-
- File[] files = directory.listFiles();
-
- for (int i = 0; (files != null) && (i < files.length); i++) {
- String name = files[i].getAbsolutePath();
-
- if (!(name.startsWith(root))) {
- continue;
- } else if (files[i].isDirectory()) {
- getClassFiles(root, holder, files[i], maxDirectories);
- } else if (files[i].getName().endsWith(clazzFileNameExtension)) {
- holder.add(files[i].getAbsolutePath().
- substring(root.length() + 1));
- }
- }
-
- return holder;
- }
-
- /**
- * Get clazz names from a jar file path
- * @param path specifies the jar file's path
- * @return
- */
- private static List<String> getClassNamesFromJar(String path) {
- List<String> classNames = new ArrayList<String>();
- ZipInputStream zip = null;
- try {
- zip = new ZipInputStream(new FileInputStream(path));
- ZipEntry entry = zip.getNextEntry();
- while (entry != null) {
- if (!entry.isDirectory() && entry.getName().endsWith(clazzFileNameExtension)) {
- StringBuilder className = new StringBuilder();
- for (String part : entry.getName().split("/")) {
- if (className.length() != 0) {
- className.append(".");
- }
- className.append(part);
- if (part.endsWith(clazzFileNameExtension)) {
- className.setLength(className.length() - clazzFileNameExtension.length());
- }
- }
- classNames.add(className.toString());
- }
- entry = zip.getNextEntry();
- }
- } catch (IOException e) {
- LOG.error("Fail to parse the class name from the Jar file due to the exception:" + e);
- } finally {
- if (zip != null) {
- try {
- zip.close();
- } catch (IOException e) {
- LOG.error("Fail to close the file due to the exception:" + e);
- }
- }
- }
-
- return classNames;
- }
-
- private static boolean isJarFile(File file) {
- return (file != null && file.isFile() && isJarFile(file.getName()));
- }
-
- private static boolean isJarFile(String fileName) {
- return fileName.endsWith(jarFileNameExtension);
- }
-
- private static boolean isClazzFile(String clazzName) {
- return clazzName.endsWith(clazzFileNameExtension);
- }
-}
http://git-wip-us.apache.org/repos/asf/hive/blob/4cc0771d/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java
----------------------------------------------------------------------
diff --git a/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java b/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java
index 2884cc8..379dcfd 100644
--- a/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java
+++ b/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java
@@ -22,7 +22,12 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.PrintStream;
@@ -92,10 +97,13 @@ public class TestBeelineArgParsing {
}
}
- @Parameters public static Collection<Object[]> data() throws IOException, InterruptedException {
+ @Parameters(name="{1}")
+ public static Collection<Object[]> data() throws IOException, InterruptedException {
// generate the dummy driver by using txt file
String u = HiveTestUtils.getFileFromClasspath("DummyDriver.txt");
- File jarFile = HiveTestUtils.genLocalJarForTest(u, dummyDriverClazzName);
+ Map<File, String> extraContent=new HashMap<>();
+ extraContent.put(new File("META-INF/services/java.sql.Driver"), dummyDriverClazzName);
+ File jarFile = HiveTestUtils.genLocalJarForTest(u, dummyDriverClazzName, extraContent);
String pathToDummyDriver = jarFile.getAbsolutePath();
return Arrays.asList(new Object[][] {
{ "jdbc:postgresql://host:5432/testdb", "org.postgresql.Driver",
@@ -284,6 +292,7 @@ public class TestBeelineArgParsing {
TestBeeline bl = new TestBeeline();
LOG.info("Add " + driverJarFileName + " for the driver class " + driverClazzName);
+ assertTrue("expected to exists: "+driverJarFileName,new File(driverJarFileName).exists());
bl.addLocalJar(driverJarFileName);
if (!defaultSupported) {
Assert.assertNull(bl.findLocalDriver(connectionString));
http://git-wip-us.apache.org/repos/asf/hive/blob/4cc0771d/beeline/src/test/org/apache/hive/beeline/TestClassNameCompleter.java
----------------------------------------------------------------------
diff --git a/beeline/src/test/org/apache/hive/beeline/TestClassNameCompleter.java b/beeline/src/test/org/apache/hive/beeline/TestClassNameCompleter.java
deleted file mode 100644
index 1999937..0000000
--- a/beeline/src/test/org/apache/hive/beeline/TestClassNameCompleter.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 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.hive.beeline;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-import static org.junit.Assert.*;
-
-public class TestClassNameCompleter {
-
- @ClassRule
- public static TemporaryFolder tmpFolder = new TemporaryFolder();
-
- @Test
- public void addingAndEmptyJarFile() throws IOException {
-
- String fileName = "empty.file.jar";
- File p = tmpFolder.newFile(fileName);
-
- URLClassLoader classLoader = (URLClassLoader) Thread.currentThread().getContextClassLoader();
- try {
- URLClassLoader newClassLoader = new URLClassLoader(new URL[] { p.toURL() }, classLoader);
-
- Thread.currentThread().setContextClassLoader(newClassLoader);
- ClassNameCompleter.getClassNames();
- fail("an exception was expected!");
- } catch (IOException e) {
- assertTrue("Exception message should contain the filename!",
- e.getMessage().indexOf(fileName) >= 0);
- } finally {
- Thread.currentThread().setContextClassLoader(classLoader);
- }
-
- }
-
- @Test
- public void addingEmptyFile() throws IOException {
-
- String fileName = "empty.file";
- File p = tmpFolder.newFile(fileName);
-
- URLClassLoader classLoader = (URLClassLoader) Thread.currentThread().getContextClassLoader();
- try {
- URLClassLoader newClassLoader = new URLClassLoader(new URL[] { p.toURL() }, classLoader);
-
- Thread.currentThread().setContextClassLoader(newClassLoader);
- ClassNameCompleter.getClassNames();
- } finally {
- Thread.currentThread().setContextClassLoader(classLoader);
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/hive/blob/4cc0771d/common/src/java/org/apache/hive/common/util/HiveTestUtils.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hive/common/util/HiveTestUtils.java b/common/src/java/org/apache/hive/common/util/HiveTestUtils.java
index 88b9f81..abb31cf 100644
--- a/common/src/java/org/apache/hive/common/util/HiveTestUtils.java
+++ b/common/src/java/org/apache/hive/common/util/HiveTestUtils.java
@@ -20,17 +20,25 @@ package org.apache.hive.common.util;
import java.io.BufferedReader;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
-import com.google.common.io.Files;
-
+import org.apache.commons.io.IOUtils;
import org.apache.hadoop.hive.common.classification.InterfaceAudience;
import org.apache.hadoop.hive.common.classification.InterfaceStability;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.io.Files;
+
@InterfaceAudience.Private
@InterfaceStability.Unstable
public class HiveTestUtils {
@@ -70,16 +78,33 @@ public class HiveTestUtils {
public static File genLocalJarForTest(String pathToClazzFile, String clazzName)
throws IOException, InterruptedException {
+ return genLocalJarForTest(pathToClazzFile, clazzName, new HashMap<File, String>());
+ }
+
+ public static File genLocalJarForTest(String pathToClazzFile, String clazzName, Map<File,String>extraContent)
+ throws IOException, InterruptedException {
String u = pathToClazzFile;
File dir = new File(u);
File parentDir = dir.getParentFile();
File f = new File(parentDir, clazzName + JAVA_FILE_EXT);
Files.copy(dir, f);
executeCmd(new String[] { "javac", clazzName + JAVA_FILE_EXT }, parentDir);
- executeCmd(new String[] { "jar", "cf", clazzName + JAR_FILE_EXT, clazzName + CLAZZ_FILE_EXT },
- parentDir);
f.delete();
- new File(parentDir, clazzName + CLAZZ_FILE_EXT).delete();
- return new File(parentDir, clazzName + JAR_FILE_EXT);
+
+ File outputJar=new File(parentDir, clazzName + JAR_FILE_EXT);
+ ZipOutputStream zos=new ZipOutputStream(new FileOutputStream(outputJar));
+ String contentClassName = clazzName + CLAZZ_FILE_EXT;
+ zos.putNextEntry(new ZipEntry(contentClassName));
+ IOUtils.copy(new FileInputStream(new File(parentDir,contentClassName)), zos);
+ zos.closeEntry();
+
+ for (Entry<File, String> entry : extraContent.entrySet()) {
+ zos.putNextEntry(new ZipEntry(entry.getKey().toString()));
+ zos.write(entry.getValue().getBytes());
+ zos.closeEntry();
+ }
+ zos.close();
+ new File(parentDir, contentClassName).delete();
+ return outputJar;
}
}
[04/21] hive git commit: HIVE-17519: Transpose column stats display
(Zoltan Haindrich, reviewed by Ashutosh Chauhan and Vineet Garg)
Posted by kg...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/load_dyn_part11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/load_dyn_part11.q.out b/ql/src/test/results/clientpositive/load_dyn_part11.q.out
index 225a6c9..6ad41ec 100644
--- a/ql/src/test/results/clientpositive/load_dyn_part11.q.out
+++ b/ql/src/test/results/clientpositive/load_dyn_part11.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/load_dyn_part12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/load_dyn_part12.q.out b/ql/src/test/results/clientpositive/load_dyn_part12.q.out
index bb51159..01cdfd4 100644
--- a/ql/src/test/results/clientpositive/load_dyn_part12.q.out
+++ b/ql/src/test/results/clientpositive/load_dyn_part12.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/load_dyn_part13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/load_dyn_part13.q.out b/ql/src/test/results/clientpositive/load_dyn_part13.q.out
index 77bb37f..f8105c7 100644
--- a/ql/src/test/results/clientpositive/load_dyn_part13.q.out
+++ b/ql/src/test/results/clientpositive/load_dyn_part13.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/load_dyn_part14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/load_dyn_part14.q.out b/ql/src/test/results/clientpositive/load_dyn_part14.q.out
index a6a5c63..d65a1e3 100644
--- a/ql/src/test/results/clientpositive/load_dyn_part14.q.out
+++ b/ql/src/test/results/clientpositive/load_dyn_part14.q.out
@@ -19,7 +19,6 @@ value string
# Partition Information
# col_name data_type comment
-
value string
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/load_dyn_part2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/load_dyn_part2.q.out b/ql/src/test/results/clientpositive/load_dyn_part2.q.out
index 93778a2..e8efa5f 100644
--- a/ql/src/test/results/clientpositive/load_dyn_part2.q.out
+++ b/ql/src/test/results/clientpositive/load_dyn_part2.q.out
@@ -23,7 +23,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/load_dyn_part3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/load_dyn_part3.q.out b/ql/src/test/results/clientpositive/load_dyn_part3.q.out
index 3849100..efe5222 100644
--- a/ql/src/test/results/clientpositive/load_dyn_part3.q.out
+++ b/ql/src/test/results/clientpositive/load_dyn_part3.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/load_dyn_part4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/load_dyn_part4.q.out b/ql/src/test/results/clientpositive/load_dyn_part4.q.out
index 40b0bbb..a561cc6 100644
--- a/ql/src/test/results/clientpositive/load_dyn_part4.q.out
+++ b/ql/src/test/results/clientpositive/load_dyn_part4.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/load_dyn_part6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/load_dyn_part6.q.out b/ql/src/test/results/clientpositive/load_dyn_part6.q.out
index fce8eff..993f42f 100644
--- a/ql/src/test/results/clientpositive/load_dyn_part6.q.out
+++ b/ql/src/test/results/clientpositive/load_dyn_part6.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/load_dyn_part7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/load_dyn_part7.q.out b/ql/src/test/results/clientpositive/load_dyn_part7.q.out
index 02f9327..1d4d013 100644
--- a/ql/src/test/results/clientpositive/load_dyn_part7.q.out
+++ b/ql/src/test/results/clientpositive/load_dyn_part7.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/load_dyn_part8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/load_dyn_part8.q.out b/ql/src/test/results/clientpositive/load_dyn_part8.q.out
index cb1a757..cf2f60f 100644
--- a/ql/src/test/results/clientpositive/load_dyn_part8.q.out
+++ b/ql/src/test/results/clientpositive/load_dyn_part8.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/load_dyn_part9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/load_dyn_part9.q.out b/ql/src/test/results/clientpositive/load_dyn_part9.q.out
index 414e784..25937df 100644
--- a/ql/src/test/results/clientpositive/load_dyn_part9.q.out
+++ b/ql/src/test/results/clientpositive/load_dyn_part9.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/materialized_view_describe.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/materialized_view_describe.q.out b/ql/src/test/results/clientpositive/materialized_view_describe.q.out
index f5daa67..8b76912 100644
--- a/ql/src/test/results/clientpositive/materialized_view_describe.q.out
+++ b/ql/src/test/results/clientpositive/materialized_view_describe.q.out
@@ -54,7 +54,6 @@ POSTHOOK: query: describe formatted cmv_mat_view
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@cmv_mat_view
# col_name data_type comment
-
a int
c decimal(10,2)
@@ -137,7 +136,6 @@ POSTHOOK: query: describe formatted cmv_mat_view2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@cmv_mat_view2
# col_name data_type comment
-
a int
# Detailed Table Information
@@ -213,7 +211,6 @@ POSTHOOK: query: describe formatted cmv_mat_view3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@cmv_mat_view3
# col_name data_type comment
-
a int
b varchar(256)
c decimal(10,2)
@@ -302,7 +299,6 @@ POSTHOOK: query: describe formatted cmv_mat_view4
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@cmv_mat_view4
# col_name data_type comment
-
a int
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/merge3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/merge3.q.out b/ql/src/test/results/clientpositive/merge3.q.out
index 1eb5f0e..e05d651 100644
--- a/ql/src/test/results/clientpositive/merge3.q.out
+++ b/ql/src/test/results/clientpositive/merge3.q.out
@@ -2324,7 +2324,6 @@ POSTHOOK: query: describe formatted merge_src2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@merge_src2
# col_name data_type comment
-
key string
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/named_column_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/named_column_join.q.out b/ql/src/test/results/clientpositive/named_column_join.q.out
index 031081a..a5d21b2 100644
--- a/ql/src/test/results/clientpositive/named_column_join.q.out
+++ b/ql/src/test/results/clientpositive/named_column_join.q.out
@@ -276,7 +276,6 @@ POSTHOOK: query: desc formatted v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@v
# col_name data_type comment
-
a int
b int
@@ -343,7 +342,6 @@ POSTHOOK: query: desc formatted v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@v
# col_name data_type comment
-
b int
a int
@@ -452,7 +450,6 @@ POSTHOOK: query: desc formatted tt
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tt
# col_name data_type comment
-
a int
b int
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/parallel_orderby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/parallel_orderby.q.out b/ql/src/test/results/clientpositive/parallel_orderby.q.out
index 98016ee..699dc16 100644
--- a/ql/src/test/results/clientpositive/parallel_orderby.q.out
+++ b/ql/src/test/results/clientpositive/parallel_orderby.q.out
@@ -100,7 +100,6 @@ POSTHOOK: query: desc formatted total_ordered
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@total_ordered
# col_name data_type comment
-
key string
value string
@@ -211,7 +210,6 @@ POSTHOOK: query: desc formatted total_ordered
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@total_ordered
# col_name data_type comment
-
key string
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/parquet_analyze.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/parquet_analyze.q.out b/ql/src/test/results/clientpositive/parquet_analyze.q.out
index 76a8d80..99199b0 100644
--- a/ql/src/test/results/clientpositive/parquet_analyze.q.out
+++ b/ql/src/test/results/clientpositive/parquet_analyze.q.out
@@ -74,7 +74,6 @@ POSTHOOK: query: DESC FORMATTED parquet_create_people
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@parquet_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -122,7 +121,6 @@ POSTHOOK: query: DESC FORMATTED parquet_create_people
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@parquet_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/parquet_array_null_element.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/parquet_array_null_element.q.out b/ql/src/test/results/clientpositive/parquet_array_null_element.q.out
index f05ecc6..142f1c3 100644
--- a/ql/src/test/results/clientpositive/parquet_array_null_element.q.out
+++ b/ql/src/test/results/clientpositive/parquet_array_null_element.q.out
@@ -57,7 +57,6 @@ POSTHOOK: query: DESCRIBE FORMATTED parquet_array_null_element
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@parquet_array_null_element
# col_name data_type comment
-
id int
lstint array<int>
lststr array<string>
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/parquet_create.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/parquet_create.q.out b/ql/src/test/results/clientpositive/parquet_create.q.out
index b4222b3..fa76111 100644
--- a/ql/src/test/results/clientpositive/parquet_create.q.out
+++ b/ql/src/test/results/clientpositive/parquet_create.q.out
@@ -59,7 +59,6 @@ POSTHOOK: query: DESCRIBE FORMATTED parquet_create
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@parquet_create
# col_name data_type comment
-
id int
str string
mp map<string,string>
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/parquet_mixed_partition_formats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/parquet_mixed_partition_formats.q.out b/ql/src/test/results/clientpositive/parquet_mixed_partition_formats.q.out
index 30a5c7d..e931aaa 100644
--- a/ql/src/test/results/clientpositive/parquet_mixed_partition_formats.q.out
+++ b/ql/src/test/results/clientpositive/parquet_mixed_partition_formats.q.out
@@ -96,7 +96,6 @@ POSTHOOK: query: DESCRIBE FORMATTED parquet_mixed_partition_formats PARTITION (d
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@parquet_mixed_partition_formats
# col_name data_type comment
-
cint int
ctinyint tinyint
csmallint smallint
@@ -114,7 +113,6 @@ d date
# Partition Information
# col_name data_type comment
-
dateint int
# Detailed Partition Information
@@ -165,7 +163,6 @@ POSTHOOK: query: DESCRIBE FORMATTED parquet_mixed_partition_formats
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@parquet_mixed_partition_formats
# col_name data_type comment
-
cint int
ctinyint tinyint
csmallint smallint
@@ -183,7 +180,6 @@ d date
# Partition Information
# col_name data_type comment
-
dateint int
# Detailed Table Information
@@ -221,7 +217,6 @@ POSTHOOK: query: DESCRIBE FORMATTED parquet_mixed_partition_formats PARTITION (d
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@parquet_mixed_partition_formats
# col_name data_type comment
-
cint int
ctinyint tinyint
csmallint smallint
@@ -239,7 +234,6 @@ d date
# Partition Information
# col_name data_type comment
-
dateint int
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/parquet_partitioned.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/parquet_partitioned.q.out b/ql/src/test/results/clientpositive/parquet_partitioned.q.out
index 654eae1..8e13834 100644
--- a/ql/src/test/results/clientpositive/parquet_partitioned.q.out
+++ b/ql/src/test/results/clientpositive/parquet_partitioned.q.out
@@ -47,13 +47,11 @@ POSTHOOK: query: DESCRIBE FORMATTED parquet_partitioned
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@parquet_partitioned
# col_name data_type comment
-
id int
str string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/parquet_serde.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/parquet_serde.q.out b/ql/src/test/results/clientpositive/parquet_serde.q.out
index 4f3a868..90dc6a5 100644
--- a/ql/src/test/results/clientpositive/parquet_serde.q.out
+++ b/ql/src/test/results/clientpositive/parquet_serde.q.out
@@ -51,14 +51,12 @@ POSTHOOK: query: DESCRIBE FORMATTED parquet_mixed_fileformat PARTITION (dateint=
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@parquet_mixed_fileformat
# col_name data_type comment
-
id int
str string
part string
# Partition Information
# col_name data_type comment
-
dateint int
# Detailed Partition Information
@@ -113,14 +111,12 @@ POSTHOOK: query: DESCRIBE FORMATTED parquet_mixed_fileformat
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@parquet_mixed_fileformat
# col_name data_type comment
-
id int
str string
part string
# Partition Information
# col_name data_type comment
-
dateint int
# Detailed Table Information
@@ -156,14 +152,12 @@ POSTHOOK: query: DESCRIBE FORMATTED parquet_mixed_fileformat PARTITION (dateint=
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@parquet_mixed_fileformat
# col_name data_type comment
-
id int
str string
part string
# Partition Information
# col_name data_type comment
-
dateint int
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out b/ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out
index 8b42dc3..ff55f27 100644
--- a/ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out
+++ b/ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out
@@ -20,12 +20,10 @@ POSTHOOK: query: describe formatted mytbl partition (c2='v1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@mytbl
# col_name data_type comment
-
c1 tinyint
# Partition Information
# col_name data_type comment
-
c2 string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/part_inherit_tbl_props_empty.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/part_inherit_tbl_props_empty.q.out b/ql/src/test/results/clientpositive/part_inherit_tbl_props_empty.q.out
index 5c2c8a6..fae954a 100644
--- a/ql/src/test/results/clientpositive/part_inherit_tbl_props_empty.q.out
+++ b/ql/src/test/results/clientpositive/part_inherit_tbl_props_empty.q.out
@@ -20,12 +20,10 @@ POSTHOOK: query: describe formatted mytbl partition (c2='v1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@mytbl
# col_name data_type comment
-
c1 tinyint
# Partition Information
# col_name data_type comment
-
c2 string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out b/ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out
index 9e00fe6..dbbfd00 100644
--- a/ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out
+++ b/ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out
@@ -20,12 +20,10 @@ POSTHOOK: query: describe formatted mytbl partition (c2='v1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@mytbl
# col_name data_type comment
-
c1 tinyint
# Partition Information
# col_name data_type comment
-
c2 string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/partial_column_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/partial_column_stats.q.out b/ql/src/test/results/clientpositive/partial_column_stats.q.out
index e8b1a99..c1a78c3 100644
--- a/ql/src/test/results/clientpositive/partial_column_stats.q.out
+++ b/ql/src/test/results/clientpositive/partial_column_stats.q.out
@@ -69,7 +69,16 @@ PREHOOK: Input: default@t1
POSTHOOK: query: desc formatted t1 value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 0 0.0 0 from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 0
+avg_col_len 0.0
+max_col_len 0
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"data\":\"true\",\"key\":\"true\",\"value\":\"true\"}}
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/partition_coltype_literals.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/partition_coltype_literals.q.out b/ql/src/test/results/clientpositive/partition_coltype_literals.q.out
index 51eda72..9a0b4f4 100644
--- a/ql/src/test/results/clientpositive/partition_coltype_literals.q.out
+++ b/ql/src/test/results/clientpositive/partition_coltype_literals.q.out
@@ -24,13 +24,11 @@ POSTHOOK: query: describe formatted partcoltypenum partition (tint=100, sint=200
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcoltypenum
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
tint tinyint
sint smallint
bint bigint
@@ -74,13 +72,11 @@ POSTHOOK: query: describe formatted partcoltypenum partition (tint=100Y, sint=20
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcoltypenum
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
tint tinyint
sint smallint
bint bigint
@@ -125,13 +121,11 @@ POSTHOOK: query: describe formatted partcoltypenum partition (tint=100Y, sint=20
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcoltypenum
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
tint tinyint
sint smallint
bint bigint
@@ -177,13 +171,11 @@ POSTHOOK: query: describe formatted partcoltypenum partition (tint=110Y, sint=22
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcoltypenum
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
tint tinyint
sint smallint
bint bigint
@@ -280,7 +272,6 @@ bint bigint
# Partition Information
# col_name data_type comment
-
tint tinyint
sint smallint
bint bigint
@@ -302,27 +293,54 @@ PREHOOK: Input: default@partcoltypenum
POSTHOOK: query: describe formatted partcoltypenum partition (tint=110Y, sint=22000S, bint=330000000000L) key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcoltypenum
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key int 27 484 0 20 HL from deserializer
+col_name key
+data_type int
+min 27
+max 484
+num_nulls 0
+distinct_count 20
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted partcoltypenum partition (tint=110Y, sint=22000S, bint=330000000000L) value
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@partcoltypenum
POSTHOOK: query: describe formatted partcoltypenum partition (tint=110Y, sint=22000S, bint=330000000000L) value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcoltypenum
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 20 6.766666666666667 7 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 20
+avg_col_len 6.766666666666667
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted partcoltypenum tint
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@partcoltypenum
POSTHOOK: query: describe formatted partcoltypenum tint
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcoltypenum
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-tint tinyint 110 110 0 1
+col_name tint
+data_type tinyint
+min 110
+max 110
+num_nulls 0
+distinct_count 1
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"tint\":\"true\"}}
PREHOOK: query: describe formatted partcoltypenum sint
PREHOOK: type: DESCTABLE
@@ -330,9 +348,18 @@ PREHOOK: Input: default@partcoltypenum
POSTHOOK: query: describe formatted partcoltypenum sint
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcoltypenum
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-sint smallint 22000 22000 0 1
+col_name sint
+data_type smallint
+min 22000
+max 22000
+num_nulls 0
+distinct_count 1
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"sint\":\"true\"}}
PREHOOK: query: describe formatted partcoltypenum bint
PREHOOK: type: DESCTABLE
@@ -340,9 +367,18 @@ PREHOOK: Input: default@partcoltypenum
POSTHOOK: query: describe formatted partcoltypenum bint
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcoltypenum
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-bint bigint 330000000000 330000000000 0 1
+col_name bint
+data_type bigint
+min 330000000000
+max 330000000000
+num_nulls 0
+distinct_count 1
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"bint\":\"true\"}}
PREHOOK: query: alter table partcoltypenum change key key decimal(10,0)
PREHOOK: type: ALTERTABLE_RENAMECOL
@@ -368,13 +404,11 @@ POSTHOOK: query: describe formatted partcoltypenum partition (tint=110Y, sint=22
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcoltypenum
# col_name data_type comment
-
key decimal(10,0)
value string
# Partition Information
# col_name data_type comment
-
tint tinyint
sint smallint
bint bigint
@@ -417,13 +451,11 @@ POSTHOOK: query: describe formatted partcoltypenum partition (tint=110BD, sint=2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcoltypenum
# col_name data_type comment
-
key decimal(10,0)
value string
# Partition Information
# col_name data_type comment
-
tint decimal(3,0)
sint smallint
bint bigint
@@ -458,9 +490,18 @@ PREHOOK: Input: default@partcoltypenum
POSTHOOK: query: describe formatted partcoltypenum tint
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcoltypenum
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-tint decimal(3,0) 110 110 0 1
+col_name tint
+data_type decimal(3,0)
+min 110
+max 110
+num_nulls 0
+distinct_count 1
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"tint\":\"true\"}}
PREHOOK: query: show partitions partcoltypenum partition (tint=110BD, sint=22000S, bint=330000000000L)
PREHOOK: type: SHOWPARTITIONS
@@ -500,13 +541,11 @@ POSTHOOK: query: describe formatted partcoltypenum partition (tint=100BD, sint=2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcoltypenum
# col_name data_type comment
-
key decimal(10,0)
value string
# Partition Information
# col_name data_type comment
-
tint decimal(3,0)
sint smallint
bint bigint
@@ -551,13 +590,11 @@ POSTHOOK: query: describe formatted partcoltypenum partition (tint=100BD, sint=2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcoltypenum
# col_name data_type comment
-
key decimal(10,0)
value string
# Partition Information
# col_name data_type comment
-
tint decimal(3,0)
sint smallint
bint bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/partition_date2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/partition_date2.q.out b/ql/src/test/results/clientpositive/partition_date2.q.out
index e8bd9e9..9cf9149 100644
--- a/ql/src/test/results/clientpositive/partition_date2.q.out
+++ b/ql/src/test/results/clientpositive/partition_date2.q.out
@@ -251,7 +251,6 @@ region int
# Partition Information
# col_name data_type comment
-
dt date
region int
@@ -311,7 +310,6 @@ region int
# Partition Information
# col_name data_type comment
-
dt date
region int
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/partition_schema1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/partition_schema1.q.out b/ql/src/test/results/clientpositive/partition_schema1.q.out
index 4893536..7db915b 100644
--- a/ql/src/test/results/clientpositive/partition_schema1.q.out
+++ b/ql/src/test/results/clientpositive/partition_schema1.q.out
@@ -28,7 +28,6 @@ dt string
# Partition Information
# col_name data_type comment
-
dt string
PREHOOK: query: alter table partition_schema1 add columns (x string)
PREHOOK: type: ALTERTABLE_ADDCOLS
@@ -51,7 +50,6 @@ dt string
# Partition Information
# col_name data_type comment
-
dt string
PREHOOK: query: desc partition_schema1 partition (dt='100')
PREHOOK: type: DESCTABLE
@@ -65,5 +63,4 @@ dt string
# Partition Information
# col_name data_type comment
-
dt string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/partition_timestamp2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/partition_timestamp2.q.out b/ql/src/test/results/clientpositive/partition_timestamp2.q.out
index 63ca197..3a4770e 100644
--- a/ql/src/test/results/clientpositive/partition_timestamp2.q.out
+++ b/ql/src/test/results/clientpositive/partition_timestamp2.q.out
@@ -285,7 +285,6 @@ region int
# Partition Information
# col_name data_type comment
-
dt timestamp
region int
@@ -348,7 +347,6 @@ region int
# Partition Information
# col_name data_type comment
-
dt timestamp
region int
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/quotedid_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/quotedid_stats.q.out b/ql/src/test/results/clientpositive/quotedid_stats.q.out
index 40e23bf..418f7f2 100644
--- a/ql/src/test/results/clientpositive/quotedid_stats.q.out
+++ b/ql/src/test/results/clientpositive/quotedid_stats.q.out
@@ -13,7 +13,6 @@ POSTHOOK: query: describe formatted t4
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t4
# col_name data_type comment
-
x+1` string
y&y string
@@ -56,7 +55,6 @@ POSTHOOK: query: describe formatted t4
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t4
# col_name data_type comment
-
x+1` string
y&y string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/rcfile_default_format.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/rcfile_default_format.q.out b/ql/src/test/results/clientpositive/rcfile_default_format.q.out
index 97bc8d2..74f5d28 100644
--- a/ql/src/test/results/clientpositive/rcfile_default_format.q.out
+++ b/ql/src/test/results/clientpositive/rcfile_default_format.q.out
@@ -13,7 +13,6 @@ POSTHOOK: query: DESCRIBE FORMATTED rcfile_default_format
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@rcfile_default_format
# col_name data_type comment
-
key string
# Detailed Table Information
@@ -59,7 +58,6 @@ POSTHOOK: query: DESCRIBE FORMATTED rcfile_default_format_ctas
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@rcfile_default_format_ctas
# col_name data_type comment
-
key string
value string
@@ -111,7 +109,6 @@ POSTHOOK: query: DESCRIBE FORMATTED rcfile_default_format_txtfile
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@rcfile_default_format_txtfile
# col_name data_type comment
-
key string
# Detailed Table Information
@@ -157,7 +154,6 @@ POSTHOOK: query: DESCRIBE FORMATTED textfile_default_format_ctas
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@textfile_default_format_ctas
# col_name data_type comment
-
key string
value string
@@ -204,7 +200,6 @@ POSTHOOK: query: DESCRIBE FORMATTED rcfile_default_format_ctas_default_serde
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@rcfile_default_format_ctas_default_serde
# col_name data_type comment
-
key string
value string
@@ -247,7 +242,6 @@ POSTHOOK: query: DESCRIBE FORMATTED rcfile_default_format_default_serde
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@rcfile_default_format_default_serde
# col_name data_type comment
-
key string
# Detailed Table Information
@@ -293,7 +287,6 @@ POSTHOOK: query: DESCRIBE FORMATTED rcfile_ctas_default_serde
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@rcfile_ctas_default_serde
# col_name data_type comment
-
key string
value string
@@ -336,7 +329,6 @@ POSTHOOK: query: DESCRIBE FORMATTED rcfile_default_serde
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@rcfile_default_serde
# col_name data_type comment
-
key string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/rename_external_partition_location.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/rename_external_partition_location.q.out b/ql/src/test/results/clientpositive/rename_external_partition_location.q.out
index 9665bce..def0aae 100644
--- a/ql/src/test/results/clientpositive/rename_external_partition_location.q.out
+++ b/ql/src/test/results/clientpositive/rename_external_partition_location.q.out
@@ -82,13 +82,11 @@ POSTHOOK: query: DESCRIBE FORMATTED ex_table
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@ex_table
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Table Information
@@ -124,13 +122,11 @@ POSTHOOK: query: DESCRIBE FORMATTED ex_table PARTITION (part='part1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@ex_table
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -162,18 +158,36 @@ PREHOOK: Input: default@ex_table
POSTHOOK: query: DESCRIBE FORMATTED ex_table PARTITION (part='part1') key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@ex_table
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key int 0 9 0 6 HL from deserializer
+col_name key
+data_type int
+min 0
+max 9
+num_nulls 0
+distinct_count 6
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: DESCRIBE FORMATTED ex_table PARTITION (part='part1') value
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@ex_table
POSTHOOK: query: DESCRIBE FORMATTED ex_table PARTITION (part='part1') value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@ex_table
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 6 5.0 5 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 6
+avg_col_len 5.0
+max_col_len 5
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: ALTER TABLE ex_table PARTITION (part='part1') RENAME TO PARTITION (part='part2')
PREHOOK: type: ALTERTABLE_RENAMEPART
PREHOOK: Input: default@ex_table
@@ -230,13 +244,11 @@ POSTHOOK: query: DESCRIBE FORMATTED ex_table
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@ex_table
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Table Information
@@ -272,13 +284,11 @@ POSTHOOK: query: DESCRIBE FORMATTED ex_table PARTITION (part='part2')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@ex_table
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -310,15 +320,33 @@ PREHOOK: Input: default@ex_table
POSTHOOK: query: DESCRIBE FORMATTED ex_table PARTITION (part='part2') key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@ex_table
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key int 0 9 0 6 HL from deserializer
+col_name key
+data_type int
+min 0
+max 9
+num_nulls 0
+distinct_count 6
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: DESCRIBE FORMATTED ex_table PARTITION (part='part2') value
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@ex_table
POSTHOOK: query: DESCRIBE FORMATTED ex_table PARTITION (part='part2') value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@ex_table
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 6 5.0 5 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 6
+avg_col_len 5.0
+max_col_len 5
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/rename_table_update_column_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/rename_table_update_column_stats.q.out b/ql/src/test/results/clientpositive/rename_table_update_column_stats.q.out
index d135485..e29bba4 100644
--- a/ql/src/test/results/clientpositive/rename_table_update_column_stats.q.out
+++ b/ql/src/test/results/clientpositive/rename_table_update_column_stats.q.out
@@ -57,9 +57,18 @@ PREHOOK: Input: statsdb1@testtable1
POSTHOOK: query: describe formatted statsdb1.testtable1 col1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col1 int 27 484 0 10 HL from deserializer
+col_name col1
+data_type int
+min 27
+max 484
+num_nulls 0
+distinct_count 10
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
PREHOOK: query: describe formatted statsdb1.testtable1 col2
PREHOOK: type: DESCTABLE
@@ -67,9 +76,18 @@ PREHOOK: Input: statsdb1@testtable1
POSTHOOK: query: describe formatted statsdb1.testtable1 col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 10 6.7 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 10
+avg_col_len 6.7
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
PREHOOK: query: describe formatted statsdb1.testtable1 col3
PREHOOK: type: DESCTABLE
@@ -77,9 +95,18 @@ PREHOOK: Input: statsdb1@testtable1
POSTHOOK: query: describe formatted statsdb1.testtable1 col3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col3 string 0 1 4.0 4 HL from deserializer
+col_name col3
+data_type string
+min
+max
+num_nulls 0
+distinct_count 1
+avg_col_len 4.0
+max_col_len 4
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
PREHOOK: query: alter table statsdb1.testtable1 rename to statsdb2.testtable2
PREHOOK: type: ALTERTABLE_RENAME
@@ -96,9 +123,18 @@ PREHOOK: Input: statsdb2@testtable2
POSTHOOK: query: describe formatted statsdb2.testtable2 col1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb2@testtable2
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col1 int 27 484 0 10 HL from deserializer
+col_name col1
+data_type int
+min 27
+max 484
+num_nulls 0
+distinct_count 10
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
PREHOOK: query: describe formatted statsdb2.testtable2 col2
PREHOOK: type: DESCTABLE
@@ -106,9 +142,18 @@ PREHOOK: Input: statsdb2@testtable2
POSTHOOK: query: describe formatted statsdb2.testtable2 col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb2@testtable2
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 10 6.7 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 10
+avg_col_len 6.7
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
PREHOOK: query: describe formatted statsdb2.testtable2 col3
PREHOOK: type: DESCTABLE
@@ -116,9 +161,18 @@ PREHOOK: Input: statsdb2@testtable2
POSTHOOK: query: describe formatted statsdb2.testtable2 col3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb2@testtable2
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col3 string 0 1 4.0 4 HL from deserializer
+col_name col3
+data_type string
+min
+max
+num_nulls 0
+distinct_count 1
+avg_col_len 4.0
+max_col_len 4
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
PREHOOK: query: use default
PREHOOK: type: SWITCHDATABASE
@@ -203,9 +257,18 @@ PREHOOK: Input: statsdb1@testtable1
POSTHOOK: query: describe formatted statsdb1.testtable1 col1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col1 int 27 484 0 10 HL from deserializer
+col_name col1
+data_type int
+min 27
+max 484
+num_nulls 0
+distinct_count 10
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
PREHOOK: query: describe formatted statsdb1.testtable1 col2
PREHOOK: type: DESCTABLE
@@ -213,9 +276,18 @@ PREHOOK: Input: statsdb1@testtable1
POSTHOOK: query: describe formatted statsdb1.testtable1 col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 10 6.7 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 10
+avg_col_len 6.7
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
PREHOOK: query: describe formatted statsdb1.testtable1 col3
PREHOOK: type: DESCTABLE
@@ -223,9 +295,18 @@ PREHOOK: Input: statsdb1@testtable1
POSTHOOK: query: describe formatted statsdb1.testtable1 col3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col3 string 0 1 4.0 4 HL from deserializer
+col_name col3
+data_type string
+min
+max
+num_nulls 0
+distinct_count 1
+avg_col_len 4.0
+max_col_len 4
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
PREHOOK: query: alter table statsdb1.testtable1 rename to statsdb2.testtable2
PREHOOK: type: ALTERTABLE_RENAME
@@ -242,9 +323,18 @@ PREHOOK: Input: statsdb2@testtable2
POSTHOOK: query: describe formatted statsdb2.testtable2 col1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb2@testtable2
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col1 int 27 484 0 10 HL from deserializer
+col_name col1
+data_type int
+min 27
+max 484
+num_nulls 0
+distinct_count 10
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
PREHOOK: query: describe formatted statsdb2.testtable2 col2
PREHOOK: type: DESCTABLE
@@ -252,9 +342,18 @@ PREHOOK: Input: statsdb2@testtable2
POSTHOOK: query: describe formatted statsdb2.testtable2 col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb2@testtable2
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 10 6.7 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 10
+avg_col_len 6.7
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
PREHOOK: query: describe formatted statsdb2.testtable2 col3
PREHOOK: type: DESCTABLE
@@ -262,9 +361,18 @@ PREHOOK: Input: statsdb2@testtable2
POSTHOOK: query: describe formatted statsdb2.testtable2 col3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb2@testtable2
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col3 string 0 1 4.0 4 HL from deserializer
+col_name col3
+data_type string
+min
+max
+num_nulls 0
+distinct_count 1
+avg_col_len 4.0
+max_col_len 4
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
PREHOOK: query: use default
PREHOOK: type: SWITCHDATABASE
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/repl_2_exim_basic.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/repl_2_exim_basic.q.out b/ql/src/test/results/clientpositive/repl_2_exim_basic.q.out
index 8c8e6be..7f5802a 100644
--- a/ql/src/test/results/clientpositive/repl_2_exim_basic.q.out
+++ b/ql/src/test/results/clientpositive/repl_2_exim_basic.q.out
@@ -141,7 +141,6 @@ emp_state string
# Partition Information
# col_name data_type comment
-
emp_country string
emp_state string
@@ -221,7 +220,6 @@ emp_state string
# Partition Information
# col_name data_type comment
-
emp_country string
emp_state string
@@ -303,7 +301,6 @@ emp_state string
# Partition Information
# col_name data_type comment
-
emp_country string
emp_state string
@@ -383,7 +380,6 @@ emp_state string
# Partition Information
# col_name data_type comment
-
emp_country string
emp_state string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/repl_3_exim_metadata.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/repl_3_exim_metadata.q.out b/ql/src/test/results/clientpositive/repl_3_exim_metadata.q.out
index b07451d..96297ff 100644
--- a/ql/src/test/results/clientpositive/repl_3_exim_metadata.q.out
+++ b/ql/src/test/results/clientpositive/repl_3_exim_metadata.q.out
@@ -75,7 +75,6 @@ emp_state string
# Partition Information
# col_name data_type comment
-
emp_country string
emp_state string
@@ -155,7 +154,6 @@ emp_state string
# Partition Information
# col_name data_type comment
-
emp_country string
emp_state string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/sample_islocalmode_hook_use_metadata.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/sample_islocalmode_hook_use_metadata.q.out b/ql/src/test/results/clientpositive/sample_islocalmode_hook_use_metadata.q.out
index 318f380..24a1f66 100644
--- a/ql/src/test/results/clientpositive/sample_islocalmode_hook_use_metadata.q.out
+++ b/ql/src/test/results/clientpositive/sample_islocalmode_hook_use_metadata.q.out
@@ -70,7 +70,6 @@ PREHOOK: query: desc formatted sih_src
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@sih_src
# col_name data_type comment
-
key int
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/serde_reported_schema.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/serde_reported_schema.q.out b/ql/src/test/results/clientpositive/serde_reported_schema.q.out
index dab76cb..16f30bb 100644
--- a/ql/src/test/results/clientpositive/serde_reported_schema.q.out
+++ b/ql/src/test/results/clientpositive/serde_reported_schema.q.out
@@ -29,7 +29,6 @@ b string
# Partition Information
# col_name data_type comment
-
b string
#### A masked pattern was here ####
@@ -53,7 +52,6 @@ b string
# Partition Information
# col_name data_type comment
-
b string
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/show_indexes_syntax.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/show_indexes_syntax.q.out b/ql/src/test/results/clientpositive/show_indexes_syntax.q.out
index bc96359..bed97f0 100644
--- a/ql/src/test/results/clientpositive/show_indexes_syntax.q.out
+++ b/ql/src/test/results/clientpositive/show_indexes_syntax.q.out
@@ -106,8 +106,6 @@ PREHOOK: type: SHOWINDEXES
POSTHOOK: query: SHOW FORMATTED INDEXES ON show_idx_t1
POSTHOOK: type: SHOWINDEXES
idx_name tab_name col_names idx_tab_name idx_type comment
-
-
idx_t1 show_idx_t1 key default__show_idx_t1_idx_t1__ compact
PREHOOK: query: DROP TABLE show_idx_t1
PREHOOK: type: DROPTABLE
[18/21] hive git commit: HIVE-17540: remove feature: describe pretty
(Zoltan Haindrich, reviewed by Ashutosh Chauhan)
Posted by kg...@apache.org.
HIVE-17540: remove feature: describe pretty (Zoltan Haindrich, reviewed by Ashutosh Chauhan)
Signed-off-by: Zoltan Haindrich <ki...@rxd.hu>
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/2a5e72c2
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/2a5e72c2
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/2a5e72c2
Branch: refs/heads/master
Commit: 2a5e72c20d7351831e8e189ba212d4918420092f
Parents: 38a594f
Author: Zoltan Haindrich <ki...@rxd.hu>
Authored: Fri Oct 6 10:55:56 2017 +0200
Committer: Zoltan Haindrich <ki...@rxd.hu>
Committed: Fri Oct 6 10:55:56 2017 +0200
----------------------------------------------------------------------
.../org/apache/hadoop/hive/ql/exec/DDLTask.java | 2 +-
.../formatting/JsonMetaDataFormatter.java | 5 +-
.../metadata/formatting/MetaDataFormatter.java | 2 +-
.../formatting/MetaDataPrettyFormatUtils.java | 243 --------------
.../formatting/TextMetaDataFormatter.java | 8 +-
.../hive/ql/parse/DDLSemanticAnalyzer.java | 25 +-
.../org/apache/hadoop/hive/ql/parse/HiveLexer.g | 1 -
.../apache/hadoop/hive/ql/parse/HiveParser.g | 2 +-
.../hadoop/hive/ql/parse/IdentifiersParser.g | 2 +-
.../hadoop/hive/ql/plan/DescTableDesc.java | 14 -
.../queries/clientpositive/describe_pretty.q | 80 -----
.../queries/clientpositive/escape_comments.q | 1 -
.../beeline/escape_comments.q.out | 18 --
.../clientpositive/describe_pretty.q.out | 323 -------------------
.../clientpositive/escape_comments.q.out | 18 --
15 files changed, 26 insertions(+), 718 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5e72c2/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
index aac38eb..ee3f52d 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
@@ -3501,7 +3501,7 @@ public class DDLTask extends Task<DDLWork> implements Serializable {
boolean isOutputPadded = !SessionState.get().isHiveServerQuery();
formatter.describeTable(outStream, colPath, tableName, tbl, part,
cols, descTbl.isFormatted(), descTbl.isExt(),
- descTbl.isPretty(), isOutputPadded, colStats,
+ isOutputPadded, colStats,
pkInfo, fkInfo, ukInfo, nnInfo);
LOG.debug("DDLTask: written data for " + tbl.getTableName());
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5e72c2/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/JsonMetaDataFormatter.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/JsonMetaDataFormatter.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/JsonMetaDataFormatter.java
index d795a19..bdf1b26 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/JsonMetaDataFormatter.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/JsonMetaDataFormatter.java
@@ -105,7 +105,7 @@ public class JsonMetaDataFormatter implements MetaDataFormatter {
@Override
public void describeTable(DataOutputStream out, String colPath,
String tableName, Table tbl, Partition part, List<FieldSchema> cols,
- boolean isFormatted, boolean isExt, boolean isPretty,
+ boolean isFormatted, boolean isExt,
boolean isOutputPadded, List<ColumnStatisticsObj> colStats,
PrimaryKeyInfo pkInfo, ForeignKeyInfo fkInfo,
UniqueConstraint ukInfo, NotNullConstraint nnInfo) throws HiveException {
@@ -362,8 +362,9 @@ public class JsonMetaDataFormatter implements MetaDataFormatter {
String[] kv = StringUtils.split(part, "=", 2);
if (kv != null) {
name = kv[0];
- if (kv.length > 1)
+ if (kv.length > 1) {
val = URLDecoder.decode(kv[1], "UTF-8");
+ }
}
if (val != null) {
names.add(name + "='" + val + "'");
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5e72c2/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatter.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatter.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatter.java
index 72ee440..ac5b306 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatter.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatter.java
@@ -83,7 +83,7 @@ public interface MetaDataFormatter {
*/
public void describeTable(DataOutputStream out, String colPath,
String tableName, Table tbl, Partition part, List<FieldSchema> cols,
- boolean isFormatted, boolean isExt, boolean isPretty,
+ boolean isFormatted, boolean isExt,
boolean isOutputPadded, List<ColumnStatisticsObj> colStats,
PrimaryKeyInfo pkInfo, ForeignKeyInfo fkInfo,
UniqueConstraint ukInfo, NotNullConstraint nnInfo)
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5e72c2/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataPrettyFormatUtils.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataPrettyFormatUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataPrettyFormatUtils.java
deleted file mode 100644
index 768ccef..0000000
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataPrettyFormatUtils.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/**
- * 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.hadoop.hive.ql.metadata.formatting;
-
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.hadoop.hive.metastore.api.FieldSchema;
-
-/**
- * This class provides methods to format the output of DESCRIBE PRETTY
- * in a human-readable way.
- */
-public final class MetaDataPrettyFormatUtils {
-
- public static final int PRETTY_MAX_INTERCOL_SPACING = 4;
- private static final int PRETTY_ALIGNMENT = 10;
- /**
- * Minimum length of the comment column. This is relevant only when the terminal width
- * or hive.cli.pretty.output.num.cols is too small, or when there are very large column
- * names.
- * 10 was arbitrarily chosen.
- */
- private static final int MIN_COMMENT_COLUMN_LEN = 10;
-
- private MetaDataPrettyFormatUtils() {
- }
-
- /**
- * @param prettyOutputNumCols The pretty output is formatted to fit within
- * these many columns.
- */
- public static String getAllColumnsInformation(List<FieldSchema> cols,
- List<FieldSchema> partCols, int prettyOutputNumCols) {
- StringBuilder columnInformation = new StringBuilder(
- MetaDataFormatUtils.DEFAULT_STRINGBUILDER_SIZE);
- int maxColNameLen = findMaxColumnNameLen(cols);
- formatColumnsHeaderPretty(columnInformation, maxColNameLen, prettyOutputNumCols);
- formatAllFieldsPretty(columnInformation, cols, maxColNameLen, prettyOutputNumCols);
-
- if ((partCols != null) && (!partCols.isEmpty())) {
- columnInformation.append(MetaDataFormatUtils.LINE_DELIM)
- .append("# Partition Information")
- .append(MetaDataFormatUtils.LINE_DELIM);
- formatColumnsHeaderPretty(columnInformation, maxColNameLen, prettyOutputNumCols);
- formatAllFieldsPretty(columnInformation, partCols, maxColNameLen, prettyOutputNumCols);
- }
-
- return columnInformation.toString();
- }
-
- /**
- * Find the length of the largest column name.
- */
- private static int findMaxColumnNameLen(List<FieldSchema> cols) {
- int maxLen = -1;
- for (FieldSchema col : cols) {
- int colNameLen = col.getName().length();
- if (colNameLen > maxLen) {
- maxLen = colNameLen;
- }
- }
- return maxLen;
- }
-
- /**
- * @param maxColNameLen The length of the largest column name
- */
- private static void formatColumnsHeaderPretty(StringBuilder columnInformation,
- int maxColNameLen, int prettyOutputNumCols) {
- String columnHeaders[] = MetaDataFormatUtils.getColumnsHeader(null);
- formatOutputPretty(columnHeaders[0], columnHeaders[1], columnHeaders[2],
- columnInformation, maxColNameLen, prettyOutputNumCols);
- columnInformation.append(MetaDataFormatUtils.FIELD_DELIM)
- .append(MetaDataFormatUtils.FIELD_DELIM).append(MetaDataFormatUtils.LINE_DELIM);
- }
-
- private static void formatAllFieldsPretty(StringBuilder tableInfo,
- List<FieldSchema> cols, int maxColNameLen, int prettyOutputNumCols) {
- for (FieldSchema col : cols) {
- formatOutputPretty(col.getName(), col.getType(),
- MetaDataFormatUtils.getComment(col), tableInfo, maxColNameLen,
- prettyOutputNumCols);
- }
- }
-
- /**
- * If the specified comment is too long, add line breaks at appropriate
- * locations. Note that the comment may already include line-breaks
- * specified by the user at table creation time.
- * @param columnsAlreadyConsumed The number of columns on the current line
- * that have already been consumed by the column name, column type and
- * and the surrounding delimiters.
- * @return The comment with line breaks added at appropriate locations.
- */
- private static String breakCommentIntoMultipleLines(String comment,
- int columnsAlreadyConsumed, int prettyOutputNumCols) {
-
- if (prettyOutputNumCols == -1) {
- // XXX fixed to 80 to remove jline dep
- prettyOutputNumCols = 80 - 1;
- }
-
- int commentNumCols = prettyOutputNumCols - columnsAlreadyConsumed;
- if (commentNumCols < MIN_COMMENT_COLUMN_LEN) {
- commentNumCols = MIN_COMMENT_COLUMN_LEN;
- }
-
- // Track the number of columns allocated for the comment that have
- // already been consumed on the current line.
- int commentNumColsConsumed = 0;
-
- StringTokenizer st = new StringTokenizer(comment, " \t\n\r\f", true);
- // We use a StringTokenizer instead of a BreakIterator, because
- // table comments often contain text that looks like code. For eg:
- // 'Type0' => 0, // This is Type 0
- // 'Type1' => 1, // This is Type 1
- // BreakIterator is meant for regular text, and was found to give
- // bad line breaks when we tried it out.
-
- StringBuilder commentBuilder = new StringBuilder(comment.length());
- while (st.hasMoreTokens()) {
- String currWord = st.nextToken();
- if (currWord.equals("\n") || currWord.equals("\r") || currWord.equals("\f")) {
- commentBuilder.append(currWord);
- commentNumColsConsumed = 0;
- continue;
- }
- if (commentNumColsConsumed + currWord.length() > commentNumCols) {
- // currWord won't fit on the current line
- if (currWord.length() > commentNumCols) {
- // currWord is too long to split on a line even all by itself.
- // Hence we have no option but to split it. The first chunk
- // will go to the end of the current line. Subsequent chunks
- // will be of length commentNumCols. The last chunk
- // may be smaller.
- while (currWord.length() > commentNumCols) {
- int remainingLineLen = commentNumCols - commentNumColsConsumed;
- String wordChunk = currWord.substring(0, remainingLineLen);
- commentBuilder.append(wordChunk);
- commentBuilder.append(MetaDataFormatUtils.LINE_DELIM);
- commentNumColsConsumed = 0;
- currWord = currWord.substring(remainingLineLen);
- }
- // Handle the last chunk
- if (currWord.length() > 0) {
- commentBuilder.append(currWord);
- commentNumColsConsumed = currWord.length();
- }
- } else {
- // Start on a new line
- commentBuilder.append(MetaDataFormatUtils.LINE_DELIM);
- if (!currWord.equals(" ")) {
- // When starting a new line, do not start with a space.
- commentBuilder.append(currWord);
- commentNumColsConsumed = currWord.length();
- } else {
- commentNumColsConsumed = 0;
- }
- }
- } else {
- commentBuilder.append(currWord);
- commentNumColsConsumed += currWord.length();
- }
- }
- return commentBuilder.toString();
- }
-
- /**
- * Appends the specified text with alignment to sb.
- * Also appends an appopriately sized delimiter.
- * @return The number of columns consumed by the aligned string and the
- * delimiter.
- */
- private static int appendFormattedColumn(StringBuilder sb, String text,
- int alignment) {
- String paddedText = String.format("%-" + alignment + "s", text);
- int delimCount = 0;
- if (paddedText.length() < alignment + PRETTY_MAX_INTERCOL_SPACING) {
- delimCount = (alignment + PRETTY_MAX_INTERCOL_SPACING)
- - paddedText.length();
- } else {
- delimCount = PRETTY_MAX_INTERCOL_SPACING;
- }
- String delim = StringUtils.repeat(" ", delimCount);
- sb.append(paddedText);
- sb.append(delim);
- sb.append(MetaDataFormatUtils.FIELD_DELIM);
-
- return paddedText.length() + delim.length();
- }
-
- private static void formatOutputPretty(String colName, String colType,
- String colComment, StringBuilder tableInfo, int maxColNameLength,
- int prettyOutputNumCols) {
- int colsNameConsumed = appendFormattedColumn(tableInfo, colName, maxColNameLength + 1);
- int colsTypeConsumed =appendFormattedColumn(tableInfo, colType, PRETTY_ALIGNMENT);
-
- colComment = breakCommentIntoMultipleLines(colComment, colsNameConsumed + colsTypeConsumed,
- prettyOutputNumCols);
-
- /* Comment indent processing for multi-line comments.
- * Comments should be indented the same amount on each line
- * if the first line comment starts indented by k,
- * the following line comments should also be indented by k
- * The following line comments will as a new line,so we need to
- * add colsNameConsumed spaces as the first column and
- * colsTypeConsumed spaces as the second column and the
- * comment as the last column.we use two FIELD_DELIM to
- * split them.
- */
- String[] commentSegments = colComment.split("\n|\r|\r\n");
- tableInfo.append(trimTrailingWS(commentSegments[0]));
- tableInfo.append(MetaDataFormatUtils.LINE_DELIM);
- for (int i = 1; i < commentSegments.length; i++) {
- tableInfo.append(String.format(
- "%" + colsNameConsumed + "s" + MetaDataFormatUtils.FIELD_DELIM + "%" + colsTypeConsumed
- + "s" + MetaDataFormatUtils.FIELD_DELIM + "%s", "", "", commentSegments[i]));
- tableInfo.append(MetaDataFormatUtils.LINE_DELIM);
- }
- }
-
- private static String trimTrailingWS(String str) {
- return str.replaceAll("\\s+$", "");
- }
-}
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5e72c2/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java
----------------------------------------------------------------------
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 833dad6..18ce1f5 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
@@ -123,18 +123,12 @@ class TextMetaDataFormatter implements MetaDataFormatter {
@Override
public void describeTable(DataOutputStream outStream, String colPath,
String tableName, Table tbl, Partition part, List<FieldSchema> cols,
- boolean isFormatted, boolean isExt, boolean isPretty,
+ boolean isFormatted, boolean isExt,
boolean isOutputPadded, List<ColumnStatisticsObj> colStats,
PrimaryKeyInfo pkInfo, ForeignKeyInfo fkInfo,
UniqueConstraint ukInfo, NotNullConstraint nnInfo) throws HiveException {
try {
List<FieldSchema> partCols = tbl.isPartitioned() ? tbl.getPartCols() : null;
-
- if (isPretty) {
- String output = MetaDataPrettyFormatUtils.getAllColumnsInformation(cols, partCols, prettyOutputNumCols);
- outStream.write(output.getBytes("UTF-8"));
- return;
- }
String output = "";
boolean isColStatsAvailable = colStats != null;
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5e72c2/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
index e70a72c..0036d18 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
@@ -591,8 +591,9 @@ public class DDLSemanticAnalyzer extends BaseSemanticAnalyzer {
}
}
- if (colType == null)
+ if (colType == null) {
throw new SemanticException("column type not found");
+ }
ColumnStatsDesc cStatsDesc = new ColumnStatsDesc(tbl.getDbName() + "." + tbl.getTableName(),
Arrays.asList(colName), Arrays.asList(colType), partSpec == null);
@@ -1799,7 +1800,9 @@ public class DDLSemanticAnalyzer extends BaseSemanticAnalyzer {
}
LinkedHashMap<String, String> newPartSpec = null;
- if (partSpec != null) newPartSpec = new LinkedHashMap<String, String>(partSpec);
+ if (partSpec != null) {
+ newPartSpec = new LinkedHashMap<String, String>(partSpec);
+ }
HashMap<String, String> mapProp = null;
boolean isBlocking = false;
@@ -2091,7 +2094,6 @@ public class DDLSemanticAnalyzer extends BaseSemanticAnalyzer {
int descOptions = ast.getChild(1).getType();
descTblDesc.setFormatted(descOptions == HiveParser.KW_FORMATTED);
descTblDesc.setExt(descOptions == HiveParser.KW_EXTENDED);
- descTblDesc.setPretty(descOptions == HiveParser.KW_PRETTY);
// in case of "DESCRIBE FORMATTED tablename column_name" statement, colPath
// will contain tablename.column_name. If column_name is not specified
// colPath will be equal to tableName. This is how we can differentiate
@@ -2897,7 +2899,10 @@ public class DDLSemanticAnalyzer extends BaseSemanticAnalyzer {
}
Map<Integer, List<ExprNodeGenericFuncDesc>> partSpecs =
getFullPartitionSpecs(ast, tab, canGroupExprs);
- if (partSpecs.isEmpty()) return; // nothing to do
+ if (partSpecs.isEmpty())
+ {
+ return; // nothing to do
+ }
validateAlterTableType(tab, AlterTableTypes.DROPPARTITION, expectView);
ReadEntity re = new ReadEntity(tab);
@@ -3232,7 +3237,9 @@ public class DDLSemanticAnalyzer extends BaseSemanticAnalyzer {
new HashMap<Integer, List<ExprNodeGenericFuncDesc>>();
for (int childIndex = 0; childIndex < ast.getChildCount(); childIndex++) {
Tree partSpecTree = ast.getChild(childIndex);
- if (partSpecTree.getType() != HiveParser.TOK_PARTSPEC) continue;
+ if (partSpecTree.getType() != HiveParser.TOK_PARTSPEC) {
+ continue;
+ }
ExprNodeGenericFuncDesc expr = null;
HashSet<String> names = new HashSet<String>(partSpecTree.getChildCount());
for (int i = 0; i < partSpecTree.getChildCount(); ++i) {
@@ -3284,7 +3291,9 @@ public class DDLSemanticAnalyzer extends BaseSemanticAnalyzer {
expr = (expr == null) ? op : makeBinaryPredicate("and", expr, op);
names.add(key);
}
- if (expr == null) continue;
+ if (expr == null) {
+ continue;
+ }
// We got the expr for one full partition spec. Determine the prefix length.
int prefixLength = calculatePartPrefix(tab, names);
List<ExprNodeGenericFuncDesc> orExpr = result.get(prefixLength);
@@ -3323,7 +3332,9 @@ public class DDLSemanticAnalyzer extends BaseSemanticAnalyzer {
private int calculatePartPrefix(Table tbl, HashSet<String> partSpecKeys) {
int partPrefixToDrop = 0;
for (FieldSchema fs : tbl.getPartCols()) {
- if (!partSpecKeys.contains(fs.getName())) break;
+ if (!partSpecKeys.contains(fs.getName())) {
+ break;
+ }
++partPrefixToDrop;
}
return partPrefixToDrop;
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5e72c2/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g b/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g
index 0f1f6f6..6ffca02 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g
@@ -188,7 +188,6 @@ KW_JAR: 'JAR';
KW_EXPLAIN: 'EXPLAIN';
KW_EXTENDED: 'EXTENDED';
KW_FORMATTED: 'FORMATTED';
-KW_PRETTY: 'PRETTY';
KW_DEPENDENCY: 'DEPENDENCY';
KW_LOGICAL: 'LOGICAL';
KW_SERDE: 'SERDE';
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5e72c2/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g b/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
index e8fa9f2..2cb6946 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
@@ -1528,7 +1528,7 @@ descStatement
|
(KW_FUNCTION) => KW_FUNCTION KW_EXTENDED? (name=descFuncNames) -> ^(TOK_DESCFUNCTION $name KW_EXTENDED?)
|
- (KW_FORMATTED|KW_EXTENDED|KW_PRETTY) => ((descOptions=KW_FORMATTED|descOptions=KW_EXTENDED|descOptions=KW_PRETTY) parttype=tabPartColTypeExpr) -> ^(TOK_DESCTABLE $parttype $descOptions)
+ (KW_FORMATTED|KW_EXTENDED) => ((descOptions=KW_FORMATTED|descOptions=KW_EXTENDED) parttype=tabPartColTypeExpr) -> ^(TOK_DESCTABLE $parttype $descOptions)
|
parttype=tabPartColTypeExpr -> ^(TOK_DESCTABLE $parttype)
)
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5e72c2/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g b/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g
index cd21de2..0591fbf 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g
@@ -789,7 +789,7 @@ nonReserved
| KW_INDEX | KW_INDEXES | KW_INPATH | KW_INPUTDRIVER | KW_INPUTFORMAT | KW_ITEMS | KW_JAR | KW_KILL
| KW_KEYS | KW_KEY_TYPE | KW_LAST | KW_LIMIT | KW_OFFSET | KW_LINES | KW_LOAD | KW_LOCATION | KW_LOCK | KW_LOCKS | KW_LOGICAL | KW_LONG
| KW_MAPJOIN | KW_MATERIALIZED | KW_METADATA | KW_MINUTE | KW_MONTH | KW_MSCK | KW_NOSCAN | KW_NO_DROP | KW_NULLS | KW_OFFLINE
- | KW_OPTION | KW_OUTPUTDRIVER | KW_OUTPUTFORMAT | KW_OVERWRITE | KW_OWNER | KW_PARTITIONED | KW_PARTITIONS | KW_PLUS | KW_PRETTY
+ | KW_OPTION | KW_OUTPUTDRIVER | KW_OUTPUTFORMAT | KW_OVERWRITE | KW_OWNER | KW_PARTITIONED | KW_PARTITIONS | KW_PLUS
| KW_PRINCIPALS | KW_PROTECTION | KW_PURGE | KW_QUERY | KW_QUARTER | KW_READ | KW_READONLY | KW_REBUILD | KW_RECORDREADER | KW_RECORDWRITER
| KW_RELOAD | KW_RENAME | KW_REPAIR | KW_REPLACE | KW_REPLICATION | KW_RESTRICT | KW_REWRITE
| KW_ROLE | KW_ROLES | KW_SCHEMA | KW_SCHEMAS | KW_SECOND | KW_SEMI | KW_SERDE | KW_SERDEPROPERTIES | KW_SERVER | KW_SETS | KW_SHARED
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5e72c2/ql/src/java/org/apache/hadoop/hive/ql/plan/DescTableDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/DescTableDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/DescTableDesc.java
index 88c9921..302926e 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/DescTableDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/DescTableDesc.java
@@ -45,11 +45,6 @@ public class DescTableDesc extends DDLDesc implements Serializable {
boolean isExt;
boolean isFormatted;
- /** Show pretty output? This has more human-readable formatting than
- * isFormatted mode.
- */
- private boolean isPretty;
-
/**
* table name for the result of describe table.
*/
@@ -74,7 +69,6 @@ public class DescTableDesc extends DDLDesc implements Serializable {
Map<String, String> partSpec, String colPath) {
this.isExt = false;
this.isFormatted = false;
- this.isPretty = false;
this.partSpec = partSpec;
this.resFile = resFile.toString();
this.tableName = tableName;
@@ -122,14 +116,6 @@ public class DescTableDesc extends DDLDesc implements Serializable {
this.isFormatted = isFormat;
}
- public boolean isPretty() {
- return this.isPretty;
- }
-
- public void setPretty(boolean isPretty) {
- this.isPretty = isPretty;
- }
-
/**
* @return the tableName
*/
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5e72c2/ql/src/test/queries/clientpositive/describe_pretty.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/describe_pretty.q b/ql/src/test/queries/clientpositive/describe_pretty.q
deleted file mode 100644
index 89db075..0000000
--- a/ql/src/test/queries/clientpositive/describe_pretty.q
+++ /dev/null
@@ -1,80 +0,0 @@
--- test comment indent processing for multi-line comments
-
-CREATE TABLE test_table(
- col1 INT COMMENT 'col1 one line comment',
- col2 STRING COMMENT 'col2
-two lines comment',
- col3 STRING COMMENT 'col3
-three lines
-comment',
- col4 STRING COMMENT 'col4 very long comment that is greater than 80 chars and is likely to spill into multiple lines',
- col5 STRING COMMENT 'col5 very long multi-line comment where each line is very long by itself and is likely to spill
-into multiple lines. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin in dolor nisl, sodales
-adipiscing tortor. Integer venenatis',
- col6 STRING COMMENT 'This comment has a very long single word ABCDEFGHIJKLMNOPQRSTUVXYZabcdefghijklmnopqrstuvzxyz123 which will not fit in a line by itself for small column widths.',
- col7_NoComment STRING)
-COMMENT 'table comment
-two lines';
-
-SET hive.cli.pretty.output.num.cols=80;
-
--- There will be an extra tab at the end of each comment line in the output.
--- This is because DESCRIBE <table_name> command separates the column, type and
--- comment field using a \t. DESCRIBE PRETTY <table_name> uses spaces instead
--- of \t to separate columns. Hive gets confused when it parses the string
--- table description constructed in MetaDataPrettyFormatUtils, and adds a tab
--- at the end of each line.
--- There are three ways to address this:
--- 1. Pad each row to the full terminal width with extra spaces.
--- 2. Assume a maximum tab width of 8, and subtract 2 * 8 spaces from the
--- available line width. This approach wastes upto 2 * 8 - 2 columns.
--- 3. Since the pretty output is meant only for human consumption, do nothing.
--- Just add a comment to the unit test file explaining what is happening.
--- This is the approach chosen.
-
-DESCRIBE PRETTY test_table;
-
-SET hive.cli.pretty.output.num.cols=200;
-DESCRIBE PRETTY test_table;
-
-SET hive.cli.pretty.output.num.cols=50;
-DESCRIBE PRETTY test_table;
-
-SET hive.cli.pretty.output.num.cols=60;
-DESCRIBE PRETTY test_table;
-
-CREATE TABLE test_table_very_long_column_name(
- col1 INT COMMENT 'col1 one line comment',
- col2_abcdefghiklmnopqrstuvxyz STRING COMMENT 'col2
-two lines comment',
- col3 STRING COMMENT 'col3
-three lines
-comment',
- col4 STRING COMMENT 'col4 very long comment that is greater than 80 chars and is likely to spill into multiple lines')
-;
-
-SET hive.cli.pretty.output.num.cols=80;
-DESCRIBE PRETTY test_table_very_long_column_name;
-
-SET hive.cli.pretty.output.num.cols=20;
-DESCRIBE PRETTY test_table_very_long_column_name;
-
-CREATE TABLE test_table_partitioned(
- col1 INT COMMENT 'col1 one line comment',
- col2 STRING COMMENT 'col2
-two lines comment',
- col3 STRING COMMENT 'col3
-three lines
-comment',
- col4 STRING COMMENT 'col4 very long comment that is greater than 80 chars and is likely to spill into multiple lines',
- col5 STRING COMMENT 'col5 very long multi-line comment where each line is very long by itself and is likely to spill
-into multiple lines. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin in dolor nisl, sodales
-adipiscing tortor. Integer venenatis',
- col6 STRING COMMENT 'This comment has a very long single word ABCDEFGHIJKLMNOPQRSTUVXYZabcdefghijklmnopqrstuvzxyz123 which will not fit in a line by itself for small column widths.',
- col7_NoComment STRING)
-COMMENT 'table comment
-two lines'
-PARTITIONED BY (ds STRING);
-
-SET hive.cli.pretty.output.num.cols=60;
-DESCRIBE PRETTY test_table_partitioned;
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5e72c2/ql/src/test/queries/clientpositive/escape_comments.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/escape_comments.q b/ql/src/test/queries/clientpositive/escape_comments.q
index 8c38690..bcfac3d 100644
--- a/ql/src/test/queries/clientpositive/escape_comments.q
+++ b/ql/src/test/queries/clientpositive/escape_comments.q
@@ -11,7 +11,6 @@ describe database extended escape_comments_db;
describe database escape_comments_db;
show create table escape_comments_tbl1;
describe formatted escape_comments_tbl1;
-describe pretty escape_comments_tbl1;
describe escape_comments_tbl1;
show create table escape_comments_view1;
describe formatted escape_comments_view1;
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5e72c2/ql/src/test/results/clientpositive/beeline/escape_comments.q.out
----------------------------------------------------------------------
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 9e17935..1b81d7c 100644
--- a/ql/src/test/results/clientpositive/beeline/escape_comments.q.out
+++ b/ql/src/test/results/clientpositive/beeline/escape_comments.q.out
@@ -118,24 +118,6 @@ Bucket Columns: [] NULL
Sort Columns: [] NULL
Storage Desc Params: NULL NULL
serialization.format 1
-PREHOOK: query: describe pretty escape_comments_tbl1
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: escape_comments_db@escape_comments_tbl1
-POSTHOOK: query: describe pretty escape_comments_tbl1
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: escape_comments_db@escape_comments_tbl1
-col_name data_type comment
-
-col1 string a
- b';
-p1 string a
- b
- NULL NULL
-# Partition Information NULL NULL
-col_name data_type comment
-
-p1 string a
- b
PREHOOK: query: describe escape_comments_tbl1
PREHOOK: type: DESCTABLE
PREHOOK: Input: escape_comments_db@escape_comments_tbl1
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5e72c2/ql/src/test/results/clientpositive/describe_pretty.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/describe_pretty.q.out b/ql/src/test/results/clientpositive/describe_pretty.q.out
deleted file mode 100644
index aa90a67..0000000
--- a/ql/src/test/results/clientpositive/describe_pretty.q.out
+++ /dev/null
@@ -1,323 +0,0 @@
-PREHOOK: query: CREATE TABLE test_table(
- col1 INT COMMENT 'col1 one line comment',
- col2 STRING COMMENT 'col2
-two lines comment',
- col3 STRING COMMENT 'col3
-three lines
-comment',
- col4 STRING COMMENT 'col4 very long comment that is greater than 80 chars and is likely to spill into multiple lines',
- col5 STRING COMMENT 'col5 very long multi-line comment where each line is very long by itself and is likely to spill
-into multiple lines. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin in dolor nisl, sodales
-adipiscing tortor. Integer venenatis',
- col6 STRING COMMENT 'This comment has a very long single word ABCDEFGHIJKLMNOPQRSTUVXYZabcdefghijklmnopqrstuvzxyz123 which will not fit in a line by itself for small column widths.',
- col7_NoComment STRING)
-COMMENT 'table comment
-two lines'
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@test_table
-POSTHOOK: query: CREATE TABLE test_table(
- col1 INT COMMENT 'col1 one line comment',
- col2 STRING COMMENT 'col2
-two lines comment',
- col3 STRING COMMENT 'col3
-three lines
-comment',
- col4 STRING COMMENT 'col4 very long comment that is greater than 80 chars and is likely to spill into multiple lines',
- col5 STRING COMMENT 'col5 very long multi-line comment where each line is very long by itself and is likely to spill
-into multiple lines. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin in dolor nisl, sodales
-adipiscing tortor. Integer venenatis',
- col6 STRING COMMENT 'This comment has a very long single word ABCDEFGHIJKLMNOPQRSTUVXYZabcdefghijklmnopqrstuvzxyz123 which will not fit in a line by itself for small column widths.',
- col7_NoComment STRING)
-COMMENT 'table comment
-two lines'
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@test_table
-PREHOOK: query: DESCRIBE PRETTY test_table
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@test_table
-POSTHOOK: query: DESCRIBE PRETTY test_table
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@test_table
-col_name data_type comment
-
-col1 int col1 one line comment
-col2 string col2
- two lines comment
-col3 string col3
- three lines
- comment
-col4 string col4 very long comment that is greater than 80
- chars and is likely to spill into multiple
- lines
-col5 string col5 very long multi-line comment where each
- line is very long by itself and is likely to
- spill
- into multiple lines. Lorem ipsum dolor sit
- amet, consectetur adipiscing elit. Proin in
- dolor nisl, sodales
- adipiscing tortor. Integer venenatis
-col6 string This comment has a very long single word ABCDEF
- GHIJKLMNOPQRSTUVXYZabcdefghijklmnopqrstuvzxyz12
- 3 which will not fit in a line by itself for
- small column widths.
-col7_nocomment string
-PREHOOK: query: DESCRIBE PRETTY test_table
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@test_table
-POSTHOOK: query: DESCRIBE PRETTY test_table
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@test_table
-col_name data_type comment
-
-col1 int col1 one line comment
-col2 string col2
- two lines comment
-col3 string col3
- three lines
- comment
-col4 string col4 very long comment that is greater than 80 chars and is likely to spill into multiple lines
-col5 string col5 very long multi-line comment where each line is very long by itself and is likely to spill
- into multiple lines. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin in dolor nisl, sodales
- adipiscing tortor. Integer venenatis
-col6 string This comment has a very long single word ABCDEFGHIJKLMNOPQRSTUVXYZabcdefghijklmnopqrstuvzxyz123 which will not fit in a line by itself for small column widths.
-col7_nocomment string
-PREHOOK: query: DESCRIBE PRETTY test_table
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@test_table
-POSTHOOK: query: DESCRIBE PRETTY test_table
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@test_table
-col_name data_type comment
-
-col1 int col1 one line
- comment
-col2 string col2
- two lines comment
-col3 string col3
- three lines
- comment
-col4 string col4 very long
- comment that is
- greater than 80
- chars and is
- likely to spill
- into multiple
- lines
-col5 string col5 very long
- multi-line
- comment where
- each line is very
- long by itself
- and is likely to
- spill
- into multiple
- lines. Lorem
- ipsum dolor sit
- amet, consectetur
- adipiscing elit.
- Proin in dolor
- nisl, sodales
- adipiscing
- tortor. Integer
- venenatis
-col6 string This comment has
- a very long
- single word ABCDE
- FGHIJKLMNOPQRSTUV
- XYZabcdefghijklmn
- opqrstuvzxyz123
- which will not
- fit in a line by
- itself for small
- column widths.
-col7_nocomment string
-PREHOOK: query: DESCRIBE PRETTY test_table
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@test_table
-POSTHOOK: query: DESCRIBE PRETTY test_table
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@test_table
-col_name data_type comment
-
-col1 int col1 one line comment
-col2 string col2
- two lines comment
-col3 string col3
- three lines
- comment
-col4 string col4 very long comment that
- is greater than 80 chars
- and is likely to spill into
- multiple lines
-col5 string col5 very long multi-line
- comment where each line is
- very long by itself and is
- likely to spill
- into multiple lines. Lorem
- ipsum dolor sit amet,
- consectetur adipiscing
- elit. Proin in dolor nisl,
- sodales
- adipiscing tortor. Integer
- venenatis
-col6 string This comment has a very
- long single word ABCDEFGHIJ
- KLMNOPQRSTUVXYZabcdefghijkl
- mnopqrstuvzxyz123 which
- will not fit in a line by
- itself for small column
- widths.
-col7_nocomment string
-PREHOOK: query: CREATE TABLE test_table_very_long_column_name(
- col1 INT COMMENT 'col1 one line comment',
- col2_abcdefghiklmnopqrstuvxyz STRING COMMENT 'col2
-two lines comment',
- col3 STRING COMMENT 'col3
-three lines
-comment',
- col4 STRING COMMENT 'col4 very long comment that is greater than 80 chars and is likely to spill into multiple lines')
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@test_table_very_long_column_name
-POSTHOOK: query: CREATE TABLE test_table_very_long_column_name(
- col1 INT COMMENT 'col1 one line comment',
- col2_abcdefghiklmnopqrstuvxyz STRING COMMENT 'col2
-two lines comment',
- col3 STRING COMMENT 'col3
-three lines
-comment',
- col4 STRING COMMENT 'col4 very long comment that is greater than 80 chars and is likely to spill into multiple lines')
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@test_table_very_long_column_name
-PREHOOK: query: DESCRIBE PRETTY test_table_very_long_column_name
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@test_table_very_long_column_name
-POSTHOOK: query: DESCRIBE PRETTY test_table_very_long_column_name
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@test_table_very_long_column_name
-col_name data_type comment
-
-col1 int col1 one line comment
-col2_abcdefghiklmnopqrstuvxyz string col2
- two lines comment
-col3 string col3
- three lines
- comment
-col4 string col4 very long comment that is
- greater than 80 chars and is
- likely to spill into multiple
- lines
-PREHOOK: query: DESCRIBE PRETTY test_table_very_long_column_name
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@test_table_very_long_column_name
-POSTHOOK: query: DESCRIBE PRETTY test_table_very_long_column_name
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@test_table_very_long_column_name
-col_name data_type comment
-
-col1 int col1 one
- line
- comment
-col2_abcdefghiklmnopqrstuvxyz string col2
- two lines
- comment
-col3 string col3
- three
- lines
- comment
-col4 string col4 very
- long
- comment
- that is
- greater
- than 80
- chars and
- is likely
- to spill
- into
- multiple
- lines
-PREHOOK: query: CREATE TABLE test_table_partitioned(
- col1 INT COMMENT 'col1 one line comment',
- col2 STRING COMMENT 'col2
-two lines comment',
- col3 STRING COMMENT 'col3
-three lines
-comment',
- col4 STRING COMMENT 'col4 very long comment that is greater than 80 chars and is likely to spill into multiple lines',
- col5 STRING COMMENT 'col5 very long multi-line comment where each line is very long by itself and is likely to spill
-into multiple lines. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin in dolor nisl, sodales
-adipiscing tortor. Integer venenatis',
- col6 STRING COMMENT 'This comment has a very long single word ABCDEFGHIJKLMNOPQRSTUVXYZabcdefghijklmnopqrstuvzxyz123 which will not fit in a line by itself for small column widths.',
- col7_NoComment STRING)
-COMMENT 'table comment
-two lines'
-PARTITIONED BY (ds STRING)
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@test_table_partitioned
-POSTHOOK: query: CREATE TABLE test_table_partitioned(
- col1 INT COMMENT 'col1 one line comment',
- col2 STRING COMMENT 'col2
-two lines comment',
- col3 STRING COMMENT 'col3
-three lines
-comment',
- col4 STRING COMMENT 'col4 very long comment that is greater than 80 chars and is likely to spill into multiple lines',
- col5 STRING COMMENT 'col5 very long multi-line comment where each line is very long by itself and is likely to spill
-into multiple lines. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin in dolor nisl, sodales
-adipiscing tortor. Integer venenatis',
- col6 STRING COMMENT 'This comment has a very long single word ABCDEFGHIJKLMNOPQRSTUVXYZabcdefghijklmnopqrstuvzxyz123 which will not fit in a line by itself for small column widths.',
- col7_NoComment STRING)
-COMMENT 'table comment
-two lines'
-PARTITIONED BY (ds STRING)
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@test_table_partitioned
-PREHOOK: query: DESCRIBE PRETTY test_table_partitioned
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@test_table_partitioned
-POSTHOOK: query: DESCRIBE PRETTY test_table_partitioned
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@test_table_partitioned
-col_name data_type comment
-
-col1 int col1 one line comment
-col2 string col2
- two lines comment
-col3 string col3
- three lines
- comment
-col4 string col4 very long comment that
- is greater than 80 chars
- and is likely to spill into
- multiple lines
-col5 string col5 very long multi-line
- comment where each line is
- very long by itself and is
- likely to spill
- into multiple lines. Lorem
- ipsum dolor sit amet,
- consectetur adipiscing
- elit. Proin in dolor nisl,
- sodales
- adipiscing tortor. Integer
- venenatis
-col6 string This comment has a very
- long single word ABCDEFGHIJ
- KLMNOPQRSTUVXYZabcdefghijkl
- mnopqrstuvzxyz123 which
- will not fit in a line by
- itself for small column
- widths.
-col7_nocomment string
-ds string
-
-# Partition Information
-col_name data_type comment
-
-ds string
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5e72c2/ql/src/test/results/clientpositive/escape_comments.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/escape_comments.q.out b/ql/src/test/results/clientpositive/escape_comments.q.out
index ecd6331..6c86e81 100644
--- a/ql/src/test/results/clientpositive/escape_comments.q.out
+++ b/ql/src/test/results/clientpositive/escape_comments.q.out
@@ -120,24 +120,6 @@ Bucket Columns: []
Sort Columns: []
Storage Desc Params:
serialization.format 1
-PREHOOK: query: describe pretty escape_comments_tbl1
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: escape_comments_db@escape_comments_tbl1
-POSTHOOK: query: describe pretty escape_comments_tbl1
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: escape_comments_db@escape_comments_tbl1
-col_name data_type comment
-
-col1 string a
- b';
-p1 string a
- b
-
-# Partition Information
-col_name data_type comment
-
-p1 string a
- b
PREHOOK: query: describe escape_comments_tbl1
PREHOOK: type: DESCTABLE
PREHOOK: Input: escape_comments_db@escape_comments_tbl1
[13/21] hive git commit: HIVE-17519: Transpose column stats display
(Zoltan Haindrich, reviewed by Ashutosh Chauhan and Vineet Garg)
Posted by kg...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_table_update_status.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_table_update_status.q.out b/ql/src/test/results/clientpositive/alter_table_update_status.q.out
index 452f37b..899ebbd 100644
--- a/ql/src/test/results/clientpositive/alter_table_update_status.q.out
+++ b/ql/src/test/results/clientpositive/alter_table_update_status.q.out
@@ -46,9 +46,18 @@ PREHOOK: Input: default@src_stat
POSTHOOK: query: describe formatted src_stat key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 16 1.72 3 HL from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 16
+avg_col_len 1.72
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}}
PREHOOK: query: ALTER TABLE src_stat UPDATE STATISTICS for column key SET ('numDVs'='1111','avgColLen'='1.111')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -60,9 +69,18 @@ PREHOOK: Input: default@src_stat
POSTHOOK: query: describe formatted src_stat key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 1111 1.111 3 HL from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 1111
+avg_col_len 1.111
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}}
PREHOOK: query: ALTER TABLE src_stat UPDATE STATISTICS for column value SET ('numDVs'='121','numNulls'='122','avgColLen'='1.23','maxColLen'='124')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -74,9 +92,18 @@ PREHOOK: Input: default@src_stat
POSTHOOK: query: describe formatted src_stat value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 122 121 1.23 124 from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 122
+distinct_count 121
+avg_col_len 1.23
+max_col_len 124
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: ANALYZE TABLE src_stat_int COMPUTE STATISTICS for columns key
PREHOOK: type: QUERY
@@ -92,9 +119,18 @@ PREHOOK: Input: default@src_stat_int
POSTHOOK: query: describe formatted src_stat_int key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat_int
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key double 66.0 406.0 10 15 HL from deserializer
+col_name key
+data_type double
+min 66.0
+max 406.0
+num_nulls 10
+distinct_count 15
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"key\":\"true\"}}
PREHOOK: query: ALTER TABLE src_stat_int UPDATE STATISTICS for column key SET ('numDVs'='2222','lowValue'='333.22','highValue'='22.22')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -106,9 +142,18 @@ PREHOOK: Input: default@src_stat_int
POSTHOOK: query: describe formatted src_stat_int key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat_int
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key double 333.22 22.22 10 2222 HL from deserializer
+col_name key
+data_type double
+min 333.22
+max 22.22
+num_nulls 10
+distinct_count 2222
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"key\":\"true\"}}
PREHOOK: query: create database if not exists dummydb
PREHOOK: type: CREATEDATABASE
@@ -132,9 +177,18 @@ PREHOOK: Input: default@src_stat
POSTHOOK: query: describe formatted default.src_stat key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 3333 2.222 3 HL from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 3333
+avg_col_len 2.222
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: ALTER TABLE default.src_stat UPDATE STATISTICS for column value SET ('numDVs'='232','numNulls'='233','avgColLen'='2.34','maxColLen'='235')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -146,9 +200,18 @@ PREHOOK: Input: default@src_stat
POSTHOOK: query: describe formatted default.src_stat value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 233 232 2.34 235 from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 233
+distinct_count 232
+avg_col_len 2.34
+max_col_len 235
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: use default
PREHOOK: type: SWITCHDATABASE
@@ -246,9 +309,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats s
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-s smallint from deserializer
+col_name s
+data_type smallint
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats i
PREHOOK: type: DESCTABLE
@@ -256,9 +328,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats i
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-i int from deserializer
+col_name i
+data_type int
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats b
PREHOOK: type: DESCTABLE
@@ -266,9 +347,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats b
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-b bigint from deserializer
+col_name b
+data_type bigint
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats f
PREHOOK: type: DESCTABLE
@@ -276,9 +366,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats f
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-f float from deserializer
+col_name f
+data_type float
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats d
PREHOOK: type: DESCTABLE
@@ -286,9 +385,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats d
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-d double from deserializer
+col_name d
+data_type double
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats dem
PREHOOK: type: DESCTABLE
@@ -296,9 +404,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats dem
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-dem decimal(10,0) from deserializer
+col_name dem
+data_type decimal(10,0)
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats ts
PREHOOK: type: DESCTABLE
@@ -306,9 +423,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats ts
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-ts timestamp from deserializer
+col_name ts
+data_type timestamp
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats dt
PREHOOK: type: DESCTABLE
@@ -316,9 +442,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats dt
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-dt date from deserializer
+col_name dt
+data_type date
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats str
PREHOOK: type: DESCTABLE
@@ -326,9 +461,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats str
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-str string from deserializer
+col_name str
+data_type string
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats v
PREHOOK: type: DESCTABLE
@@ -336,9 +480,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-v varchar(12) from deserializer
+col_name v
+data_type varchar(12)
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats c
PREHOOK: type: DESCTABLE
@@ -346,9 +499,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats c
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-c char(5) from deserializer
+col_name c
+data_type char(5)
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats bl
PREHOOK: type: DESCTABLE
@@ -356,9 +518,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats bl
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-bl boolean from deserializer
+col_name bl
+data_type boolean
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats bin
PREHOOK: type: DESCTABLE
@@ -366,9 +537,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats bin
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-bin binary from deserializer
+col_name bin
+data_type binary
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats t
PREHOOK: type: DESCTABLE
@@ -376,9 +556,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats t
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-t tinyint from deserializer
+col_name t
+data_type tinyint
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column t SET ('numDVs'='232','numNulls'='233','highValue'='234','lowValue'='35')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -390,9 +579,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats t
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-t tinyint 35 234 233 232 from deserializer
+col_name t
+data_type tinyint
+min 35
+max 234
+num_nulls 233
+distinct_count 232
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"t\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats s
PREHOOK: type: DESCTABLE
@@ -400,9 +598,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats s
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-s smallint from deserializer
+col_name s
+data_type smallint
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"t\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column s SET ('numDVs'='56','numNulls'='56','highValue'='489','lowValue'='25')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -414,9 +621,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats s
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-s smallint 25 489 56 56 from deserializer
+col_name s
+data_type smallint
+min 25
+max 489
+num_nulls 56
+distinct_count 56
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats i
PREHOOK: type: DESCTABLE
@@ -424,9 +640,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats i
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-i int from deserializer
+col_name i
+data_type int
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column i SET ('numDVs'='59','numNulls'='1','highValue'='889','lowValue'='5')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -438,9 +663,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats i
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-i int 5 889 1 59 from deserializer
+col_name i
+data_type int
+min 5
+max 889
+num_nulls 1
+distinct_count 59
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"i\":\"true\",\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats b
PREHOOK: type: DESCTABLE
@@ -448,9 +682,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats b
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-b bigint from deserializer
+col_name b
+data_type bigint
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"i\":\"true\",\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column b SET ('numDVs'='9','numNulls'='14','highValue'='89','lowValue'='8')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -462,9 +705,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats b
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-b bigint 8 89 14 9 from deserializer
+col_name b
+data_type bigint
+min 8
+max 89
+num_nulls 14
+distinct_count 9
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats f
PREHOOK: type: DESCTABLE
@@ -472,9 +724,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats f
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-f float from deserializer
+col_name f
+data_type float
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column f SET ('numDVs'='563','numNulls'='45','highValue'='2345.656','lowValue'='8.00')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -486,9 +747,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats f
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-f float 8.0 2345.656 45 563 from deserializer
+col_name f
+data_type float
+min 8.0
+max 2345.656
+num_nulls 45
+distinct_count 563
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats d
PREHOOK: type: DESCTABLE
@@ -496,9 +766,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats d
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-d double from deserializer
+col_name d
+data_type double
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column d SET ('numDVs'='5677','numNulls'='12','highValue'='560.3367','lowValue'='0.00455')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -510,9 +789,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats d
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-d double 0.00455 560.3367 12 5677 from deserializer
+col_name d
+data_type double
+min 0.00455
+max 560.3367
+num_nulls 12
+distinct_count 5677
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats dem
PREHOOK: type: DESCTABLE
@@ -520,9 +808,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats dem
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-dem decimal(10,0) from deserializer
+col_name dem
+data_type decimal(10,0)
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column dem SET ('numDVs'='57','numNulls'='912','highValue'='560','lowValue'='0')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -534,9 +831,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats dem
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-dem decimal(10,0) 0 560 912 57 from deserializer
+col_name dem
+data_type decimal(10,0)
+min 0
+max 560
+num_nulls 912
+distinct_count 57
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats ts
PREHOOK: type: DESCTABLE
@@ -544,9 +850,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats ts
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-ts timestamp from deserializer
+col_name ts
+data_type timestamp
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column ts SET ('numDVs'='7','numNulls'='12','highValue'='1357030923','lowValue'='1357030924')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -558,9 +873,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats ts
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-ts timestamp 1357030924 1357030923 12 7 from deserializer
+col_name ts
+data_type timestamp
+min 1357030924
+max 1357030923
+num_nulls 12
+distinct_count 7
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\",\"ts\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats dt
PREHOOK: type: DESCTABLE
@@ -568,9 +892,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats dt
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-dt date from deserializer
+col_name dt
+data_type date
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\",\"ts\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column dt SET ('numDVs'='57','numNulls'='912','highValue'='2012-01-01','lowValue'='2001-02-04')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -582,9 +915,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats dt
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-dt date 2001-02-04 2012-01-01 912 57 from deserializer
+col_name dt
+data_type date
+min 2001-02-04
+max 2012-01-01
+num_nulls 912
+distinct_count 57
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\",\"ts\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats str
PREHOOK: type: DESCTABLE
@@ -592,9 +934,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats str
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-str string from deserializer
+col_name str
+data_type string
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\",\"ts\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column str SET ('numDVs'='232','numNulls'='233','avgColLen'='2.34','maxColLen'='235')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -606,9 +957,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats str
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-str string 233 232 2.34 235 from deserializer
+col_name str
+data_type string
+min
+max
+num_nulls 233
+distinct_count 232
+avg_col_len 2.34
+max_col_len 235
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"str\":\"true\",\"t\":\"true\",\"ts\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats v
PREHOOK: type: DESCTABLE
@@ -616,9 +976,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-v varchar(12) from deserializer
+col_name v
+data_type varchar(12)
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"str\":\"true\",\"t\":\"true\",\"ts\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column v SET ('numDVs'='22','numNulls'='33','avgColLen'='4.40','maxColLen'='25')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -630,9 +999,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-v varchar(12) 33 22 4.4 25 from deserializer
+col_name v
+data_type varchar(12)
+min
+max
+num_nulls 33
+distinct_count 22
+avg_col_len 4.4
+max_col_len 25
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"str\":\"true\",\"t\":\"true\",\"ts\":\"true\",\"v\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats c
PREHOOK: type: DESCTABLE
@@ -640,9 +1018,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats c
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-c char(5) from deserializer
+col_name c
+data_type char(5)
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"str\":\"true\",\"t\":\"true\",\"ts\":\"true\",\"v\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column c SET ('numDVs'='2','numNulls'='03','avgColLen'='9.00','maxColLen'='58')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -654,9 +1041,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats c
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-c char(5) 3 2 9.0 58 from deserializer
+col_name c
+data_type char(5)
+min
+max
+num_nulls 3
+distinct_count 2
+avg_col_len 9.0
+max_col_len 58
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"c\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"str\":\"true\",\"t\":\"true\",\"ts\":\"true\",\"v\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats bl
PREHOOK: type: DESCTABLE
@@ -664,9 +1060,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats bl
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-bl boolean from deserializer
+col_name bl
+data_type boolean
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"c\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"str\":\"true\",\"t\":\"true\",\"ts\":\"true\",\"v\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column bl SET ('numNulls'='1','numTrues'='9','numFalses'='8')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -678,9 +1083,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats bl
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-bl boolean 1 9 8 from deserializer
+col_name bl
+data_type boolean
+min
+max
+num_nulls 1
+distinct_count
+avg_col_len
+max_col_len
+num_trues 9
+num_falses 8
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"bl\":\"true\",\"c\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"str\":\"true\",\"t\":\"true\",\"ts\":\"true\",\"v\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats bin
PREHOOK: type: DESCTABLE
@@ -688,9 +1102,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats bin
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-bin binary from deserializer
+col_name bin
+data_type binary
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"bl\":\"true\",\"c\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"str\":\"true\",\"t\":\"true\",\"ts\":\"true\",\"v\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column bin SET ('numNulls'='8','avgColLen'='2.0','maxColLen'='8')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -702,7 +1125,16 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats bin
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-bin binary 8 2.0 8 from deserializer
+col_name bin
+data_type binary
+min
+max
+num_nulls 8
+distinct_count
+avg_col_len 2.0
+max_col_len 8
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"bin\":\"true\",\"bl\":\"true\",\"c\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"str\":\"true\",\"t\":\"true\",\"ts\":\"true\",\"v\":\"true\"}}
[15/21] hive git commit: HIVE-17519: Transpose column stats display
(Zoltan Haindrich, reviewed by Ashutosh Chauhan and Vineet Garg)
Posted by kg...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_table_column_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_table_column_stats.q.out b/ql/src/test/results/clientpositive/alter_table_column_stats.q.out
index b93e9de..a648335 100644
--- a/ql/src/test/results/clientpositive/alter_table_column_stats.q.out
+++ b/ql/src/test/results/clientpositive/alter_table_column_stats.q.out
@@ -88,7 +88,6 @@ POSTHOOK: query: describe formatted statsdb1.testtable0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable0
# col_name data_type comment
-
col1 int
col2 string
col3 string
@@ -123,9 +122,18 @@ PREHOOK: Input: statsdb1@testtable0
POSTHOOK: query: describe formatted statsdb1.testtable0 col1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable0
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col1 int 27 484 0 10 HL from deserializer
+col_name col1
+data_type int
+min 27
+max 484
+num_nulls 0
+distinct_count 10
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
PREHOOK: query: describe formatted statsdb1.testtable0 col2
PREHOOK: type: DESCTABLE
@@ -133,9 +141,18 @@ PREHOOK: Input: statsdb1@testtable0
POSTHOOK: query: describe formatted statsdb1.testtable0 col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable0
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 10 6.7 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 10
+avg_col_len 6.7
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
PREHOOK: query: describe formatted statsdb1.testtable0 col3
PREHOOK: type: DESCTABLE
@@ -143,9 +160,18 @@ PREHOOK: Input: statsdb1@testtable0
POSTHOOK: query: describe formatted statsdb1.testtable0 col3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable0
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col3 string 0 1 4.0 4 HL from deserializer
+col_name col3
+data_type string
+min
+max
+num_nulls 0
+distinct_count 1
+avg_col_len 4.0
+max_col_len 4
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
PREHOOK: query: alter table statsdb1.testtable0 rename to statsdb1.testtable1
PREHOOK: type: ALTERTABLE_RENAME
@@ -163,7 +189,6 @@ POSTHOOK: query: describe formatted statsdb1.testtable1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable1
# col_name data_type comment
-
col1 int
col2 string
col3 string
@@ -199,9 +224,18 @@ PREHOOK: Input: statsdb1@testtable1
POSTHOOK: query: describe formatted statsdb1.testtable1 col1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col1 int 27 484 0 10 HL from deserializer
+col_name col1
+data_type int
+min 27
+max 484
+num_nulls 0
+distinct_count 10
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
PREHOOK: query: describe formatted statsdb1.testtable1 col2
PREHOOK: type: DESCTABLE
@@ -209,9 +243,18 @@ PREHOOK: Input: statsdb1@testtable1
POSTHOOK: query: describe formatted statsdb1.testtable1 col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 10 6.7 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 10
+avg_col_len 6.7
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
PREHOOK: query: describe formatted statsdb1.testtable1 col3
PREHOOK: type: DESCTABLE
@@ -219,9 +262,18 @@ PREHOOK: Input: statsdb1@testtable1
POSTHOOK: query: describe formatted statsdb1.testtable1 col3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col3 string 0 1 4.0 4 HL from deserializer
+col_name col3
+data_type string
+min
+max
+num_nulls 0
+distinct_count 1
+avg_col_len 4.0
+max_col_len 4
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
PREHOOK: query: alter table testtable1 replace columns (col1 int, col2 string, col4 string)
PREHOOK: type: ALTERTABLE_REPLACECOLS
@@ -238,7 +290,6 @@ POSTHOOK: query: describe formatted statsdb1.testtable1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable1
# col_name data_type comment
-
col1 int
col2 string
col4 string
@@ -274,9 +325,18 @@ PREHOOK: Input: statsdb1@testtable1
POSTHOOK: query: describe formatted statsdb1.testtable1 col1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col1 int 27 484 0 10 HL from deserializer
+col_name col1
+data_type int
+min 27
+max 484
+num_nulls 0
+distinct_count 10
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\"}}
PREHOOK: query: describe formatted statsdb1.testtable1 col2
PREHOOK: type: DESCTABLE
@@ -284,9 +344,18 @@ PREHOOK: Input: statsdb1@testtable1
POSTHOOK: query: describe formatted statsdb1.testtable1 col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 10 6.7 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 10
+avg_col_len 6.7
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\"}}
PREHOOK: query: describe formatted statsdb1.testtable1 col4
PREHOOK: type: DESCTABLE
@@ -294,9 +363,18 @@ PREHOOK: Input: statsdb1@testtable1
POSTHOOK: query: describe formatted statsdb1.testtable1 col4
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col4 string from deserializer
+col_name col4
+data_type string
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\"}}
PREHOOK: query: alter table testtable1 change col1 col1 string
PREHOOK: type: ALTERTABLE_RENAMECOL
@@ -313,7 +391,6 @@ POSTHOOK: query: describe formatted statsdb1.testtable1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable1
# col_name data_type comment
-
col1 string
col2 string
col4 string
@@ -349,9 +426,18 @@ PREHOOK: Input: statsdb1@testtable1
POSTHOOK: query: describe formatted statsdb1.testtable1 col1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col1 string from deserializer
+col_name col1
+data_type string
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col2\":\"true\"}}
PREHOOK: query: describe formatted statsdb1.testtable1 col2
PREHOOK: type: DESCTABLE
@@ -359,9 +445,18 @@ PREHOOK: Input: statsdb1@testtable1
POSTHOOK: query: describe formatted statsdb1.testtable1 col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 10 6.7 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 10
+avg_col_len 6.7
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col2\":\"true\"}}
PREHOOK: query: describe formatted statsdb1.testtable1 col4
PREHOOK: type: DESCTABLE
@@ -369,9 +464,18 @@ PREHOOK: Input: statsdb1@testtable1
POSTHOOK: query: describe formatted statsdb1.testtable1 col4
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col4 string from deserializer
+col_name col4
+data_type string
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col2\":\"true\"}}
PREHOOK: query: alter table statsdb1.testtable1 rename to statsdb2.testtable2
PREHOOK: type: ALTERTABLE_RENAME
@@ -389,7 +493,6 @@ POSTHOOK: query: describe formatted statsdb2.testtable2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb2@testtable2
# col_name data_type comment
-
col1 string
col2 string
col4 string
@@ -425,9 +528,18 @@ PREHOOK: Input: statsdb2@testtable2
POSTHOOK: query: describe formatted statsdb2.testtable2 col1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb2@testtable2
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col1 string from deserializer
+col_name col1
+data_type string
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col2\":\"true\"}}
PREHOOK: query: describe formatted statsdb2.testtable2 col2
PREHOOK: type: DESCTABLE
@@ -435,9 +547,18 @@ PREHOOK: Input: statsdb2@testtable2
POSTHOOK: query: describe formatted statsdb2.testtable2 col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb2@testtable2
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 10 6.7 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 10
+avg_col_len 6.7
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col2\":\"true\"}}
PREHOOK: query: describe formatted statsdb2.testtable2 col4
PREHOOK: type: DESCTABLE
@@ -445,9 +566,18 @@ PREHOOK: Input: statsdb2@testtable2
POSTHOOK: query: describe formatted statsdb2.testtable2 col4
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb2@testtable2
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col4 string from deserializer
+col_name col4
+data_type string
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col2\":\"true\"}}
PREHOOK: query: analyze table testpart0 compute statistics for columns
PREHOOK: type: QUERY
@@ -468,14 +598,12 @@ POSTHOOK: query: describe formatted statsdb1.testpart0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart0
# col_name data_type comment
-
col1 int
col2 string
col3 string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Table Information
@@ -510,14 +638,12 @@ POSTHOOK: query: describe formatted statsdb1.testpart0 partition (part = 'part1'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart0
# col_name data_type comment
-
col1 int
col2 string
col3 string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -549,27 +675,54 @@ PREHOOK: Input: statsdb1@testpart0
POSTHOOK: query: describe formatted statsdb1.testpart0 partition (part = 'part1') col1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart0
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col1 int 27 484 0 10 HL from deserializer
+col_name col1
+data_type int
+min 27
+max 484
+num_nulls 0
+distinct_count 10
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart0 partition (part = 'part1') col2
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart0
POSTHOOK: query: describe formatted statsdb1.testpart0 partition (part = 'part1') col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart0
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 10 6.7 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 10
+avg_col_len 6.7
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart0 partition (part = 'part1') col3
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart0
POSTHOOK: query: describe formatted statsdb1.testpart0 partition (part = 'part1') col3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart0
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col3 string 0 1 4.0 4 HL from deserializer
+col_name col3
+data_type string
+min
+max
+num_nulls 0
+distinct_count 1
+avg_col_len 4.0
+max_col_len 4
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart0 partition (part = 'part2')
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart0
@@ -577,14 +730,12 @@ POSTHOOK: query: describe formatted statsdb1.testpart0 partition (part = 'part2'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart0
# col_name data_type comment
-
col1 int
col2 string
col3 string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -616,27 +767,54 @@ PREHOOK: Input: statsdb1@testpart0
POSTHOOK: query: describe formatted statsdb1.testpart0 partition (part = 'part2') col1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart0
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col1 int 27 484 0 20 HL from deserializer
+col_name col1
+data_type int
+min 27
+max 484
+num_nulls 0
+distinct_count 20
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart0 partition (part = 'part2') col2
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart0
POSTHOOK: query: describe formatted statsdb1.testpart0 partition (part = 'part2') col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart0
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 20 6.8 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 20
+avg_col_len 6.8
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart0 partition (part = 'part2') col3
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart0
POSTHOOK: query: describe formatted statsdb1.testpart0 partition (part = 'part2') col3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart0
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col3 string 0 1 4.0 4 HL from deserializer
+col_name col3
+data_type string
+min
+max
+num_nulls 0
+distinct_count 1
+avg_col_len 4.0
+max_col_len 4
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: alter table statsdb1.testpart0 rename to statsdb1.testpart1
PREHOOK: type: ALTERTABLE_RENAME
PREHOOK: Input: statsdb1@testpart0
@@ -653,14 +831,12 @@ POSTHOOK: query: describe formatted statsdb1.testpart1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
# col_name data_type comment
-
col1 int
col2 string
col3 string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Table Information
@@ -696,14 +872,12 @@ POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part1'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
# col_name data_type comment
-
col1 int
col2 string
col3 string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -735,27 +909,54 @@ PREHOOK: Input: statsdb1@testpart1
POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part1') col1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col1 int 27 484 0 10 HL from deserializer
+col_name col1
+data_type int
+min 27
+max 484
+num_nulls 0
+distinct_count 10
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part1') col2
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart1
POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part1') col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 10 6.7 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 10
+avg_col_len 6.7
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part1') col3
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart1
POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part1') col3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col3 string 0 1 4.0 4 HL from deserializer
+col_name col3
+data_type string
+min
+max
+num_nulls 0
+distinct_count 1
+avg_col_len 4.0
+max_col_len 4
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2')
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart1
@@ -763,14 +964,12 @@ POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
# col_name data_type comment
-
col1 int
col2 string
col3 string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -802,27 +1001,54 @@ PREHOOK: Input: statsdb1@testpart1
POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2') col1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col1 int 27 484 0 20 HL from deserializer
+col_name col1
+data_type int
+min 27
+max 484
+num_nulls 0
+distinct_count 20
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2') col2
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart1
POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2') col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 20 6.8 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 20
+avg_col_len 6.8
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2') col3
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart1
POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2') col3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col3 string 0 1 4.0 4 HL from deserializer
+col_name col3
+data_type string
+min
+max
+num_nulls 0
+distinct_count 1
+avg_col_len 4.0
+max_col_len 4
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: alter table statsdb1.testpart1 partition (part = 'part1') rename to partition (part = 'part11')
PREHOOK: type: ALTERTABLE_RENAMEPART
PREHOOK: Input: statsdb1@testpart1
@@ -840,14 +1066,12 @@ POSTHOOK: query: describe formatted statsdb1.testpart1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
# col_name data_type comment
-
col1 int
col2 string
col3 string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Table Information
@@ -883,14 +1107,12 @@ POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part11
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
# col_name data_type comment
-
col1 int
col2 string
col3 string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -922,27 +1144,54 @@ PREHOOK: Input: statsdb1@testpart1
POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part11') col1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col1 int 27 484 0 10 HL from deserializer
+col_name col1
+data_type int
+min 27
+max 484
+num_nulls 0
+distinct_count 10
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part11') col2
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart1
POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part11') col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 10 6.7 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 10
+avg_col_len 6.7
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part11') col3
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart1
POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part11') col3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col3 string 0 1 4.0 4 HL from deserializer
+col_name col3
+data_type string
+min
+max
+num_nulls 0
+distinct_count 1
+avg_col_len 4.0
+max_col_len 4
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2')
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart1
@@ -950,14 +1199,12 @@ POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
# col_name data_type comment
-
col1 int
col2 string
col3 string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -989,27 +1236,54 @@ PREHOOK: Input: statsdb1@testpart1
POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2') col1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col1 int 27 484 0 20 HL from deserializer
+col_name col1
+data_type int
+min 27
+max 484
+num_nulls 0
+distinct_count 20
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2') col2
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart1
POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2') col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 20 6.8 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 20
+avg_col_len 6.8
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2') col3
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart1
POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2') col3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col3 string 0 1 4.0 4 HL from deserializer
+col_name col3
+data_type string
+min
+max
+num_nulls 0
+distinct_count 1
+avg_col_len 4.0
+max_col_len 4
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: alter table statsdb1.testpart1 replace columns (col1 int, col2 string, col4 string) cascade
PREHOOK: type: ALTERTABLE_REPLACECOLS
PREHOOK: Input: statsdb1@testpart1
@@ -1029,14 +1303,12 @@ POSTHOOK: query: describe formatted statsdb1.testpart1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
# col_name data_type comment
-
col1 int
col2 string
col4 string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Table Information
@@ -1072,14 +1344,12 @@ POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part11
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
# col_name data_type comment
-
col1 int
col2 string
col4 string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -1111,18 +1381,36 @@ PREHOOK: Input: statsdb1@testpart1
POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part11') col1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col1 int 27 484 0 10 HL from deserializer
+col_name col1
+data_type int
+min 27
+max 484
+num_nulls 0
+distinct_count 10
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part11') col2
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart1
POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part11') col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 10 6.7 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 10
+avg_col_len 6.7
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part11') col4
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart1
@@ -1130,7 +1418,6 @@ POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part11
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
# col_name data_type comment
-
col4 string from deserializer
PREHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2')
PREHOOK: type: DESCTABLE
@@ -1139,14 +1426,12 @@ POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
# col_name data_type comment
-
col1 int
col2 string
col4 string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -1178,18 +1463,36 @@ PREHOOK: Input: statsdb1@testpart1
POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2') col1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col1 int 27 484 0 20 HL from deserializer
+col_name col1
+data_type int
+min 27
+max 484
+num_nulls 0
+distinct_count 20
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2') col2
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart1
POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2') col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 20 6.8 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 20
+avg_col_len 6.8
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2') col4
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart1
@@ -1197,7 +1500,6 @@ POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
# col_name data_type comment
-
col4 string from deserializer
PREHOOK: query: alter table statsdb1.testpart1 change column col1 col1 string cascade
PREHOOK: type: ALTERTABLE_RENAMECOL
@@ -1218,14 +1520,12 @@ POSTHOOK: query: describe formatted statsdb1.testpart1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
# col_name data_type comment
-
col1 string
col2 string
col4 string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Table Information
@@ -1261,14 +1561,12 @@ POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part11
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
# col_name data_type comment
-
col1 string
col2 string
col4 string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -1301,7 +1599,6 @@ POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part11
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
# col_name data_type comment
-
col1 string from deserializer
PREHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part11') col2
PREHOOK: type: DESCTABLE
@@ -1309,9 +1606,18 @@ PREHOOK: Input: statsdb1@testpart1
POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part11') col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 10 6.7 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 10
+avg_col_len 6.7
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part11') col4
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart1
@@ -1319,7 +1625,6 @@ POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part11
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
# col_name data_type comment
-
col4 string from deserializer
PREHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2')
PREHOOK: type: DESCTABLE
@@ -1328,14 +1633,12 @@ POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
# col_name data_type comment
-
col1 string
col2 string
col4 string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -1368,7 +1671,6 @@ POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
# col_name data_type comment
-
col1 string from deserializer
PREHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2') col2
PREHOOK: type: DESCTABLE
@@ -1376,9 +1678,18 @@ PREHOOK: Input: statsdb1@testpart1
POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2') col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 20 6.8 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 20
+avg_col_len 6.8
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2') col4
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb1@testpart1
@@ -1386,7 +1697,6 @@ POSTHOOK: query: describe formatted statsdb1.testpart1 partition (part = 'part2'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testpart1
# col_name data_type comment
-
col4 string from deserializer
PREHOOK: query: alter table statsdb1.testpart1 rename to statsdb2.testpart2
PREHOOK: type: ALTERTABLE_RENAME
@@ -1404,14 +1714,12 @@ POSTHOOK: query: describe formatted statsdb2.testpart2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb2@testpart2
# col_name data_type comment
-
col1 string
col2 string
col4 string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Table Information
@@ -1447,7 +1755,6 @@ POSTHOOK: query: describe formatted statsdb2.testpart2 partition (part = 'part11
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb2@testpart2
# col_name data_type comment
-
col1 string from deserializer
PREHOOK: query: describe formatted statsdb2.testpart2 partition (part = 'part11') col2
PREHOOK: type: DESCTABLE
@@ -1455,9 +1762,18 @@ PREHOOK: Input: statsdb2@testpart2
POSTHOOK: query: describe formatted statsdb2.testpart2 partition (part = 'part11') col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb2@testpart2
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 10 6.7 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 10
+avg_col_len 6.7
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb2.testpart2 partition (part = 'part11') col4
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb2@testpart2
@@ -1465,7 +1781,6 @@ POSTHOOK: query: describe formatted statsdb2.testpart2 partition (part = 'part11
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb2@testpart2
# col_name data_type comment
-
col4 string from deserializer
PREHOOK: query: describe formatted statsdb2.testpart2 partition (part = 'part2') col1
PREHOOK: type: DESCTABLE
@@ -1474,7 +1789,6 @@ POSTHOOK: query: describe formatted statsdb2.testpart2 partition (part = 'part2'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb2@testpart2
# col_name data_type comment
-
col1 string from deserializer
PREHOOK: query: describe formatted statsdb2.testpart2 partition (part = 'part2') col2
PREHOOK: type: DESCTABLE
@@ -1482,9 +1796,18 @@ PREHOOK: Input: statsdb2@testpart2
POSTHOOK: query: describe formatted statsdb2.testpart2 partition (part = 'part2') col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb2@testpart2
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 20 6.8 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 20
+avg_col_len 6.8
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted statsdb2.testpart2 partition (part = 'part2') col4
PREHOOK: type: DESCTABLE
PREHOOK: Input: statsdb2@testpart2
@@ -1492,7 +1815,6 @@ POSTHOOK: query: describe formatted statsdb2.testpart2 partition (part = 'part2'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb2@testpart2
# col_name data_type comment
-
col4 string from deserializer
PREHOOK: query: use statsdb2
PREHOOK: type: SWITCHDATABASE
@@ -1628,7 +1950,6 @@ POSTHOOK: query: describe formatted statsdb1.testtable0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable0
# col_name data_type comment
-
col1 int
col2 string
col3 string
@@ -1663,9 +1984,18 @@ PREHOOK: Input: statsdb1@testtable0
POSTHOOK: query: describe formatted statsdb1.testtable0 col1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable0
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col1 int 27 484 0 10 HL from deserializer
+col_name col1
+data_type int
+min 27
+max 484
+num_nulls 0
+distinct_count 10
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
PREHOOK: query: describe formatted statsdb1.testtable0 col2
PREHOOK: type: DESCTABLE
@@ -1673,9 +2003,18 @@ PREHOOK: Input: statsdb1@testtable0
POSTHOOK: query: describe formatted statsdb1.testtable0 col2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable0
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col2 string 0 10 6.7 7 HL from deserializer
+col_name col2
+data_type string
+min
+max
+num_nulls 0
+distinct_count 10
+avg_col_len 6.7
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
PREHOOK: query: describe formatted statsdb1.testtable0 col3
PREHOOK: type: DESCTABLE
@@ -1683,9 +2022,18 @@ PREHOOK: Input: statsdb1@testtable0
POSTHOOK: query: describe formatted statsdb1.testtable0 col3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb1@testtable0
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col3 string 0 1 4.0 4 HL from deserializer
+col_name col3
+data_type string
+min
<TRUNCATED>
[20/21] hive git commit: HIVE-17652: retire ANALYZE TABLE ...
PARTIALSCAN (Zoltan Haindrich, reviewed by Ashutosh Chauhan)
Posted by kg...@apache.org.
HIVE-17652: retire ANALYZE TABLE ... PARTIALSCAN (Zoltan Haindrich, reviewed by Ashutosh Chauhan)
Signed-off-by: Zoltan Haindrich <ki...@rxd.hu>
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/71004d2e
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/71004d2e
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/71004d2e
Branch: refs/heads/master
Commit: 71004d2e1ffb7974ba7cdf7a73bd843ccf4962ba
Parents: 2a5e72c
Author: Zoltan Haindrich <ki...@rxd.hu>
Authored: Fri Oct 6 11:00:37 2017 +0200
Committer: Zoltan Haindrich <ki...@rxd.hu>
Committed: Fri Oct 6 11:08:38 2017 +0200
----------------------------------------------------------------------
.../org/apache/hadoop/hive/conf/HiveConf.java | 22 +-
.../org/apache/hadoop/hive/ql/ErrorMsg.java | 35 +-
.../apache/hadoop/hive/ql/QueryProperties.java | 13 +-
.../hadoop/hive/ql/exec/StatsNoJobTask.java | 2 +-
.../apache/hadoop/hive/ql/exec/TaskFactory.java | 4 -
.../apache/hadoop/hive/ql/exec/Utilities.java | 14 +-
.../ql/io/rcfile/stats/PartialScanMapper.java | 180 ---------
.../ql/io/rcfile/stats/PartialScanTask.java | 381 -------------------
.../ql/io/rcfile/stats/PartialScanWork.java | 115 ------
.../hive/ql/optimizer/GenMRTableScan1.java | 56 ---
.../hive/ql/optimizer/GenMapRedUtils.java | 31 --
.../ql/optimizer/QueryPlanPostProcessor.java | 1 -
.../ql/parse/ColumnStatsSemanticAnalyzer.java | 2 -
.../org/apache/hadoop/hive/ql/parse/HiveLexer.g | 1 -
.../apache/hadoop/hive/ql/parse/HiveParser.g | 4 +-
.../hive/ql/parse/ProcessAnalyzeTable.java | 48 ---
.../hadoop/hive/ql/parse/QBParseInfo.java | 16 -
.../hadoop/hive/ql/parse/SemanticAnalyzer.java | 156 ++------
.../parse/spark/SparkProcessAnalyzeTable.java | 49 +--
.../apache/hadoop/hive/ql/plan/StatsWork.java | 16 -
.../stats_partialscan_autogether.q | 32 --
.../stats_partialscan_non_external.q | 5 -
.../stats_partialscan_non_native.q | 6 -
.../clientnegative/stats_partscan_norcfile.q | 12 -
.../test/queries/clientpositive/orc_analyze.q | 14 -
.../queries/clientpositive/stats_partscan_1.q | 37 --
.../clientpositive/stats_partscan_1_23.q | 38 --
.../stats_partialscan_autogether.q.out | 75 ----
.../stats_partialscan_non_external.q.out | 9 -
.../stats_partialscan_non_native.q.out | 11 -
.../stats_partscan_norcfile.q.out | 36 --
.../clientpositive/llap/orc_analyze.q.out | 288 --------------
.../spark/stats_partscan_1_23.q.out | 181 ---------
.../clientpositive/stats_partscan_1.q.out | 215 -----------
.../clientpositive/stats_partscan_1_23.q.out | 184 ---------
35 files changed, 81 insertions(+), 2208 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index c95844b..d2afc2c 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -1722,7 +1722,7 @@ public class HiveConf extends Configuration {
"analyze table T compute statistics for columns. Queries like these should compute partition"
+ "level stats for partitioned table even when no part spec is specified."),
HIVE_STATS_GATHER_NUM_THREADS("hive.stats.gather.num.threads", 10,
- "Number of threads used by partialscan/noscan analyze command for partitioned tables.\n" +
+ "Number of threads used by noscan analyze command for partitioned tables.\n" +
"This is applicable only for file formats that implement StatsProvidingRecordReader (like ORC)."),
// Collect table access keys information for operators that can benefit from bucketing
HIVE_STATS_COLLECT_TABLEKEYS("hive.stats.collect.tablekeys", false,
@@ -4119,10 +4119,14 @@ public class HiveConf extends Configuration {
public static String[] getTrimmedStringsVar(Configuration conf, ConfVars var) {
assert (var.valClass == String.class) : var.varname;
String[] result = conf.getTrimmedStrings(var.varname, (String[])null);
- if (result != null) return result;
+ if (result != null) {
+ return result;
+ }
if (var.altName != null) {
result = conf.getTrimmedStrings(var.altName, (String[])null);
- if (result != null) return result;
+ if (result != null) {
+ return result;
+ }
}
return org.apache.hadoop.util.StringUtils.getTrimmedStrings(var.defaultStrVal);
}
@@ -4824,7 +4828,9 @@ public class HiveConf extends Configuration {
public static String getNonMrEngines() {
String result = "";
for (String s : ConfVars.HIVE_EXECUTION_ENGINE.getValidStringValues()) {
- if ("mr".equals(s)) continue;
+ if ("mr".equals(s)) {
+ continue;
+ }
if (!result.isEmpty()) {
result += ", ";
}
@@ -4845,7 +4851,9 @@ public class HiveConf extends Configuration {
public static HashMap<String, ConfVars> getOrCreateReverseMap() {
// This should be called rarely enough; for now it's ok to just lock every time.
synchronized (reverseMapLock) {
- if (reverseMap != null) return reverseMap;
+ if (reverseMap != null) {
+ return reverseMap;
+ }
}
HashMap<String, ConfVars> vars = new HashMap<>();
for (ConfVars val : ConfVars.values()) {
@@ -4855,7 +4863,9 @@ public class HiveConf extends Configuration {
}
}
synchronized (reverseMapLock) {
- if (reverseMap != null) return reverseMap;
+ if (reverseMap != null) {
+ return reverseMap;
+ }
reverseMap = vars;
return reverseMap;
}
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java b/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
index 6da8304..4b6bae1 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
@@ -327,19 +327,8 @@ public enum ErrorMsg {
OPERATOR_NOT_ALLOWED_WITH_MAPJOIN(10227,
"Not all clauses are supported with mapjoin hint. Please remove mapjoin hint."),
- ANALYZE_TABLE_NOSCAN_NON_NATIVE(10228, "ANALYZE TABLE NOSCAN cannot be used for "
- + "a non-native table"),
-
- ANALYZE_TABLE_PARTIALSCAN_NON_NATIVE(10229, "ANALYZE TABLE PARTIALSCAN cannot be used for "
- + "a non-native table"),
- ANALYZE_TABLE_PARTIALSCAN_NON_RCFILE(10230, "ANALYZE TABLE PARTIALSCAN doesn't "
- + "support non-RCfile. "),
- ANALYZE_TABLE_PARTIALSCAN_EXTERNAL_TABLE(10231, "ANALYZE TABLE PARTIALSCAN "
- + "doesn't support external table: "),
- ANALYZE_TABLE_PARTIALSCAN_AGGKEY(10232, "Analyze partialscan command "
- + "fails to construct aggregation for the partition "),
- ANALYZE_TABLE_PARTIALSCAN_AUTOGATHER(10233, "Analyze partialscan is not allowed " +
- "if hive.stats.autogather is set to false"),
+ ANALYZE_TABLE_NOSCAN_NON_NATIVE(10228, "ANALYZE TABLE NOSCAN cannot be used for " + "a non-native table"),
+
PARTITION_VALUE_NOT_CONTINUOUS(10234, "Partition values specified are not continuous." +
" A subpartition value is specified without specifying the parent partition's value"),
TABLES_INCOMPATIBLE_SCHEMAS(10235, "Tables have incompatible schemas and their partitions " +
@@ -606,11 +595,21 @@ public enum ErrorMsg {
* @return ErrorMsg
*/
public static ErrorMsg getErrorMsg(Exception e) {
- if (e instanceof AccessControlException) return ACCESS_DENIED;
- if (e instanceof NSQuotaExceededException) return QUOTA_EXCEEDED;
- if (e instanceof DSQuotaExceededException) return QUOTA_EXCEEDED;
- if (e instanceof UnresolvedPathException) return UNRESOLVED_PATH;
- if (e instanceof FileNotFoundException) return FILE_NOT_FOUND;
+ if (e instanceof AccessControlException) {
+ return ACCESS_DENIED;
+ }
+ if (e instanceof NSQuotaExceededException) {
+ return QUOTA_EXCEEDED;
+ }
+ if (e instanceof DSQuotaExceededException) {
+ return QUOTA_EXCEEDED;
+ }
+ if (e instanceof UnresolvedPathException) {
+ return UNRESOLVED_PATH;
+ }
+ if (e instanceof FileNotFoundException) {
+ return FILE_NOT_FOUND;
+ }
return UNRESOLVED_RT_EXCEPTION;
}
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/java/org/apache/hadoop/hive/ql/QueryProperties.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/QueryProperties.java b/ql/src/java/org/apache/hadoop/hive/ql/QueryProperties.java
index 154fec4..69a750b 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/QueryProperties.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/QueryProperties.java
@@ -35,7 +35,6 @@ public class QueryProperties {
boolean query;
boolean analyzeCommand;
- boolean partialScanAnalyzeCommand;
boolean noScanAnalyzeCommand;
boolean analyzeRewrite;
boolean ctas;
@@ -84,14 +83,6 @@ public class QueryProperties {
this.analyzeCommand = analyzeCommand;
}
- public boolean isPartialScanAnalyzeCommand() {
- return partialScanAnalyzeCommand;
- }
-
- public void setPartialScanAnalyzeCommand(boolean partialScanAnalyzeCommand) {
- this.partialScanAnalyzeCommand = partialScanAnalyzeCommand;
- }
-
public boolean isNoScanAnalyzeCommand() {
return noScanAnalyzeCommand;
}
@@ -130,8 +121,9 @@ public class QueryProperties {
public void incrementJoinCount(boolean outerJoin) {
noOfJoins++;
- if (outerJoin)
+ if (outerJoin) {
noOfOuterJoins++;
+ }
}
public int getJoinCount() {
@@ -278,7 +270,6 @@ public class QueryProperties {
public void clear() {
query = false;
analyzeCommand = false;
- partialScanAnalyzeCommand = false;
noScanAnalyzeCommand = false;
analyzeRewrite = false;
ctas = false;
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/java/org/apache/hadoop/hive/ql/exec/StatsNoJobTask.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/StatsNoJobTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/StatsNoJobTask.java
index 9c3a664..61e19ca 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/StatsNoJobTask.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/StatsNoJobTask.java
@@ -64,7 +64,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
/**
* StatsNoJobTask is used in cases where stats collection is the only task for the given query (no
- * parent MR or Tez job). It is used in the following cases 1) ANALYZE with partialscan/noscan for
+ * parent MR or Tez job). It is used in the following cases 1) ANALYZE with noscan for
* file formats that implement StatsProvidingRecordReader interface: ORC format (implements
* StatsProvidingRecordReader) stores column statistics for all columns in the file footer. Its much
* faster to compute the table/partition statistics by reading the footer than scanning all the
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/java/org/apache/hadoop/hive/ql/exec/TaskFactory.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/TaskFactory.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/TaskFactory.java
index e9c69d9..e1969bb 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/TaskFactory.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/TaskFactory.java
@@ -37,8 +37,6 @@ import org.apache.hadoop.hive.ql.index.IndexMetadataChangeTask;
import org.apache.hadoop.hive.ql.index.IndexMetadataChangeWork;
import org.apache.hadoop.hive.ql.io.merge.MergeFileTask;
import org.apache.hadoop.hive.ql.io.merge.MergeFileWork;
-import org.apache.hadoop.hive.ql.io.rcfile.stats.PartialScanTask;
-import org.apache.hadoop.hive.ql.io.rcfile.stats.PartialScanWork;
import org.apache.hadoop.hive.ql.plan.ColumnStatsUpdateWork;
import org.apache.hadoop.hive.ql.plan.ColumnStatsWork;
import org.apache.hadoop.hive.ql.plan.ConditionalWork;
@@ -109,8 +107,6 @@ public final class TaskFactory {
MergeFileTask.class));
taskvec.add(new TaskTuple<DependencyCollectionWork>(DependencyCollectionWork.class,
DependencyCollectionTask.class));
- taskvec.add(new TaskTuple<PartialScanWork>(PartialScanWork.class,
- PartialScanTask.class));
taskvec.add(new TaskTuple<IndexMetadataChangeWork>(IndexMetadataChangeWork.class,
IndexMetadataChangeTask.class));
taskvec.add(new TaskTuple<TezWork>(TezWork.class, TezTask.class));
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
index 8311037..c199780 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
@@ -82,8 +82,6 @@ import org.apache.hadoop.hive.ql.io.ReworkMapredInputFormat;
import org.apache.hadoop.hive.ql.io.SelfDescribingInputFormatInterface;
import org.apache.hadoop.hive.ql.io.merge.MergeFileMapper;
import org.apache.hadoop.hive.ql.io.merge.MergeFileWork;
-import org.apache.hadoop.hive.ql.io.rcfile.stats.PartialScanMapper;
-import org.apache.hadoop.hive.ql.io.rcfile.stats.PartialScanWork;
import org.apache.hadoop.hive.ql.io.rcfile.truncate.ColumnTruncateMapper;
import org.apache.hadoop.hive.ql.io.rcfile.truncate.ColumnTruncateWork;
import org.apache.hadoop.hive.ql.log.PerfLogger;
@@ -447,8 +445,6 @@ public final class Utilities {
gWork = SerializationUtilities.deserializePlan(kryo, in, MergeFileWork.class);
} else if(ColumnTruncateMapper.class.getName().equals(conf.get(MAPRED_MAPPER_CLASS))) {
gWork = SerializationUtilities.deserializePlan(kryo, in, ColumnTruncateWork.class);
- } else if(PartialScanMapper.class.getName().equals(conf.get(MAPRED_MAPPER_CLASS))) {
- gWork = SerializationUtilities.deserializePlan(kryo, in, PartialScanWork.class);
} else {
throw new RuntimeException("unable to determine work from configuration ."
+ MAPRED_MAPPER_CLASS + " was "+ conf.get(MAPRED_MAPPER_CLASS)) ;
@@ -2179,7 +2175,9 @@ public final class Utilities {
*/
@VisibleForTesting
static int getMaxExecutorsForInputListing(final Configuration conf, int inputLocationListSize) {
- if (inputLocationListSize < 1) return 0;
+ if (inputLocationListSize < 1) {
+ return 0;
+ }
int maxExecutors = 1;
@@ -3114,8 +3112,9 @@ public final class Utilities {
boolean hasLogged = false;
// Note: this copies the list because createDummyFileForEmptyPartition may modify the map.
for (Path file : new LinkedList<Path>(work.getPathToAliases().keySet())) {
- if (lDrvStat != null && lDrvStat.driverState == DriverState.INTERRUPT)
+ if (lDrvStat != null && lDrvStat.driverState == DriverState.INTERRUPT) {
throw new IOException("Operation is Canceled.");
+ }
List<String> aliases = work.getPathToAliases().get(file);
if (aliases.contains(alias)) {
@@ -3611,8 +3610,9 @@ public final class Utilities {
public static boolean skipHeader(RecordReader<WritableComparable, Writable> currRecReader,
int headerCount, WritableComparable key, Writable value) throws IOException {
while (headerCount > 0) {
- if (!currRecReader.next(key, value))
+ if (!currRecReader.next(key, value)) {
return false;
+ }
headerCount--;
}
return true;
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanMapper.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanMapper.java b/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanMapper.java
deleted file mode 100644
index 9a6406d..0000000
--- a/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanMapper.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/**
- * 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.hadoop.hive.ql.io.rcfile.stats;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hive.common.StatsSetupConst;
-import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.ql.ErrorMsg;
-import org.apache.hadoop.hive.ql.exec.Utilities;
-import org.apache.hadoop.hive.ql.exec.MapredContext;
-import org.apache.hadoop.hive.ql.io.RCFile.KeyBuffer;
-import org.apache.hadoop.hive.ql.io.rcfile.merge.RCFileKeyBufferWrapper;
-import org.apache.hadoop.hive.ql.io.rcfile.merge.RCFileValueBufferWrapper;
-import org.apache.hadoop.hive.ql.metadata.HiveException;
-import org.apache.hadoop.hive.ql.stats.StatsCollectionContext;
-import org.apache.hadoop.hive.ql.stats.StatsFactory;
-import org.apache.hadoop.hive.ql.stats.StatsPublisher;
-import org.apache.hadoop.hive.shims.CombineHiveKey;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.MapReduceBase;
-import org.apache.hadoop.mapred.Mapper;
-import org.apache.hadoop.mapred.OutputCollector;
-import org.apache.hadoop.mapred.Reporter;
-
-/**
- *
- * PartialScanMapper.
- *
- * It reads through block header and aggregates statistics at the end.
- *
- * https://issues.apache.org/jira/browse/HIVE-3958
- */
-@SuppressWarnings("deprecation")
-public class PartialScanMapper extends MapReduceBase implements
- Mapper<Object, RCFileValueBufferWrapper, Object, Object> {
-
- private JobConf jc;
- private String statsAggKeyPrefix;
- private long uncompressedFileSize = 0;
- private long rowNo = 0;
- private boolean exception = false;
- private Reporter rp = null;
-
- private static final Logger LOG = LoggerFactory.getLogger("PartialScanMapper");
-
- public PartialScanMapper() {
- }
-
- @Override
- public void configure(JobConf job) {
- jc = job;
- MapredContext.init(true, new JobConf(jc));
- statsAggKeyPrefix = HiveConf.getVar(job,
- HiveConf.ConfVars.HIVE_STATS_KEY_PREFIX);
- }
-
-
- @Override
- public void map(Object k, RCFileValueBufferWrapper value,
- OutputCollector<Object, Object> output, Reporter reporter)
- throws IOException {
-
- if (rp == null) {
- this.rp = reporter;
- MapredContext.get().setReporter(reporter);
- }
-
- try {
- //CombineHiveInputFormat may be set in PartialScanTask.
- RCFileKeyBufferWrapper key = (RCFileKeyBufferWrapper)
- ((k instanceof CombineHiveKey) ? ((CombineHiveKey) k).getKey() : k);
-
- // calculate rawdatasize
- KeyBuffer keyBuffer = key.getKeyBuffer();
- long[] uncompressedColumnSizes = new long[keyBuffer.getColumnNumber()];
- for (int i = 0; i < keyBuffer.getColumnNumber(); i++) {
- uncompressedColumnSizes[i] += keyBuffer.getEachColumnUncompressedValueLen()[i];
- }
- if (uncompressedColumnSizes != null) {
- for (int i = 0; i < uncompressedColumnSizes.length; i++) {
- uncompressedFileSize += uncompressedColumnSizes[i];
- }
- }
-
- // calculate no. of rows
- rowNo += keyBuffer.getNumberRows();
- } catch (Throwable e) {
- this.exception = true;
- close();
- throw new IOException(e);
- }
-
- }
-
-
- @Override
- public void close() throws IOException {
- try {
- // Only publish stats if this operator's flag was set to gather stats
- if (!exception) {
- publishStats();
- }
- } catch (HiveException e) {
- this.exception = true;
- throw new RuntimeException(e);
- } finally {
- MapredContext.close();
- }
- }
-
-
- /**
- * Publish statistics.
- * similar to FileSinkOperator.java publishStats()
- *
- * @throws HiveException
- */
- private void publishStats() throws HiveException {
- // Initializing a stats publisher
- StatsPublisher statsPublisher = Utilities.getStatsPublisher(jc);
-
- if (statsPublisher == null) {
- // just return, stats gathering should not block the main query
- LOG.error("StatsPublishing error: StatsPublisher is not initialized.");
- throw new HiveException(ErrorMsg.STATSPUBLISHER_NOT_OBTAINED.getErrorCodedMsg());
- }
-
- StatsCollectionContext sc = new StatsCollectionContext(jc);
- sc.setStatsTmpDir(jc.get(StatsSetupConst.STATS_TMP_LOC, ""));
- if (!statsPublisher.connect(sc)) {
- // should fail since stats gathering is main purpose of the job
- LOG.error("StatsPublishing error: cannot connect to database");
- throw new HiveException(ErrorMsg.STATSPUBLISHER_CONNECTION_ERROR.getErrorCodedMsg());
- }
-
- // construct key used to store stats in intermediate db
- String key = statsAggKeyPrefix.endsWith(Path.SEPARATOR) ? statsAggKeyPrefix : statsAggKeyPrefix
- + Path.SEPARATOR;
-
- // construct statistics to be stored
- Map<String, String> statsToPublish = new HashMap<String, String>();
- statsToPublish.put(StatsSetupConst.RAW_DATA_SIZE, Long.toString(uncompressedFileSize));
- statsToPublish.put(StatsSetupConst.ROW_COUNT, Long.toString(rowNo));
-
- if (!statsPublisher.publishStat(key, statsToPublish)) {
- // The original exception is lost.
- // Not changing the interface to maintain backward compatibility
- throw new HiveException(ErrorMsg.STATSPUBLISHER_PUBLISHING_ERROR.getErrorCodedMsg());
- }
-
- if (!statsPublisher.closeConnection(sc)) {
- // The original exception is lost.
- // Not changing the interface to maintain backward compatibility
- throw new HiveException(ErrorMsg.STATSPUBLISHER_CLOSING_ERROR.getErrorCodedMsg());
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanTask.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanTask.java b/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanTask.java
deleted file mode 100644
index ad921f3..0000000
--- a/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanTask.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/**
- * 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.hadoop.hive.ql.io.rcfile.stats;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.hadoop.mapreduce.MRJobConfig;
-import org.slf4j.LoggerFactory;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hive.common.JavaUtils;
-import org.apache.hadoop.hive.common.StatsSetupConst;
-import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.ql.CompilationOpContext;
-import org.apache.hadoop.hive.ql.Context;
-import org.apache.hadoop.hive.ql.DriverContext;
-import org.apache.hadoop.hive.ql.ErrorMsg;
-import org.apache.hadoop.hive.ql.QueryPlan;
-import org.apache.hadoop.hive.ql.QueryState;
-import org.apache.hadoop.hive.ql.exec.Task;
-import org.apache.hadoop.hive.ql.exec.Utilities;
-import org.apache.hadoop.hive.ql.exec.mr.HadoopJobExecHelper;
-import org.apache.hadoop.hive.ql.exec.mr.HadoopJobExecHook;
-import org.apache.hadoop.hive.ql.exec.mr.Throttle;
-import org.apache.hadoop.hive.ql.io.CombineHiveInputFormat;
-import org.apache.hadoop.hive.ql.io.HiveFileFormatUtils;
-import org.apache.hadoop.hive.ql.io.HiveOutputFormatImpl;
-import org.apache.hadoop.hive.ql.metadata.HiveException;
-import org.apache.hadoop.hive.ql.plan.MapredWork;
-import org.apache.hadoop.hive.ql.plan.api.StageType;
-import org.apache.hadoop.hive.ql.session.SessionState;
-import org.apache.hadoop.hive.ql.session.SessionState.LogHelper;
-import org.apache.hadoop.hive.ql.stats.StatsCollectionContext;
-import org.apache.hadoop.hive.ql.stats.StatsFactory;
-import org.apache.hadoop.hive.ql.stats.StatsPublisher;
-import org.apache.hadoop.io.NullWritable;
-import org.apache.hadoop.mapred.Counters;
-import org.apache.hadoop.mapred.FileInputFormat;
-import org.apache.hadoop.mapred.JobClient;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.RunningJob;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.core.Appender;
-import org.apache.logging.log4j.core.Logger;
-import org.apache.logging.log4j.core.appender.FileAppender;
-import org.apache.logging.log4j.core.appender.RollingFileAppender;
-
-/**
- * PartialScanTask.
- * This task handles RCFile statics calculation via partial scan.
- * Instead of reading all bytes, it reads block header and aggregates result.
- * https://issues.apache.org/jira/browse/HIVE-3958
- */
-@SuppressWarnings( { "deprecation"})
-public class PartialScanTask extends Task<PartialScanWork> implements
- Serializable, HadoopJobExecHook {
- private static final long serialVersionUID = 1L;
-
- protected transient JobConf job;
- protected HadoopJobExecHelper jobExecHelper;
-
- @Override
- public void initialize(QueryState queryState, QueryPlan queryPlan,
- DriverContext driverContext, CompilationOpContext opContext) {
- super.initialize(queryState, queryPlan, driverContext, opContext);
- job = new JobConf(conf, PartialScanTask.class);
- jobExecHelper = new HadoopJobExecHelper(job, this.console, this, this);
- }
-
- @Override
- public boolean requireLock() {
- return true;
- }
-
- boolean success = true;
-
- @Override
- /**
- * start a new map-reduce job to do partial scan to calculate Stats,
- * almost the same as BlockMergeTask or ExecDriver.
- */
- public int execute(DriverContext driverContext) {
- HiveConf.setVar(job, HiveConf.ConfVars.HIVEINPUTFORMAT,
- CombineHiveInputFormat.class.getName());
- success = true;
- HiveFileFormatUtils.prepareJobOutput(job);
- job.setOutputFormat(HiveOutputFormatImpl.class);
- job.setMapperClass(work.getMapperClass());
-
- Context ctx = driverContext.getCtx();
- boolean ctxCreated = false;
- try {
- if (ctx == null) {
- ctx = new Context(job);
- ctxCreated = true;
- }
- }catch (IOException e) {
- e.printStackTrace();
- console.printError("Error launching map-reduce job", "\n"
- + org.apache.hadoop.util.StringUtils.stringifyException(e));
- return 5;
- }
-
- job.setMapOutputKeyClass(NullWritable.class);
- job.setMapOutputValueClass(NullWritable.class);
- if(work.getNumMapTasks() != null) {
- job.setNumMapTasks(work.getNumMapTasks());
- }
-
- // zero reducers
- job.setNumReduceTasks(0);
-
- if (work.getMinSplitSize() != null) {
- HiveConf.setLongVar(job, HiveConf.ConfVars.MAPREDMINSPLITSIZE, work
- .getMinSplitSize().longValue());
- }
-
- if (work.getInputformat() != null) {
- HiveConf.setVar(job, HiveConf.ConfVars.HIVEINPUTFORMAT, work
- .getInputformat());
- }
-
- String inpFormat = HiveConf.getVar(job, HiveConf.ConfVars.HIVEINPUTFORMAT);
-
- LOG.info("Using " + inpFormat);
-
- try {
- job.setInputFormat(JavaUtils.loadClass(inpFormat));
- } catch (ClassNotFoundException e) {
- throw new RuntimeException(e.getMessage(), e);
- }
-
- job.setOutputKeyClass(NullWritable.class);
- job.setOutputValueClass(NullWritable.class);
-
- int returnVal = 0;
- RunningJob rj = null;
- boolean noName = StringUtils.isEmpty(job.get(MRJobConfig.JOB_NAME));
-
- String jobName = null;
- if (noName && this.getQueryPlan() != null) {
- int maxlen = conf.getIntVar(HiveConf.ConfVars.HIVEJOBNAMELENGTH);
- jobName = Utilities.abbreviate(this.getQueryPlan().getQueryStr(),
- maxlen - 6);
- }
-
- if (noName) {
- // This is for a special case to ensure unit tests pass
- job.set(MRJobConfig.JOB_NAME,
- jobName != null ? jobName : "JOB" + Utilities.randGen.nextInt());
- }
-
- // pass aggregation key to mapper
- HiveConf.setVar(job,
- HiveConf.ConfVars.HIVE_STATS_KEY_PREFIX,
- work.getAggKey());
- job.set(StatsSetupConst.STATS_TMP_LOC, work.getStatsTmpDir());
- try {
- addInputPaths(job, work);
-
- MapredWork mrWork = new MapredWork();
- mrWork.setMapWork(work);
- Utilities.setMapRedWork(job, mrWork, ctx.getMRTmpPath());
-
- // remove the pwd from conf file so that job tracker doesn't show this
- // logs
- String pwd = HiveConf.getVar(job, HiveConf.ConfVars.METASTOREPWD);
- if (pwd != null) {
- HiveConf.setVar(job, HiveConf.ConfVars.METASTOREPWD, "HIVE");
- }
- JobClient jc = new JobClient(job);
-
- String addedJars = Utilities.getResourceFiles(job, SessionState.ResourceType.JAR);
- if (!addedJars.isEmpty()) {
- job.set("tmpjars", addedJars);
- }
-
- // make this client wait if job trcker is not behaving well.
- Throttle.checkJobTracker(job, LOG);
-
- if (work.isGatheringStats()) {
- // initialize stats publishing table
- StatsPublisher statsPublisher;
- StatsFactory factory = StatsFactory.newFactory(job);
- if (factory != null) {
- statsPublisher = factory.getStatsPublisher();
- StatsCollectionContext sc = new StatsCollectionContext(job);
- sc.setStatsTmpDir(work.getStatsTmpDir());
- if (!statsPublisher.init(sc)) { // creating stats table if not exists
- if (HiveConf.getBoolVar(job, HiveConf.ConfVars.HIVE_STATS_RELIABLE)) {
- throw
- new HiveException(ErrorMsg.STATSPUBLISHER_INITIALIZATION_ERROR.getErrorCodedMsg());
- }
- }
- }
- }
-
- // Finally SUBMIT the JOB!
- rj = jc.submitJob(job);
- this.jobID = rj.getJobID();
- returnVal = jobExecHelper.progress(rj, jc, ctx);
- success = (returnVal == 0);
-
- } catch (Exception e) {
- e.printStackTrace();
- setException(e);
- String mesg = " with exception '" + Utilities.getNameMessage(e) + "'";
- if (rj != null) {
- mesg = "Ended Job = " + rj.getJobID() + mesg;
- } else {
- mesg = "Job Submission failed" + mesg;
- }
-
- // Has to use full name to make sure it does not conflict with
- // org.apache.commons.lang.StringUtils
- console.printError(mesg, "\n"
- + org.apache.hadoop.util.StringUtils.stringifyException(e));
-
- success = false;
- returnVal = 1;
- } finally {
- try {
- if (ctxCreated) {
- ctx.clear();
- }
- if (rj != null) {
- if (returnVal != 0) {
- rj.killJob();
- }
- }
- } catch (Exception e) {
- LOG.warn("Failed in cleaning up ", e);
- } finally {
- HadoopJobExecHelper.runningJobs.remove(rj);
- }
- }
-
- return (returnVal);
- }
-
- private void addInputPaths(JobConf job, PartialScanWork work) {
- for (Path path : work.getInputPaths()) {
- FileInputFormat.addInputPath(job, path);
- }
- }
-
- @Override
- public String getName() {
- return "RCFile Statistics Partial Scan";
- }
-
- public static final String INPUT_SEPERATOR = ":";
-
- public static void main(String[] args) {
- String inputPathStr = null;
- String outputDir = null;
- String jobConfFileName = null;
-
- try {
- for (int i = 0; i < args.length; i++) {
- if (args[i].equals("-input")) {
- inputPathStr = args[++i];
- } else if (args[i].equals("-jobconffile")) {
- jobConfFileName = args[++i];
- } else if (args[i].equals("-outputDir")) {
- outputDir = args[++i];
- }
- }
- } catch (IndexOutOfBoundsException e) {
- System.err.println("Missing argument to option");
- printUsage();
- }
-
- if (inputPathStr == null || outputDir == null
- || outputDir.trim().equals("")) {
- printUsage();
- }
-
- List<Path> inputPaths = new ArrayList<Path>();
- String[] paths = inputPathStr.split(INPUT_SEPERATOR);
- if (paths == null || paths.length == 0) {
- printUsage();
- }
-
- FileSystem fs = null;
- JobConf conf = new JobConf(PartialScanTask.class);
- for (String path : paths) {
- try {
- Path pathObj = new Path(path);
- if (fs == null) {
- fs = FileSystem.get(pathObj.toUri(), conf);
- }
- FileStatus fstatus = fs.getFileStatus(pathObj);
- if (fstatus.isDir()) {
- FileStatus[] fileStatus = fs.listStatus(pathObj);
- for (FileStatus st : fileStatus) {
- inputPaths.add(st.getPath());
- }
- } else {
- inputPaths.add(fstatus.getPath());
- }
- } catch (IOException e) {
- e.printStackTrace(System.err);
- }
- }
-
- if (jobConfFileName != null) {
- conf.addResource(new Path(jobConfFileName));
- }
-
- org.slf4j.Logger LOG = LoggerFactory.getLogger(PartialScanTask.class.getName());
- boolean isSilent = HiveConf.getBoolVar(conf,
- HiveConf.ConfVars.HIVESESSIONSILENT);
- LogHelper console = new LogHelper(LOG, isSilent);
-
- // print out the location of the log file for the user so
- // that it's easy to find reason for local mode execution failures
- for (Appender appender : ((Logger) LogManager.getRootLogger()).getAppenders().values()) {
- if (appender instanceof FileAppender) {
- console.printInfo("Execution log at: " + ((FileAppender) appender).getFileName());
- } else if (appender instanceof RollingFileAppender) {
- console.printInfo("Execution log at: " + ((RollingFileAppender) appender).getFileName());
- }
- }
-
- QueryState queryState =
- new QueryState.Builder().withHiveConf(new HiveConf(conf, PartialScanTask.class)).build();
- PartialScanWork mergeWork = new PartialScanWork(inputPaths);
- DriverContext driverCxt = new DriverContext();
- PartialScanTask taskExec = new PartialScanTask();
- taskExec.initialize(queryState, null, driverCxt, new CompilationOpContext());
- taskExec.setWork(mergeWork);
- int ret = taskExec.execute(driverCxt);
-
- if (ret != 0) {
- System.exit(2);
- }
-
- }
-
- private static void printUsage() {
- System.exit(1);
- }
-
- @Override
- public StageType getType() {
- return StageType.MAPRED;
- }
-
-
- @Override
- public boolean checkFatalErrors(Counters ctrs, StringBuilder errMsg) {
- return false;
- }
-
- @Override
- public void logPlanProgress(SessionState ss) throws IOException {
- // no op
- }
-}
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanWork.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanWork.java b/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanWork.java
deleted file mode 100644
index 919cea0..0000000
--- a/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanWork.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * 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.hadoop.hive.ql.io.rcfile.stats;
-
-import static org.apache.hadoop.hive.conf.HiveConf.ConfVars.HIVESTATSDBCLASS;
-
-import java.io.Serializable;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hive.common.StatsSetupConst.StatDB;
-import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.ql.io.CombineHiveInputFormat;
-import org.apache.hadoop.hive.ql.io.rcfile.merge.RCFileBlockMergeInputFormat;
-import org.apache.hadoop.hive.ql.plan.Explain;
-import org.apache.hadoop.hive.ql.plan.MapWork;
-import org.apache.hadoop.hive.ql.plan.PartitionDesc;
-import org.apache.hadoop.hive.ql.plan.Explain.Level;
-import org.apache.hadoop.mapred.Mapper;
-
-/**
- * Partial Scan Work.
- *
- */
-@Explain(displayName = "Partial Scan Statistics")
-public class PartialScanWork extends MapWork implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private transient List<Path> inputPaths;
- private String aggKey;
- private String statsTmpDir;
-
- public PartialScanWork() {
- }
-
- public PartialScanWork(List<Path> inputPaths) {
- super();
- this.inputPaths = inputPaths;
- PartitionDesc partDesc = new PartitionDesc();
- partDesc.setInputFileFormatClass(RCFileBlockMergeInputFormat.class);
- for(Path path: this.inputPaths) {
- this.addPathToPartitionInfo(path, partDesc);
- }
- }
-
- public List<Path> getInputPaths() {
- return inputPaths;
- }
-
- public void setInputPaths(List<Path> inputPaths) {
- this.inputPaths = inputPaths;
- }
-
- public Class<? extends Mapper> getMapperClass() {
- return PartialScanMapper.class;
- }
-
- @Override
- public Long getMinSplitSize() {
- return null;
- }
-
- @Override
- public String getInputformat() {
- return CombineHiveInputFormat.class.getName();
- }
-
- @Override
- public boolean isGatheringStats() {
- return true;
- }
-
- /**
- * @return the aggKey
- */
- @Explain(displayName = "Stats Aggregation Key Prefix", explainLevels = { Level.EXTENDED })
- public String getAggKey() {
- return aggKey;
- }
-
- /**
- * @param aggKey the aggKey to set
- */
- public void setAggKey(String aggKey) {
- this.aggKey = aggKey;
- }
-
- public String getStatsTmpDir() {
- return statsTmpDir;
- }
-
- public void setStatsTmpDir(String statsTmpDir, HiveConf conf) {
- this.statsTmpDir = HiveConf.getVar(conf, HIVESTATSDBCLASS).equalsIgnoreCase(StatDB.fs.name())
- ? statsTmpDir : "";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRTableScan1.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRTableScan1.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRTableScan1.java
index 9297a0b..2adb144 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRTableScan1.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRTableScan1.java
@@ -18,16 +18,12 @@
package org.apache.hadoop.hive.ql.optimizer;
-import java.io.Serializable;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Stack;
-import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.ql.DriverContext;
import org.apache.hadoop.hive.ql.exec.Operator;
import org.apache.hadoop.hive.ql.exec.TableScanOperator;
import org.apache.hadoop.hive.ql.exec.Task;
@@ -35,7 +31,6 @@ import org.apache.hadoop.hive.ql.exec.TaskFactory;
import org.apache.hadoop.hive.ql.exec.mr.MapRedTask;
import org.apache.hadoop.hive.ql.io.orc.OrcInputFormat;
import org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat;
-import org.apache.hadoop.hive.ql.io.rcfile.stats.PartialScanWork;
import org.apache.hadoop.hive.ql.lib.Node;
import org.apache.hadoop.hive.ql.lib.NodeProcessor;
import org.apache.hadoop.hive.ql.lib.NodeProcessorCtx;
@@ -89,13 +84,11 @@ public class GenMRTableScan1 implements NodeProcessor {
mapCurrCtx.put(op, new GenMapRedCtx(currTask, currAliasId));
if (parseCtx.getQueryProperties().isAnalyzeCommand()) {
- boolean partialScan = parseCtx.getQueryProperties().isPartialScanAnalyzeCommand();
boolean noScan = parseCtx.getQueryProperties().isNoScanAnalyzeCommand();
if (OrcInputFormat.class.isAssignableFrom(inputFormat) ||
MapredParquetInputFormat.class.isAssignableFrom(inputFormat)) {
// For ORC and Parquet, all the following statements are the same
// ANALYZE TABLE T [PARTITION (...)] COMPUTE STATISTICS
- // ANALYZE TABLE T [PARTITION (...)] COMPUTE STATISTICS partialscan;
// ANALYZE TABLE T [PARTITION (...)] COMPUTE STATISTICS noscan;
// There will not be any MR or Tez job above this task
@@ -142,11 +135,6 @@ public class GenMRTableScan1 implements NodeProcessor {
ctx.getRootTasks().add(statsTask);
}
- // ANALYZE TABLE T [PARTITION (...)] COMPUTE STATISTICS partialscan;
- if (partialScan) {
- handlePartialScanCommand(op, ctx, parseCtx, currTask, statsWork, statsTask);
- }
-
currWork.getMapWork().setGatheringStats(true);
if (currWork.getReduceWork() != null) {
currWork.getReduceWork().setGatheringStats(true);
@@ -174,48 +162,4 @@ public class GenMRTableScan1 implements NodeProcessor {
assert false;
return null;
}
-
- /**
- * handle partial scan command. It is composed of PartialScanTask followed by StatsTask .
- * @param op
- * @param ctx
- * @param parseCtx
- * @param currTask
- * @param parseInfo
- * @param statsWork
- * @param statsTask
- * @throws SemanticException
- */
- private void handlePartialScanCommand(TableScanOperator op, GenMRProcContext ctx,
- ParseContext parseCtx, Task<? extends Serializable> currTask,
- StatsWork statsWork, Task<StatsWork> statsTask) throws SemanticException {
- String aggregationKey = op.getConf().getStatsAggPrefix();
- StringBuilder aggregationKeyBuffer = new StringBuilder(aggregationKey);
- List<Path> inputPaths = GenMapRedUtils.getInputPathsForPartialScan(op, aggregationKeyBuffer);
- aggregationKey = aggregationKeyBuffer.toString();
-
- // scan work
- PartialScanWork scanWork = new PartialScanWork(inputPaths);
- scanWork.setMapperCannotSpanPartns(true);
- scanWork.setAggKey(aggregationKey);
- scanWork.setStatsTmpDir(op.getConf().getTmpStatsDir(), parseCtx.getConf());
-
- // stats work
- statsWork.setPartialScanAnalyzeCommand(true);
-
- // partial scan task
- DriverContext driverCxt = new DriverContext();
- Task<PartialScanWork> psTask = TaskFactory.get(scanWork, parseCtx.getConf());
- psTask.initialize(parseCtx.getQueryState(), null, driverCxt, op.getCompilationOpContext());
- psTask.setWork(scanWork);
-
- // task dependency
- ctx.getRootTasks().remove(currTask);
- ctx.getRootTasks().add(psTask);
- psTask.addDependentTask(statsTask);
- List<Task<? extends Serializable>> parentTasks = new ArrayList<Task<? extends Serializable>>();
- parentTasks.add(psTask);
- statsTask.setParentTasks(parentTasks);
- }
-
}
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
index 25cca7b..b861d8d 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.hive.ql.optimizer;
-import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
@@ -41,11 +40,8 @@ import org.apache.hadoop.hive.common.BlobStorageUtils;
import org.apache.hadoop.hive.common.StringInternUtils;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
-import org.apache.hadoop.hive.metastore.Warehouse;
-import org.apache.hadoop.hive.metastore.api.MetaException;
import org.apache.hadoop.hive.ql.CompilationOpContext;
import org.apache.hadoop.hive.ql.Context;
-import org.apache.hadoop.hive.ql.ErrorMsg;
import org.apache.hadoop.hive.ql.exec.ColumnInfo;
import org.apache.hadoop.hive.ql.exec.ConditionalTask;
import org.apache.hadoop.hive.ql.exec.DemuxOperator;
@@ -1976,33 +1972,6 @@ public final class GenMapRedUtils {
return Collections.emptyList();
}
- public static List<Path> getInputPathsForPartialScan(TableScanOperator tableScanOp,
- Appendable aggregationKey) throws SemanticException {
- List<Path> inputPaths = new ArrayList<Path>();
- switch (tableScanOp.getConf().getTableMetadata().getTableSpec().specType) {
- case TABLE_ONLY:
- inputPaths.add(tableScanOp.getConf().getTableMetadata()
- .getTableSpec().tableHandle.getPath());
- break;
- case STATIC_PARTITION:
- Partition part = tableScanOp.getConf().getTableMetadata()
- .getTableSpec().partHandle;
- try {
- aggregationKey.append(Warehouse.makePartPath(part.getSpec()));
- } catch (MetaException e) {
- throw new SemanticException(ErrorMsg.ANALYZE_TABLE_PARTIALSCAN_AGGKEY.getMsg(
- part.getDataLocation().toString() + e.getMessage()));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- inputPaths.add(part.getDataLocation());
- break;
- default:
- assert false;
- }
- return inputPaths;
- }
-
public static Set<String> findAliases(final MapWork work, Operator<?> startOp) {
Set<String> aliases = new LinkedHashSet<String>();
for (Operator<?> topOp : findTopOps(startOp, null)) {
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/java/org/apache/hadoop/hive/ql/optimizer/QueryPlanPostProcessor.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/QueryPlanPostProcessor.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/QueryPlanPostProcessor.java
index b5bc386..7f5136f 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/QueryPlanPostProcessor.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/QueryPlanPostProcessor.java
@@ -91,7 +91,6 @@ ekoifman:apache ekoifman$ find . -name *Work.java
./hadoop/hive/ql/exec/repl/ReplStateLogWork.java
./hadoop/hive/ql/index/IndexMetadataChangeWork.java
./hadoop/hive/ql/io/merge/MergeFileWork.java - extends MapWork
-./hadoop/hive/ql/io/rcfile/stats/PartialScanWork.java - extends MapWork
./hadoop/hive/ql/io/rcfile/truncate/ColumnTruncateWork.java - extends MapWork
./hadoop/hive/ql/parse/GenTezWork.java
./hadoop/hive/ql/parse/spark/GenSparkWork.java
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/java/org/apache/hadoop/hive/ql/parse/ColumnStatsSemanticAnalyzer.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/ColumnStatsSemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/ColumnStatsSemanticAnalyzer.java
index 1923a9b..5733909 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/ColumnStatsSemanticAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/ColumnStatsSemanticAnalyzer.java
@@ -357,8 +357,6 @@ public class ColumnStatsSemanticAnalyzer extends SemanticAnalyzer {
// check if it is no scan. grammar prevents coexit noscan/columns
super.processNoScanCommand(ast);
- // check if it is partial scan. grammar prevents coexit partialscan/columns
- super.processPartialScanCommand(ast);
/* Rewrite only analyze table <> column <> compute statistics; Don't rewrite analyze table
* command - table stats are collected by the table scan operator and is not rewritten to
* an aggregation.
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g b/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g
index 6ffca02..d0ce4ae 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g
@@ -288,7 +288,6 @@ KW_GROUPING: 'GROUPING';
KW_SETS: 'SETS';
KW_TRUNCATE: 'TRUNCATE';
KW_NOSCAN: 'NOSCAN';
-KW_PARTIALSCAN: 'PARTIALSCAN';
KW_USER: 'USER';
KW_ROLE: 'ROLE';
KW_ROLES: 'ROLES';
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g b/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
index 2cb6946..d238833 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
@@ -1539,9 +1539,9 @@ analyzeStatement
@after { popMsg(state); }
: KW_ANALYZE KW_TABLE (parttype=tableOrPartition)
(
- (KW_COMPUTE) => KW_COMPUTE KW_STATISTICS ((noscan=KW_NOSCAN) | (partialscan=KW_PARTIALSCAN)
+ (KW_COMPUTE) => KW_COMPUTE KW_STATISTICS ((noscan=KW_NOSCAN)
| (KW_FOR KW_COLUMNS (statsColumnName=columnNameList)?))?
- -> ^(TOK_ANALYZE $parttype $noscan? $partialscan? KW_COLUMNS? $statsColumnName?)
+ -> ^(TOK_ANALYZE $parttype $noscan? KW_COLUMNS? $statsColumnName?)
|
(KW_CACHE) => KW_CACHE KW_METADATA -> ^(TOK_CACHE_METADATA $parttype)
)
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/java/org/apache/hadoop/hive/ql/parse/ProcessAnalyzeTable.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/ProcessAnalyzeTable.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/ProcessAnalyzeTable.java
index b6d7ee8..c497419 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/ProcessAnalyzeTable.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/ProcessAnalyzeTable.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.hive.ql.parse;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -27,15 +26,12 @@ import java.util.Stack;
import org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.ql.DriverContext;
import org.apache.hadoop.hive.ql.exec.TableScanOperator;
import org.apache.hadoop.hive.ql.exec.Task;
import org.apache.hadoop.hive.ql.exec.TaskFactory;
import org.apache.hadoop.hive.ql.hooks.WriteEntity;
import org.apache.hadoop.hive.ql.io.orc.OrcInputFormat;
-import org.apache.hadoop.hive.ql.io.rcfile.stats.PartialScanWork;
import org.apache.hadoop.hive.ql.lib.Node;
import org.apache.hadoop.hive.ql.lib.NodeProcessor;
import org.apache.hadoop.hive.ql.lib.NodeProcessorCtx;
@@ -99,7 +95,6 @@ public class ProcessAnalyzeTable implements NodeProcessor {
MapredParquetInputFormat.class.isAssignableFrom(inputFormat)) {
// For ORC & Parquet, all the following statements are the same
// ANALYZE TABLE T [PARTITION (...)] COMPUTE STATISTICS
- // ANALYZE TABLE T [PARTITION (...)] COMPUTE STATISTICS partialscan;
// ANALYZE TABLE T [PARTITION (...)] COMPUTE STATISTICS noscan;
// There will not be any Tez job above this task
@@ -145,11 +140,6 @@ public class ProcessAnalyzeTable implements NodeProcessor {
context.rootTasks.add(statsTask);
}
- // ANALYZE TABLE T [PARTITION (...)] COMPUTE STATISTICS partialscan;
- if (parseContext.getQueryProperties().isPartialScanAnalyzeCommand()) {
- handlePartialScanCommand(tableScan, parseContext, statsWork, context, statsTask);
- }
-
// NOTE: here we should use the new partition predicate pushdown API to
// get a list of pruned list,
// and pass it to setTaskPlan as the last parameter
@@ -217,42 +207,4 @@ public class ProcessAnalyzeTable implements NodeProcessor {
return TaskFactory.get(statsWork, parseContext.getConf());
}
}
-
- /**
- * handle partial scan command.
- *
- * It is composed of PartialScanTask followed by StatsTask.
- */
- private void handlePartialScanCommand(TableScanOperator tableScan, ParseContext parseContext,
- StatsWork statsWork, GenTezProcContext context, Task<StatsWork> statsTask)
- throws SemanticException {
-
- String aggregationKey = tableScan.getConf().getStatsAggPrefix();
- StringBuilder aggregationKeyBuffer = new StringBuilder(aggregationKey);
- List<Path> inputPaths = GenMapRedUtils.getInputPathsForPartialScan(tableScan,
- aggregationKeyBuffer);
- aggregationKey = aggregationKeyBuffer.toString();
-
- // scan work
- PartialScanWork scanWork = new PartialScanWork(inputPaths);
- scanWork.setMapperCannotSpanPartns(true);
- scanWork.setAggKey(aggregationKey);
- scanWork.setStatsTmpDir(tableScan.getConf().getTmpStatsDir(), parseContext.getConf());
-
- // stats work
- statsWork.setPartialScanAnalyzeCommand(true);
-
- // partial scan task
- DriverContext driverCxt = new DriverContext();
- Task<PartialScanWork> partialScanTask = TaskFactory.get(scanWork, parseContext.getConf());
- partialScanTask.initialize(parseContext.getQueryState(), null, driverCxt,
- tableScan.getCompilationOpContext());
- partialScanTask.setWork(scanWork);
- statsWork.setSourceTask(partialScanTask);
-
- // task dependency
- context.rootTasks.remove(context.currentTask);
- context.rootTasks.add(partialScanTask);
- partialScanTask.addDependentTask(statsTask);
- }
}
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/java/org/apache/hadoop/hive/ql/parse/QBParseInfo.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/QBParseInfo.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/QBParseInfo.java
index 38df5de..ab71073 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/QBParseInfo.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/QBParseInfo.java
@@ -71,8 +71,6 @@ public class QBParseInfo {
private boolean isAnalyzeCommand; // used for the analyze command (statistics)
private boolean isNoScanAnalyzeCommand; // used for the analyze command (statistics) (noscan)
- private boolean isPartialScanAnalyzeCommand; // used for the analyze command (statistics)
- // (partialscan)
private final HashMap<String, TableSpec> tableSpecs; // used for statistics
@@ -657,20 +655,6 @@ public class QBParseInfo {
}
/**
- * @return the isPartialScanAnalyzeCommand
- */
- public boolean isPartialScanAnalyzeCommand() {
- return isPartialScanAnalyzeCommand;
- }
-
- /**
- * @param isPartialScanAnalyzeCommand the isPartialScanAnalyzeCommand to set
- */
- public void setPartialScanAnalyzeCommand(boolean isPartialScanAnalyzeCommand) {
- this.isPartialScanAnalyzeCommand = isPartialScanAnalyzeCommand;
- }
-
- /**
* See also {@link #isInsertIntoTable(String)}
*/
public Map<String, ASTNode> getInsertOverwriteTables() {
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
index c8277f4..a5b69ec 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
@@ -116,8 +116,6 @@ import org.apache.hadoop.hive.ql.io.CombineHiveInputFormat;
import org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat;
import org.apache.hadoop.hive.ql.io.HiveOutputFormat;
import org.apache.hadoop.hive.ql.io.NullRowsInputFormat;
-import org.apache.hadoop.hive.ql.io.RCFileInputFormat;
-import org.apache.hadoop.hive.ql.io.orc.OrcInputFormat;
import org.apache.hadoop.hive.ql.lib.DefaultGraphWalker;
import org.apache.hadoop.hive.ql.lib.Dispatcher;
import org.apache.hadoop.hive.ql.lib.GraphWalker;
@@ -222,7 +220,6 @@ import org.apache.hadoop.hive.serde2.NullStructSerDe;
import org.apache.hadoop.hive.serde2.SerDeException;
import org.apache.hadoop.hive.serde2.SerDeUtils;
import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
-import org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe;
import org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe2;
import org.apache.hadoop.hive.serde2.objectinspector.ConstantObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
@@ -321,9 +318,6 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
// flag for no scan during analyze ... compute statistics
protected boolean noscan;
- //flag for partial scan during analyze ... compute statistics
- protected boolean partialscan;
-
protected volatile boolean disableJoinMerge = false;
protected final boolean defaultJoinMerge;
@@ -400,7 +394,7 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
globalLimitCtx = new GlobalLimitCtx();
viewAliasToInput = new HashMap<String, ReadEntity>();
mergeIsDirect = true;
- noscan = partialscan = false;
+ noscan = false;
tabNameToTabObject = new HashMap<>();
defaultJoinMerge = false == HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVE_MERGE_NWAY_JOINS);
disableJoinMerge = defaultJoinMerge;
@@ -956,8 +950,11 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
if (firstRow) {
fields.add(new FieldSchema("tmp_values_col" + nextColNum++, "string", ""));
}
- if (isFirst) isFirst = false;
- else writeAsText("\u0001", out);
+ if (isFirst) {
+ isFirst = false;
+ } else {
+ writeAsText("\u0001", out);
+ }
writeAsText(unparseExprForValuesClause(value), out);
}
writeAsText("\n", out);
@@ -1471,8 +1468,9 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
}
}
- if ((ast.getChild(posn).getChild(0).getType() == HiveParser.TOK_TRANSFORM))
+ if ((ast.getChild(posn).getChild(0).getType() == HiveParser.TOK_TRANSFORM)) {
queryProperties.setUsesScript(true);
+ }
LinkedHashMap<String, ASTNode> aggregations = doPhase1GetAggregationsFromSelect(ast,
qb, ctx_1.dest);
@@ -1484,8 +1482,9 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
case HiveParser.TOK_WHERE:
qbp.setWhrExprForClause(ctx_1.dest, ast);
- if (!SubQueryUtils.findSubQueries((ASTNode) ast.getChild(0)).isEmpty())
- queryProperties.setFilterWithSubQuery(true);
+ if (!SubQueryUtils.findSubQueries((ASTNode) ast.getChild(0)).isEmpty()) {
+ queryProperties.setFilterWithSubQuery(true);
+ }
break;
case HiveParser.TOK_INSERT_INTO:
@@ -1694,7 +1693,6 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
qb.addAlias(table_name);
qb.getParseInfo().setIsAnalyzeCommand(true);
qb.getParseInfo().setNoScanAnalyzeCommand(this.noscan);
- qb.getParseInfo().setPartialScanAnalyzeCommand(this.partialscan);
// Allow analyze the whole table and dynamic partitions
HiveConf.setVar(conf, HiveConf.ConfVars.DYNAMICPARTITIONINGMODE, "nonstrict");
HiveConf.setVar(conf, HiveConf.ConfVars.HIVEMAPREDMODE, "nonstrict");
@@ -2082,27 +2080,6 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
"Cannot get partitions for " + ts.partSpec), e);
}
}
- // validate partial scan command
- QBParseInfo qbpi = qb.getParseInfo();
- if (qbpi.isPartialScanAnalyzeCommand()) {
- Class<? extends InputFormat> inputFormatClass = null;
- switch (ts.specType) {
- case TABLE_ONLY:
- case DYNAMIC_PARTITION:
- inputFormatClass = ts.tableHandle.getInputFormatClass();
- break;
- case STATIC_PARTITION:
- inputFormatClass = ts.partHandle.getInputFormatClass();
- break;
- default:
- assert false;
- }
- // throw a HiveException for formats other than rcfile or orcfile.
- if (!(inputFormatClass.equals(RCFileInputFormat.class) || inputFormatClass
- .equals(OrcInputFormat.class))) {
- throw new SemanticException(ErrorMsg.ANALYZE_TABLE_PARTIALSCAN_NON_RCFILE.getMsg());
- }
- }
tab.setTableSpec(ts);
qb.getParseInfo().addTableSpec(alias, ts);
@@ -8304,7 +8281,9 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
if (reduceKeys.size() == 0) {
numReds = 1;
String error = StrictChecks.checkCartesian(conf);
- if (error != null) throw new SemanticException(error);
+ if (error != null) {
+ throw new SemanticException(error);
+ }
}
ReduceSinkDesc rsDesc = PlanUtils.getReduceSinkDesc(reduceKeys,
@@ -9081,12 +9060,16 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
* 2. TableName, ColumnName, Target-TableName
* */
private Map<String, List<SemiJoinHint>> parseSemiJoinHint(List<ASTNode> hints) throws SemanticException {
- if (hints == null || hints.size() == 0) return null;
+ if (hints == null || hints.size() == 0) {
+ return null;
+ }
Map<String, List<SemiJoinHint>> result = null;
for (ASTNode hintNode : hints) {
for (Node node : hintNode.getChildren()) {
ASTNode hint = (ASTNode) node;
- if (hint.getChild(0).getType() != HintParser.TOK_LEFTSEMIJOIN) continue;
+ if (hint.getChild(0).getType() != HintParser.TOK_LEFTSEMIJOIN) {
+ continue;
+ }
if (result == null) {
result = new HashMap<>();
}
@@ -9161,11 +9144,15 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
* @throws SemanticException
*/
private boolean disableMapJoinWithHint(List<ASTNode> hints) throws SemanticException {
- if (hints == null || hints.size() == 0) return false;
+ if (hints == null || hints.size() == 0) {
+ return false;
+ }
for (ASTNode hintNode : hints) {
for (Node node : hintNode.getChildren()) {
ASTNode hint = (ASTNode) node;
- if (hint.getChild(0).getType() != HintParser.TOK_MAPJOIN) continue;
+ if (hint.getChild(0).getType() != HintParser.TOK_MAPJOIN) {
+ continue;
+ }
Tree args = hint.getChild(1);
if (args.getChildCount() == 1) {
String text = args.getChild(0).getText();
@@ -11299,11 +11286,17 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
continue;
}
ASTNode n = (ASTNode) ((ASTNode) child).getFirstChildWithType(HiveParser.TOK_INSERT_INTO);
- if (n == null) continue;
+ if (n == null) {
+ continue;
+ }
n = (ASTNode) n.getFirstChildWithType(HiveParser.TOK_TAB);
- if (n == null) continue;
+ if (n == null) {
+ continue;
+ }
n = (ASTNode) n.getFirstChildWithType(HiveParser.TOK_TABNAME);
- if (n == null) continue;
+ if (n == null) {
+ continue;
+ }
String[] dbTab = getQualifiedTableName(n);
Table t = db.getTable(dbTab[0], dbTab[1]);
Path tablePath = t.getPath();
@@ -12735,24 +12728,6 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
}
/**
- * process analyze ... partial command
- *
- * separate it from noscan command process so that it provides us flexibility
- *
- * @param tree
- * @throws SemanticException
- */
- protected void processPartialScanCommand (ASTNode tree) throws SemanticException {
- // check if it is partial scan command
- this.checkPartialScan(tree);
-
- //validate partial scan
- if (this.partialscan) {
- validateAnalyzePartialscan(tree);
- }
- }
-
- /**
* process analyze ... noscan command
* @param tree
* @throws SemanticException
@@ -12797,45 +12772,6 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
}
/**
- * Validate partialscan command
- *
- * @param tree
- * @throws SemanticException
- */
- private void validateAnalyzePartialscan(ASTNode tree) throws SemanticException {
- // since it is partialscan, it is true table name in command
- String tableName = getUnescapedName((ASTNode) tree.getChild(0).getChild(0));
- Table tbl;
- try {
- tbl = this.getTableObjectByName(tableName);
- } catch (InvalidTableException e) {
- throw new SemanticException(ErrorMsg.INVALID_TABLE.getMsg(tableName), e);
- } catch (HiveException e) {
- throw new SemanticException(e.getMessage(), e);
- }
- /* partialscan uses hdfs apis to retrieve such information from Namenode. */
- /* But that will be specific to hdfs. Through storagehandler mechanism, */
- /* storage of table could be on any storage system: hbase, cassandra etc. */
- /* A nice error message should be given to user. */
- if (tbl.isNonNative()) {
- throw new SemanticException(ErrorMsg.ANALYZE_TABLE_PARTIALSCAN_NON_NATIVE.getMsg(tbl
- .getTableName()));
- }
-
- /**
- * Partial scan doesn't support external table.
- */
- if(tbl.getTableType().equals(TableType.EXTERNAL_TABLE)) {
- throw new SemanticException(ErrorMsg.ANALYZE_TABLE_PARTIALSCAN_EXTERNAL_TABLE.getMsg(tbl
- .getTableName()));
- }
-
- if (!HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVESTATSAUTOGATHER)) {
- throw new SemanticException(ErrorMsg.ANALYZE_TABLE_PARTIALSCAN_AUTOGATHER.getMsg());
- }
- }
-
- /**
* It will check if this is analyze ... compute statistics noscan
* @param tree
*/
@@ -12855,27 +12791,6 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
}
}
- /**
- * It will check if this is analyze ... compute statistics partialscan
- * @param tree
- */
- private void checkPartialScan(ASTNode tree) {
- if (tree.getChildCount() > 1) {
- ASTNode child0 = (ASTNode) tree.getChild(0);
- ASTNode child1;
- if (child0.getToken().getType() == HiveParser.TOK_TAB) {
- child0 = (ASTNode) child0.getChild(0);
- if (child0.getToken().getType() == HiveParser.TOK_TABNAME) {
- child1 = (ASTNode) tree.getChild(1);
- if (child1.getToken().getType() == HiveParser.KW_PARTIALSCAN) {
- this.partialscan = true;
- }
- }
- }
- }
- }
-
-
public QB getQB() {
return qb;
}
@@ -13743,7 +13658,6 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
if (qb != null) {
queryProperties.setQuery(qb.getIsQuery());
queryProperties.setAnalyzeCommand(qb.getParseInfo().isAnalyzeCommand());
- queryProperties.setPartialScanAnalyzeCommand(qb.getParseInfo().isPartialScanAnalyzeCommand());
queryProperties.setNoScanAnalyzeCommand(qb.getParseInfo().isNoScanAnalyzeCommand());
queryProperties.setAnalyzeRewrite(qb.isAnalyzeRewrite());
queryProperties.setCTAS(qb.getTableDesc() != null);
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/java/org/apache/hadoop/hive/ql/parse/spark/SparkProcessAnalyzeTable.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/spark/SparkProcessAnalyzeTable.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/spark/SparkProcessAnalyzeTable.java
index a2876e1..7ff321f 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/spark/SparkProcessAnalyzeTable.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/spark/SparkProcessAnalyzeTable.java
@@ -25,14 +25,11 @@ import java.util.Stack;
import org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.ql.DriverContext;
import org.apache.hadoop.hive.ql.exec.TableScanOperator;
import org.apache.hadoop.hive.ql.exec.Task;
import org.apache.hadoop.hive.ql.exec.TaskFactory;
import org.apache.hadoop.hive.ql.io.orc.OrcInputFormat;
-import org.apache.hadoop.hive.ql.io.rcfile.stats.PartialScanWork;
import org.apache.hadoop.hive.ql.lib.Node;
import org.apache.hadoop.hive.ql.lib.NodeProcessor;
import org.apache.hadoop.hive.ql.lib.NodeProcessorCtx;
@@ -52,7 +49,7 @@ import com.google.common.base.Preconditions;
/**
* ProcessAnalyzeTable sets up work for the several variants of analyze table
- * (normal, no scan, partial scan.) The plan at this point will be a single
+ * (normal, no scan) The plan at this point will be a single
* table scan operator.
*
* Cloned from Tez ProcessAnalyzeTable.
@@ -103,7 +100,6 @@ public class SparkProcessAnalyzeTable implements NodeProcessor {
MapredParquetInputFormat.class.isAssignableFrom(inputFormat)) {
// For ORC & Parquet, all the following statements are the same
// ANALYZE TABLE T [PARTITION (...)] COMPUTE STATISTICS
- // ANALYZE TABLE T [PARTITION (...)] COMPUTE STATISTICS partialscan;
// ANALYZE TABLE T [PARTITION (...)] COMPUTE STATISTICS noscan;
// There will not be any Spark job above this task
StatsNoJobWork snjWork = new StatsNoJobWork(tableScan.getConf().getTableMetadata().getTableSpec());
@@ -146,11 +142,6 @@ public class SparkProcessAnalyzeTable implements NodeProcessor {
context.rootTasks.add(statsTask);
}
- // ANALYZE TABLE T [PARTITION (...)] COMPUTE STATISTICS partialscan;
- if (parseContext.getQueryProperties().isPartialScanAnalyzeCommand()) {
- handlePartialScanCommand(tableScan, parseContext, statsWork, context, statsTask);
- }
-
// NOTE: here we should use the new partition predicate pushdown API to get a list of pruned list,
// and pass it to setTaskPlan as the last parameter
Set<Partition> confirmedPartns = GenMapRedUtils.getConfirmedPartitionsForScan(tableScan);
@@ -170,42 +161,4 @@ public class SparkProcessAnalyzeTable implements NodeProcessor {
return null;
}
- /**
- * handle partial scan command.
- *
- * It is composed of PartialScanTask followed by StatsTask.
- */
- private void handlePartialScanCommand(TableScanOperator tableScan, ParseContext parseContext,
- StatsWork statsWork, GenSparkProcContext context, Task<StatsWork> statsTask)
- throws SemanticException {
- String aggregationKey = tableScan.getConf().getStatsAggPrefix();
- StringBuilder aggregationKeyBuffer = new StringBuilder(aggregationKey);
- List<Path> inputPaths = GenMapRedUtils.getInputPathsForPartialScan(tableScan, aggregationKeyBuffer);
- aggregationKey = aggregationKeyBuffer.toString();
-
- // scan work
- PartialScanWork scanWork = new PartialScanWork(inputPaths);
- scanWork.setMapperCannotSpanPartns(true);
- scanWork.setAggKey(aggregationKey);
- scanWork.setStatsTmpDir(tableScan.getConf().getTmpStatsDir(), parseContext.getConf());
-
- // stats work
- statsWork.setPartialScanAnalyzeCommand(true);
-
- // partial scan task
- DriverContext driverCxt = new DriverContext();
-
- @SuppressWarnings("unchecked")
- Task<PartialScanWork> partialScanTask = TaskFactory.get(scanWork, parseContext.getConf());
- partialScanTask.initialize(parseContext.getQueryState(), null, driverCxt,
- tableScan.getCompilationOpContext());
- partialScanTask.setWork(scanWork);
- statsWork.setSourceTask(partialScanTask);
-
- // task dependency
- context.rootTasks.remove(context.currentTask);
- context.rootTasks.add(partialScanTask);
- partialScanTask.addDependentTask(statsTask);
- }
-
}
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/java/org/apache/hadoop/hive/ql/plan/StatsWork.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/StatsWork.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/StatsWork.java
index a5050c5..74629d5 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/StatsWork.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/StatsWork.java
@@ -54,8 +54,6 @@ public class StatsWork implements Serializable {
private boolean isNoScanAnalyzeCommand = false;
- private boolean isPartialScanAnalyzeCommand = false;
-
// sourceTask for TS is not changed (currently) but that of FS might be changed
// by various optimizers (auto.convert.join, for example)
// so this is set by DriverContext in runtime
@@ -146,20 +144,6 @@ public class StatsWork implements Serializable {
this.isNoScanAnalyzeCommand = isNoScanAnalyzeCommand;
}
- /**
- * @return the isPartialScanAnalyzeCommand
- */
- public boolean isPartialScanAnalyzeCommand() {
- return isPartialScanAnalyzeCommand;
- }
-
- /**
- * @param isPartialScanAnalyzeCommand the isPartialScanAnalyzeCommand to set
- */
- public void setPartialScanAnalyzeCommand(boolean isPartialScanAnalyzeCommand) {
- this.isPartialScanAnalyzeCommand = isPartialScanAnalyzeCommand;
- }
-
public Task getSourceTask() {
return sourceTask;
}
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/test/queries/clientnegative/stats_partialscan_autogether.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/stats_partialscan_autogether.q b/ql/src/test/queries/clientnegative/stats_partialscan_autogether.q
deleted file mode 100644
index fb3bd20..0000000
--- a/ql/src/test/queries/clientnegative/stats_partialscan_autogether.q
+++ /dev/null
@@ -1,32 +0,0 @@
-set hive.mapred.mode=nonstrict;
-set datanucleus.cache.collections=false;
-set hive.stats.autogather=false;
-set hive.exec.dynamic.partition=true;
-set hive.exec.dynamic.partition.mode=nonstrict;
-set mapred.min.split.size=256;
-set mapred.min.split.size.per.node=256;
-set mapred.min.split.size.per.rack=256;
-set mapred.max.split.size=256;
-
--- test analyze table ... compute statistics partialscan
-
--- 1. prepare data
-CREATE table analyze_srcpart_partial_scan (key STRING, value STRING)
-partitioned by (ds string, hr string)
-stored as rcfile;
-insert overwrite table analyze_srcpart_partial_scan partition (ds, hr) select * from srcpart where ds is not null order by key;
-describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11);
-
-
--- 2. partialscan
-explain
-analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan;
-analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan;
-
--- 3. confirm result
-describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11);
-describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-09',hr=11);
-drop table analyze_srcpart_partial_scan;
-
-
-
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/test/queries/clientnegative/stats_partialscan_non_external.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/stats_partialscan_non_external.q b/ql/src/test/queries/clientnegative/stats_partialscan_non_external.q
deleted file mode 100644
index c206b8b..0000000
--- a/ql/src/test/queries/clientnegative/stats_partialscan_non_external.q
+++ /dev/null
@@ -1,5 +0,0 @@
-
-CREATE EXTERNAL TABLE external_table (key int, value string);
-
--- we do not support analyze table ... partialscan on EXTERNAL tables yet
-analyze table external_table compute statistics partialscan;
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/test/queries/clientnegative/stats_partialscan_non_native.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/stats_partialscan_non_native.q b/ql/src/test/queries/clientnegative/stats_partialscan_non_native.q
deleted file mode 100644
index 8e02ced..0000000
--- a/ql/src/test/queries/clientnegative/stats_partialscan_non_native.q
+++ /dev/null
@@ -1,6 +0,0 @@
-
-CREATE TABLE non_native1(key int, value string)
-STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler';
-
--- we do not support analyze table ... partialscan on non-native tables yet
-analyze table non_native1 compute statistics partialscan;
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/test/queries/clientnegative/stats_partscan_norcfile.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/stats_partscan_norcfile.q b/ql/src/test/queries/clientnegative/stats_partscan_norcfile.q
deleted file mode 100644
index 56d93d0..0000000
--- a/ql/src/test/queries/clientnegative/stats_partscan_norcfile.q
+++ /dev/null
@@ -1,12 +0,0 @@
-set datanucleus.cache.collections=false;
-set hive.stats.autogather=true;
-set hive.exec.dynamic.partition=true;
-set hive.exec.dynamic.partition.mode=nonstrict;
-
--- test analyze table ... compute statistics partialscan
-
-create table analyze_srcpart_partial_scan like srcpart;
-insert overwrite table analyze_srcpart_partial_scan partition (ds, hr) select * from srcpart where ds is not null;
-analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan;
-
-
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/test/queries/clientpositive/orc_analyze.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_analyze.q b/ql/src/test/queries/clientpositive/orc_analyze.q
index 3f9a592..5202c07 100644
--- a/ql/src/test/queries/clientpositive/orc_analyze.q
+++ b/ql/src/test/queries/clientpositive/orc_analyze.q
@@ -34,9 +34,6 @@ set hive.stats.autogather = true;
analyze table orc_create_people compute statistics;
desc formatted orc_create_people;
-analyze table orc_create_people compute statistics partialscan;
-desc formatted orc_create_people;
-
analyze table orc_create_people compute statistics noscan;
desc formatted orc_create_people;
@@ -80,10 +77,6 @@ analyze table orc_create_people partition(state) compute statistics;
desc formatted orc_create_people partition(state="Ca");
desc formatted orc_create_people partition(state="Or");
-analyze table orc_create_people partition(state) compute statistics partialscan;
-desc formatted orc_create_people partition(state="Ca");
-desc formatted orc_create_people partition(state="Or");
-
analyze table orc_create_people partition(state) compute statistics noscan;
desc formatted orc_create_people partition(state="Ca");
desc formatted orc_create_people partition(state="Or");
@@ -133,10 +126,6 @@ analyze table orc_create_people partition(state) compute statistics;
desc formatted orc_create_people partition(state="Ca");
desc formatted orc_create_people partition(state="Or");
-analyze table orc_create_people partition(state) compute statistics partialscan;
-desc formatted orc_create_people partition(state="Ca");
-desc formatted orc_create_people partition(state="Or");
-
analyze table orc_create_people partition(state) compute statistics noscan;
desc formatted orc_create_people partition(state="Ca");
desc formatted orc_create_people partition(state="Or");
@@ -186,9 +175,6 @@ set hive.stats.autogather = true;
analyze table orc_create_people partition(state) compute statistics;
desc formatted orc_create_people partition(state="Ca");
-analyze table orc_create_people partition(state) compute statistics partialscan;
-desc formatted orc_create_people partition(state="Ca");
-
analyze table orc_create_people partition(state) compute statistics noscan;
desc formatted orc_create_people partition(state="Ca");
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/test/queries/clientpositive/stats_partscan_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats_partscan_1.q b/ql/src/test/queries/clientpositive/stats_partscan_1.q
deleted file mode 100644
index b790b7d..0000000
--- a/ql/src/test/queries/clientpositive/stats_partscan_1.q
+++ /dev/null
@@ -1,37 +0,0 @@
-set datanucleus.cache.collections=false;
-set hive.stats.autogather=false;
-set hive.exec.dynamic.partition=true;
-set hive.exec.dynamic.partition.mode=nonstrict;
-set mapred.min.split.size=256;
-set mapred.min.split.size.per.node=256;
-set mapred.min.split.size.per.rack=256;
-set mapred.max.split.size=256;
-
--- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20S)
--- This test uses mapred.max.split.size/mapred.max.split.size for controlling
--- number of input splits, which is not effective in hive 0.20.
--- stats_partscan_1_23.q is the same test with this but has different result.
-
--- test analyze table ... compute statistics partialscan
-
--- 1. prepare data
-CREATE table analyze_srcpart_partial_scan (key STRING, value STRING)
-partitioned by (ds string, hr string)
-stored as rcfile;
-insert overwrite table analyze_srcpart_partial_scan partition (ds, hr) select * from srcpart where ds is not null;
-describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11);
-
-set hive.stats.autogather=true;
-
--- 2. partialscan
-explain
-analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan;
-analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan;
-
--- 3. confirm result
-describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11);
-describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-09',hr=11);
-drop table analyze_srcpart_partial_scan;
-
-
-
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/test/queries/clientpositive/stats_partscan_1_23.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats_partscan_1_23.q b/ql/src/test/queries/clientpositive/stats_partscan_1_23.q
deleted file mode 100644
index 905c4c2..0000000
--- a/ql/src/test/queries/clientpositive/stats_partscan_1_23.q
+++ /dev/null
@@ -1,38 +0,0 @@
-set datanucleus.cache.collections=false;
-set hive.stats.autogather=false;
-set hive.exec.dynamic.partition=true;
-set hive.exec.dynamic.partition.mode=nonstrict;
-set mapred.min.split.size=256;
-set mapred.min.split.size.per.node=256;
-set mapred.min.split.size.per.rack=256;
-set mapred.max.split.size=256;
-set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-
--- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23)
--- This test uses mapred.max.split.size/mapred.max.split.size for controlling
--- number of input splits.
--- stats_partscan_1.q is the same test with this but has different result.
-
--- test analyze table ... compute statistics partialscan
-
--- 1. prepare data
-CREATE table analyze_srcpart_partial_scan (key STRING, value STRING)
-partitioned by (ds string, hr string)
-stored as rcfile;
-insert overwrite table analyze_srcpart_partial_scan partition (ds, hr) select * from srcpart where ds is not null;
-describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11);
-
-set hive.stats.autogather=true;
-
--- 2. partialscan
-explain
-analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan;
-analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan;
-
--- 3. confirm result
-describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11);
-describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-09',hr=11);
-drop table analyze_srcpart_partial_scan;
-
-
-
[07/21] hive git commit: HIVE-17519: Transpose column stats display
(Zoltan Haindrich, reviewed by Ashutosh Chauhan and Vineet Garg)
Posted by kg...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out
index 71d7e16..23ec5f4 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out
@@ -224,13 +224,11 @@ POSTHOOK: query: desc formatted list_bucketing_dynamic_part partition (ds='2008-
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_dynamic_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -269,13 +267,11 @@ POSTHOOK: query: desc formatted list_bucketing_dynamic_part partition (ds='2008-
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_dynamic_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out
index 8e20ff1..1e01ca3 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out
@@ -238,13 +238,11 @@ POSTHOOK: query: desc formatted list_bucketing_dynamic_part partition (ds='2008-
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_dynamic_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -281,13 +279,11 @@ POSTHOOK: query: desc formatted list_bucketing_dynamic_part partition (ds='2008-
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_dynamic_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -665,13 +661,11 @@ POSTHOOK: query: desc formatted list_bucketing_dynamic_part partition (ds='2008-
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_dynamic_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -708,13 +702,11 @@ POSTHOOK: query: desc formatted list_bucketing_dynamic_part partition (ds='2008-
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_dynamic_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out
index 58bf240..eea69ff 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out
@@ -238,13 +238,11 @@ POSTHOOK: query: desc formatted list_bucketing_dynamic_part partition (ds='2008-
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_dynamic_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -281,13 +279,11 @@ POSTHOOK: query: desc formatted list_bucketing_dynamic_part partition (ds='2008-
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_dynamic_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -665,13 +661,11 @@ POSTHOOK: query: desc formatted list_bucketing_dynamic_part partition (ds='2008-
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_dynamic_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -708,13 +702,11 @@ POSTHOOK: query: desc formatted list_bucketing_dynamic_part partition (ds='2008-
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_dynamic_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out
index b38d332..0215f5d 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out
@@ -238,13 +238,11 @@ POSTHOOK: query: desc formatted list_bucketing_dynamic_part partition (ds='2008-
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_dynamic_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -281,13 +279,11 @@ POSTHOOK: query: desc formatted list_bucketing_dynamic_part partition (ds='2008-
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_dynamic_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -334,13 +330,11 @@ POSTHOOK: query: desc formatted list_bucketing_dynamic_part partition (ds='2008-
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_dynamic_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out
index 624e3ac..fdc7a3e 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out
@@ -234,13 +234,11 @@ POSTHOOK: query: desc formatted list_bucketing_static_part partition (ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_static_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -608,13 +606,11 @@ POSTHOOK: query: desc formatted list_bucketing_static_part partition (ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_static_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out
index 17c7afe..a1f225c 100644
--- a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out
@@ -31,13 +31,11 @@ POSTHOOK: query: describe formatted fact_daily PARTITION (ds = '1', hr='4')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@fact_daily
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out
index afba625..0ad2ff5 100644
--- a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out
@@ -31,13 +31,11 @@ POSTHOOK: query: describe formatted fact_daily PARTITION (ds = '1', hr='4')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@fact_daily
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
index 3ff221d..02fc314 100644
--- a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
@@ -27,13 +27,11 @@ POSTHOOK: query: describe formatted fact_daily PARTITION (ds = '1', hr='1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@fact_daily
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -87,13 +85,11 @@ POSTHOOK: query: describe formatted fact_daily PARTITION (ds = '1', hr='2')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@fact_daily
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -152,13 +148,11 @@ POSTHOOK: query: describe formatted fact_daily PARTITION (ds = '1', hr='3')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@fact_daily
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out
index fd87cf0..1076df5 100644
--- a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out
@@ -85,12 +85,10 @@ POSTHOOK: query: describe formatted fact_daily PARTITION (ds = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@fact_daily
# col_name data_type comment
-
x int
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out
index 37f5484..876434f 100644
--- a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out
@@ -87,13 +87,11 @@ POSTHOOK: query: describe formatted fact_daily PARTITION (ds = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@fact_daily
# col_name data_type comment
-
x int
y string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out
index e3b6513..9d30759 100644
--- a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out
@@ -102,14 +102,12 @@ POSTHOOK: query: describe formatted fact_daily PARTITION (ds = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@fact_daily
# col_name data_type comment
-
x int
y string
z string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/alter_merge_2_orc.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/alter_merge_2_orc.q.out b/ql/src/test/results/clientpositive/llap/alter_merge_2_orc.q.out
index caa41b2..0829057 100644
--- a/ql/src/test/results/clientpositive/llap/alter_merge_2_orc.q.out
+++ b/ql/src/test/results/clientpositive/llap/alter_merge_2_orc.q.out
@@ -26,7 +26,6 @@ ts string
# Partition Information
# col_name data_type comment
-
ds string
ts string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/alter_merge_stats_orc.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/alter_merge_stats_orc.q.out b/ql/src/test/results/clientpositive/llap/alter_merge_stats_orc.q.out
index 0d5ba01..2b069ec 100644
--- a/ql/src/test/results/clientpositive/llap/alter_merge_stats_orc.q.out
+++ b/ql/src/test/results/clientpositive/llap/alter_merge_stats_orc.q.out
@@ -78,7 +78,6 @@ POSTHOOK: query: desc formatted src_orc_merge_test_stat
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_orc_merge_test_stat
# col_name data_type comment
-
key int
value string
@@ -129,7 +128,6 @@ POSTHOOK: query: desc formatted src_orc_merge_test_stat
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_orc_merge_test_stat
# col_name data_type comment
-
key int
value string
@@ -226,13 +224,11 @@ POSTHOOK: query: desc formatted src_orc_merge_test_part_stat partition (ds='2011
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_orc_merge_test_part_stat
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -275,13 +271,11 @@ POSTHOOK: query: desc formatted src_orc_merge_test_part_stat partition (ds='2011
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_orc_merge_test_part_stat
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -332,13 +326,11 @@ POSTHOOK: query: desc formatted src_orc_merge_test_part_stat partition (ds='2011
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_orc_merge_test_part_stat
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out b/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out
index 6369dd3..9fbc404 100644
--- a/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out
@@ -47,7 +47,6 @@ POSTHOOK: query: describe formatted src_multi1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_multi1
# col_name data_type comment
-
key string default
value string default
@@ -124,7 +123,6 @@ POSTHOOK: query: describe formatted a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@a
# col_name data_type comment
-
key string default
value string default
@@ -159,7 +157,6 @@ POSTHOOK: query: describe formatted b
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@b
# col_name data_type comment
-
key string default
value string default
@@ -244,7 +241,6 @@ POSTHOOK: query: describe formatted a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@a
# col_name data_type comment
-
key string default
value string default
@@ -279,7 +275,6 @@ POSTHOOK: query: describe formatted b
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@b
# col_name data_type comment
-
key string default
value string default
@@ -338,7 +333,6 @@ POSTHOOK: query: describe formatted src_multi2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_multi2
# col_name data_type comment
-
key string default
value string default
@@ -502,12 +496,10 @@ POSTHOOK: query: describe formatted alter5 partition (dt='a')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter5
# col_name data_type comment
-
col1 string
# Partition Information
# col_name data_type comment
-
dt string
# Detailed Partition Information
@@ -544,12 +536,10 @@ POSTHOOK: query: describe formatted alter5 partition (dt='a')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter5
# col_name data_type comment
-
col1 string
# Partition Information
# col_name data_type comment
-
dt string
# Detailed Partition Information
@@ -625,13 +615,11 @@ POSTHOOK: query: describe formatted src_stat_part PARTITION(partitionId=1)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
partitionid int
# Detailed Partition Information
@@ -676,13 +664,11 @@ POSTHOOK: query: describe formatted src_stat_part PARTITION(partitionId=2)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
partitionid int
# Detailed Partition Information
@@ -815,13 +801,11 @@ POSTHOOK: query: describe formatted tab_part partition (ds='2008-04-08')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tab_part
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -876,13 +860,11 @@ POSTHOOK: query: describe formatted tab partition (ds='2008-04-08')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tab
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -933,13 +915,11 @@ POSTHOOK: query: describe formatted nzhang_part14
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_part14
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -1005,13 +985,11 @@ POSTHOOK: query: desc formatted nzhang_part14 partition(ds='1', hr='3')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_part14
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -1068,13 +1046,11 @@ POSTHOOK: query: desc formatted nzhang_part14 PARTITION(ds='2010-03-03', hr='12'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_part14
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -1149,13 +1125,11 @@ POSTHOOK: query: desc formatted nzhang_part14 PARTITION(ds='2010-03-03', hr='12'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_part14
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out b/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out
index a61eafa..104c25f 100644
--- a/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out
@@ -47,7 +47,6 @@ POSTHOOK: query: describe formatted src_multi1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_multi1
# col_name data_type comment
-
key string default
value string default
@@ -123,9 +122,18 @@ PREHOOK: Input: default@a
POSTHOOK: query: describe formatted a key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@a
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 309 2.812 3 HL from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 309
+avg_col_len 2.812
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: describe formatted b key
PREHOOK: type: DESCTABLE
@@ -133,9 +141,18 @@ PREHOOK: Input: default@b
POSTHOOK: query: describe formatted b key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@b
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 309 2.812 3 HL from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 309
+avg_col_len 2.812
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: from src
insert overwrite table a select *
@@ -162,7 +179,6 @@ POSTHOOK: query: describe formatted a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@a
# col_name data_type comment
-
key string default
value string default
@@ -197,7 +213,6 @@ POSTHOOK: query: describe formatted b
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@b
# col_name data_type comment
-
key string default
value string default
@@ -231,9 +246,18 @@ PREHOOK: Input: default@b
POSTHOOK: query: describe formatted b key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@b
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 309 2.812 3 HL from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 309
+avg_col_len 2.812
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: describe formatted b value
PREHOOK: type: DESCTABLE
@@ -241,9 +265,18 @@ PREHOOK: Input: default@b
POSTHOOK: query: describe formatted b value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@b
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 309 6.812 7 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 309
+avg_col_len 6.812
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: insert into table b select NULL, NULL from src limit 10
PREHOOK: type: QUERY
@@ -261,9 +294,18 @@ PREHOOK: Input: default@b
POSTHOOK: query: describe formatted b key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@b
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 10 309 2.812 3 HL from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 10
+distinct_count 309
+avg_col_len 2.812
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: describe formatted b value
PREHOOK: type: DESCTABLE
@@ -271,9 +313,18 @@ PREHOOK: Input: default@b
POSTHOOK: query: describe formatted b value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@b
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 10 309 6.812 7 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 10
+distinct_count 309
+avg_col_len 6.812
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: insert into table b(value) select key+100000 from src limit 10
PREHOOK: type: QUERY
@@ -291,9 +342,18 @@ PREHOOK: Input: default@b
POSTHOOK: query: describe formatted b key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@b
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 20 309 2.812 3 HL from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 20
+distinct_count 309
+avg_col_len 2.812
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: describe formatted b value
PREHOOK: type: DESCTABLE
@@ -301,9 +361,18 @@ PREHOOK: Input: default@b
POSTHOOK: query: describe formatted b value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@b
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 10 319 8.0 8 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 10
+distinct_count 319
+avg_col_len 8.0
+max_col_len 8
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: drop table src_multi2
PREHOOK: type: DROPTABLE
@@ -336,7 +405,6 @@ POSTHOOK: query: describe formatted src_multi2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_multi2
# col_name data_type comment
-
key string default
value string default
@@ -502,12 +570,10 @@ POSTHOOK: query: describe formatted alter5 partition (dt='a')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter5
# col_name data_type comment
-
col1 string
# Partition Information
# col_name data_type comment
-
dt string
# Detailed Partition Information
@@ -549,12 +615,10 @@ POSTHOOK: query: describe formatted alter5 partition (dt='a')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter5
# col_name data_type comment
-
col1 string
# Partition Information
# col_name data_type comment
-
dt string
# Detailed Partition Information
@@ -631,12 +695,10 @@ POSTHOOK: query: describe formatted alter5 partition (dt='a')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter5
# col_name data_type comment
-
col1 string
# Partition Information
# col_name data_type comment
-
dt string
# Detailed Partition Information
@@ -673,12 +735,10 @@ POSTHOOK: query: describe formatted alter5 partition (dt='a')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter5
# col_name data_type comment
-
col1 string
# Partition Information
# col_name data_type comment
-
dt string
# Detailed Partition Information
@@ -752,13 +812,11 @@ POSTHOOK: query: describe formatted src_stat_part PARTITION(partitionId=1)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
partitionid int
# Detailed Partition Information
@@ -803,13 +861,11 @@ POSTHOOK: query: describe formatted src_stat_part PARTITION(partitionId=2)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
partitionid int
# Detailed Partition Information
@@ -942,13 +998,11 @@ POSTHOOK: query: describe formatted tab_part partition (ds='2008-04-08')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tab_part
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -1003,13 +1057,11 @@ POSTHOOK: query: describe formatted tab partition (ds='2008-04-08')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tab
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -1060,13 +1112,11 @@ POSTHOOK: query: describe formatted nzhang_part14
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_part14
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -1132,13 +1182,11 @@ POSTHOOK: query: desc formatted nzhang_part14 partition(ds='1', hr='3')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_part14
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -1195,13 +1243,11 @@ POSTHOOK: query: desc formatted nzhang_part14 PARTITION(ds='2010-03-03', hr='12'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_part14
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -1276,13 +1322,11 @@ POSTHOOK: query: desc formatted nzhang_part14 PARTITION(ds='2010-03-03', hr='12'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_part14
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/bucket5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket5.q.out b/ql/src/test/results/clientpositive/llap/bucket5.q.out
index 0b5a14d..2357623 100644
--- a/ql/src/test/results/clientpositive/llap/bucket5.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket5.q.out
@@ -503,7 +503,6 @@ POSTHOOK: query: DESC FORMATTED bucketed_table
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@bucketed_table
# col_name data_type comment
-
key int
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/bucket_groupby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket_groupby.q.out b/ql/src/test/results/clientpositive/llap/bucket_groupby.q.out
index 1c6ab8c..98c1e48 100644
--- a/ql/src/test/results/clientpositive/llap/bucket_groupby.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket_groupby.q.out
@@ -18,7 +18,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
@@ -154,7 +153,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
@@ -1121,7 +1119,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
@@ -1427,7 +1424,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out b/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out
index 434f739..c60a5be 100644
--- a/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out
@@ -25,7 +25,6 @@ POSTHOOK: query: desc formatted calendar
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@calendar
# col_name data_type comment
-
year int
month int
@@ -68,7 +67,6 @@ POSTHOOK: query: desc formatted calendar
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@calendar
# col_name data_type comment
-
year int
month int
@@ -203,7 +201,6 @@ POSTHOOK: query: desc formatted calendar
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@calendar
# col_name data_type comment
-
year int
month int
@@ -269,7 +266,6 @@ POSTHOOK: query: desc formatted calendar
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@calendar
# col_name data_type comment
-
year int
month int
@@ -448,7 +444,6 @@ POSTHOOK: query: desc formatted calendar
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@calendar
# col_name data_type comment
-
year int
month int
@@ -583,7 +578,6 @@ POSTHOOK: query: desc formatted calendar
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@calendar
# col_name data_type comment
-
year int
month int
@@ -656,12 +650,10 @@ POSTHOOK: query: desc formatted calendarp partition (p=1)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@calendarp
# col_name data_type comment
-
year int
# Partition Information
# col_name data_type comment
-
p int
# Detailed Partition Information
@@ -777,12 +769,10 @@ POSTHOOK: query: desc formatted calendarp partition (p=1)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@calendarp
# col_name data_type comment
-
year int
# Partition Information
# col_name data_type comment
-
p int
# Detailed Partition Information
@@ -836,12 +826,10 @@ POSTHOOK: query: desc formatted calendarp partition (p=1)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@calendarp
# col_name data_type comment
-
year int
# Partition Information
# col_name data_type comment
-
p int
# Detailed Partition Information
@@ -959,7 +947,6 @@ POSTHOOK: query: desc formatted t
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t
# col_name data_type comment
-
key string
value string
@@ -1001,7 +988,6 @@ POSTHOOK: query: desc formatted t
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t
# col_name data_type comment
-
key string
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out b/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out
index 345434f..2b87d50 100644
--- a/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out
+++ b/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out
@@ -13,7 +13,6 @@ POSTHOOK: query: desc formatted space
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@space
# col_name data_type comment
-
left string
middle string
right string
@@ -48,9 +47,18 @@ PREHOOK: Input: default@space
POSTHOOK: query: desc formatted space ` left`
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@space
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
- left string from deserializer
+col_name left
+data_type string
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\" left\":\"true\",\" middle \":\"true\",\"right \":\"true\"}}
PREHOOK: query: insert into space values ("1", "2", "3")
PREHOOK: type: QUERY
@@ -67,9 +75,18 @@ PREHOOK: Input: default@space
POSTHOOK: query: desc formatted space ` left`
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@space
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
- left string 0 1 1.0 1 HL from deserializer
+col_name left
+data_type string
+min
+max
+num_nulls 0
+distinct_count 1
+avg_col_len 1.0
+max_col_len 1
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\" left\":\"true\",\" middle \":\"true\",\"right \":\"true\"}}
PREHOOK: query: select * from space
PREHOOK: type: QUERY
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/column_table_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/column_table_stats.q.out b/ql/src/test/results/clientpositive/llap/column_table_stats.q.out
index 9aad454..f073720 100644
--- a/ql/src/test/results/clientpositive/llap/column_table_stats.q.out
+++ b/ql/src/test/results/clientpositive/llap/column_table_stats.q.out
@@ -25,7 +25,6 @@ POSTHOOK: query: desc formatted s
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@s
# col_name data_type comment
-
key string default
value string default
@@ -204,7 +203,6 @@ POSTHOOK: query: desc formatted s
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@s
# col_name data_type comment
-
key string default
value string default
@@ -277,13 +275,11 @@ POSTHOOK: query: desc formatted spart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@spart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -530,13 +526,11 @@ POSTHOOK: query: desc formatted spart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@spart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -572,13 +566,11 @@ POSTHOOK: query: desc formatted spart PARTITION(ds='2008-04-08', hr=11)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@spart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -612,13 +604,11 @@ POSTHOOK: query: desc formatted spart PARTITION(ds='2008-04-08', hr=12)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@spart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -694,13 +684,11 @@ POSTHOOK: query: desc formatted spart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@spart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -947,13 +935,11 @@ POSTHOOK: query: desc formatted spart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@spart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -989,13 +975,11 @@ POSTHOOK: query: desc formatted spart PARTITION(ds='2008-04-08', hr=11)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@spart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -1029,13 +1013,11 @@ POSTHOOK: query: desc formatted spart PARTITION(ds='2008-04-08', hr=12)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@spart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -1111,13 +1093,11 @@ POSTHOOK: query: desc formatted spart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@spart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -1312,13 +1292,11 @@ POSTHOOK: query: desc formatted spart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@spart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -1353,13 +1331,11 @@ POSTHOOK: query: desc formatted spart PARTITION(ds='2008-04-08', hr=11)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@spart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -1393,13 +1369,11 @@ POSTHOOK: query: desc formatted spart PARTITION(ds='2008-04-08', hr=12)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@spart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/column_table_stats_orc.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/column_table_stats_orc.q.out b/ql/src/test/results/clientpositive/llap/column_table_stats_orc.q.out
index c719976..4bc5b39 100644
--- a/ql/src/test/results/clientpositive/llap/column_table_stats_orc.q.out
+++ b/ql/src/test/results/clientpositive/llap/column_table_stats_orc.q.out
@@ -25,7 +25,6 @@ POSTHOOK: query: desc formatted s
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@s
# col_name data_type comment
-
key string default
value string default
@@ -206,7 +205,6 @@ POSTHOOK: query: desc formatted s
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@s
# col_name data_type comment
-
key string default
value string default
@@ -273,13 +271,11 @@ POSTHOOK: query: desc formatted spart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@spart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -520,13 +516,11 @@ POSTHOOK: query: desc formatted spart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@spart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -562,13 +556,11 @@ POSTHOOK: query: desc formatted spart PARTITION(ds='2008-04-08', hr=11)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@spart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -602,13 +594,11 @@ POSTHOOK: query: desc formatted spart PARTITION(ds='2008-04-08', hr=12)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@spart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -678,13 +668,11 @@ POSTHOOK: query: desc formatted spart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@spart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -876,13 +864,11 @@ POSTHOOK: query: desc formatted spart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@spart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -918,13 +904,11 @@ POSTHOOK: query: desc formatted spart PARTITION(ds='2008-04-08', hr=11)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@spart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -958,13 +942,11 @@ POSTHOOK: query: desc formatted spart PARTITION(ds='2008-04-08', hr=12)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@spart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
[19/21] hive git commit: HIVE-17652: retire ANALYZE TABLE ...
PARTIALSCAN (Zoltan Haindrich, reviewed by Ashutosh Chauhan)
Posted by kg...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out b/ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out
deleted file mode 100644
index 680999f..0000000
--- a/ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out
+++ /dev/null
@@ -1,75 +0,0 @@
-PREHOOK: query: CREATE table analyze_srcpart_partial_scan (key STRING, value STRING)
-partitioned by (ds string, hr string)
-stored as rcfile
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@analyze_srcpart_partial_scan
-POSTHOOK: query: CREATE table analyze_srcpart_partial_scan (key STRING, value STRING)
-partitioned by (ds string, hr string)
-stored as rcfile
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@analyze_srcpart_partial_scan
-PREHOOK: query: insert overwrite table analyze_srcpart_partial_scan partition (ds, hr) select * from srcpart where ds is not null order by key
-PREHOOK: type: QUERY
-PREHOOK: Input: default@srcpart
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-PREHOOK: Output: default@analyze_srcpart_partial_scan
-POSTHOOK: query: insert overwrite table analyze_srcpart_partial_scan partition (ds, hr) select * from srcpart where ds is not null order by key
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@srcpart
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=11
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=12
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-09/hr=11
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-09/hr=12
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@analyze_srcpart_partial_scan
-POSTHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@analyze_srcpart_partial_scan
-# col_name data_type comment
-key string
-value string
-
-# Partition Information
-# col_name data_type comment
-ds string
-hr string
-
-# Detailed Partition Information
-Partition Value: [2008-04-08, 11]
-Database: default
-Table: analyze_srcpart_partial_scan
-#### A masked pattern was here ####
-Partition Parameters:
- numFiles 1
- totalSize 5077
-#### A masked pattern was here ####
-
-# Storage Information
-SerDe Library: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
-InputFormat: org.apache.hadoop.hive.ql.io.RCFileInputFormat
-OutputFormat: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
-Compressed: No
-Num Buckets: -1
-Bucket Columns: []
-Sort Columns: []
-Storage Desc Params:
- serialization.format 1
-FAILED: SemanticException [Error 10233]: Analyze partialscan is not allowed if hive.stats.autogather is set to false
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/test/results/clientnegative/stats_partialscan_non_external.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/stats_partialscan_non_external.q.out b/ql/src/test/results/clientnegative/stats_partialscan_non_external.q.out
deleted file mode 100644
index ce3073b..0000000
--- a/ql/src/test/results/clientnegative/stats_partialscan_non_external.q.out
+++ /dev/null
@@ -1,9 +0,0 @@
-PREHOOK: query: CREATE EXTERNAL TABLE external_table (key int, value string)
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@external_table
-POSTHOOK: query: CREATE EXTERNAL TABLE external_table (key int, value string)
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@external_table
-FAILED: SemanticException [Error 10231]: ANALYZE TABLE PARTIALSCAN doesn't support external table: external_table
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/test/results/clientnegative/stats_partialscan_non_native.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/stats_partialscan_non_native.q.out b/ql/src/test/results/clientnegative/stats_partialscan_non_native.q.out
deleted file mode 100644
index 9d46969..0000000
--- a/ql/src/test/results/clientnegative/stats_partialscan_non_native.q.out
+++ /dev/null
@@ -1,11 +0,0 @@
-PREHOOK: query: CREATE TABLE non_native1(key int, value string)
-STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler'
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@non_native1
-POSTHOOK: query: CREATE TABLE non_native1(key int, value string)
-STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler'
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@non_native1
-FAILED: SemanticException [Error 10229]: ANALYZE TABLE PARTIALSCAN cannot be used for a non-native table non_native1
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/test/results/clientnegative/stats_partscan_norcfile.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/stats_partscan_norcfile.q.out b/ql/src/test/results/clientnegative/stats_partscan_norcfile.q.out
deleted file mode 100644
index 38a62b0..0000000
--- a/ql/src/test/results/clientnegative/stats_partscan_norcfile.q.out
+++ /dev/null
@@ -1,36 +0,0 @@
-PREHOOK: query: create table analyze_srcpart_partial_scan like srcpart
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@analyze_srcpart_partial_scan
-POSTHOOK: query: create table analyze_srcpart_partial_scan like srcpart
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@analyze_srcpart_partial_scan
-PREHOOK: query: insert overwrite table analyze_srcpart_partial_scan partition (ds, hr) select * from srcpart where ds is not null
-PREHOOK: type: QUERY
-PREHOOK: Input: default@srcpart
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-PREHOOK: Output: default@analyze_srcpart_partial_scan
-POSTHOOK: query: insert overwrite table analyze_srcpart_partial_scan partition (ds, hr) select * from srcpart where ds is not null
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@srcpart
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=11
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=12
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-09/hr=11
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-09/hr=12
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-FAILED: SemanticException [Error 10230]: ANALYZE TABLE PARTIALSCAN doesn't support non-RCfile.
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_analyze.q.out b/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
index 2cecf4e..4e4e3e3 100644
--- a/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
@@ -114,53 +114,6 @@ Bucket Columns: []
Sort Columns: []
Storage Desc Params:
serialization.format 1
-PREHOOK: query: analyze table orc_create_people compute statistics partialscan
-PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_create_people
-PREHOOK: Output: default@orc_create_people
-POSTHOOK: query: analyze table orc_create_people compute statistics partialscan
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_create_people
-POSTHOOK: Output: default@orc_create_people
-PREHOOK: query: desc formatted orc_create_people
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_create_people
-POSTHOOK: query: desc formatted orc_create_people
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_create_people
-# col_name data_type comment
-id int
-first_name string
-last_name string
-address string
-salary decimal(10,0)
-start_date timestamp
-state string
-
-# Detailed Table Information
-Database: default
-#### A masked pattern was here ####
-Retention: 0
-#### A masked pattern was here ####
-Table Type: MANAGED_TABLE
-Table Parameters:
- COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
- numFiles 1
- numRows 100
- rawDataSize 52600
- totalSize 3200
-#### A masked pattern was here ####
-
-# Storage Information
-SerDe Library: org.apache.hadoop.hive.ql.io.orc.OrcSerde
-InputFormat: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-OutputFormat: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
-Compressed: No
-Num Buckets: -1
-Bucket Columns: []
-Sort Columns: []
-Storage Desc Params:
- serialization.format 1
PREHOOK: query: analyze table orc_create_people compute statistics noscan
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_create_people
@@ -443,100 +396,6 @@ Bucket Columns: []
Sort Columns: []
Storage Desc Params:
serialization.format 1
-PREHOOK: query: analyze table orc_create_people partition(state) compute statistics partialscan
-PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_create_people
-PREHOOK: Output: default@orc_create_people
-PREHOOK: Output: default@orc_create_people@state=Ca
-PREHOOK: Output: default@orc_create_people@state=Or
-POSTHOOK: query: analyze table orc_create_people partition(state) compute statistics partialscan
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_create_people
-POSTHOOK: Output: default@orc_create_people
-POSTHOOK: Output: default@orc_create_people@state=Ca
-POSTHOOK: Output: default@orc_create_people@state=Or
-PREHOOK: query: desc formatted orc_create_people partition(state="Ca")
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_create_people
-POSTHOOK: query: desc formatted orc_create_people partition(state="Ca")
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_create_people
-# col_name data_type comment
-id int
-first_name string
-last_name string
-address string
-salary decimal(10,0)
-start_date timestamp
-
-# Partition Information
-# col_name data_type comment
-state string
-
-# Detailed Partition Information
-Partition Value: [Ca]
-Database: default
-Table: orc_create_people
-#### A masked pattern was here ####
-Partition Parameters:
- COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
- numFiles 1
- numRows 50
- rawDataSize 21950
- totalSize 2099
-#### A masked pattern was here ####
-
-# Storage Information
-SerDe Library: org.apache.hadoop.hive.ql.io.orc.OrcSerde
-InputFormat: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-OutputFormat: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
-Compressed: No
-Num Buckets: -1
-Bucket Columns: []
-Sort Columns: []
-Storage Desc Params:
- serialization.format 1
-PREHOOK: query: desc formatted orc_create_people partition(state="Or")
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_create_people
-POSTHOOK: query: desc formatted orc_create_people partition(state="Or")
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_create_people
-# col_name data_type comment
-id int
-first_name string
-last_name string
-address string
-salary decimal(10,0)
-start_date timestamp
-
-# Partition Information
-# col_name data_type comment
-state string
-
-# Detailed Partition Information
-Partition Value: [Or]
-Database: default
-Table: orc_create_people
-#### A masked pattern was here ####
-Partition Parameters:
- COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
- numFiles 1
- numRows 50
- rawDataSize 22050
- totalSize 2114
-#### A masked pattern was here ####
-
-# Storage Information
-SerDe Library: org.apache.hadoop.hive.ql.io.orc.OrcSerde
-InputFormat: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-OutputFormat: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
-Compressed: No
-Num Buckets: -1
-Bucket Columns: []
-Sort Columns: []
-Storage Desc Params:
- serialization.format 1
PREHOOK: query: analyze table orc_create_people partition(state) compute statistics noscan
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_create_people
@@ -923,100 +782,6 @@ Bucket Columns: [first_name]
Sort Columns: [Order(col:last_name, order:1)]
Storage Desc Params:
serialization.format 1
-PREHOOK: query: analyze table orc_create_people partition(state) compute statistics partialscan
-PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_create_people
-PREHOOK: Output: default@orc_create_people
-PREHOOK: Output: default@orc_create_people@state=Ca
-PREHOOK: Output: default@orc_create_people@state=Or
-POSTHOOK: query: analyze table orc_create_people partition(state) compute statistics partialscan
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_create_people
-POSTHOOK: Output: default@orc_create_people
-POSTHOOK: Output: default@orc_create_people@state=Ca
-POSTHOOK: Output: default@orc_create_people@state=Or
-PREHOOK: query: desc formatted orc_create_people partition(state="Ca")
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_create_people
-POSTHOOK: query: desc formatted orc_create_people partition(state="Ca")
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_create_people
-# col_name data_type comment
-id int
-first_name string
-last_name string
-address string
-salary decimal(10,0)
-start_date timestamp
-
-# Partition Information
-# col_name data_type comment
-state string
-
-# Detailed Partition Information
-Partition Value: [Ca]
-Database: default
-Table: orc_create_people
-#### A masked pattern was here ####
-Partition Parameters:
- COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
- numFiles 4
- numRows 50
- rawDataSize 21975
- totalSize 5260
-#### A masked pattern was here ####
-
-# Storage Information
-SerDe Library: org.apache.hadoop.hive.ql.io.orc.OrcSerde
-InputFormat: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-OutputFormat: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
-Compressed: No
-Num Buckets: 4
-Bucket Columns: [first_name]
-Sort Columns: [Order(col:last_name, order:1)]
-Storage Desc Params:
- serialization.format 1
-PREHOOK: query: desc formatted orc_create_people partition(state="Or")
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_create_people
-POSTHOOK: query: desc formatted orc_create_people partition(state="Or")
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_create_people
-# col_name data_type comment
-id int
-first_name string
-last_name string
-address string
-salary decimal(10,0)
-start_date timestamp
-
-# Partition Information
-# col_name data_type comment
-state string
-
-# Detailed Partition Information
-Partition Value: [Or]
-Database: default
-Table: orc_create_people
-#### A masked pattern was here ####
-Partition Parameters:
- COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
- numFiles 4
- numRows 50
- rawDataSize 22043
- totalSize 5331
-#### A masked pattern was here ####
-
-# Storage Information
-SerDe Library: org.apache.hadoop.hive.ql.io.orc.OrcSerde
-InputFormat: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-OutputFormat: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
-Compressed: No
-Num Buckets: 4
-Bucket Columns: [first_name]
-Sort Columns: [Order(col:last_name, order:1)]
-Storage Desc Params:
- serialization.format 1
PREHOOK: query: analyze table orc_create_people partition(state) compute statistics noscan
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_create_people
@@ -1362,59 +1127,6 @@ Bucket Columns: []
Sort Columns: []
Storage Desc Params:
serialization.format 1
-PREHOOK: query: analyze table orc_create_people partition(state) compute statistics partialscan
-PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_create_people
-PREHOOK: Output: default@orc_create_people
-PREHOOK: Output: default@orc_create_people@state=Ca
-PREHOOK: Output: default@orc_create_people@state=Or
-POSTHOOK: query: analyze table orc_create_people partition(state) compute statistics partialscan
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_create_people
-POSTHOOK: Output: default@orc_create_people
-POSTHOOK: Output: default@orc_create_people@state=Ca
-POSTHOOK: Output: default@orc_create_people@state=Or
-PREHOOK: query: desc formatted orc_create_people partition(state="Ca")
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_create_people
-POSTHOOK: query: desc formatted orc_create_people partition(state="Ca")
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_create_people
-# col_name data_type comment
-id int
-first_name string
-last_name string
-address string
-salary decimal(10,0)
-start_date timestamp
-
-# Partition Information
-# col_name data_type comment
-state string
-
-# Detailed Partition Information
-Partition Value: [Ca]
-Database: default
-Table: orc_create_people
-#### A masked pattern was here ####
-Partition Parameters:
- COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
- numFiles 1
- numRows 50
- rawDataSize 21950
- totalSize 2099
-#### A masked pattern was here ####
-
-# Storage Information
-SerDe Library: org.apache.hadoop.hive.ql.io.orc.OrcSerde
-InputFormat: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-OutputFormat: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
-Compressed: No
-Num Buckets: -1
-Bucket Columns: []
-Sort Columns: []
-Storage Desc Params:
- serialization.format 1
PREHOOK: query: analyze table orc_create_people partition(state) compute statistics noscan
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_create_people
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/test/results/clientpositive/spark/stats_partscan_1_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats_partscan_1_23.q.out b/ql/src/test/results/clientpositive/spark/stats_partscan_1_23.q.out
deleted file mode 100644
index fdf111e..0000000
--- a/ql/src/test/results/clientpositive/spark/stats_partscan_1_23.q.out
+++ /dev/null
@@ -1,181 +0,0 @@
-PREHOOK: query: CREATE table analyze_srcpart_partial_scan (key STRING, value STRING)
-partitioned by (ds string, hr string)
-stored as rcfile
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@analyze_srcpart_partial_scan
-POSTHOOK: query: CREATE table analyze_srcpart_partial_scan (key STRING, value STRING)
-partitioned by (ds string, hr string)
-stored as rcfile
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@analyze_srcpart_partial_scan
-PREHOOK: query: insert overwrite table analyze_srcpart_partial_scan partition (ds, hr) select * from srcpart where ds is not null
-PREHOOK: type: QUERY
-PREHOOK: Input: default@srcpart
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-PREHOOK: Output: default@analyze_srcpart_partial_scan
-POSTHOOK: query: insert overwrite table analyze_srcpart_partial_scan partition (ds, hr) select * from srcpart where ds is not null
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@srcpart
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=11
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=12
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-09/hr=11
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-09/hr=12
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@analyze_srcpart_partial_scan
-POSTHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@analyze_srcpart_partial_scan
-# col_name data_type comment
-key string
-value string
-
-# Partition Information
-# col_name data_type comment
-ds string
-hr string
-
-# Detailed Partition Information
-Partition Value: [2008-04-08, 11]
-Database: default
-Table: analyze_srcpart_partial_scan
-#### A masked pattern was here ####
-Partition Parameters:
- numFiles 1
- totalSize 5293
-#### A masked pattern was here ####
-
-# Storage Information
-SerDe Library: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
-InputFormat: org.apache.hadoop.hive.ql.io.RCFileInputFormat
-OutputFormat: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
-Compressed: No
-Num Buckets: -1
-Bucket Columns: []
-Sort Columns: []
-Storage Desc Params:
- serialization.format 1
-PREHOOK: query: explain
-analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan
-PREHOOK: type: QUERY
-POSTHOOK: query: explain
-analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
- Stage-2 is a root stage
- Stage-1 depends on stages: Stage-0, Stage-2
-
-STAGE PLANS:
- Stage: Stage-2
- Partial Scan Statistics
-
- Stage: Stage-1
- Stats-Aggr Operator
-
-PREHOOK: query: analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan
-PREHOOK: type: QUERY
-PREHOOK: Input: default@analyze_srcpart_partial_scan
-PREHOOK: Input: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=11
-PREHOOK: Output: default@analyze_srcpart_partial_scan
-PREHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=11
-POSTHOOK: query: analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@analyze_srcpart_partial_scan
-POSTHOOK: Input: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=11
-POSTHOOK: Output: default@analyze_srcpart_partial_scan
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=11
-PREHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@analyze_srcpart_partial_scan
-POSTHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@analyze_srcpart_partial_scan
-# col_name data_type comment
-key string
-value string
-
-# Partition Information
-# col_name data_type comment
-ds string
-hr string
-
-# Detailed Partition Information
-Partition Value: [2008-04-08, 11]
-Database: default
-Table: analyze_srcpart_partial_scan
-#### A masked pattern was here ####
-Partition Parameters:
- numFiles 1
- totalSize 5293
-#### A masked pattern was here ####
-
-# Storage Information
-SerDe Library: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
-InputFormat: org.apache.hadoop.hive.ql.io.RCFileInputFormat
-OutputFormat: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
-Compressed: No
-Num Buckets: -1
-Bucket Columns: []
-Sort Columns: []
-Storage Desc Params:
- serialization.format 1
-PREHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-09',hr=11)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@analyze_srcpart_partial_scan
-POSTHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-09',hr=11)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@analyze_srcpart_partial_scan
-# col_name data_type comment
-key string
-value string
-
-# Partition Information
-# col_name data_type comment
-ds string
-hr string
-
-# Detailed Partition Information
-Partition Value: [2008-04-09, 11]
-Database: default
-Table: analyze_srcpart_partial_scan
-#### A masked pattern was here ####
-Partition Parameters:
- numFiles 1
- totalSize 5293
-#### A masked pattern was here ####
-
-# Storage Information
-SerDe Library: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
-InputFormat: org.apache.hadoop.hive.ql.io.RCFileInputFormat
-OutputFormat: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
-Compressed: No
-Num Buckets: -1
-Bucket Columns: []
-Sort Columns: []
-Storage Desc Params:
- serialization.format 1
-PREHOOK: query: drop table analyze_srcpart_partial_scan
-PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@analyze_srcpart_partial_scan
-PREHOOK: Output: default@analyze_srcpart_partial_scan
-POSTHOOK: query: drop table analyze_srcpart_partial_scan
-POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@analyze_srcpart_partial_scan
-POSTHOOK: Output: default@analyze_srcpart_partial_scan
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/test/results/clientpositive/stats_partscan_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats_partscan_1.q.out b/ql/src/test/results/clientpositive/stats_partscan_1.q.out
deleted file mode 100644
index e2a3bbd..0000000
--- a/ql/src/test/results/clientpositive/stats_partscan_1.q.out
+++ /dev/null
@@ -1,215 +0,0 @@
-PREHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20,0.20S)
--- This test uses mapred.max.split.size/mapred.max.split.size for controlling
--- number of input splits, which is not effective in hive 0.20.
--- stats_partscan_1_23.q is the same test with this but has different result.
-
--- test analyze table ... compute statistics partialscan
-
--- 1. prepare data
-CREATE table analyze_srcpart_partial_scan (key STRING, value STRING)
-partitioned by (ds string, hr string)
-stored as rcfile
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20,0.20S)
--- This test uses mapred.max.split.size/mapred.max.split.size for controlling
--- number of input splits, which is not effective in hive 0.20.
--- stats_partscan_1_23.q is the same test with this but has different result.
-
--- test analyze table ... compute statistics partialscan
-
--- 1. prepare data
-CREATE table analyze_srcpart_partial_scan (key STRING, value STRING)
-partitioned by (ds string, hr string)
-stored as rcfile
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@analyze_srcpart_partial_scan
-PREHOOK: query: insert overwrite table analyze_srcpart_partial_scan partition (ds, hr) select * from srcpart where ds is not null
-PREHOOK: type: QUERY
-PREHOOK: Input: default@srcpart
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-PREHOOK: Output: default@analyze_srcpart_partial_scan
-POSTHOOK: query: insert overwrite table analyze_srcpart_partial_scan partition (ds, hr) select * from srcpart where ds is not null
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@srcpart
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=11
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=12
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-09/hr=11
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-09/hr=12
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@analyze_srcpart_partial_scan
-POSTHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@analyze_srcpart_partial_scan
-# col_name data_type comment
-
-key string
-value string
-
-# Partition Information
-# col_name data_type comment
-
-ds string
-hr string
-
-# Detailed Partition Information
-Partition Value: [2008-04-08, 11]
-Database: default
-Table: analyze_srcpart_partial_scan
-#### A masked pattern was here ####
-Partition Parameters:
- COLUMN_STATS_ACCURATE false
- numFiles 1
- numRows -1
- rawDataSize -1
- totalSize 5293
-#### A masked pattern was here ####
-
-# Storage Information
-SerDe Library: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
-InputFormat: org.apache.hadoop.hive.ql.io.RCFileInputFormat
-OutputFormat: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
-Compressed: No
-Num Buckets: -1
-Bucket Columns: []
-Sort Columns: []
-Storage Desc Params:
- serialization.format 1
-PREHOOK: query: -- 2. partialscan
-explain
-analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan
-PREHOOK: type: QUERY
-POSTHOOK: query: -- 2. partialscan
-explain
-analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
- Stage-2 is a root stage
- Stage-1 depends on stages: Stage-2
-
-STAGE PLANS:
- Stage: Stage-2
- Partial Scan Statistics
-
- Stage: Stage-1
- Stats-Aggr Operator
-
-PREHOOK: query: analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan
-PREHOOK: type: QUERY
-PREHOOK: Input: default@analyze_srcpart_partial_scan
-PREHOOK: Input: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=11
-PREHOOK: Output: default@analyze_srcpart_partial_scan
-PREHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=11
-POSTHOOK: query: analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@analyze_srcpart_partial_scan
-POSTHOOK: Input: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=11
-POSTHOOK: Output: default@analyze_srcpart_partial_scan
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=11
-PREHOOK: query: -- 3. confirm result
-describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@analyze_srcpart_partial_scan
-POSTHOOK: query: -- 3. confirm result
-describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@analyze_srcpart_partial_scan
-# col_name data_type comment
-
-key string
-value string
-
-# Partition Information
-# col_name data_type comment
-
-ds string
-hr string
-
-# Detailed Partition Information
-Partition Value: [2008-04-08, 11]
-Database: default
-Table: analyze_srcpart_partial_scan
-#### A masked pattern was here ####
-Partition Parameters:
- COLUMN_STATS_ACCURATE true
- numFiles 1
- numRows 500
- rawDataSize 4812
- totalSize 5293
-#### A masked pattern was here ####
-
-# Storage Information
-SerDe Library: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
-InputFormat: org.apache.hadoop.hive.ql.io.RCFileInputFormat
-OutputFormat: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
-Compressed: No
-Num Buckets: -1
-Bucket Columns: []
-Sort Columns: []
-Storage Desc Params:
- serialization.format 1
-PREHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-09',hr=11)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@analyze_srcpart_partial_scan
-POSTHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-09',hr=11)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@analyze_srcpart_partial_scan
-# col_name data_type comment
-
-key string
-value string
-
-# Partition Information
-# col_name data_type comment
-
-ds string
-hr string
-
-# Detailed Partition Information
-Partition Value: [2008-04-09, 11]
-Database: default
-Table: analyze_srcpart_partial_scan
-#### A masked pattern was here ####
-Partition Parameters:
- COLUMN_STATS_ACCURATE false
- numFiles 1
- numRows -1
- rawDataSize -1
- totalSize 5293
-#### A masked pattern was here ####
-
-# Storage Information
-SerDe Library: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
-InputFormat: org.apache.hadoop.hive.ql.io.RCFileInputFormat
-OutputFormat: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
-Compressed: No
-Num Buckets: -1
-Bucket Columns: []
-Sort Columns: []
-Storage Desc Params:
- serialization.format 1
-PREHOOK: query: drop table analyze_srcpart_partial_scan
-PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@analyze_srcpart_partial_scan
-PREHOOK: Output: default@analyze_srcpart_partial_scan
-POSTHOOK: query: drop table analyze_srcpart_partial_scan
-POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@analyze_srcpart_partial_scan
-POSTHOOK: Output: default@analyze_srcpart_partial_scan
http://git-wip-us.apache.org/repos/asf/hive/blob/71004d2e/ql/src/test/results/clientpositive/stats_partscan_1_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats_partscan_1_23.q.out b/ql/src/test/results/clientpositive/stats_partscan_1_23.q.out
deleted file mode 100644
index bc2fec5..0000000
--- a/ql/src/test/results/clientpositive/stats_partscan_1_23.q.out
+++ /dev/null
@@ -1,184 +0,0 @@
-PREHOOK: query: CREATE table analyze_srcpart_partial_scan (key STRING, value STRING)
-partitioned by (ds string, hr string)
-stored as rcfile
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@analyze_srcpart_partial_scan
-POSTHOOK: query: CREATE table analyze_srcpart_partial_scan (key STRING, value STRING)
-partitioned by (ds string, hr string)
-stored as rcfile
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@analyze_srcpart_partial_scan
-PREHOOK: query: insert overwrite table analyze_srcpart_partial_scan partition (ds, hr) select * from srcpart where ds is not null
-PREHOOK: type: QUERY
-PREHOOK: Input: default@srcpart
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-PREHOOK: Output: default@analyze_srcpart_partial_scan
-POSTHOOK: query: insert overwrite table analyze_srcpart_partial_scan partition (ds, hr) select * from srcpart where ds is not null
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@srcpart
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=11
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=12
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-09/hr=11
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-09/hr=12
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@analyze_srcpart_partial_scan
-POSTHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@analyze_srcpart_partial_scan
-# col_name data_type comment
-key string
-value string
-
-# Partition Information
-# col_name data_type comment
-ds string
-hr string
-
-# Detailed Partition Information
-Partition Value: [2008-04-08, 11]
-Database: default
-Table: analyze_srcpart_partial_scan
-#### A masked pattern was here ####
-Partition Parameters:
- numFiles 1
- totalSize 5293
-#### A masked pattern was here ####
-
-# Storage Information
-SerDe Library: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
-InputFormat: org.apache.hadoop.hive.ql.io.RCFileInputFormat
-OutputFormat: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
-Compressed: No
-Num Buckets: -1
-Bucket Columns: []
-Sort Columns: []
-Storage Desc Params:
- serialization.format 1
-PREHOOK: query: explain
-analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan
-PREHOOK: type: QUERY
-POSTHOOK: query: explain
-analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
- Stage-2 is a root stage
- Stage-1 depends on stages: Stage-2
-
-STAGE PLANS:
- Stage: Stage-2
- Partial Scan Statistics
-
- Stage: Stage-1
- Stats-Aggr Operator
-
-PREHOOK: query: analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan
-PREHOOK: type: QUERY
-PREHOOK: Input: default@analyze_srcpart_partial_scan
-PREHOOK: Input: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=11
-PREHOOK: Output: default@analyze_srcpart_partial_scan
-PREHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=11
-POSTHOOK: query: analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@analyze_srcpart_partial_scan
-POSTHOOK: Input: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=11
-POSTHOOK: Output: default@analyze_srcpart_partial_scan
-POSTHOOK: Output: default@analyze_srcpart_partial_scan@ds=2008-04-08/hr=11
-PREHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@analyze_srcpart_partial_scan
-POSTHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@analyze_srcpart_partial_scan
-# col_name data_type comment
-key string
-value string
-
-# Partition Information
-# col_name data_type comment
-ds string
-hr string
-
-# Detailed Partition Information
-Partition Value: [2008-04-08, 11]
-Database: default
-Table: analyze_srcpart_partial_scan
-#### A masked pattern was here ####
-Partition Parameters:
- COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
- numFiles 1
- numRows 500
- rawDataSize 4812
- totalSize 5293
-#### A masked pattern was here ####
-
-# Storage Information
-SerDe Library: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
-InputFormat: org.apache.hadoop.hive.ql.io.RCFileInputFormat
-OutputFormat: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
-Compressed: No
-Num Buckets: -1
-Bucket Columns: []
-Sort Columns: []
-Storage Desc Params:
- serialization.format 1
-PREHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-09',hr=11)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@analyze_srcpart_partial_scan
-POSTHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-09',hr=11)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@analyze_srcpart_partial_scan
-# col_name data_type comment
-key string
-value string
-
-# Partition Information
-# col_name data_type comment
-ds string
-hr string
-
-# Detailed Partition Information
-Partition Value: [2008-04-09, 11]
-Database: default
-Table: analyze_srcpart_partial_scan
-#### A masked pattern was here ####
-Partition Parameters:
- numFiles 1
- totalSize 5293
-#### A masked pattern was here ####
-
-# Storage Information
-SerDe Library: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
-InputFormat: org.apache.hadoop.hive.ql.io.RCFileInputFormat
-OutputFormat: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
-Compressed: No
-Num Buckets: -1
-Bucket Columns: []
-Sort Columns: []
-Storage Desc Params:
- serialization.format 1
-PREHOOK: query: drop table analyze_srcpart_partial_scan
-PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@analyze_srcpart_partial_scan
-PREHOOK: Output: default@analyze_srcpart_partial_scan
-POSTHOOK: query: drop table analyze_srcpart_partial_scan
-POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@analyze_srcpart_partial_scan
-POSTHOOK: Output: default@analyze_srcpart_partial_scan
[17/21] hive git commit: HIVE-17519: Transpose column stats display
(Zoltan Haindrich, reviewed by Ashutosh Chauhan and Vineet Garg)
Posted by kg...@apache.org.
HIVE-17519: Transpose column stats display (Zoltan Haindrich, reviewed by Ashutosh Chauhan and Vineet Garg)
Signed-off-by: Zoltan Haindrich <ki...@rxd.hu>
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/38a594f3
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/38a594f3
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/38a594f3
Branch: refs/heads/master
Commit: 38a594f321d3f5a1ebc33c50c5c2ef6e5bd7845c
Parents: 2902c7c
Author: Zoltan Haindrich <ki...@rxd.hu>
Authored: Fri Oct 6 10:51:42 2017 +0200
Committer: Zoltan Haindrich <ki...@rxd.hu>
Committed: Fri Oct 6 10:51:45 2017 +0200
----------------------------------------------------------------------
.../results/positive/external_table_ppd.q.out | 1 -
.../positive/hbase_binary_storage_queries.q.out | 2 -
.../src/test/results/positive/hbase_ddl.q.out | 2 -
.../src/test/results/positive/hbasestats.q.out | 5 -
...rt_addpartition_blobstore_to_blobstore.q.out | 4 -
...import_addpartition_blobstore_to_local.q.out | 4 -
...rt_addpartition_blobstore_to_warehouse.q.out | 4 -
...import_addpartition_local_to_blobstore.q.out | 4 -
.../import_blobstore_to_blobstore.q.out | 2 -
.../import_blobstore_to_local.q.out | 2 -
.../import_blobstore_to_warehouse.q.out | 2 -
.../import_local_to_blobstore.q.out | 2 -
.../org/apache/hadoop/hive/ql/exec/DDLTask.java | 18 +-
.../formatting/MetaDataFormatUtils.java | 279 +---
.../formatting/MetaDataPrettyFormatUtils.java | 1 -
.../formatting/TextMetaDataFormatter.java | 46 +-
.../metadata/formatting/TextMetaDataTable.java | 61 +
.../hadoop/hive/ql/plan/DescTableDesc.java | 2 +-
.../clientnegative/alter_file_format.q.out | 1 -
.../alter_partition_coltype_2columns.q.out | 1 -
...alter_partition_coltype_invalidcolname.q.out | 1 -
.../alter_partition_coltype_invalidtype.q.out | 1 -
...ter_partition_partial_spec_dyndisabled.q.out | 1 -
.../alter_view_as_select_with_partition.q.out | 2 -
.../results/clientnegative/desc_failure2.q.out | 1 -
.../stats_partialscan_autogether.q.out | 2 -
.../clientpositive/acid_table_stats.q.out | 16 -
ql/src/test/results/clientpositive/alter2.q.out | 12 -
ql/src/test/results/clientpositive/alter3.q.out | 6 -
ql/src/test/results/clientpositive/alter5.q.out | 4 -
.../clientpositive/alterColumnStats.q.out | 33 +-
.../clientpositive/alterColumnStatsPart.q.out | 11 -
.../clientpositive/alter_file_format.q.out | 19 -
.../results/clientpositive/alter_merge_2.q.out | 1 -
.../clientpositive/alter_merge_2_orc.q.out | 1 -
.../clientpositive/alter_merge_stats.q.out | 3 -
...lter_numbuckets_partitioned_table2_h23.q.out | 36 -
...alter_numbuckets_partitioned_table_h23.q.out | 24 -
.../alter_partition_change_col.q.out | 13 -
.../alter_partition_clusterby_sortby.q.out | 8 -
.../alter_partition_coltype.q.out | 4 -
.../alter_partition_format_loc.q.out | 6 -
.../alter_partition_onto_nocurrent_db.q.out | 2 -
.../alter_partition_update_status.q.out | 75 +-
.../clientpositive/alter_skewed_table.q.out | 6 -
.../alter_table_add_partition.q.out | 10 -
.../clientpositive/alter_table_cascade.q.out | 46 -
.../alter_table_column_stats.q.out | 1324 +++++++++++++-----
.../clientpositive/alter_table_not_sorted.q.out | 2 -
.../clientpositive/alter_table_serde.q.out | 5 -
.../clientpositive/alter_table_serde2.q.out | 8 -
.../alter_table_stats_status.q.out | 13 -
.../alter_table_update_status.q.out | 720 ++++++++--
..._table_update_status_disable_bitvector.q.out | 720 ++++++++--
.../clientpositive/alter_view_as_select.q.out | 3 -
.../analyze_table_null_partition.q.out | 1 -
.../clientpositive/analyze_tbl_date.q.out | 1 -
.../clientpositive/analyze_tbl_part.q.out | 45 +-
.../clientpositive/authorization_index.q.out | 1 -
.../clientpositive/autoColumnStats_3.q.out | 14 -
.../clientpositive/autoColumnStats_4.q.out | 3 -
.../clientpositive/autoColumnStats_5.q.out | 76 +-
.../clientpositive/autoColumnStats_8.q.out | 1 -
.../clientpositive/autoColumnStats_9.q.out | 31 +-
.../clientpositive/avro_add_column3.q.out | 1 -
.../results/clientpositive/avro_decimal.q.out | 15 +-
.../clientpositive/avro_decimal_native.q.out | 15 +-
.../avro_schema_evolution_native.q.out | 4 -
.../beeline/escape_comments.q.out | 14 +-
.../test/results/clientpositive/bitvector.q.out | 15 +-
.../clientpositive/colstats_all_nulls.q.out | 30 +-
.../columnStatsUpdateForStatsOptimizer_2.q.out | 4 -
...names_with_leading_and_trailing_spaces.q.out | 31 +-
.../column_pruner_multiple_children.q.out | 31 +-
.../clientpositive/columnstats_infinity.q.out | 3 -
.../clientpositive/columnstats_partlvl.q.out | 90 +-
.../clientpositive/columnstats_partlvl_dp.q.out | 150 +-
.../clientpositive/columnstats_tbllvl.q.out | 105 +-
.../test/results/clientpositive/combine3.q.out | 2 -
.../results/clientpositive/compustat_avro.q.out | 30 +-
.../clientpositive/compute_stats_date.q.out | 30 +-
.../confirm_initial_tbl_stats.q.out | 166 ++-
.../clientpositive/convert_enum_to_string.q.out | 1 -
.../create_alter_list_bucketing_table1.q.out | 7 -
.../results/clientpositive/create_like.q.out | 10 -
.../results/clientpositive/create_like2.q.out | 1 -
.../clientpositive/create_like_tbl_props.q.out | 5 -
.../clientpositive/create_like_view.q.out | 5 -
.../clientpositive/create_or_replace_view.q.out | 9 -
.../clientpositive/create_skewed_table1.q.out | 3 -
.../create_table_like_stats.q.out | 6 -
.../results/clientpositive/create_view.q.out | 14 -
.../create_view_defaultformats.q.out | 2 -
.../create_view_partitioned.q.out | 7 -
.../clientpositive/create_view_translate.q.out | 2 -
.../create_with_constraints.q.out | 36 -
ql/src/test/results/clientpositive/ctas.q.out | 5 -
.../results/clientpositive/ctas_colname.q.out | 7 -
.../ctas_uses_database_location.q.out | 1 -
.../clientpositive/database_location.q.out | 2 -
.../clientpositive/dbtxnmgr_query5.q.out | 1 -
.../results/clientpositive/decimal_serde.q.out | 2 -
.../results/clientpositive/decimal_stats.q.out | 15 +-
.../clientpositive/default_file_format.q.out | 12 -
.../results/clientpositive/deleteAnalyze.q.out | 16 +-
.../clientpositive/desc_tbl_part_cols.q.out | 1 -
.../describe_comment_indent.q.out | 1 -
.../describe_comment_nonascii.q.out | 1 -
.../describe_formatted_view_partitioned.q.out | 2 -
.../clientpositive/describe_syntax.q.out | 61 +-
.../results/clientpositive/describe_table.q.out | 84 +-
.../display_colstats_tbllvl.q.out | 180 ++-
.../clientpositive/drop_partitions_filter.q.out | 1 -
.../drop_partitions_filter2.q.out | 1 -
.../drop_partitions_filter3.q.out | 1 -
.../results/clientpositive/druid_basic1.q.out | 2 -
.../results/clientpositive/druid_basic2.q.out | 1 -
.../clientpositive/druid_intervals.q.out | 1 -
.../clientpositive/druid_timeseries.q.out | 1 -
.../results/clientpositive/druid_topn.q.out | 1 -
.../encrypted/encryption_insert_values.q.out | 1 -
.../encrypted/encryption_move_tbl.q.out | 60 +-
.../clientpositive/escape_comments.q.out | 6 -
.../clientpositive/exim_02_00_part_empty.q.out | 1 -
.../results/clientpositive/exim_02_part.q.out | 1 -
.../clientpositive/exim_04_all_part.q.out | 1 -
.../clientpositive/exim_04_evolved_parts.q.out | 3 -
.../clientpositive/exim_05_some_part.q.out | 1 -
.../clientpositive/exim_06_one_part.q.out | 1 -
.../exim_07_all_part_over_nonoverlap.q.out | 1 -
.../exim_09_part_spec_nonoverlap.q.out | 1 -
.../clientpositive/exim_15_external_part.q.out | 1 -
.../clientpositive/exim_18_part_external.q.out | 1 -
.../exim_19_00_part_external_location.q.out | 1 -
.../exim_19_part_external_location.q.out | 1 -
.../exim_20_part_managed_location.q.out | 1 -
.../clientpositive/exim_hidden_files.q.out | 2 -
.../extrapolate_part_stats_full.q.out | 15 +-
.../extrapolate_part_stats_partial.q.out | 30 +-
.../test/results/clientpositive/fm-sketch.q.out | 75 +-
ql/src/test/results/clientpositive/hll.q.out | 75 +-
.../clientpositive/index_skewtable.q.out | 1 -
.../clientpositive/infer_bucket_sort.q.out | 50 -
.../infer_bucket_sort_convert_join.q.out | 4 -
.../infer_bucket_sort_dyn_part.q.out | 16 -
.../infer_bucket_sort_grouping_operators.q.out | 12 -
.../infer_bucket_sort_list_bucket.q.out | 4 -
.../infer_bucket_sort_map_operators.q.out | 8 -
.../infer_bucket_sort_merge.q.out | 4 -
.../infer_bucket_sort_multi_insert.q.out | 16 -
.../infer_bucket_sort_num_buckets.q.out | 4 -
.../infer_bucket_sort_reducers_power_two.q.out | 12 -
.../test/results/clientpositive/input10.q.out | 1 -
.../results/clientpositive/input_part10.q.out | 1 -
.../test/results/clientpositive/inputddl2.q.out | 1 -
.../test/results/clientpositive/inputddl4.q.out | 2 -
.../test/results/clientpositive/inputddl6.q.out | 2 -
.../test/results/clientpositive/inputddl7.q.out | 2 -
.../test/results/clientpositive/inputddl8.q.out | 1 -
.../insert_values_orig_table_use_metadata.q.out | 13 -
.../results/clientpositive/lb_fs_stats.q.out | 2 -
.../clientpositive/list_bucket_dml_1.q.out | 4 -
.../clientpositive/list_bucket_dml_11.q.out | 2 -
.../clientpositive/list_bucket_dml_12.q.out | 2 -
.../clientpositive/list_bucket_dml_13.q.out | 2 -
.../clientpositive/list_bucket_dml_14.q.out | 1 -
.../clientpositive/list_bucket_dml_2.q.out | 2 -
.../clientpositive/list_bucket_dml_3.q.out | 2 -
.../clientpositive/list_bucket_dml_4.q.out | 4 -
.../clientpositive/list_bucket_dml_5.q.out | 4 -
.../clientpositive/list_bucket_dml_6.q.out | 8 -
.../clientpositive/list_bucket_dml_7.q.out | 8 -
.../clientpositive/list_bucket_dml_8.q.out | 6 -
.../clientpositive/list_bucket_dml_9.q.out | 4 -
.../list_bucket_query_multiskew_1.q.out | 2 -
.../list_bucket_query_multiskew_2.q.out | 2 -
.../list_bucket_query_multiskew_3.q.out | 6 -
.../list_bucket_query_oneskew_1.q.out | 2 -
.../list_bucket_query_oneskew_2.q.out | 2 -
.../list_bucket_query_oneskew_3.q.out | 2 -
.../clientpositive/llap/alter_merge_2_orc.q.out | 1 -
.../llap/alter_merge_stats_orc.q.out | 8 -
.../clientpositive/llap/autoColumnStats_1.q.out | 26 -
.../clientpositive/llap/autoColumnStats_2.q.out | 148 +-
.../results/clientpositive/llap/bucket5.q.out | 1 -
.../clientpositive/llap/bucket_groupby.q.out | 4 -
.../columnStatsUpdateForStatsOptimizer_1.q.out | 14 -
...names_with_leading_and_trailing_spaces.q.out | 31 +-
.../llap/column_table_stats.q.out | 26 -
.../llap/column_table_stats_orc.q.out | 18 -
.../llap/columnstats_part_coltype.q.out | 203 ++-
.../test/results/clientpositive/llap/ctas.q.out | 5 -
.../clientpositive/llap/deleteAnalyze.q.out | 16 +-
.../llap/dynpart_sort_opt_vectorization.q.out | 32 -
.../llap/dynpart_sort_optimization.q.out | 32 -
.../llap/dynpart_sort_optimization2.q.out | 24 -
.../clientpositive/llap/explainuser_1.q.out | 1 -
.../extrapolate_part_stats_partial_ndv.q.out | 330 ++++-
.../llap/infer_bucket_sort_bucketed_table.q.out | 2 -
.../llap/list_bucket_dml_10.q.out | 2 -
.../clientpositive/llap/load_dyn_part1.q.out | 1 -
.../clientpositive/llap/load_dyn_part2.q.out | 1 -
.../clientpositive/llap/load_dyn_part3.q.out | 1 -
.../clientpositive/llap/load_dyn_part5.q.out | 1 -
.../clientpositive/llap/orc_analyze.q.out | 42 -
.../clientpositive/llap/orc_create.q.out | 10 -
.../clientpositive/llap/orc_llap_counters.q.out | 1 -
.../llap/orc_llap_counters1.q.out | 1 -
.../clientpositive/llap/schema_evol_stats.q.out | 12 -
.../llap/selectDistinctStar.q.out | 2 -
.../results/clientpositive/llap/stats11.q.out | 8 -
.../clientpositive/llap/stats_noscan_1.q.out | 18 -
.../clientpositive/llap/stats_only_null.q.out | 19 +-
.../llap/tez_bmj_schema_evolution.q.out | 1 -
.../clientpositive/llap/tez_fsstat.q.out | 2 -
.../llap/tez_schema_evolution.q.out | 1 -
.../clientpositive/llap/union_fast_stats.q.out | 12 +-
.../clientpositive/llap/union_stats.q.out | 5 -
.../results/clientpositive/load_dyn_part1.q.out | 1 -
.../clientpositive/load_dyn_part10.q.out | 1 -
.../clientpositive/load_dyn_part11.q.out | 1 -
.../clientpositive/load_dyn_part12.q.out | 1 -
.../clientpositive/load_dyn_part13.q.out | 1 -
.../clientpositive/load_dyn_part14.q.out | 1 -
.../results/clientpositive/load_dyn_part2.q.out | 1 -
.../results/clientpositive/load_dyn_part3.q.out | 1 -
.../results/clientpositive/load_dyn_part4.q.out | 1 -
.../results/clientpositive/load_dyn_part6.q.out | 1 -
.../results/clientpositive/load_dyn_part7.q.out | 1 -
.../results/clientpositive/load_dyn_part8.q.out | 1 -
.../results/clientpositive/load_dyn_part9.q.out | 1 -
.../materialized_view_describe.q.out | 4 -
ql/src/test/results/clientpositive/merge3.q.out | 1 -
.../clientpositive/named_column_join.q.out | 3 -
.../clientpositive/parallel_orderby.q.out | 2 -
.../clientpositive/parquet_analyze.q.out | 2 -
.../parquet_array_null_element.q.out | 1 -
.../results/clientpositive/parquet_create.q.out | 1 -
.../parquet_mixed_partition_formats.q.out | 6 -
.../clientpositive/parquet_partitioned.q.out | 2 -
.../results/clientpositive/parquet_serde.q.out | 6 -
.../clientpositive/part_inherit_tbl_props.q.out | 2 -
.../part_inherit_tbl_props_empty.q.out | 2 -
.../part_inherit_tbl_props_with_star.q.out | 2 -
.../clientpositive/partial_column_stats.q.out | 15 +-
.../partition_coltype_literals.q.out | 107 +-
.../clientpositive/partition_date2.q.out | 2 -
.../clientpositive/partition_schema1.q.out | 3 -
.../clientpositive/partition_timestamp2.q.out | 2 -
.../results/clientpositive/quotedid_stats.q.out | 2 -
.../clientpositive/rcfile_default_format.q.out | 8 -
.../rename_external_partition_location.q.out | 68 +-
.../rename_table_update_column_stats.q.out | 180 ++-
.../clientpositive/repl_2_exim_basic.q.out | 4 -
.../clientpositive/repl_3_exim_metadata.q.out | 2 -
.../sample_islocalmode_hook_use_metadata.q.out | 1 -
.../clientpositive/serde_reported_schema.q.out | 2 -
.../clientpositive/show_indexes_syntax.q.out | 2 -
.../spark/alter_merge_stats_orc.q.out | 8 -
.../spark/avro_decimal_native.q.out | 15 +-
.../results/clientpositive/spark/bucket5.q.out | 1 -
.../results/clientpositive/spark/ctas.q.out | 5 -
.../infer_bucket_sort_bucketed_table.q.out | 2 -
.../spark/infer_bucket_sort_map_operators.q.out | 8 -
.../spark/infer_bucket_sort_merge.q.out | 4 -
.../spark/infer_bucket_sort_num_buckets.q.out | 4 -
.../infer_bucket_sort_reducers_power_two.q.out | 12 -
.../spark/list_bucket_dml_10.q.out | 2 -
.../spark/list_bucket_dml_2.q.out | 2 -
.../clientpositive/spark/load_dyn_part1.q.out | 1 -
.../clientpositive/spark/load_dyn_part10.q.out | 1 -
.../clientpositive/spark/load_dyn_part11.q.out | 1 -
.../clientpositive/spark/load_dyn_part12.q.out | 1 -
.../clientpositive/spark/load_dyn_part13.q.out | 1 -
.../clientpositive/spark/load_dyn_part14.q.out | 1 -
.../clientpositive/spark/load_dyn_part2.q.out | 1 -
.../clientpositive/spark/load_dyn_part3.q.out | 1 -
.../clientpositive/spark/load_dyn_part4.q.out | 1 -
.../clientpositive/spark/load_dyn_part5.q.out | 1 -
.../clientpositive/spark/load_dyn_part6.q.out | 1 -
.../clientpositive/spark/load_dyn_part7.q.out | 1 -
.../clientpositive/spark/load_dyn_part8.q.out | 1 -
.../clientpositive/spark/load_dyn_part9.q.out | 1 -
.../clientpositive/spark/parallel_orderby.q.out | 2 -
.../spark/spark_explainuser_1.q.out | 1 -
.../results/clientpositive/spark/stats0.q.out | 4 -
.../results/clientpositive/spark/stats1.q.out | 2 -
.../results/clientpositive/spark/stats10.q.out | 6 -
.../results/clientpositive/spark/stats12.q.out | 10 -
.../results/clientpositive/spark/stats13.q.out | 12 -
.../results/clientpositive/spark/stats14.q.out | 9 -
.../results/clientpositive/spark/stats15.q.out | 9 -
.../results/clientpositive/spark/stats16.q.out | 2 -
.../results/clientpositive/spark/stats18.q.out | 4 -
.../results/clientpositive/spark/stats2.q.out | 4 -
.../results/clientpositive/spark/stats3.q.out | 3 -
.../results/clientpositive/spark/stats5.q.out | 1 -
.../results/clientpositive/spark/stats6.q.out | 10 -
.../results/clientpositive/spark/stats7.q.out | 6 -
.../results/clientpositive/spark/stats8.q.out | 20 -
.../results/clientpositive/spark/stats9.q.out | 1 -
.../clientpositive/spark/stats_noscan_1.q.out | 18 -
.../clientpositive/spark/stats_noscan_2.q.out | 6 -
.../clientpositive/spark/stats_only_null.q.out | 19 +-
.../spark/stats_partscan_1_23.q.out | 6 -
.../results/clientpositive/spark/statsfs.q.out | 14 -
.../clientpositive/spark/union_remove_1.q.out | 1 -
.../clientpositive/spark/union_remove_10.q.out | 1 -
.../clientpositive/spark/union_remove_11.q.out | 1 -
.../clientpositive/spark/union_remove_12.q.out | 1 -
.../clientpositive/spark/union_remove_13.q.out | 1 -
.../clientpositive/spark/union_remove_14.q.out | 1 -
.../clientpositive/spark/union_remove_15.q.out | 2 -
.../clientpositive/spark/union_remove_16.q.out | 2 -
.../clientpositive/spark/union_remove_17.q.out | 2 -
.../clientpositive/spark/union_remove_18.q.out | 2 -
.../clientpositive/spark/union_remove_19.q.out | 1 -
.../clientpositive/spark/union_remove_2.q.out | 1 -
.../clientpositive/spark/union_remove_20.q.out | 1 -
.../clientpositive/spark/union_remove_21.q.out | 1 -
.../clientpositive/spark/union_remove_22.q.out | 1 -
.../clientpositive/spark/union_remove_23.q.out | 1 -
.../clientpositive/spark/union_remove_24.q.out | 1 -
.../clientpositive/spark/union_remove_25.q.out | 6 -
.../clientpositive/spark/union_remove_3.q.out | 1 -
.../clientpositive/spark/union_remove_4.q.out | 1 -
.../clientpositive/spark/union_remove_5.q.out | 1 -
.../clientpositive/spark/union_remove_7.q.out | 1 -
.../clientpositive/spark/union_remove_8.q.out | 1 -
.../clientpositive/spark/union_remove_9.q.out | 1 -
ql/src/test/results/clientpositive/stats0.q.out | 4 -
ql/src/test/results/clientpositive/stats1.q.out | 2 -
.../test/results/clientpositive/stats10.q.out | 6 -
.../test/results/clientpositive/stats12.q.out | 10 -
.../test/results/clientpositive/stats13.q.out | 12 -
.../test/results/clientpositive/stats14.q.out | 9 -
.../test/results/clientpositive/stats15.q.out | 9 -
.../test/results/clientpositive/stats16.q.out | 2 -
.../test/results/clientpositive/stats18.q.out | 4 -
ql/src/test/results/clientpositive/stats2.q.out | 4 -
ql/src/test/results/clientpositive/stats3.q.out | 3 -
ql/src/test/results/clientpositive/stats4.q.out | 12 -
ql/src/test/results/clientpositive/stats5.q.out | 1 -
ql/src/test/results/clientpositive/stats6.q.out | 10 -
ql/src/test/results/clientpositive/stats7.q.out | 6 -
ql/src/test/results/clientpositive/stats8.q.out | 20 -
ql/src/test/results/clientpositive/stats9.q.out | 1 -
.../clientpositive/stats_empty_partition.q.out | 2 -
.../clientpositive/stats_invalidation.q.out | 2 -
.../clientpositive/stats_list_bucket.q.out | 3 -
.../results/clientpositive/stats_noscan_1.q.out | 18 -
.../results/clientpositive/stats_noscan_2.q.out | 6 -
.../clientpositive/stats_only_null.q.out | 19 +-
.../clientpositive/stats_partscan_1_23.q.out | 6 -
.../test/results/clientpositive/statsfs.q.out | 14 -
.../temp_table_display_colstats_tbllvl.q.out | 180 ++-
.../clientpositive/tez/explainanalyze_5.q.out | 1 -
.../clientpositive/truncate_column.q.out | 11 -
.../results/clientpositive/tunable_ndv.q.out | 120 +-
.../clientpositive/unicode_comments.q.out | 5 -
.../clientpositive/unicode_notation.q.out | 3 -
.../clientpositive/union_pos_alias.q.out | 1 -
.../results/clientpositive/union_remove_1.q.out | 1 -
.../clientpositive/union_remove_10.q.out | 1 -
.../clientpositive/union_remove_11.q.out | 1 -
.../clientpositive/union_remove_12.q.out | 1 -
.../clientpositive/union_remove_13.q.out | 1 -
.../clientpositive/union_remove_14.q.out | 1 -
.../clientpositive/union_remove_15.q.out | 2 -
.../clientpositive/union_remove_16.q.out | 2 -
.../clientpositive/union_remove_17.q.out | 2 -
.../clientpositive/union_remove_18.q.out | 2 -
.../clientpositive/union_remove_19.q.out | 1 -
.../results/clientpositive/union_remove_2.q.out | 1 -
.../clientpositive/union_remove_20.q.out | 1 -
.../clientpositive/union_remove_21.q.out | 1 -
.../clientpositive/union_remove_22.q.out | 1 -
.../clientpositive/union_remove_23.q.out | 1 -
.../clientpositive/union_remove_24.q.out | 1 -
.../clientpositive/union_remove_25.q.out | 6 -
.../results/clientpositive/union_remove_3.q.out | 1 -
.../results/clientpositive/union_remove_4.q.out | 1 -
.../results/clientpositive/union_remove_5.q.out | 1 -
.../results/clientpositive/union_remove_7.q.out | 1 -
.../results/clientpositive/union_remove_8.q.out | 1 -
.../results/clientpositive/union_remove_9.q.out | 1 -
.../results/clientpositive/union_stats.q.out | 5 -
.../clientpositive/updateAccessTime.q.out | 6 -
.../results/clientpositive/view_alias.q.out | 6 -
.../test/results/clientpositive/view_cbo.q.out | 10 -
390 files changed, 4651 insertions(+), 3200 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/hbase-handler/src/test/results/positive/external_table_ppd.q.out
----------------------------------------------------------------------
diff --git a/hbase-handler/src/test/results/positive/external_table_ppd.q.out b/hbase-handler/src/test/results/positive/external_table_ppd.q.out
index 328131a..cdc43ee 100644
--- a/hbase-handler/src/test/results/positive/external_table_ppd.q.out
+++ b/hbase-handler/src/test/results/positive/external_table_ppd.q.out
@@ -39,7 +39,6 @@ POSTHOOK: query: DESCRIBE FORMATTED t_hbase
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t_hbase
# col_name data_type comment
-
key string
tinyint_col tinyint
smallint_col smallint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out
----------------------------------------------------------------------
diff --git a/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out b/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out
index 5404cd9..153613e 100644
--- a/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out
@@ -39,7 +39,6 @@ POSTHOOK: query: DESCRIBE FORMATTED t_hbase
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t_hbase
# col_name data_type comment
-
key string
tinyint_col tinyint
smallint_col smallint
@@ -219,7 +218,6 @@ POSTHOOK: query: DESCRIBE FORMATTED t_hbase_1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t_hbase_1
# col_name data_type comment
-
key string
tinyint_col tinyint
smallint_col smallint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/hbase-handler/src/test/results/positive/hbase_ddl.q.out
----------------------------------------------------------------------
diff --git a/hbase-handler/src/test/results/positive/hbase_ddl.q.out b/hbase-handler/src/test/results/positive/hbase_ddl.q.out
index 8cb88ed..c015f29 100644
--- a/hbase-handler/src/test/results/positive/hbase_ddl.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_ddl.q.out
@@ -106,7 +106,6 @@ POSTHOOK: query: desc formatted hbase_table_1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@hbase_table_1
# col_name data_type comment
-
key int It is a column key
value string It is the column string value
@@ -153,7 +152,6 @@ POSTHOOK: query: desc formatted hbase_table_1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@hbase_table_1
# col_name data_type comment
-
key int It is a column key
value string It is the column string value
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/hbase-handler/src/test/results/positive/hbasestats.q.out
----------------------------------------------------------------------
diff --git a/hbase-handler/src/test/results/positive/hbasestats.q.out b/hbase-handler/src/test/results/positive/hbasestats.q.out
index b7ef954..29eefd4 100644
--- a/hbase-handler/src/test/results/positive/hbasestats.q.out
+++ b/hbase-handler/src/test/results/positive/hbasestats.q.out
@@ -25,7 +25,6 @@ POSTHOOK: query: desc formatted users
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@users
# col_name data_type comment
-
key string
state string
country string
@@ -118,7 +117,6 @@ POSTHOOK: query: desc formatted users
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@users
# col_name data_type comment
-
key string
state string
country string
@@ -183,7 +181,6 @@ POSTHOOK: query: desc formatted users
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@users
# col_name data_type comment
-
key string
state string
country string
@@ -239,7 +236,6 @@ POSTHOOK: query: desc formatted users
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@users
# col_name data_type comment
-
key string
state string
country string
@@ -310,7 +306,6 @@ POSTHOOK: query: desc formatted users
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@users
# col_name data_type comment
-
key string
state string
country string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_blobstore.q.out
----------------------------------------------------------------------
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_blobstore.q.out b/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_blobstore.q.out
index c1e57ee..8750dbf 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_blobstore.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_blobstore.q.out
@@ -60,7 +60,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
@@ -145,7 +144,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
@@ -191,7 +189,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
@@ -245,7 +242,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_local.q.out
----------------------------------------------------------------------
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_local.q.out b/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_local.q.out
index 4d296da..4a821ea 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_local.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_local.q.out
@@ -60,7 +60,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
@@ -145,7 +144,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
@@ -191,7 +189,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
@@ -245,7 +242,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_warehouse.q.out
----------------------------------------------------------------------
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_warehouse.q.out b/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_warehouse.q.out
index fce5ffe..31745a0 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_warehouse.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_warehouse.q.out
@@ -60,7 +60,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
@@ -141,7 +140,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
@@ -183,7 +181,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
@@ -233,7 +230,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_local_to_blobstore.q.out
----------------------------------------------------------------------
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_local_to_blobstore.q.out b/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_local_to_blobstore.q.out
index 72068c5..8c689d4 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_local_to_blobstore.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_local_to_blobstore.q.out
@@ -60,7 +60,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
@@ -143,7 +142,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
@@ -187,7 +185,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
@@ -239,7 +236,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_blobstore.q.out
----------------------------------------------------------------------
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_blobstore.q.out b/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_blobstore.q.out
index b15a22f..741eef5 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_blobstore.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_blobstore.q.out
@@ -60,7 +60,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
@@ -139,7 +138,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_local.q.out
----------------------------------------------------------------------
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_local.q.out b/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_local.q.out
index 4d2eeb0..00ab66b 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_local.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_local.q.out
@@ -60,7 +60,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
@@ -139,7 +138,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_warehouse.q.out
----------------------------------------------------------------------
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_warehouse.q.out b/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_warehouse.q.out
index 764c86d..01cae7c 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_warehouse.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_warehouse.q.out
@@ -60,7 +60,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
@@ -135,7 +134,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/itests/hive-blobstore/src/test/results/clientpositive/import_local_to_blobstore.q.out
----------------------------------------------------------------------
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/import_local_to_blobstore.q.out b/itests/hive-blobstore/src/test/results/clientpositive/import_local_to_blobstore.q.out
index 56343bb..6e2b38b 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/import_local_to_blobstore.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/import_local_to_blobstore.q.out
@@ -60,7 +60,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
@@ -137,7 +136,6 @@ emp_country string two char iso code
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
index 4b1df73..aac38eb 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
@@ -145,6 +145,7 @@ import org.apache.hadoop.hive.ql.metadata.Table;
import org.apache.hadoop.hive.ql.metadata.UniqueConstraint;
import org.apache.hadoop.hive.ql.metadata.formatting.MetaDataFormatUtils;
import org.apache.hadoop.hive.ql.metadata.formatting.MetaDataFormatter;
+import org.apache.hadoop.hive.ql.metadata.formatting.TextMetaDataTable;
import org.apache.hadoop.hive.ql.parse.AlterTablePartMergeFilesDesc;
import org.apache.hadoop.hive.ql.parse.BaseSemanticAnalyzer;
import org.apache.hadoop.hive.ql.parse.DDLSemanticAnalyzer;
@@ -2017,7 +2018,9 @@ public class DDLTask extends Task<DDLWork> implements Serializable {
for (String val : vals) {
String escapedPath = FileUtils.escapePathName(val);
assert escapedPath != null;
- if (escapedPath.equals(val)) continue;
+ if (escapedPath.equals(val)) {
+ continue;
+ }
String errorMsg = "Repair: Cannot add partition " + msckDesc.getTableName()
+ ':' + part.getPartitionName() + " due to invalid characters in the name";
if (doSkip) {
@@ -2528,8 +2531,6 @@ public class DDLTask extends Task<DDLWork> implements Serializable {
if (showIndexes.isFormatted()) {
// column headers
outStream.write(MetaDataFormatUtils.getIndexColumnsHeader().getBytes(StandardCharsets.UTF_8));
- outStream.write(terminator);
- outStream.write(terminator);
}
for (Index index : indexes)
@@ -2643,8 +2644,11 @@ public class DDLTask extends Task<DDLWork> implements Serializable {
// In case the query is served by HiveServer2, don't pad it with spaces,
// as HiveServer2 output is consumed by JDBC/ODBC clients.
boolean isOutputPadded = !SessionState.get().isHiveServerQuery();
- outStream.writeBytes(MetaDataFormatUtils.getAllColumnsInformation(
- cols, false, isOutputPadded, null));
+ TextMetaDataTable tmd = new TextMetaDataTable();
+ for (FieldSchema fieldSchema : cols) {
+ tmd.addRow(MetaDataFormatUtils.extractColumnValues(fieldSchema));
+ }
+ outStream.writeBytes(tmd.renderTable(isOutputPadded));
} catch (IOException e) {
throw new HiveException(e, ErrorMsg.GENERIC_ERROR);
} finally {
@@ -2721,7 +2725,9 @@ public class DDLTask extends Task<DDLWork> implements Serializable {
HiveTxnManager txnManager = ctx.getHiveTxnManager();
HiveLockManager lockMgr = txnManager.getLockManager();
- if (txnManager.useNewShowLocksFormat()) return showLocksNewFormat(showLocks, lockMgr);
+ if (txnManager.useNewShowLocksFormat()) {
+ return showLocksNewFormat(showLocks, lockMgr);
+ }
boolean isExt = showLocks.isExt();
if (lockMgr == null) {
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java
index a7f2967..159fb2b 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.hive.ql.metadata.formatting;
-import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.hadoop.hive.common.type.HiveDecimal;
import org.apache.hadoop.hive.conf.HiveConf;
@@ -53,9 +52,10 @@ import org.apache.hadoop.hive.ql.plan.ShowIndexesDesc;
import org.apache.hadoop.hive.serde2.io.DateWritable;
import org.apache.hive.common.util.HiveStringUtils;
+import com.google.common.collect.Lists;
+
import java.math.BigInteger;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -81,81 +81,6 @@ public final class MetaDataFormatUtils {
private MetaDataFormatUtils() {
}
- private static void formatColumnsHeader(StringBuilder columnInformation,
- List<ColumnStatisticsObj> colStats) {
- columnInformation.append("# "); // Easy for shell scripts to ignore
- formatOutput(getColumnsHeader(colStats), columnInformation);
- columnInformation.append(LINE_DELIM);
- }
-
- /**
- * Write formatted information about the given columns to a string
- * @param cols - list of columns
- * @param printHeader - if header should be included
- * @param isOutputPadded - make it more human readable by setting indentation
- * with spaces. Turned off for use by HiveServer2
- * @param colStats
- * @return string with formatted column information
- */
- public static String getAllColumnsInformation(List<FieldSchema> cols,
- boolean printHeader, boolean isOutputPadded, List<ColumnStatisticsObj> colStats) {
- StringBuilder columnInformation = new StringBuilder(DEFAULT_STRINGBUILDER_SIZE);
- if(printHeader){
- formatColumnsHeader(columnInformation, colStats);
- }
-
- formatAllFields(columnInformation, cols, isOutputPadded, colStats);
- return columnInformation.toString();
- }
-
- /**
- * Write formatted information about the given columns, including partition
- * columns to a string
- * @param cols - list of columns
- * @param partCols - list of partition columns
- * @param printHeader - if header should be included
- * @param isOutputPadded - make it more human readable by setting indentation
- * with spaces. Turned off for use by HiveServer2
- * @return string with formatted column information
- */
- public static String getAllColumnsInformation(List<FieldSchema> cols,
- List<FieldSchema> partCols, boolean printHeader, boolean isOutputPadded, boolean showPartColsSep) {
- StringBuilder columnInformation = new StringBuilder(DEFAULT_STRINGBUILDER_SIZE);
- if(printHeader){
- formatColumnsHeader(columnInformation, null);
- }
- formatAllFields(columnInformation, cols, isOutputPadded, null);
-
- if ((partCols != null) && !partCols.isEmpty() && showPartColsSep) {
- columnInformation.append(LINE_DELIM).append("# Partition Information")
- .append(LINE_DELIM);
- formatColumnsHeader(columnInformation, null);
- formatAllFields(columnInformation, partCols, isOutputPadded, null);
- }
-
- return columnInformation.toString();
- }
-
- /**
- * Write formatted column information into given StringBuilder
- * @param tableInfo - StringBuilder to append column information into
- * @param cols - list of columns
- * @param isOutputPadded - make it more human readable by setting indentation
- * with spaces. Turned off for use by HiveServer2
- * @param colStats
- */
- private static void formatAllFields(StringBuilder tableInfo,
- List<FieldSchema> cols, boolean isOutputPadded, List<ColumnStatisticsObj> colStats) {
- for (FieldSchema col : cols) {
- if(isOutputPadded) {
- formatWithIndentation(col.getName(), col.getType(), getComment(col), tableInfo, colStats);
- }
- else {
- formatWithoutIndentation(col.getName(), col.getType(), col.getComment(), tableInfo, colStats);
- }
- }
- }
-
private static String convertToString(Decimal val) {
if (val == null) {
return "";
@@ -183,12 +108,12 @@ public final class MetaDataFormatUtils {
return "";
}
byte[] sub = new byte[2];
- sub[0] = (byte) buf[0];
- sub[1] = (byte) buf[1];
+ sub[0] = buf[0];
+ sub[1] = buf[1];
return new String(sub);
}
- private static ColumnStatisticsObj getColumnStatisticsObject(String colName,
+ static ColumnStatisticsObj getColumnStatisticsObject(String colName,
String colType, List<ColumnStatisticsObj> colStats) {
if (colStats != null && !colStats.isEmpty()) {
for (ColumnStatisticsObj cso : colStats) {
@@ -201,56 +126,6 @@ public final class MetaDataFormatUtils {
return null;
}
- private static void formatWithoutIndentation(String name, String type, String comment,
- StringBuilder colBuffer, List<ColumnStatisticsObj> colStats) {
- colBuffer.append(name);
- colBuffer.append(FIELD_DELIM);
- colBuffer.append(type);
- colBuffer.append(FIELD_DELIM);
- if (colStats != null) {
- ColumnStatisticsObj cso = getColumnStatisticsObject(name, type, colStats);
- if (cso != null) {
- ColumnStatisticsData csd = cso.getStatsData();
- if (csd.isSetBinaryStats()) {
- BinaryColumnStatsData bcsd = csd.getBinaryStats();
- appendColumnStatsNoFormatting(colBuffer, "", "", bcsd.getNumNulls(), "",
- bcsd.getAvgColLen(), bcsd.getMaxColLen(), "", "");
- } else if (csd.isSetStringStats()) {
- StringColumnStatsData scsd = csd.getStringStats();
- appendColumnStatsNoFormatting(colBuffer, "", "", scsd.getNumNulls(), scsd.getNumDVs(),
- scsd.getAvgColLen(), scsd.getMaxColLen(), "", "");
- } else if (csd.isSetBooleanStats()) {
- BooleanColumnStatsData bcsd = csd.getBooleanStats();
- appendColumnStatsNoFormatting(colBuffer, "", "", bcsd.getNumNulls(), "", "", "",
- bcsd.getNumTrues(), bcsd.getNumFalses());
- } else if (csd.isSetDecimalStats()) {
- DecimalColumnStatsData dcsd = csd.getDecimalStats();
- appendColumnStatsNoFormatting(colBuffer, convertToString(dcsd.getLowValue()),
- convertToString(dcsd.getHighValue()), dcsd.getNumNulls(), dcsd.getNumDVs(),
- "", "", "", "");
- } else if (csd.isSetDoubleStats()) {
- DoubleColumnStatsData dcsd = csd.getDoubleStats();
- appendColumnStatsNoFormatting(colBuffer, dcsd.getLowValue(), dcsd.getHighValue(),
- dcsd.getNumNulls(), dcsd.getNumDVs(), "", "", "", "");
- } else if (csd.isSetLongStats()) {
- LongColumnStatsData lcsd = csd.getLongStats();
- appendColumnStatsNoFormatting(colBuffer, lcsd.getLowValue(), lcsd.getHighValue(),
- lcsd.getNumNulls(), lcsd.getNumDVs(), "", "", "", "");
- } else if (csd.isSetDateStats()) {
- DateColumnStatsData dcsd = csd.getDateStats();
- appendColumnStatsNoFormatting(colBuffer,
- convertToString(dcsd.getLowValue()),
- convertToString(dcsd.getHighValue()),
- dcsd.getNumNulls(), dcsd.getNumDVs(), "", "", "", "");
- }
- } else {
- appendColumnStatsNoFormatting(colBuffer, "", "", "", "", "", "", "", "");
- }
- }
- colBuffer.append(comment == null ? "" : HiveStringUtils.escapeJava(comment));
- colBuffer.append(LINE_DELIM);
- }
-
public static String getIndexInformation(Index index, boolean isOutputPadded) {
StringBuilder indexInfo = new StringBuilder(DEFAULT_STRINGBUILDER_SIZE);
@@ -282,10 +157,10 @@ public final class MetaDataFormatUtils {
IndexType indexType = HiveIndex.getIndexTypeByClassName(indexHandlerClass);
indexColumns.add(indexType.getName());
- String comment = index.getParameters().get("comment");
- indexColumns.add(comment == null ? null : HiveStringUtils.escapeJava(comment));
+ String comment = HiveStringUtils.escapeJava(index.getParameters().get("comment"));
+ indexColumns.add(comment);
- formatOutput(indexColumns.toArray(new String[0]), indexInfo, isOutputPadded);
+ formatOutput(indexColumns.toArray(new String[0]), indexInfo, isOutputPadded, true);
return indexInfo.toString();
}
@@ -634,27 +509,35 @@ public final class MetaDataFormatUtils {
* @param isLastLinePadded Is the last field could be printed in multiple lines, if contains
* newlines?
*/
- private static void formatOutput(String[] fields, StringBuilder tableInfo,
- boolean isLastLinePadded) {
- int[] paddings = new int[fields.length-1];
- if (fields.length > 1) {
- for (int i = 0; i < fields.length - 1; i++) {
- if (fields[i] == null) {
- tableInfo.append(FIELD_DELIM);
- continue;
+ static void formatOutput(String[] fields, StringBuilder tableInfo,
+ boolean isLastLinePadded, boolean isFormatted) {
+ if (!isFormatted) {
+ for (int i = 0; i < fields.length; i++) {
+ Object value = HiveStringUtils.escapeJava(fields[i]);
+ if (value != null) {
+ tableInfo.append(value);
}
- tableInfo.append(String.format("%-" + ALIGNMENT + "s", fields[i])).append(FIELD_DELIM);
- paddings[i] = ALIGNMENT > fields[i].length() ? ALIGNMENT : fields[i].length();
+ tableInfo.append((i == fields.length - 1) ? LINE_DELIM : FIELD_DELIM);
}
- }
- if (fields.length > 0) {
- String value = fields[fields.length-1];
- String unescapedValue =
- (isLastLinePadded && value != null) ? value.replaceAll("\\\\n|\\\\r|\\\\r\\\\n","\n")
- :value;
- indentMultilineValue(unescapedValue, tableInfo, paddings, false);
} else {
- tableInfo.append(LINE_DELIM);
+ int[] paddings = new int[fields.length - 1];
+ if (fields.length > 1) {
+ for (int i = 0; i < fields.length - 1; i++) {
+ if (fields[i] == null) {
+ tableInfo.append(FIELD_DELIM);
+ continue;
+ }
+ tableInfo.append(String.format("%-" + ALIGNMENT + "s", fields[i])).append(FIELD_DELIM);
+ paddings[i] = ALIGNMENT > fields[i].length() ? ALIGNMENT : fields[i].length();
+ }
+ }
+ if (fields.length > 0) {
+ String value = fields[fields.length - 1];
+ String unescapedValue = (isLastLinePadded && value != null) ? value.replaceAll("\\\\n|\\\\r|\\\\r\\\\n", "\n") : value;
+ indentMultilineValue(unescapedValue, tableInfo, paddings, false);
+ } else {
+ tableInfo.append(LINE_DELIM);
+ }
}
}
@@ -664,7 +547,7 @@ public final class MetaDataFormatUtils {
* @param tableInfo The target builder
*/
private static void formatOutput(String[] fields, StringBuilder tableInfo) {
- formatOutput(fields, tableInfo, false);
+ formatOutput(fields, tableInfo, false, true);
}
/**
@@ -689,68 +572,59 @@ public final class MetaDataFormatUtils {
* @param tableInfo The target builder
* @param isOutputPadded Should the value printed as a padded string?
*/
- protected static void formatOutput(String name, String value, StringBuilder tableInfo,
+ static void formatOutput(String name, String value, StringBuilder tableInfo,
boolean isOutputPadded) {
String unescapedValue =
(isOutputPadded && value != null) ? value.replaceAll("\\\\n|\\\\r|\\\\r\\\\n","\n"):value;
formatOutput(name, unescapedValue, tableInfo);
}
- private static void formatWithIndentation(String colName, String colType, String colComment,
- StringBuilder tableInfo, List<ColumnStatisticsObj> colStats) {
- tableInfo.append(String.format("%-" + ALIGNMENT + "s", colName)).append(FIELD_DELIM);
- tableInfo.append(String.format("%-" + ALIGNMENT + "s", colType)).append(FIELD_DELIM);
+ public static String[] extractColumnValues(FieldSchema col) {
+ return extractColumnValues(col, false, null);
+ }
+
+ public static String[] extractColumnValues(FieldSchema col, boolean isColStatsAvailable, ColumnStatisticsObj columnStatisticsObj){
+ List<String> ret = new ArrayList<>();
+ ret.add(col.getName());
+ ret.add(col.getType());
- if (colStats != null) {
- ColumnStatisticsObj cso = getColumnStatisticsObject(colName, colType, colStats);
- if (cso != null) {
- ColumnStatisticsData csd = cso.getStatsData();
+ if (isColStatsAvailable) {
+ if (columnStatisticsObj != null) {
+ ColumnStatisticsData csd = columnStatisticsObj.getStatsData();
if (csd.isSetBinaryStats()) {
BinaryColumnStatsData bcsd = csd.getBinaryStats();
- appendColumnStats(tableInfo, "", "", bcsd.getNumNulls(), "", "", bcsd.getAvgColLen(),
- bcsd.getMaxColLen(), "", "");
+ ret.addAll(Lists.newArrayList("", "", "" + bcsd.getNumNulls(), "", "" + bcsd.getAvgColLen(), "" + bcsd.getMaxColLen(), "", "", ""));
} else if (csd.isSetStringStats()) {
StringColumnStatsData scsd = csd.getStringStats();
- appendColumnStats(tableInfo, "", "", scsd.getNumNulls(), scsd.getNumDVs(),
- convertToString(scsd.getBitVectors()), scsd.getAvgColLen(),
- scsd.getMaxColLen(), "", "");
+ ret.addAll(Lists.newArrayList("", "", "" + scsd.getNumNulls(), "" + scsd.getNumDVs(), "" + scsd.getAvgColLen(), "" + scsd.getMaxColLen(), "", "",
+ convertToString(scsd.getBitVectors())));
} else if (csd.isSetBooleanStats()) {
BooleanColumnStatsData bcsd = csd.getBooleanStats();
- appendColumnStats(tableInfo, "", "", bcsd.getNumNulls(), "", "", "", "",
- bcsd.getNumTrues(), bcsd.getNumFalses());
+ ret.addAll(Lists.newArrayList("", "", "" + bcsd.getNumNulls(), "", "", "", "" + bcsd.getNumTrues(), "" + bcsd.getNumFalses(), ""));
} else if (csd.isSetDecimalStats()) {
DecimalColumnStatsData dcsd = csd.getDecimalStats();
- appendColumnStats(tableInfo, convertToString(dcsd.getLowValue()),
- convertToString(dcsd.getHighValue()), dcsd.getNumNulls(), dcsd.getNumDVs(),
- convertToString(dcsd.getBitVectors()),
- "", "", "", "");
+ ret.addAll(Lists.newArrayList(convertToString(dcsd.getLowValue()), convertToString(dcsd.getHighValue()), "" + dcsd.getNumNulls(),
+ "" + dcsd.getNumDVs(), "", "", "", "", convertToString(dcsd.getBitVectors())));
} else if (csd.isSetDoubleStats()) {
DoubleColumnStatsData dcsd = csd.getDoubleStats();
- appendColumnStats(tableInfo, dcsd.getLowValue(), dcsd.getHighValue(), dcsd.getNumNulls(),
- dcsd.getNumDVs(), convertToString(dcsd.getBitVectors()),
- "", "", "", "");
+ ret.addAll(Lists.newArrayList("" + dcsd.getLowValue(), "" + dcsd.getHighValue(), "" + dcsd.getNumNulls(), "" + dcsd.getNumDVs(), "", "", "", "",
+ convertToString(dcsd.getBitVectors())));
} else if (csd.isSetLongStats()) {
LongColumnStatsData lcsd = csd.getLongStats();
- appendColumnStats(tableInfo, lcsd.getLowValue(), lcsd.getHighValue(), lcsd.getNumNulls(),
- lcsd.getNumDVs(), convertToString(lcsd.getBitVectors()),
- "", "", "", "");
+ ret.addAll(Lists.newArrayList("" + lcsd.getLowValue(), "" + lcsd.getHighValue(), "" + lcsd.getNumNulls(), "" + lcsd.getNumDVs(), "", "", "", "",
+ convertToString(lcsd.getBitVectors())));
} else if (csd.isSetDateStats()) {
DateColumnStatsData dcsd = csd.getDateStats();
- appendColumnStats(tableInfo,
- convertToString(dcsd.getLowValue()),
- convertToString(dcsd.getHighValue()),
- dcsd.getNumNulls(), dcsd.getNumDVs(),
- convertToString(dcsd.getBitVectors()),
- "", "", "", "");
+ ret.addAll(Lists.newArrayList(convertToString(dcsd.getLowValue()), convertToString(dcsd.getHighValue()), "" + dcsd.getNumNulls(),
+ "" + dcsd.getNumDVs(), "", "", "", "", convertToString(dcsd.getBitVectors())));
}
} else {
- appendColumnStats(tableInfo, "", "", "", "", "", "", "", "", "");
+ ret.addAll(Lists.newArrayList("", "", "", "", "", "", "", "", ""));
+ }
}
- }
- int colNameLength = ALIGNMENT > colName.length() ? ALIGNMENT : colName.length();
- int colTypeLength = ALIGNMENT > colType.length() ? ALIGNMENT : colType.length();
- indentMultilineValue(colComment, tableInfo, new int[]{colNameLength, colTypeLength}, false);
+ ret.add(getComment(col));
+ return ret.toArray(new String[] {});
}
/**
@@ -796,32 +670,6 @@ public final class MetaDataFormatUtils {
}
}
- private static void appendColumnStats(StringBuilder sb, Object min, Object max, Object numNulls,
- Object ndv, Object bitVector, Object avgColLen, Object maxColLen, Object numTrues, Object numFalses) {
- sb.append(String.format("%-" + ALIGNMENT + "s", min)).append(FIELD_DELIM);
- sb.append(String.format("%-" + ALIGNMENT + "s", max)).append(FIELD_DELIM);
- sb.append(String.format("%-" + ALIGNMENT + "s", numNulls)).append(FIELD_DELIM);
- sb.append(String.format("%-" + ALIGNMENT + "s", ndv)).append(FIELD_DELIM);
- sb.append(String.format("%-" + ALIGNMENT + "s", avgColLen)).append(FIELD_DELIM);
- sb.append(String.format("%-" + ALIGNMENT + "s", maxColLen)).append(FIELD_DELIM);
- sb.append(String.format("%-" + ALIGNMENT + "s", numTrues)).append(FIELD_DELIM);
- sb.append(String.format("%-" + ALIGNMENT + "s", numFalses)).append(FIELD_DELIM);
- sb.append(String.format("%-" + ALIGNMENT + "s", bitVector)).append(FIELD_DELIM);
- }
-
- private static void appendColumnStatsNoFormatting(StringBuilder sb, Object min,
- Object max, Object numNulls, Object ndv, Object avgColLen, Object maxColLen,
- Object numTrues, Object numFalses) {
- sb.append(min).append(FIELD_DELIM);
- sb.append(max).append(FIELD_DELIM);
- sb.append(numNulls).append(FIELD_DELIM);
- sb.append(ndv).append(FIELD_DELIM);
- sb.append(avgColLen).append(FIELD_DELIM);
- sb.append(maxColLen).append(FIELD_DELIM);
- sb.append(numTrues).append(FIELD_DELIM);
- sb.append(numFalses).append(FIELD_DELIM);
- }
-
public static String[] getColumnsHeader(List<ColumnStatisticsObj> colStats) {
boolean showColStats = false;
if (colStats != null) {
@@ -843,4 +691,5 @@ public final class MetaDataFormatUtils {
return new TextMetaDataFormatter(conf.getIntVar(HiveConf.ConfVars.CLIPRETTYOUTPUTNUMCOLS), conf.getBoolVar(ConfVars.HIVE_DISPLAY_PARTITION_COLUMNS_SEPARATELY));
}
}
+
}
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataPrettyFormatUtils.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataPrettyFormatUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataPrettyFormatUtils.java
index c653252..768ccef 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataPrettyFormatUtils.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataPrettyFormatUtils.java
@@ -21,7 +21,6 @@ package org.apache.hadoop.hive.ql.metadata.formatting;
import java.util.List;
import java.util.StringTokenizer;
-import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.hive.metastore.api.FieldSchema;
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java
----------------------------------------------------------------------
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 dcecb0e..833dad6 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
@@ -128,16 +128,46 @@ class TextMetaDataFormatter implements MetaDataFormatter {
PrimaryKeyInfo pkInfo, ForeignKeyInfo fkInfo,
UniqueConstraint ukInfo, NotNullConstraint nnInfo) throws HiveException {
try {
- String output;
+ List<FieldSchema> partCols = tbl.isPartitioned() ? tbl.getPartCols() : null;
+
+ if (isPretty) {
+ String output = MetaDataPrettyFormatUtils.getAllColumnsInformation(cols, partCols, prettyOutputNumCols);
+ outStream.write(output.getBytes("UTF-8"));
+ return;
+ }
+ String output = "";
+
+ boolean isColStatsAvailable = colStats != null;
+
+ TextMetaDataTable mdt = new TextMetaDataTable();
+ if (isFormatted && !isColStatsAvailable) {
+ output = "# ";
+ }
+ if (isFormatted) {
+ mdt.addRow(MetaDataFormatUtils.getColumnsHeader(colStats));
+ }
+ for (FieldSchema col : cols) {
+ mdt.addRow(MetaDataFormatUtils.extractColumnValues(col, isColStatsAvailable,
+ MetaDataFormatUtils.getColumnStatisticsObject(col.getName(), col.getType(), colStats)));
+ }
+ if (isColStatsAvailable) {
+ mdt.transpose();
+ }
+ output += mdt.renderTable(isOutputPadded);
+
if (colPath.equals(tableName)) {
- List<FieldSchema> partCols = tbl.isPartitioned() ? tbl.getPartCols() : null;
- output = isPretty ?
- MetaDataPrettyFormatUtils.getAllColumnsInformation(
- cols, partCols, prettyOutputNumCols)
- :
- MetaDataFormatUtils.getAllColumnsInformation(cols, partCols, isFormatted, isOutputPadded, showPartColsSeparately);
+ if ((partCols != null) && !partCols.isEmpty() && showPartColsSeparately) {
+
+ mdt = new TextMetaDataTable();
+ output += MetaDataFormatUtils.LINE_DELIM + "# Partition Information" + MetaDataFormatUtils.LINE_DELIM + "# ";
+ mdt.addRow(MetaDataFormatUtils.getColumnsHeader(null));
+ for (FieldSchema col : partCols) {
+ mdt.addRow(MetaDataFormatUtils.extractColumnValues(col));
+ }
+ output += mdt.renderTable(isOutputPadded);
+ }
} else {
- output = MetaDataFormatUtils.getAllColumnsInformation(cols, isFormatted, isOutputPadded, colStats);
+
String statsState;
if (tbl.getParameters() != null && (statsState = tbl.getParameters().get(StatsSetupConst.COLUMN_STATS_ACCURATE)) != null) {
StringBuilder str = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataTable.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataTable.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataTable.java
new file mode 100644
index 0000000..0f78d3a
--- /dev/null
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataTable.java
@@ -0,0 +1,61 @@
+/**
+ * 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.hadoop.hive.ql.metadata.formatting;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.common.collect.Lists;
+
+public class TextMetaDataTable {
+
+ List<List<String>> table = new ArrayList<>();
+
+ public void addRow(String... values) {
+ table.add(Lists.<String> newArrayList(values));
+ }
+
+ public String renderTable(boolean isOutputPadded) {
+ StringBuilder str = new StringBuilder();
+ for (List<String> row : table) {
+ MetaDataFormatUtils.formatOutput(row.toArray(new String[] {}), str, isOutputPadded, isOutputPadded);
+ }
+ return str.toString();
+ }
+
+ public void transpose() {
+ if (table.size() == 0) {
+ return;
+ }
+ List<List<String>> newTable = new ArrayList<List<String>>();
+ for (int i = 0; i < table.get(0).size(); i++) {
+ newTable.add(new ArrayList<>());
+ }
+ for (List<String> srcRow : table) {
+ if (newTable.size() != srcRow.size()) {
+ throw new RuntimeException("invalid table size");
+ }
+ for (int i = 0; i < srcRow.size(); i++) {
+ newTable.get(i).add(srcRow.get(i));
+ }
+ }
+ table = newTable;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/java/org/apache/hadoop/hive/ql/plan/DescTableDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/DescTableDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/DescTableDesc.java
index 845ffcf..88c9921 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/DescTableDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/DescTableDesc.java
@@ -59,7 +59,7 @@ public class DescTableDesc extends DDLDesc implements Serializable {
*/
private static final String schema = "col_name,data_type,comment#string:string:string";
private static final String colStatsSchema = "col_name,data_type,min,max,num_nulls,"
- + "distinct_count,avg_col_len,max_col_len,num_trues,num_falses,comment,bitVector"
+ + "distinct_count,avg_col_len,max_col_len,num_trues,num_falses,bitVector,comment"
+ "#string:string:string:string:string:string:string:string:string:string:string:string";
public DescTableDesc() {
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientnegative/alter_file_format.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/alter_file_format.q.out b/ql/src/test/results/clientnegative/alter_file_format.q.out
index 4a79eaa..96259e5 100644
--- a/ql/src/test/results/clientnegative/alter_file_format.q.out
+++ b/ql/src/test/results/clientnegative/alter_file_format.q.out
@@ -13,7 +13,6 @@ POSTHOOK: query: desc FORMATTED alter_file_format_test
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter_file_format_test
# col_name data_type comment
-
key int
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out b/ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out
index d9a0624..3d3696b 100644
--- a/ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out
+++ b/ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out
@@ -29,7 +29,6 @@ ts string
# Partition Information
# col_name data_type comment
-
dt string
ts string
FAILED: ParseException line 4:50 mismatched input ',' expecting ) near 'int' in alter partition key type
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out b/ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out
index cc06fc5..78d7e87 100644
--- a/ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out
+++ b/ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out
@@ -29,7 +29,6 @@ ts string
# Partition Information
# col_name data_type comment
-
dt string
ts string
FAILED: SemanticException [Error 10002]: Invalid column reference dd
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out b/ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out
index 26ef712..f50a25b 100644
--- a/ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out
+++ b/ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out
@@ -29,7 +29,6 @@ ts string
# Partition Information
# col_name data_type comment
-
dt string
ts string
FAILED: ParseException line 4:47 cannot recognize input near 'time' ')' '<EOF>' in column type
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientnegative/alter_partition_partial_spec_dyndisabled.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/alter_partition_partial_spec_dyndisabled.q.out b/ql/src/test/results/clientnegative/alter_partition_partial_spec_dyndisabled.q.out
index 8ec2c28..c71c9bf 100644
--- a/ql/src/test/results/clientnegative/alter_partition_partial_spec_dyndisabled.q.out
+++ b/ql/src/test/results/clientnegative/alter_partition_partial_spec_dyndisabled.q.out
@@ -34,7 +34,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
FAILED: SemanticException [Error 10095]: Dynamic partition is disabled. Either enable it by setting hive.exec.dynamic.partition=true or specify partition column values
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out b/ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out
index 4893c61..8e240ea 100644
--- a/ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out
+++ b/ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out
@@ -38,12 +38,10 @@ POSTHOOK: query: DESCRIBE FORMATTED testViewPart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@testviewpart
# col_name data_type comment
-
key string
# Partition Information
# col_name data_type comment
-
value string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientnegative/desc_failure2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/desc_failure2.q.out b/ql/src/test/results/clientnegative/desc_failure2.q.out
index 7e55211..8e3836e 100644
--- a/ql/src/test/results/clientnegative/desc_failure2.q.out
+++ b/ql/src/test/results/clientnegative/desc_failure2.q.out
@@ -11,7 +11,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
FAILED: SemanticException [Error 10006]: Partition not found {ds=2012-04-08, hr=15}
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out b/ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out
index a88e0b8..680999f 100644
--- a/ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out
+++ b/ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out
@@ -44,13 +44,11 @@ POSTHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart_partial_scan
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/acid_table_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/acid_table_stats.q.out b/ql/src/test/results/clientpositive/acid_table_stats.q.out
index 6ab6b43..32c8531 100644
--- a/ql/src/test/results/clientpositive/acid_table_stats.q.out
+++ b/ql/src/test/results/clientpositive/acid_table_stats.q.out
@@ -17,13 +17,11 @@ POSTHOOK: query: desc formatted acid
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@acid
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -80,13 +78,11 @@ POSTHOOK: query: desc formatted acid partition(ds='2008-04-08')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@acid
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -196,13 +192,11 @@ POSTHOOK: query: desc formatted acid partition(ds='2008-04-08')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@acid
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -245,13 +239,11 @@ POSTHOOK: query: desc formatted acid partition(ds='2008-04-08')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@acid
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -373,13 +365,11 @@ POSTHOOK: query: desc formatted acid partition(ds='2008-04-08')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@acid
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -421,13 +411,11 @@ POSTHOOK: query: desc formatted acid partition(ds='2008-04-08')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@acid
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -591,13 +579,11 @@ POSTHOOK: query: desc formatted acid
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@acid
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -653,13 +639,11 @@ POSTHOOK: query: desc formatted acid partition(ds='2008-04-08')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@acid
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter2.q.out b/ql/src/test/results/clientpositive/alter2.q.out
index 47ed6d6..18032ac 100644
--- a/ql/src/test/results/clientpositive/alter2.q.out
+++ b/ql/src/test/results/clientpositive/alter2.q.out
@@ -18,7 +18,6 @@ insertdate string
# Partition Information
# col_name data_type comment
-
insertdate string
#### A masked pattern was here ####
@@ -49,7 +48,6 @@ insertdate string
# Partition Information
# col_name data_type comment
-
insertdate string
#### A masked pattern was here ####
@@ -81,7 +79,6 @@ insertdate string
# Partition Information
# col_name data_type comment
-
insertdate string
#### A masked pattern was here ####
@@ -121,7 +118,6 @@ insertdate string
# Partition Information
# col_name data_type comment
-
insertdate string
#### A masked pattern was here ####
@@ -152,7 +148,6 @@ insertdate string
# Partition Information
# col_name data_type comment
-
insertdate string
#### A masked pattern was here ####
@@ -184,7 +179,6 @@ insertdate string
# Partition Information
# col_name data_type comment
-
insertdate string
#### A masked pattern was here ####
@@ -263,7 +257,6 @@ insertdate string
# Partition Information
# col_name data_type comment
-
insertdate string
#### A masked pattern was here ####
@@ -294,7 +287,6 @@ insertdate string
# Partition Information
# col_name data_type comment
-
insertdate string
#### A masked pattern was here ####
@@ -326,7 +318,6 @@ insertdate string
# Partition Information
# col_name data_type comment
-
insertdate string
#### A masked pattern was here ####
@@ -366,7 +357,6 @@ insertdate string
# Partition Information
# col_name data_type comment
-
insertdate string
#### A masked pattern was here ####
@@ -397,7 +387,6 @@ insertdate string
# Partition Information
# col_name data_type comment
-
insertdate string
#### A masked pattern was here ####
@@ -429,7 +418,6 @@ insertdate string
# Partition Information
# col_name data_type comment
-
insertdate string
#### A masked pattern was here ####
[10/21] hive git commit: HIVE-17519: Transpose column stats display
(Zoltan Haindrich, reviewed by Ashutosh Chauhan and Vineet Garg)
Posted by kg...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out b/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
index bcab71a..f51ff4c 100644
--- a/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
+++ b/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
@@ -285,9 +285,18 @@ PREHOOK: Input: default@uservisits_web_text_none
POSTHOOK: query: describe formatted UserVisits_web_text_none destURL
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-destURL string 0 55 48.945454545454545 96 HL from deserializer
+col_name destURL
+data_type string
+min
+max
+num_nulls 0
+distinct_count 55
+avg_col_len 48.945454545454545
+max_col_len 96
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"ccode\":\"true\",\"desturl\":\"true\",\"lcode\":\"true\",\"skeyword\":\"true\",\"sourceip\":\"true\",\"useragent\":\"true\",\"visitdate\":\"true\"}}
PREHOOK: query: describe formatted UserVisits_web_text_none adRevenue
PREHOOK: type: DESCTABLE
@@ -295,9 +304,18 @@ PREHOOK: Input: default@uservisits_web_text_none
POSTHOOK: query: describe formatted UserVisits_web_text_none adRevenue
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-adRevenue float 13.099044799804688 492.98870849609375 0 55 HL from deserializer
+col_name adRevenue
+data_type float
+min 13.099044799804688
+max 492.98870849609375
+num_nulls 0
+distinct_count 55
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"ccode\":\"true\",\"desturl\":\"true\",\"lcode\":\"true\",\"skeyword\":\"true\",\"sourceip\":\"true\",\"useragent\":\"true\",\"visitdate\":\"true\"}}
PREHOOK: query: describe formatted UserVisits_web_text_none avgTimeOnSite
PREHOOK: type: DESCTABLE
@@ -305,9 +323,18 @@ PREHOOK: Input: default@uservisits_web_text_none
POSTHOOK: query: describe formatted UserVisits_web_text_none avgTimeOnSite
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-avgTimeOnSite int 1 9 0 9 HL from deserializer
+col_name avgTimeOnSite
+data_type int
+min 1
+max 9
+num_nulls 0
+distinct_count 9
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"ccode\":\"true\",\"desturl\":\"true\",\"lcode\":\"true\",\"skeyword\":\"true\",\"sourceip\":\"true\",\"useragent\":\"true\",\"visitdate\":\"true\"}}
PREHOOK: query: CREATE TABLE empty_tab(
a int,
@@ -414,9 +441,18 @@ PREHOOK: Input: default@uservisits_web_text_none
POSTHOOK: query: describe formatted default.UserVisits_web_text_none destURL
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-destURL string 0 55 48.945454545454545 96 HL from deserializer
+col_name destURL
+data_type string
+min
+max
+num_nulls 0
+distinct_count 55
+avg_col_len 48.945454545454545
+max_col_len 96
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"ccode\":\"true\",\"desturl\":\"true\",\"lcode\":\"true\",\"skeyword\":\"true\",\"sourceip\":\"true\",\"useragent\":\"true\",\"visitdate\":\"true\"}}
PREHOOK: query: CREATE TABLE UserVisits_in_dummy_db (
sourceIP string,
@@ -707,9 +743,18 @@ PREHOOK: Input: dummydb@uservisits_in_dummy_db
POSTHOOK: query: describe formatted dummydb.UserVisits_in_dummy_db destURL
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: dummydb@uservisits_in_dummy_db
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-destURL string 0 55 48.945454545454545 96 HL from deserializer
+col_name destURL
+data_type string
+min
+max
+num_nulls 0
+distinct_count 55
+avg_col_len 48.945454545454545
+max_col_len 96
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"ccode\":\"true\",\"desturl\":\"true\",\"lcode\":\"true\",\"skeyword\":\"true\",\"sourceip\":\"true\",\"useragent\":\"true\",\"visitdate\":\"true\"}}
PREHOOK: query: describe formatted dummydb.UserVisits_in_dummy_db adRevenue
PREHOOK: type: DESCTABLE
@@ -717,9 +762,18 @@ PREHOOK: Input: dummydb@uservisits_in_dummy_db
POSTHOOK: query: describe formatted dummydb.UserVisits_in_dummy_db adRevenue
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: dummydb@uservisits_in_dummy_db
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-adRevenue float 13.099044799804688 492.98870849609375 0 55 HL from deserializer
+col_name adRevenue
+data_type float
+min 13.099044799804688
+max 492.98870849609375
+num_nulls 0
+distinct_count 55
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"ccode\":\"true\",\"desturl\":\"true\",\"lcode\":\"true\",\"skeyword\":\"true\",\"sourceip\":\"true\",\"useragent\":\"true\",\"visitdate\":\"true\"}}
PREHOOK: query: describe formatted dummydb.UserVisits_in_dummy_db avgTimeOnSite
PREHOOK: type: DESCTABLE
@@ -727,9 +781,18 @@ PREHOOK: Input: dummydb@uservisits_in_dummy_db
POSTHOOK: query: describe formatted dummydb.UserVisits_in_dummy_db avgTimeOnSite
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: dummydb@uservisits_in_dummy_db
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-avgTimeOnSite int 1 9 0 9 HL from deserializer
+col_name avgTimeOnSite
+data_type int
+min 1
+max 9
+num_nulls 0
+distinct_count 9
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"ccode\":\"true\",\"desturl\":\"true\",\"lcode\":\"true\",\"skeyword\":\"true\",\"sourceip\":\"true\",\"useragent\":\"true\",\"visitdate\":\"true\"}}
PREHOOK: query: drop table dummydb.UserVisits_in_dummy_db
PREHOOK: type: DROPTABLE
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/combine3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/combine3.q.out b/ql/src/test/results/clientpositive/combine3.q.out
index d84a7ba..c508166 100644
--- a/ql/src/test/results/clientpositive/combine3.q.out
+++ b/ql/src/test/results/clientpositive/combine3.q.out
@@ -51,7 +51,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -69,7 +68,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/compustat_avro.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/compustat_avro.q.out b/ql/src/test/results/clientpositive/compustat_avro.q.out
index db20bef..cdf9d36 100644
--- a/ql/src/test/results/clientpositive/compustat_avro.q.out
+++ b/ql/src/test/results/clientpositive/compustat_avro.q.out
@@ -30,9 +30,18 @@ PREHOOK: Input: default@testavro
POSTHOOK: query: describe formatted testAvro col1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@testavro
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col1 string from deserializer
+col_name col1
+data_type string
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\",\"col4\":\"true\",\"col5\":\"true\",\"col6\":\"true\"}}
PREHOOK: query: analyze table testAvro compute statistics for columns col1,col3
PREHOOK: type: QUERY
@@ -48,7 +57,16 @@ PREHOOK: Input: default@testavro
POSTHOOK: query: describe formatted testAvro col1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@testavro
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-col1 string 0 0 0.0 0 from deserializer
+col_name col1
+data_type string
+min
+max
+num_nulls 0
+distinct_count 0
+avg_col_len 0.0
+max_col_len 0
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\",\"col4\":\"true\",\"col5\":\"true\",\"col6\":\"true\"}}
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/compute_stats_date.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/compute_stats_date.q.out b/ql/src/test/results/clientpositive/compute_stats_date.q.out
index 7043d52..1e6de61 100644
--- a/ql/src/test/results/clientpositive/compute_stats_date.q.out
+++ b/ql/src/test/results/clientpositive/compute_stats_date.q.out
@@ -109,9 +109,18 @@ PREHOOK: Input: default@tab_date
POSTHOOK: query: describe formatted tab_date fl_date
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tab_date
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-fl_date date 2000-11-20 2010-10-29 0 19 HL from deserializer
+col_name fl_date
+data_type date
+min 2000-11-20
+max 2010-10-29
+num_nulls 0
+distinct_count 19
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"fl_date\":\"true\"}}
PREHOOK: query: alter table tab_date update statistics for column fl_date set ('numDVs'='19', 'highValue'='2015-01-01', 'lowValue'='0')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -123,7 +132,16 @@ PREHOOK: Input: default@tab_date
POSTHOOK: query: describe formatted tab_date fl_date
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tab_date
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-fl_date date 1970-01-01 2015-01-01 0 19 HL from deserializer
+col_name fl_date
+data_type date
+min 1970-01-01
+max 2015-01-01
+num_nulls 0
+distinct_count 19
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"fl_date\":\"true\"}}
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/confirm_initial_tbl_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/confirm_initial_tbl_stats.q.out b/ql/src/test/results/clientpositive/confirm_initial_tbl_stats.q.out
index 10dbd24..a900194 100644
--- a/ql/src/test/results/clientpositive/confirm_initial_tbl_stats.q.out
+++ b/ql/src/test/results/clientpositive/confirm_initial_tbl_stats.q.out
@@ -14,9 +14,18 @@ PREHOOK: Input: default@src
POSTHOOK: query: describe formatted src key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 309 2.812 3 HL from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 309
+avg_col_len 2.812
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: describe extended src1
PREHOOK: type: DESCTABLE
@@ -34,9 +43,18 @@ PREHOOK: Input: default@src1
POSTHOOK: query: describe formatted src1 value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 19 4.92 7 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 19
+avg_col_len 4.92
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: describe extended src_json
PREHOOK: type: DESCTABLE
@@ -53,9 +71,18 @@ PREHOOK: Input: default@src_json
POSTHOOK: query: describe formatted src_json json
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_json
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-json string 0 1 644.0 644 HL from deserializer
+col_name json
+data_type string
+min
+max
+num_nulls 0
+distinct_count 1
+avg_col_len 644.0
+max_col_len 644
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"json\":\"true\"}}
PREHOOK: query: describe extended src_sequencefile
PREHOOK: type: DESCTABLE
@@ -73,9 +100,18 @@ PREHOOK: Input: default@src_sequencefile
POSTHOOK: query: describe formatted src_sequencefile value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_sequencefile
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 309 6.812 7 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 309
+avg_col_len 6.812
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: describe extended srcbucket
PREHOOK: type: DESCTABLE
@@ -93,9 +129,18 @@ PREHOOK: Input: default@srcbucket
POSTHOOK: query: describe formatted srcbucket value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@srcbucket
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 430 6.802 7 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 430
+avg_col_len 6.802
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: describe extended srcbucket2
PREHOOK: type: DESCTABLE
@@ -113,9 +158,18 @@ PREHOOK: Input: default@srcbucket2
POSTHOOK: query: describe formatted srcbucket2 value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@srcbucket2
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 309 6.812 7 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 309
+avg_col_len 6.812
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: describe extended srcpart
PREHOOK: type: DESCTABLE
@@ -130,7 +184,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -141,9 +194,18 @@ PREHOOK: Input: default@srcpart
POSTHOOK: query: describe formatted srcpart PARTITION (ds="2008-04-09", hr="12") key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@srcpart
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 309 2.812 3 HL from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 309
+avg_col_len 2.812
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe extended alltypesorc
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@alltypesorc
@@ -170,9 +232,18 @@ PREHOOK: Input: default@alltypesorc
POSTHOOK: query: describe formatted alltypesorc ctinyint
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alltypesorc
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-ctinyint tinyint -64 62 3115 127 HL from deserializer
+col_name ctinyint
+data_type tinyint
+min -64
+max 62
+num_nulls 3115
+distinct_count 127
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"cbigint\":\"true\",\"cboolean1\":\"true\",\"cboolean2\":\"true\",\"cdouble\":\"true\",\"cfloat\":\"true\",\"cint\":\"true\",\"csmallint\":\"true\",\"cstring1\":\"true\",\"cstring2\":\"true\",\"ctimestamp1\":\"true\",\"ctimestamp2\":\"true\",\"ctinyint\":\"true\"}}
PREHOOK: query: describe formatted alltypesorc cfloat
PREHOOK: type: DESCTABLE
@@ -180,9 +251,18 @@ PREHOOK: Input: default@alltypesorc
POSTHOOK: query: describe formatted alltypesorc cfloat
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alltypesorc
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-cfloat float -64.0 79.5530014038086 3115 131 HL from deserializer
+col_name cfloat
+data_type float
+min -64.0
+max 79.5530014038086
+num_nulls 3115
+distinct_count 131
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"cbigint\":\"true\",\"cboolean1\":\"true\",\"cboolean2\":\"true\",\"cdouble\":\"true\",\"cfloat\":\"true\",\"cint\":\"true\",\"csmallint\":\"true\",\"cstring1\":\"true\",\"cstring2\":\"true\",\"ctimestamp1\":\"true\",\"ctimestamp2\":\"true\",\"ctinyint\":\"true\"}}
PREHOOK: query: describe formatted alltypesorc ctimestamp1
PREHOOK: type: DESCTABLE
@@ -190,9 +270,18 @@ PREHOOK: Input: default@alltypesorc
POSTHOOK: query: describe formatted alltypesorc ctimestamp1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alltypesorc
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-ctimestamp1 timestamp -30 31 3115 35 HL from deserializer
+col_name ctimestamp1
+data_type timestamp
+min -30
+max 31
+num_nulls 3115
+distinct_count 35
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"cbigint\":\"true\",\"cboolean1\":\"true\",\"cboolean2\":\"true\",\"cdouble\":\"true\",\"cfloat\":\"true\",\"cint\":\"true\",\"csmallint\":\"true\",\"cstring1\":\"true\",\"cstring2\":\"true\",\"ctimestamp1\":\"true\",\"ctimestamp2\":\"true\",\"ctinyint\":\"true\"}}
PREHOOK: query: describe formatted alltypesorc cboolean2
PREHOOK: type: DESCTABLE
@@ -200,7 +289,16 @@ PREHOOK: Input: default@alltypesorc
POSTHOOK: query: describe formatted alltypesorc cboolean2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alltypesorc
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-cboolean2 boolean 3115 3983 5190 from deserializer
+col_name cboolean2
+data_type boolean
+min
+max
+num_nulls 3115
+distinct_count
+avg_col_len
+max_col_len
+num_trues 3983
+num_falses 5190
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"cbigint\":\"true\",\"cboolean1\":\"true\",\"cboolean2\":\"true\",\"cdouble\":\"true\",\"cfloat\":\"true\",\"cint\":\"true\",\"csmallint\":\"true\",\"cstring1\":\"true\",\"cstring2\":\"true\",\"ctimestamp1\":\"true\",\"ctimestamp2\":\"true\",\"ctinyint\":\"true\"}}
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/convert_enum_to_string.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/convert_enum_to_string.q.out b/ql/src/test/results/clientpositive/convert_enum_to_string.q.out
index b9b8324..d1d2f2e 100644
--- a/ql/src/test/results/clientpositive/convert_enum_to_string.q.out
+++ b/ql/src/test/results/clientpositive/convert_enum_to_string.q.out
@@ -46,5 +46,4 @@ b string
# Partition Information
# col_name data_type comment
-
b string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out b/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out
index f661c5d..e74be62 100644
--- a/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out
+++ b/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out
@@ -15,7 +15,6 @@ POSTHOOK: query: describe formatted stored_as_dirs_multiple
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stored_as_dirs_multiple
# col_name data_type comment
-
col1 string
col2 int
col3 string
@@ -62,7 +61,6 @@ POSTHOOK: query: describe formatted stored_as_dirs_multiple
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stored_as_dirs_multiple
# col_name data_type comment
-
col1 string
col2 int
col3 string
@@ -109,7 +107,6 @@ POSTHOOK: query: describe formatted stored_as_dirs_multiple
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stored_as_dirs_multiple
# col_name data_type comment
-
col1 string
col2 int
col3 string
@@ -164,7 +161,6 @@ POSTHOOK: query: describe formatted stored_as_dirs_single
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stored_as_dirs_single
# col_name data_type comment
-
key string
value string
@@ -211,7 +207,6 @@ POSTHOOK: query: describe formatted stored_as_dirs_single
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stored_as_dirs_single
# col_name data_type comment
-
key string
value string
@@ -257,7 +252,6 @@ POSTHOOK: query: describe formatted stored_as_dirs_single
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stored_as_dirs_single
# col_name data_type comment
-
key string
value string
@@ -304,7 +298,6 @@ POSTHOOK: query: describe formatted stored_as_dirs_single_like
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stored_as_dirs_single_like
# col_name data_type comment
-
key string
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/create_like.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_like.q.out b/ql/src/test/results/clientpositive/create_like.q.out
index a5c0c73..7c26a59 100644
--- a/ql/src/test/results/clientpositive/create_like.q.out
+++ b/ql/src/test/results/clientpositive/create_like.q.out
@@ -13,7 +13,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table1
# col_name data_type comment
-
a string
b string
@@ -56,7 +55,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table2
# col_name data_type comment
-
a string
b string
@@ -107,7 +105,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table3
# col_name data_type comment
-
a string
b string
@@ -342,7 +339,6 @@ POSTHOOK: query: DESCRIBE FORMATTED doctors
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@doctors
# col_name data_type comment
-
number int Order of playing the role
first_name string first name of actor playing role
last_name string last name of actor playing role
@@ -411,7 +407,6 @@ POSTHOOK: query: DESCRIBE FORMATTED doctors2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@doctors2
# col_name data_type comment
-
number int Order of playing the role
first_name string first name of actor playing role
last_name string last name of actor playing role
@@ -485,7 +480,6 @@ POSTHOOK: query: DESCRIBE FORMATTED LikePropertiedParquetTable
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@likepropertiedparquettable
# col_name data_type comment
-
a int
b string
@@ -529,7 +523,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table5
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table5
# col_name data_type comment
-
col1 int
col2 string
@@ -572,7 +565,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table6
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table6
# col_name data_type comment
-
col1 int
col2 string
@@ -625,7 +617,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table6
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table6
# col_name data_type comment
-
col1 int
col2 string
@@ -683,7 +674,6 @@ POSTHOOK: query: describe formatted orc_table_using_like
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_table_using_like
# col_name data_type comment
-
time string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/create_like2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_like2.q.out b/ql/src/test/results/clientpositive/create_like2.q.out
index 157c3c9..601b929 100644
--- a/ql/src/test/results/clientpositive/create_like2.q.out
+++ b/ql/src/test/results/clientpositive/create_like2.q.out
@@ -29,7 +29,6 @@ POSTHOOK: query: DESC FORMATTED table2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table2
# col_name data_type comment
-
a int
b string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/create_like_tbl_props.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_like_tbl_props.q.out b/ql/src/test/results/clientpositive/create_like_tbl_props.q.out
index c242f3d..e324749 100644
--- a/ql/src/test/results/clientpositive/create_like_tbl_props.q.out
+++ b/ql/src/test/results/clientpositive/create_like_tbl_props.q.out
@@ -13,7 +13,6 @@ POSTHOOK: query: DESC FORMATTED test_table
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string default
value string default
@@ -57,7 +56,6 @@ POSTHOOK: query: DESC FORMATTED test_table1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table1
# col_name data_type comment
-
key string default
value string default
@@ -101,7 +99,6 @@ POSTHOOK: query: DESC FORMATTED test_table2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table2
# col_name data_type comment
-
key string default
value string default
@@ -146,7 +143,6 @@ POSTHOOK: query: DESC FORMATTED test_table3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table3
# col_name data_type comment
-
key string default
value string default
@@ -203,7 +199,6 @@ POSTHOOK: query: DESC FORMATTED test_table4
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table4
# col_name data_type comment
-
key string
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/create_like_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_like_view.q.out b/ql/src/test/results/clientpositive/create_like_view.q.out
index 756934b..25b927b 100644
--- a/ql/src/test/results/clientpositive/create_like_view.q.out
+++ b/ql/src/test/results/clientpositive/create_like_view.q.out
@@ -37,7 +37,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table1
# col_name data_type comment
-
a string
b string
@@ -100,7 +99,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table2
# col_name data_type comment
-
a string
b string
@@ -159,7 +157,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table3
# col_name data_type comment
-
a string
b string
@@ -278,13 +275,11 @@ POSTHOOK: query: describe formatted table1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/create_or_replace_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_or_replace_view.q.out b/ql/src/test/results/clientpositive/create_or_replace_view.q.out
index 6cf1e5a..8383951 100644
--- a/ql/src/test/results/clientpositive/create_or_replace_view.q.out
+++ b/ql/src/test/results/clientpositive/create_or_replace_view.q.out
@@ -25,7 +25,6 @@ POSTHOOK: query: describe formatted vt.v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: vt@v
# col_name data_type comment
-
key string
value string
ds string
@@ -110,13 +109,11 @@ POSTHOOK: query: describe formatted vt.v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: vt@v
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -209,12 +206,10 @@ POSTHOOK: query: describe formatted vt.v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: vt@v
# col_name data_type comment
-
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -283,13 +278,11 @@ POSTHOOK: query: describe formatted vt.v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: vt@v
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -381,13 +374,11 @@ POSTHOOK: query: describe formatted vt.v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: vt@v
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/create_skewed_table1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_skewed_table1.q.out b/ql/src/test/results/clientpositive/create_skewed_table1.q.out
index df927a7..cc647a3 100644
--- a/ql/src/test/results/clientpositive/create_skewed_table1.q.out
+++ b/ql/src/test/results/clientpositive/create_skewed_table1.q.out
@@ -29,7 +29,6 @@ POSTHOOK: query: describe formatted list_bucket_single_2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucket_single_2
# col_name data_type comment
-
key string
value string
@@ -66,7 +65,6 @@ POSTHOOK: query: describe formatted list_bucket_single
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucket_single
# col_name data_type comment
-
key string
value string
@@ -103,7 +101,6 @@ POSTHOOK: query: describe formatted list_bucket_multiple
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucket_multiple
# col_name data_type comment
-
col1 string
col2 int
col3 string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/create_table_like_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_table_like_stats.q.out b/ql/src/test/results/clientpositive/create_table_like_stats.q.out
index bd559c0..f88c50c 100644
--- a/ql/src/test/results/clientpositive/create_table_like_stats.q.out
+++ b/ql/src/test/results/clientpositive/create_table_like_stats.q.out
@@ -17,7 +17,6 @@ POSTHOOK: query: desc formatted a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@a
# col_name data_type comment
-
key string default
value string default
@@ -70,7 +69,6 @@ POSTHOOK: query: desc formatted a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@a
# col_name data_type comment
-
key string default
value string default
@@ -122,13 +120,11 @@ POSTHOOK: query: desc formatted a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@a
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -180,13 +176,11 @@ POSTHOOK: query: desc formatted a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@a
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/create_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_view.q.out b/ql/src/test/results/clientpositive/create_view.q.out
index 823b716..8763fdb 100644
--- a/ql/src/test/results/clientpositive/create_view.q.out
+++ b/ql/src/test/results/clientpositive/create_view.q.out
@@ -247,7 +247,6 @@ POSTHOOK: query: DESCRIBE FORMATTED view1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@view1
# col_name data_type comment
-
value string
# Detailed Table Information
@@ -296,7 +295,6 @@ POSTHOOK: query: DESCRIBE FORMATTED view2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@view2
# col_name data_type comment
-
key string
value string
@@ -344,7 +342,6 @@ POSTHOOK: query: DESCRIBE FORMATTED view3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@view3
# col_name data_type comment
-
valoo string
# Detailed Table Information
@@ -393,7 +390,6 @@ POSTHOOK: query: DESCRIBE FORMATTED view3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@view3
# col_name data_type comment
-
valoo string
# Detailed Table Information
@@ -739,7 +735,6 @@ POSTHOOK: query: DESCRIBE FORMATTED view8
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@view8
# col_name data_type comment
-
c string
# Detailed Table Information
@@ -817,7 +812,6 @@ POSTHOOK: query: DESCRIBE FORMATTED view9
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@view9
# col_name data_type comment
-
m int
# Detailed Table Information
@@ -895,7 +889,6 @@ POSTHOOK: query: DESCRIBE FORMATTED view9
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@view9
# col_name data_type comment
-
m int
# Detailed Table Information
@@ -963,7 +956,6 @@ POSTHOOK: query: DESCRIBE FORMATTED view10
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@view10
# col_name data_type comment
-
key string
value string
@@ -1040,7 +1032,6 @@ POSTHOOK: query: DESCRIBE FORMATTED view11
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@view11
# col_name data_type comment
-
boom int
# Detailed Table Information
@@ -1112,7 +1103,6 @@ POSTHOOK: query: DESCRIBE FORMATTED view12
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@view12
# col_name data_type comment
-
key string
value string
mycol int
@@ -1197,7 +1187,6 @@ POSTHOOK: query: DESCRIBE FORMATTED view13
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@view13
# col_name data_type comment
-
key int
# Detailed Table Information
@@ -1318,7 +1307,6 @@ POSTHOOK: query: DESCRIBE FORMATTED view14
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@view14
# col_name data_type comment
-
k1 string
v1 string
k2 string
@@ -1437,7 +1425,6 @@ POSTHOOK: query: DESCRIBE FORMATTED view15
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@view15
# col_name data_type comment
-
key string
value_count bigint
@@ -1523,7 +1510,6 @@ POSTHOOK: query: DESCRIBE FORMATTED view16
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@view16
# col_name data_type comment
-
value string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/create_view_defaultformats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_view_defaultformats.q.out b/ql/src/test/results/clientpositive/create_view_defaultformats.q.out
index 1ac20c2..71df2b2 100644
--- a/ql/src/test/results/clientpositive/create_view_defaultformats.q.out
+++ b/ql/src/test/results/clientpositive/create_view_defaultformats.q.out
@@ -37,7 +37,6 @@ POSTHOOK: query: describe formatted sfsrc
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@sfsrc
# col_name data_type comment
-
key string
value string
@@ -69,7 +68,6 @@ POSTHOOK: query: describe formatted rcsrc
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@rcsrc
# col_name data_type comment
-
key string
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/create_view_partitioned.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_view_partitioned.q.out b/ql/src/test/results/clientpositive/create_view_partitioned.q.out
index b1bf7d6..fc90317 100644
--- a/ql/src/test/results/clientpositive/create_view_partitioned.q.out
+++ b/ql/src/test/results/clientpositive/create_view_partitioned.q.out
@@ -42,7 +42,6 @@ value string
# Partition Information
# col_name data_type comment
-
value string
#### A masked pattern was here ####
@@ -57,12 +56,10 @@ POSTHOOK: query: DESCRIBE FORMATTED vp1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@vp1
# col_name data_type comment
-
key string
# Partition Information
# col_name data_type comment
-
value string
# Detailed Table Information
@@ -256,14 +253,12 @@ POSTHOOK: query: DESCRIBE FORMATTED vp2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@vp2
# col_name data_type comment
-
key string
value string
ds string
# Partition Information
# col_name data_type comment
-
hr string
# Detailed Table Information
@@ -375,12 +370,10 @@ POSTHOOK: query: DESCRIBE FORMATTED vp3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@vp3
# col_name data_type comment
-
k string
# Partition Information
# col_name data_type comment
-
v string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/create_view_translate.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_view_translate.q.out b/ql/src/test/results/clientpositive/create_view_translate.q.out
index db9fd78..e574897 100644
--- a/ql/src/test/results/clientpositive/create_view_translate.q.out
+++ b/ql/src/test/results/clientpositive/create_view_translate.q.out
@@ -24,7 +24,6 @@ POSTHOOK: query: describe formatted v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@v
# col_name data_type comment
-
key string
# Detailed Table Information
@@ -71,7 +70,6 @@ POSTHOOK: query: describe formatted w
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@w
# col_name data_type comment
-
key string
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/create_with_constraints.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_with_constraints.q.out b/ql/src/test/results/clientpositive/create_with_constraints.q.out
index 50a6d05..a675a0e 100644
--- a/ql/src/test/results/clientpositive/create_with_constraints.q.out
+++ b/ql/src/test/results/clientpositive/create_with_constraints.q.out
@@ -358,7 +358,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table1
# col_name data_type comment
-
a string
b string
@@ -400,7 +399,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table2
# col_name data_type comment
-
a string
b string
@@ -442,7 +440,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table3
# col_name data_type comment
-
x string
# Detailed Table Information
@@ -495,7 +492,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table4
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table4
# col_name data_type comment
-
x string
y string
@@ -556,7 +552,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table5
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table5
# col_name data_type comment
-
x string
# Detailed Table Information
@@ -603,7 +598,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table6
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table6
# col_name data_type comment
-
x string
y string
@@ -654,7 +648,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table7
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table7
# col_name data_type comment
-
a string
b string
@@ -696,7 +689,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table8
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table8
# col_name data_type comment
-
a string
b string
@@ -738,7 +730,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table9
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table9
# col_name data_type comment
-
a string
b string
@@ -780,7 +771,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table10
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table10
# col_name data_type comment
-
a string
b string
@@ -829,7 +819,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table11
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table11
# col_name data_type comment
-
a string
b string
c string
@@ -879,7 +868,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table12
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table12
# col_name data_type comment
-
a string
b string
@@ -922,7 +910,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table13
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table13
# col_name data_type comment
-
a string
b string
@@ -965,7 +952,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table14
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table14
# col_name data_type comment
-
a string
b string
@@ -1008,7 +994,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table15
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table15
# col_name data_type comment
-
a string
b string
@@ -1043,7 +1028,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table16
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table16
# col_name data_type comment
-
a string
b string
@@ -1078,7 +1062,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table17
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table17
# col_name data_type comment
-
a string
b string
@@ -1121,7 +1104,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table18
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table18
# col_name data_type comment
-
a string
b string
@@ -1252,7 +1234,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table2
# col_name data_type comment
-
a string
b string
@@ -1287,7 +1268,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table3
# col_name data_type comment
-
x string
# Detailed Table Information
@@ -1334,7 +1314,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table4
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table4
# col_name data_type comment
-
x string
y string
@@ -1383,7 +1362,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table6
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table6
# col_name data_type comment
-
x string
y string
@@ -1425,7 +1403,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table16
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table16
# col_name data_type comment
-
a string
b string
@@ -1460,7 +1437,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table18
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table18
# col_name data_type comment
-
a string
b string
@@ -1519,7 +1495,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table2
# col_name data_type comment
-
a string
b string
@@ -1561,7 +1536,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table3
# col_name data_type comment
-
x string
# Detailed Table Information
@@ -1614,7 +1588,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table6
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table6
# col_name data_type comment
-
x string
y string
@@ -1665,7 +1638,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table16
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table16
# col_name data_type comment
-
a string
b string
@@ -1701,7 +1673,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table18
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table18
# col_name data_type comment
-
a string
b string
@@ -1761,7 +1732,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table12
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table12
# col_name data_type comment
-
a string
b string
@@ -1808,7 +1778,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table13
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table13
# col_name data_type comment
-
a string
b string
@@ -1859,7 +1828,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table12
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table12
# col_name data_type comment
-
a string
b string
@@ -1941,7 +1909,6 @@ POSTHOOK: query: DESCRIBE FORMATTED DbConstraint.Table2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: dbconstraint@table2
# col_name data_type comment
-
a string
b string
@@ -2004,7 +1971,6 @@ POSTHOOK: query: DESCRIBE FORMATTED DbConstraint.Table2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: dbconstraint@table2
# col_name data_type comment
-
a string
b string
@@ -2051,7 +2017,6 @@ POSTHOOK: query: DESCRIBE FORMATTED DbConstraint.Table2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: dbconstraint@table2
# col_name data_type comment
-
a string
b string
@@ -2103,7 +2068,6 @@ POSTHOOK: query: DESCRIBE FORMATTED DbConstraint.Table2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: dbconstraint@table2
# col_name data_type comment
-
a string
b string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/ctas.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ctas.q.out b/ql/src/test/results/clientpositive/ctas.q.out
index c1b0838..1764c6b 100644
--- a/ql/src/test/results/clientpositive/ctas.q.out
+++ b/ql/src/test/results/clientpositive/ctas.q.out
@@ -137,7 +137,6 @@ POSTHOOK: query: describe formatted nzhang_CTAS1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_ctas1
# col_name data_type comment
-
k string
value string
@@ -288,7 +287,6 @@ POSTHOOK: query: describe formatted nzhang_CTAS2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_ctas2
# col_name data_type comment
-
key string
value string
@@ -439,7 +437,6 @@ POSTHOOK: query: describe formatted nzhang_CTAS3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_ctas3
# col_name data_type comment
-
half_key double
conb string
@@ -503,7 +500,6 @@ POSTHOOK: query: describe formatted nzhang_CTAS3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_ctas3
# col_name data_type comment
-
half_key double
conb string
@@ -655,7 +651,6 @@ POSTHOOK: query: describe formatted nzhang_CTAS4
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_ctas4
# col_name data_type comment
-
key string
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/ctas_colname.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ctas_colname.q.out b/ql/src/test/results/clientpositive/ctas_colname.q.out
index 8d61c9d..795517d 100644
--- a/ql/src/test/results/clientpositive/ctas_colname.q.out
+++ b/ql/src/test/results/clientpositive/ctas_colname.q.out
@@ -85,7 +85,6 @@ POSTHOOK: query: describe formatted summary
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@summary
# col_name data_type comment
-
key string
value string
_c1 double
@@ -244,7 +243,6 @@ POSTHOOK: query: describe formatted x4
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@x4
# col_name data_type comment
-
key string
value string
rr int
@@ -435,7 +433,6 @@ POSTHOOK: query: describe formatted x5
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@x5
# col_name data_type comment
-
key string
value string
lead1 string
@@ -606,7 +603,6 @@ POSTHOOK: query: describe formatted x6
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@x6
# col_name data_type comment
-
key string
value string
_c1 double
@@ -757,7 +753,6 @@ POSTHOOK: query: describe formatted x7
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@x7
# col_name data_type comment
-
_col0 string
_col1 string
_c1 bigint
@@ -1191,7 +1186,6 @@ POSTHOOK: query: describe formatted x8
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@x8
# col_name data_type comment
-
_col0 string
_col1 string
_c1 bigint
@@ -1327,7 +1321,6 @@ POSTHOOK: query: describe formatted x9
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@x9
# col_name data_type comment
-
_c0 string
key string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out b/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out
index ed6d2bc..fe5cf87 100644
--- a/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out
+++ b/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out
@@ -125,7 +125,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table_db1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: db1@table_db1
# col_name data_type comment
-
key string
value string
[05/21] hive git commit: HIVE-17519: Transpose column stats display
(Zoltan Haindrich, reviewed by Ashutosh Chauhan and Vineet Garg)
Posted by kg...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/extrapolate_part_stats_partial_ndv.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/extrapolate_part_stats_partial_ndv.q.out b/ql/src/test/results/clientpositive/llap/extrapolate_part_stats_partial_ndv.q.out
index 6b6ba4d..1ac5977 100644
--- a/ql/src/test/results/clientpositive/llap/extrapolate_part_stats_partial_ndv.q.out
+++ b/ql/src/test/results/clientpositive/llap/extrapolate_part_stats_partial_ndv.q.out
@@ -113,72 +113,144 @@ PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d PARTITION(year='2001') state
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-state string 0 3 0.75 2 HL from deserializer
+col_name state
+data_type string
+min
+max
+num_nulls 0
+distinct_count 3
+avg_col_len 0.75
+max_col_len 2
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2002') state
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d PARTITION(year='2002') state
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-state string 0 6 3.0 3 HL from deserializer
+col_name state
+data_type string
+min
+max
+num_nulls 0
+distinct_count 6
+avg_col_len 3.0
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2001') locid
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d PARTITION(year='2001') locid
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-locid double 1.0 4.0 0 4 HL from deserializer
+col_name locid
+data_type double
+min 1.0
+max 4.0
+num_nulls 0
+distinct_count 4
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2002') locid
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d PARTITION(year='2002') locid
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-locid double 1.0 5.0 0 5 HL from deserializer
+col_name locid
+data_type double
+min 1.0
+max 5.0
+num_nulls 0
+distinct_count 5
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2001') cnt
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d PARTITION(year='2001') cnt
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-cnt decimal(10,0) 10 2000 0 4 HL from deserializer
+col_name cnt
+data_type decimal(10,0)
+min 10
+max 2000
+num_nulls 0
+distinct_count 4
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2002') cnt
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d PARTITION(year='2002') cnt
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-cnt decimal(10,0) 10 910 0 4 HL from deserializer
+col_name cnt
+data_type decimal(10,0)
+min 10
+max 910
+num_nulls 0
+distinct_count 4
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2001') zip
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d PARTITION(year='2001') zip
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-zip int 43201 94087 0 3 HL from deserializer
+col_name zip
+data_type int
+min 43201
+max 94087
+num_nulls 0
+distinct_count 3
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2002') zip
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d PARTITION(year='2002') zip
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-zip int 43201 94087 0 3 HL from deserializer
+col_name zip
+data_type int
+min 43201
+max 94087
+num_nulls 0
+distinct_count 3
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: explain extended select state,locid,cnt,zip from loc_orc_1d
PREHOOK: type: QUERY
POSTHOOK: query: explain extended select state,locid,cnt,zip from loc_orc_1d
@@ -414,72 +486,144 @@ PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d PARTITION(year='2000') state
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-state string 0 2 0.5 1 HL from deserializer
+col_name state
+data_type string
+min
+max
+num_nulls 0
+distinct_count 2
+avg_col_len 0.5
+max_col_len 1
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2003') state
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d PARTITION(year='2003') state
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-state string 0 3 1.25 4 HL from deserializer
+col_name state
+data_type string
+min
+max
+num_nulls 0
+distinct_count 3
+avg_col_len 1.25
+max_col_len 4
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2000') locid
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d PARTITION(year='2000') locid
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-locid double 1.0 2.0 0 2 HL from deserializer
+col_name locid
+data_type double
+min 1.0
+max 2.0
+num_nulls 0
+distinct_count 2
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2003') locid
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d PARTITION(year='2003') locid
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-locid double 1.0 31.0 0 5 HL from deserializer
+col_name locid
+data_type double
+min 1.0
+max 31.0
+num_nulls 0
+distinct_count 5
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2000') cnt
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d PARTITION(year='2000') cnt
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-cnt decimal(10,0) 1000 1010 0 2 HL from deserializer
+col_name cnt
+data_type decimal(10,0)
+min 1000
+max 1010
+num_nulls 0
+distinct_count 2
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2003') cnt
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d PARTITION(year='2003') cnt
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-cnt decimal(10,0) 1000 2000 0 3 HL from deserializer
+col_name cnt
+data_type decimal(10,0)
+min 1000
+max 2000
+num_nulls 0
+distinct_count 3
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2000') zip
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d PARTITION(year='2000') zip
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-zip int 94086 94087 0 2 HL from deserializer
+col_name zip
+data_type int
+min 94086
+max 94087
+num_nulls 0
+distinct_count 2
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2003') zip
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d PARTITION(year='2003') zip
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-zip int 43201 94087 0 3 HL from deserializer
+col_name zip
+data_type int
+min 43201
+max 94087
+num_nulls 0
+distinct_count 3
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: explain extended select state,locid,cnt,zip from loc_orc_1d
PREHOOK: type: QUERY
POSTHOOK: query: explain extended select state,locid,cnt,zip from loc_orc_1d
@@ -786,54 +930,108 @@ PREHOOK: Input: default@loc_orc_2d
POSTHOOK: query: describe formatted loc_orc_2d partition(zip=94086, year='2001') state
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_2d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-state string 0 2 0.5 1 HL from deserializer
+col_name state
+data_type string
+min
+max
+num_nulls 0
+distinct_count 2
+avg_col_len 0.5
+max_col_len 1
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_2d partition(zip=94087, year='2002') state
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_2d
POSTHOOK: query: describe formatted loc_orc_2d partition(zip=94087, year='2002') state
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_2d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-state string 0 3 3.0 3 HL from deserializer
+col_name state
+data_type string
+min
+max
+num_nulls 0
+distinct_count 3
+avg_col_len 3.0
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_2d partition(zip=94086, year='2001') locid
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_2d
POSTHOOK: query: describe formatted loc_orc_2d partition(zip=94086, year='2001') locid
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_2d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-locid int 2 3 0 2 HL from deserializer
+col_name locid
+data_type int
+min 2
+max 3
+num_nulls 0
+distinct_count 2
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_2d partition(zip=94087, year='2002') locid
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_2d
POSTHOOK: query: describe formatted loc_orc_2d partition(zip=94087, year='2002') locid
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_2d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-locid int 1 5 0 3 HL from deserializer
+col_name locid
+data_type int
+min 1
+max 5
+num_nulls 0
+distinct_count 3
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_2d partition(zip=94086, year='2001') cnt
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_2d
POSTHOOK: query: describe formatted loc_orc_2d partition(zip=94086, year='2001') cnt
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_2d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-cnt decimal(10,0) 1000 2000 0 2 HL from deserializer
+col_name cnt
+data_type decimal(10,0)
+min 1000
+max 2000
+num_nulls 0
+distinct_count 2
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_2d partition(zip=94087, year='2002') cnt
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_2d
POSTHOOK: query: describe formatted loc_orc_2d partition(zip=94087, year='2002') cnt
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_2d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-cnt decimal(10,0) 10 100 0 2 HL from deserializer
+col_name cnt
+data_type decimal(10,0)
+min 10
+max 100
+num_nulls 0
+distinct_count 2
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: explain extended select state,locid,cnt,zip from loc_orc_2d
PREHOOK: type: QUERY
POSTHOOK: query: explain extended select state,locid,cnt,zip from loc_orc_2d
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/infer_bucket_sort_bucketed_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_bucketed_table.q.out b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_bucketed_table.q.out
index 1efb81b..876c858 100644
--- a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_bucketed_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_bucketed_table.q.out
@@ -27,13 +27,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table_bucketed PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table_bucketed
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out
index cdb688b..23c28e0 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out
@@ -188,13 +188,11 @@ POSTHOOK: query: desc formatted list_bucketing_static_part partition (ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_static_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/load_dyn_part1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/load_dyn_part1.q.out b/ql/src/test/results/clientpositive/llap/load_dyn_part1.q.out
index 6ad9af8..41f93cc 100644
--- a/ql/src/test/results/clientpositive/llap/load_dyn_part1.q.out
+++ b/ql/src/test/results/clientpositive/llap/load_dyn_part1.q.out
@@ -37,7 +37,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/load_dyn_part2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/load_dyn_part2.q.out b/ql/src/test/results/clientpositive/llap/load_dyn_part2.q.out
index ce5517a..f15226b 100644
--- a/ql/src/test/results/clientpositive/llap/load_dyn_part2.q.out
+++ b/ql/src/test/results/clientpositive/llap/load_dyn_part2.q.out
@@ -23,7 +23,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/load_dyn_part3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/load_dyn_part3.q.out b/ql/src/test/results/clientpositive/llap/load_dyn_part3.q.out
index b34975f..fd24a05 100644
--- a/ql/src/test/results/clientpositive/llap/load_dyn_part3.q.out
+++ b/ql/src/test/results/clientpositive/llap/load_dyn_part3.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/load_dyn_part5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/load_dyn_part5.q.out b/ql/src/test/results/clientpositive/llap/load_dyn_part5.q.out
index 9c4e8a8..8e2bf0c 100644
--- a/ql/src/test/results/clientpositive/llap/load_dyn_part5.q.out
+++ b/ql/src/test/results/clientpositive/llap/load_dyn_part5.q.out
@@ -17,7 +17,6 @@ value string
# Partition Information
# col_name data_type comment
-
value string
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_analyze.q.out b/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
index 1cc9d61..2cecf4e 100644
--- a/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
@@ -82,7 +82,6 @@ POSTHOOK: query: desc formatted orc_create_people
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -130,7 +129,6 @@ POSTHOOK: query: desc formatted orc_create_people
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -178,7 +176,6 @@ POSTHOOK: query: desc formatted orc_create_people
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -265,7 +262,6 @@ POSTHOOK: query: desc formatted orc_create_people
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -372,7 +368,6 @@ POSTHOOK: query: desc formatted orc_create_people partition(state="Ca")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -382,7 +377,6 @@ start_date timestamp
# Partition Information
# col_name data_type comment
-
state string
# Detailed Partition Information
@@ -415,7 +409,6 @@ POSTHOOK: query: desc formatted orc_create_people partition(state="Or")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -425,7 +418,6 @@ start_date timestamp
# Partition Information
# col_name data_type comment
-
state string
# Detailed Partition Information
@@ -470,7 +462,6 @@ POSTHOOK: query: desc formatted orc_create_people partition(state="Ca")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -480,7 +471,6 @@ start_date timestamp
# Partition Information
# col_name data_type comment
-
state string
# Detailed Partition Information
@@ -513,7 +503,6 @@ POSTHOOK: query: desc formatted orc_create_people partition(state="Or")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -523,7 +512,6 @@ start_date timestamp
# Partition Information
# col_name data_type comment
-
state string
# Detailed Partition Information
@@ -568,7 +556,6 @@ POSTHOOK: query: desc formatted orc_create_people partition(state="Ca")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -578,7 +565,6 @@ start_date timestamp
# Partition Information
# col_name data_type comment
-
state string
# Detailed Partition Information
@@ -611,7 +597,6 @@ POSTHOOK: query: desc formatted orc_create_people partition(state="Or")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -621,7 +606,6 @@ start_date timestamp
# Partition Information
# col_name data_type comment
-
state string
# Detailed Partition Information
@@ -709,7 +693,6 @@ POSTHOOK: query: desc formatted orc_create_people partition(state="Ca")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -719,7 +702,6 @@ start_date timestamp
# Partition Information
# col_name data_type comment
-
state string
# Detailed Partition Information
@@ -752,7 +734,6 @@ POSTHOOK: query: desc formatted orc_create_people partition(state="Or")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -762,7 +743,6 @@ start_date timestamp
# Partition Information
# col_name data_type comment
-
state string
# Detailed Partition Information
@@ -868,7 +848,6 @@ POSTHOOK: query: desc formatted orc_create_people partition(state="Ca")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -878,7 +857,6 @@ start_date timestamp
# Partition Information
# col_name data_type comment
-
state string
# Detailed Partition Information
@@ -911,7 +889,6 @@ POSTHOOK: query: desc formatted orc_create_people partition(state="Or")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -921,7 +898,6 @@ start_date timestamp
# Partition Information
# col_name data_type comment
-
state string
# Detailed Partition Information
@@ -966,7 +942,6 @@ POSTHOOK: query: desc formatted orc_create_people partition(state="Ca")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -976,7 +951,6 @@ start_date timestamp
# Partition Information
# col_name data_type comment
-
state string
# Detailed Partition Information
@@ -1009,7 +983,6 @@ POSTHOOK: query: desc formatted orc_create_people partition(state="Or")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -1019,7 +992,6 @@ start_date timestamp
# Partition Information
# col_name data_type comment
-
state string
# Detailed Partition Information
@@ -1064,7 +1036,6 @@ POSTHOOK: query: desc formatted orc_create_people partition(state="Ca")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -1074,7 +1045,6 @@ start_date timestamp
# Partition Information
# col_name data_type comment
-
state string
# Detailed Partition Information
@@ -1107,7 +1077,6 @@ POSTHOOK: query: desc formatted orc_create_people partition(state="Or")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -1117,7 +1086,6 @@ start_date timestamp
# Partition Information
# col_name data_type comment
-
state string
# Detailed Partition Information
@@ -1211,7 +1179,6 @@ POSTHOOK: query: desc formatted orc_create_people partition(state="Ca")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -1221,7 +1188,6 @@ start_date timestamp
# Partition Information
# col_name data_type comment
-
state string
# Detailed Partition Information
@@ -1254,7 +1220,6 @@ POSTHOOK: query: desc formatted orc_create_people partition(state="Or")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -1264,7 +1229,6 @@ start_date timestamp
# Partition Information
# col_name data_type comment
-
state string
# Detailed Partition Information
@@ -1364,7 +1328,6 @@ POSTHOOK: query: desc formatted orc_create_people partition(state="Ca")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -1374,7 +1337,6 @@ start_date timestamp
# Partition Information
# col_name data_type comment
-
state string
# Detailed Partition Information
@@ -1419,7 +1381,6 @@ POSTHOOK: query: desc formatted orc_create_people partition(state="Ca")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -1429,7 +1390,6 @@ start_date timestamp
# Partition Information
# col_name data_type comment
-
state string
# Detailed Partition Information
@@ -1474,7 +1434,6 @@ POSTHOOK: query: desc formatted orc_create_people partition(state="Ca")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_people
# col_name data_type comment
-
id int
first_name string
last_name string
@@ -1484,7 +1443,6 @@ start_date timestamp
# Partition Information
# col_name data_type comment
-
state string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/orc_create.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_create.q.out b/ql/src/test/results/clientpositive/llap/orc_create.q.out
index 7e7c889..44373da 100644
--- a/ql/src/test/results/clientpositive/llap/orc_create.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_create.q.out
@@ -53,7 +53,6 @@ POSTHOOK: query: DESCRIBE FORMATTED orc_create_staging
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_staging
# col_name data_type comment
-
str string
mp map<string,string>
lst array<string>
@@ -105,13 +104,11 @@ POSTHOOK: query: DESCRIBE FORMATTED orc_create
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -164,13 +161,11 @@ POSTHOOK: query: DESCRIBE FORMATTED orc_create
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -213,13 +208,11 @@ POSTHOOK: query: DESCRIBE FORMATTED orc_create
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -273,13 +266,11 @@ POSTHOOK: query: DESCRIBE FORMATTED orc_create
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -332,7 +323,6 @@ POSTHOOK: query: DESCRIBE FORMATTED orc_create_complex
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_create_complex
# col_name data_type comment
-
str string
mp map<string,string>
lst array<string>
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out b/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out
index 9e9f8cf..cce0fda 100644
--- a/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out
@@ -205,7 +205,6 @@ POSTHOOK: query: describe formatted orc_ppd
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_ppd
# col_name data_type comment
-
t tinyint
si smallint
i int
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out b/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out
index 7b52493..ef6908f 100644
--- a/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out
@@ -205,7 +205,6 @@ POSTHOOK: query: describe formatted orc_ppd
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@orc_ppd
# col_name data_type comment
-
t tinyint
si smallint
i int
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/schema_evol_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_stats.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_stats.q.out
index 0a7a85c..282bcb2 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_stats.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_stats.q.out
@@ -57,7 +57,6 @@ POSTHOOK: query: desc formatted partitioned1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partitioned1
# col_name data_type comment
-
a int
b string
c int
@@ -65,7 +64,6 @@ d string
# Partition Information
# col_name data_type comment
-
part int
# Detailed Table Information
@@ -101,13 +99,11 @@ POSTHOOK: query: desc formatted partitioned1 PARTITION(part=1)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partitioned1
# col_name data_type comment
-
a int
b string
# Partition Information
# col_name data_type comment
-
part int
# Detailed Partition Information
@@ -140,7 +136,6 @@ POSTHOOK: query: desc formatted partitioned1 PARTITION(part=2)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partitioned1
# col_name data_type comment
-
a int
b string
c int
@@ -148,7 +143,6 @@ d string
# Partition Information
# col_name data_type comment
-
part int
# Detailed Partition Information
@@ -264,7 +258,6 @@ POSTHOOK: query: desc formatted partitioned1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partitioned1
# col_name data_type comment
-
a int
b string
c int
@@ -272,7 +265,6 @@ d string
# Partition Information
# col_name data_type comment
-
part int
# Detailed Table Information
@@ -308,13 +300,11 @@ POSTHOOK: query: desc formatted partitioned1 PARTITION(part=1)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partitioned1
# col_name data_type comment
-
a int
b string
# Partition Information
# col_name data_type comment
-
part int
# Detailed Partition Information
@@ -347,7 +337,6 @@ POSTHOOK: query: desc formatted partitioned1 PARTITION(part=2)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partitioned1
# col_name data_type comment
-
a int
b string
c int
@@ -355,7 +344,6 @@ d string
# Partition Information
# col_name data_type comment
-
part int
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/selectDistinctStar.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/selectDistinctStar.q.out b/ql/src/test/results/clientpositive/llap/selectDistinctStar.q.out
index c5ca782..befb6e7 100644
--- a/ql/src/test/results/clientpositive/llap/selectDistinctStar.q.out
+++ b/ql/src/test/results/clientpositive/llap/selectDistinctStar.q.out
@@ -1385,7 +1385,6 @@ POSTHOOK: query: describe formatted sdi
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@sdi
# col_name data_type comment
-
key string
value string
@@ -3849,7 +3848,6 @@ POSTHOOK: query: describe formatted sdi
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@sdi
# col_name data_type comment
-
key string
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/stats11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/stats11.q.out b/ql/src/test/results/clientpositive/llap/stats11.q.out
index 59ee96f..2899d8a 100644
--- a/ql/src/test/results/clientpositive/llap/stats11.q.out
+++ b/ql/src/test/results/clientpositive/llap/stats11.q.out
@@ -72,13 +72,11 @@ POSTHOOK: query: desc formatted srcbucket_mapjoin_part partition(ds='2008-04-08'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@srcbucket_mapjoin_part
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -118,13 +116,11 @@ POSTHOOK: query: desc formatted srcbucket_mapjoin_part partition(ds='2008-04-08'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@srcbucket_mapjoin_part
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -164,13 +160,11 @@ POSTHOOK: query: desc formatted srcbucket_mapjoin_part partition(ds='2008-04-08'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@srcbucket_mapjoin_part
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -210,13 +204,11 @@ POSTHOOK: query: desc formatted srcbucket_mapjoin_part partition(ds='2008-04-08'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@srcbucket_mapjoin_part
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/stats_noscan_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/stats_noscan_1.q.out b/ql/src/test/results/clientpositive/llap/stats_noscan_1.q.out
index d6eacf6..6d3e674 100644
--- a/ql/src/test/results/clientpositive/llap/stats_noscan_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/stats_noscan_1.q.out
@@ -77,13 +77,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -115,13 +113,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -153,13 +149,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-09',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -190,13 +184,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-09',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -227,13 +219,11 @@ POSTHOOK: query: describe formatted analyze_srcpart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -340,13 +330,11 @@ POSTHOOK: query: describe formatted analyze_srcpart_partial PARTITION(ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart_partial
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -378,13 +366,11 @@ POSTHOOK: query: describe formatted analyze_srcpart_partial PARTITION(ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart_partial
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -416,13 +402,11 @@ POSTHOOK: query: describe formatted analyze_srcpart_partial PARTITION(ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart_partial
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -453,13 +437,11 @@ POSTHOOK: query: describe formatted analyze_srcpart_partial PARTITION(ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart_partial
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/stats_only_null.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/stats_only_null.q.out b/ql/src/test/results/clientpositive/llap/stats_only_null.q.out
index f25f9d5..ac6c18e 100644
--- a/ql/src/test/results/clientpositive/llap/stats_only_null.q.out
+++ b/ql/src/test/results/clientpositive/llap/stats_only_null.q.out
@@ -231,7 +231,6 @@ POSTHOOK: query: describe formatted stats_null_part partition (dt='2010')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_null_part
# col_name data_type comment
-
a double
b int
c string
@@ -239,7 +238,6 @@ d smallint
# Partition Information
# col_name data_type comment
-
dt string
# Detailed Partition Information
@@ -272,7 +270,6 @@ POSTHOOK: query: describe formatted stats_null_part partition (dt='2011')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_null_part
# col_name data_type comment
-
a double
b int
c string
@@ -280,7 +277,6 @@ d smallint
# Partition Information
# col_name data_type comment
-
dt string
# Detailed Partition Information
@@ -413,9 +409,18 @@ PREHOOK: Input: default@stats_null_part
POSTHOOK: query: describe formatted stats_null_part partition(dt = 1) a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_null_part
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-a double 1.0 1.0 1 1 HL from deserializer
+col_name a
+data_type double
+min 1.0
+max 1.0
+num_nulls 1
+distinct_count 1
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: drop table stats_null
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@stats_null
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/tez_bmj_schema_evolution.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_bmj_schema_evolution.q.out b/ql/src/test/results/clientpositive/llap/tez_bmj_schema_evolution.q.out
index 27c8334..c71db51 100644
--- a/ql/src/test/results/clientpositive/llap/tez_bmj_schema_evolution.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_bmj_schema_evolution.q.out
@@ -64,7 +64,6 @@ p int
# Partition Information
# col_name data_type comment
-
p int
PREHOOK: query: explain select test.key, test.value from test join test1 on (test.key = test1.key) order by test.key
PREHOOK: type: QUERY
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/tez_fsstat.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_fsstat.q.out b/ql/src/test/results/clientpositive/llap/tez_fsstat.q.out
index 133f50c..d6872e4 100644
--- a/ql/src/test/results/clientpositive/llap/tez_fsstat.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_fsstat.q.out
@@ -68,13 +68,11 @@ POSTHOOK: query: describe formatted tab_part partition(ds='2008-04-08')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tab_part
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/tez_schema_evolution.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_schema_evolution.q.out b/ql/src/test/results/clientpositive/llap/tez_schema_evolution.q.out
index 346ec38..a9ff134 100644
--- a/ql/src/test/results/clientpositive/llap/tez_schema_evolution.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_schema_evolution.q.out
@@ -46,7 +46,6 @@ p int
# Partition Information
# col_name data_type comment
-
p int
PREHOOK: query: select * from test where p=1 and key > 0 order by key
PREHOOK: type: QUERY
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/union_fast_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/union_fast_stats.q.out b/ql/src/test/results/clientpositive/llap/union_fast_stats.q.out
index b13c0ee..5cd5d41 100644
--- a/ql/src/test/results/clientpositive/llap/union_fast_stats.q.out
+++ b/ql/src/test/results/clientpositive/llap/union_fast_stats.q.out
@@ -155,7 +155,6 @@ POSTHOOK: query: desc formatted small_alltypesorc_a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@small_alltypesorc_a
# col_name data_type comment
-
ctinyint tinyint
csmallint smallint
cint int
@@ -208,7 +207,6 @@ POSTHOOK: query: desc formatted small_alltypesorc_a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@small_alltypesorc_a
# col_name data_type comment
-
ctinyint tinyint
csmallint smallint
cint int
@@ -273,7 +271,6 @@ POSTHOOK: query: desc formatted small_alltypesorc_a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@small_alltypesorc_a
# col_name data_type comment
-
ctinyint tinyint
csmallint smallint
cint int
@@ -488,7 +485,6 @@ POSTHOOK: query: desc formatted small_alltypesorc_a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@small_alltypesorc_a
# col_name data_type comment
-
ctinyint tinyint
csmallint smallint
cint int
@@ -513,7 +509,7 @@ Table Parameters:
numFiles 1
numRows 5
rawDataSize 1069
- totalSize 3245
+ totalSize 3243
#### A masked pattern was here ####
# Storage Information
@@ -541,7 +537,6 @@ POSTHOOK: query: desc formatted small_alltypesorc_a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@small_alltypesorc_a
# col_name data_type comment
-
ctinyint tinyint
csmallint smallint
cint int
@@ -566,7 +561,7 @@ Table Parameters:
numFiles 1
numRows 15
rawDataSize 3320
- totalSize 3245
+ totalSize 3243
#### A masked pattern was here ####
# Storage Information
@@ -606,7 +601,6 @@ POSTHOOK: query: desc formatted small_alltypesorc_a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@small_alltypesorc_a
# col_name data_type comment
-
ctinyint tinyint
csmallint smallint
cint int
@@ -631,7 +625,7 @@ Table Parameters:
numFiles 2
numRows 20
rawDataSize 4389
- totalSize 4618
+ totalSize 4616
#### A masked pattern was here ####
# Storage Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/union_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/union_stats.q.out b/ql/src/test/results/clientpositive/llap/union_stats.q.out
index 1f3dc82..4178684 100644
--- a/ql/src/test/results/clientpositive/llap/union_stats.q.out
+++ b/ql/src/test/results/clientpositive/llap/union_stats.q.out
@@ -239,7 +239,6 @@ POSTHOOK: query: desc formatted t
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t
# col_name data_type comment
-
key string
value string
@@ -288,7 +287,6 @@ POSTHOOK: query: desc formatted tt
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tt
# col_name data_type comment
-
key string
value string
@@ -345,7 +343,6 @@ POSTHOOK: query: desc formatted tt
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tt
# col_name data_type comment
-
key string
value string
@@ -414,7 +411,6 @@ POSTHOOK: query: desc formatted t1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t1
# col_name data_type comment
-
key string default
value string default
@@ -449,7 +445,6 @@ POSTHOOK: query: desc formatted t2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t2
# col_name data_type comment
-
key string default
value string default
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/load_dyn_part1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/load_dyn_part1.q.out b/ql/src/test/results/clientpositive/load_dyn_part1.q.out
index 84d806d..43a8bc8 100644
--- a/ql/src/test/results/clientpositive/load_dyn_part1.q.out
+++ b/ql/src/test/results/clientpositive/load_dyn_part1.q.out
@@ -37,7 +37,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/load_dyn_part10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/load_dyn_part10.q.out b/ql/src/test/results/clientpositive/load_dyn_part10.q.out
index 99d3572..066b335 100644
--- a/ql/src/test/results/clientpositive/load_dyn_part10.q.out
+++ b/ql/src/test/results/clientpositive/load_dyn_part10.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
[03/21] hive git commit: HIVE-17519: Transpose column stats display
(Zoltan Haindrich, reviewed by Ashutosh Chauhan and Vineet Garg)
Posted by kg...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/alter_merge_stats_orc.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/alter_merge_stats_orc.q.out b/ql/src/test/results/clientpositive/spark/alter_merge_stats_orc.q.out
index 0d5ba01..2b069ec 100644
--- a/ql/src/test/results/clientpositive/spark/alter_merge_stats_orc.q.out
+++ b/ql/src/test/results/clientpositive/spark/alter_merge_stats_orc.q.out
@@ -78,7 +78,6 @@ POSTHOOK: query: desc formatted src_orc_merge_test_stat
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_orc_merge_test_stat
# col_name data_type comment
-
key int
value string
@@ -129,7 +128,6 @@ POSTHOOK: query: desc formatted src_orc_merge_test_stat
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_orc_merge_test_stat
# col_name data_type comment
-
key int
value string
@@ -226,13 +224,11 @@ POSTHOOK: query: desc formatted src_orc_merge_test_part_stat partition (ds='2011
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_orc_merge_test_part_stat
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -275,13 +271,11 @@ POSTHOOK: query: desc formatted src_orc_merge_test_part_stat partition (ds='2011
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_orc_merge_test_part_stat
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -332,13 +326,11 @@ POSTHOOK: query: desc formatted src_orc_merge_test_part_stat partition (ds='2011
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_orc_merge_test_part_stat
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/avro_decimal_native.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/avro_decimal_native.q.out b/ql/src/test/results/clientpositive/spark/avro_decimal_native.q.out
index eb2a636..2a00cb3 100644
--- a/ql/src/test/results/clientpositive/spark/avro_decimal_native.q.out
+++ b/ql/src/test/results/clientpositive/spark/avro_decimal_native.q.out
@@ -36,9 +36,18 @@ PREHOOK: Input: default@dec
POSTHOOK: query: DESC FORMATTED `dec` value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@dec
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value decimal(8,4) -12.25 234.79 0 10 from deserializer
+col_name value
+data_type decimal(8,4)
+min -12.25
+max 234.79
+num_nulls 0
+distinct_count 10
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"value\":\"true\"}}
PREHOOK: query: DROP TABLE IF EXISTS avro_dec
PREHOOK: type: DROPTABLE
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/bucket5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/bucket5.q.out b/ql/src/test/results/clientpositive/spark/bucket5.q.out
index dd24db8..8aa4e5f 100644
--- a/ql/src/test/results/clientpositive/spark/bucket5.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucket5.q.out
@@ -351,7 +351,6 @@ POSTHOOK: query: DESC FORMATTED bucketed_table
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@bucketed_table
# col_name data_type comment
-
key int
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/ctas.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/ctas.q.out b/ql/src/test/results/clientpositive/spark/ctas.q.out
index 4969930..d958a32 100644
--- a/ql/src/test/results/clientpositive/spark/ctas.q.out
+++ b/ql/src/test/results/clientpositive/spark/ctas.q.out
@@ -133,7 +133,6 @@ POSTHOOK: query: describe formatted nzhang_CTAS1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_ctas1
# col_name data_type comment
-
k string
value string
@@ -280,7 +279,6 @@ POSTHOOK: query: describe formatted nzhang_CTAS2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_ctas2
# col_name data_type comment
-
key string
value string
@@ -427,7 +425,6 @@ POSTHOOK: query: describe formatted nzhang_CTAS3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_ctas3
# col_name data_type comment
-
half_key double
conb string
@@ -491,7 +488,6 @@ POSTHOOK: query: describe formatted nzhang_CTAS3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_ctas3
# col_name data_type comment
-
half_key double
conb string
@@ -639,7 +635,6 @@ POSTHOOK: query: describe formatted nzhang_CTAS4
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_ctas4
# col_name data_type comment
-
key string
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/infer_bucket_sort_bucketed_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/infer_bucket_sort_bucketed_table.q.out b/ql/src/test/results/clientpositive/spark/infer_bucket_sort_bucketed_table.q.out
index 1efb81b..876c858 100644
--- a/ql/src/test/results/clientpositive/spark/infer_bucket_sort_bucketed_table.q.out
+++ b/ql/src/test/results/clientpositive/spark/infer_bucket_sort_bucketed_table.q.out
@@ -27,13 +27,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table_bucketed PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table_bucketed
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/infer_bucket_sort_map_operators.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/infer_bucket_sort_map_operators.q.out b/ql/src/test/results/clientpositive/spark/infer_bucket_sort_map_operators.q.out
index 5151b17..49eafbe 100644
--- a/ql/src/test/results/clientpositive/spark/infer_bucket_sort_map_operators.q.out
+++ b/ql/src/test/results/clientpositive/spark/infer_bucket_sort_map_operators.q.out
@@ -124,13 +124,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table_out PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table_out
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -295,13 +293,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table_out PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table_out
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -408,13 +404,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table_out PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table_out
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -547,13 +541,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table_out PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table_out
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/infer_bucket_sort_merge.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/infer_bucket_sort_merge.q.out b/ql/src/test/results/clientpositive/spark/infer_bucket_sort_merge.q.out
index 175ddd6..3d12692 100644
--- a/ql/src/test/results/clientpositive/spark/infer_bucket_sort_merge.q.out
+++ b/ql/src/test/results/clientpositive/spark/infer_bucket_sort_merge.q.out
@@ -25,13 +25,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -76,13 +74,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/infer_bucket_sort_num_buckets.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/infer_bucket_sort_num_buckets.q.out b/ql/src/test/results/clientpositive/spark/infer_bucket_sort_num_buckets.q.out
index 13219ac..8da2705 100644
--- a/ql/src/test/results/clientpositive/spark/infer_bucket_sort_num_buckets.q.out
+++ b/ql/src/test/results/clientpositive/spark/infer_bucket_sort_num_buckets.q.out
@@ -113,13 +113,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (ds='2008-04-08', hr='0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -153,13 +151,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (ds='2008-04-08', hr='1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/infer_bucket_sort_reducers_power_two.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/infer_bucket_sort_reducers_power_two.q.out b/ql/src/test/results/clientpositive/spark/infer_bucket_sort_reducers_power_two.q.out
index 85f43af..279b1cc 100644
--- a/ql/src/test/results/clientpositive/spark/infer_bucket_sort_reducers_power_two.q.out
+++ b/ql/src/test/results/clientpositive/spark/infer_bucket_sort_reducers_power_two.q.out
@@ -25,13 +25,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -76,13 +74,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -127,13 +123,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -178,13 +172,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -229,13 +221,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -280,13 +270,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/list_bucket_dml_10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/list_bucket_dml_10.q.out b/ql/src/test/results/clientpositive/spark/list_bucket_dml_10.q.out
index cdd5c66..de3af40 100644
--- a/ql/src/test/results/clientpositive/spark/list_bucket_dml_10.q.out
+++ b/ql/src/test/results/clientpositive/spark/list_bucket_dml_10.q.out
@@ -182,13 +182,11 @@ POSTHOOK: query: desc formatted list_bucketing_static_part partition (ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_static_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out b/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out
index 08df5d3..6427f70 100644
--- a/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out
+++ b/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out
@@ -237,13 +237,11 @@ POSTHOOK: query: desc formatted list_bucketing_static_part partition (ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_static_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/load_dyn_part1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part1.q.out b/ql/src/test/results/clientpositive/spark/load_dyn_part1.q.out
index 5bf7f28..99ebfbd 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part1.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part1.q.out
@@ -37,7 +37,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/load_dyn_part10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part10.q.out b/ql/src/test/results/clientpositive/spark/load_dyn_part10.q.out
index 5ec6d68..24c76c2 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part10.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part10.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/load_dyn_part11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part11.q.out b/ql/src/test/results/clientpositive/spark/load_dyn_part11.q.out
index 225a6c9..6ad41ec 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part11.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part11.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/load_dyn_part12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part12.q.out b/ql/src/test/results/clientpositive/spark/load_dyn_part12.q.out
index bb51159..01cdfd4 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part12.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part12.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out b/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out
index e153b4d..4318004 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/load_dyn_part14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part14.q.out b/ql/src/test/results/clientpositive/spark/load_dyn_part14.q.out
index ce65e71..7a562e4 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part14.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part14.q.out
@@ -19,7 +19,6 @@ value string
# Partition Information
# col_name data_type comment
-
value string
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/load_dyn_part2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part2.q.out b/ql/src/test/results/clientpositive/spark/load_dyn_part2.q.out
index d066b3a..9bdd77b 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part2.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part2.q.out
@@ -23,7 +23,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/load_dyn_part3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part3.q.out b/ql/src/test/results/clientpositive/spark/load_dyn_part3.q.out
index d120963..0d4b21a 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part3.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part3.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/load_dyn_part4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part4.q.out b/ql/src/test/results/clientpositive/spark/load_dyn_part4.q.out
index 7ec76b5..937b9d0 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part4.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part4.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/load_dyn_part5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part5.q.out b/ql/src/test/results/clientpositive/spark/load_dyn_part5.q.out
index b132a59..16da589 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part5.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part5.q.out
@@ -17,7 +17,6 @@ value string
# Partition Information
# col_name data_type comment
-
value string
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/load_dyn_part6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part6.q.out b/ql/src/test/results/clientpositive/spark/load_dyn_part6.q.out
index fce8eff..993f42f 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part6.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part6.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/load_dyn_part7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part7.q.out b/ql/src/test/results/clientpositive/spark/load_dyn_part7.q.out
index 02f9327..1d4d013 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part7.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part7.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/load_dyn_part8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part8.q.out b/ql/src/test/results/clientpositive/spark/load_dyn_part8.q.out
index e19a986..8322177 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part8.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part8.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/load_dyn_part9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part9.q.out b/ql/src/test/results/clientpositive/spark/load_dyn_part9.q.out
index 55bcfae..eb242af 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part9.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part9.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out b/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out
index 30511e8..cb6c2b0 100644
--- a/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out
+++ b/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out
@@ -106,7 +106,6 @@ POSTHOOK: query: desc formatted total_ordered
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@total_ordered
# col_name data_type comment
-
key string
value string
@@ -217,7 +216,6 @@ POSTHOOK: query: desc formatted total_ordered
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@total_ordered
# col_name data_type comment
-
key string
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out b/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out
index 129feb7..7b36824 100644
--- a/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out
+++ b/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out
@@ -34,7 +34,6 @@ ts string
# Partition Information
# col_name data_type comment
-
ds string
ts string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/stats0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats0.q.out b/ql/src/test/results/clientpositive/spark/stats0.q.out
index ece5f08..66dfa63 100644
--- a/ql/src/test/results/clientpositive/spark/stats0.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats0.q.out
@@ -1280,7 +1280,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
@@ -1296,7 +1295,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
@@ -2598,7 +2596,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
@@ -2614,7 +2611,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/stats1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats1.q.out b/ql/src/test/results/clientpositive/spark/stats1.q.out
index 13690db..cdabdce 100644
--- a/ql/src/test/results/clientpositive/spark/stats1.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats1.q.out
@@ -159,7 +159,6 @@ POSTHOOK: query: DESCRIBE FORMATTED tmptable
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tmptable
# col_name data_type comment
-
key string
value string
@@ -202,7 +201,6 @@ POSTHOOK: query: DESCRIBE FORMATTED tmptable
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tmptable
# col_name data_type comment
-
key string
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/stats10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats10.q.out b/ql/src/test/results/clientpositive/spark/stats10.q.out
index 9c682fc..865a3b8 100644
--- a/ql/src/test/results/clientpositive/spark/stats10.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats10.q.out
@@ -408,13 +408,11 @@ POSTHOOK: query: describe formatted bucket3_1 partition (ds='1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@bucket3_1
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -447,13 +445,11 @@ POSTHOOK: query: describe formatted bucket3_1 partition (ds='2')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@bucket3_1
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -486,13 +482,11 @@ POSTHOOK: query: describe formatted bucket3_1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@bucket3_1
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/stats12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats12.q.out b/ql/src/test/results/clientpositive/spark/stats12.q.out
index 460cf1d..9c96819 100644
--- a/ql/src/test/results/clientpositive/spark/stats12.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats12.q.out
@@ -179,13 +179,11 @@ POSTHOOK: query: desc formatted analyze_srcpart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -220,13 +218,11 @@ POSTHOOK: query: desc formatted analyze_srcpart partition (ds='2008-04-08', hr=1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -260,13 +256,11 @@ POSTHOOK: query: desc formatted analyze_srcpart partition (ds='2008-04-08', hr=1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -300,13 +294,11 @@ POSTHOOK: query: desc formatted analyze_srcpart partition (ds='2008-04-09', hr=1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -337,13 +329,11 @@ POSTHOOK: query: desc formatted analyze_srcpart partition (ds='2008-04-09', hr=1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/stats13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats13.q.out b/ql/src/test/results/clientpositive/spark/stats13.q.out
index 859bb6b..9e4302b 100644
--- a/ql/src/test/results/clientpositive/spark/stats13.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats13.q.out
@@ -129,13 +129,11 @@ POSTHOOK: query: desc formatted analyze_srcpart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -170,13 +168,11 @@ POSTHOOK: query: desc formatted analyze_srcpart partition (ds='2008-04-08', hr=1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -210,13 +206,11 @@ POSTHOOK: query: desc formatted analyze_srcpart partition (ds='2008-04-08', hr=1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -247,13 +241,11 @@ POSTHOOK: query: desc formatted analyze_srcpart partition (ds='2008-04-09', hr=1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -284,13 +276,11 @@ POSTHOOK: query: desc formatted analyze_srcpart partition (ds='2008-04-09', hr=1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -329,13 +319,11 @@ POSTHOOK: query: desc formatted analyze_srcpart2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart2
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/stats14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats14.q.out b/ql/src/test/results/clientpositive/spark/stats14.q.out
index 8501746..eb8a995 100644
--- a/ql/src/test/results/clientpositive/spark/stats14.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats14.q.out
@@ -31,7 +31,6 @@ POSTHOOK: query: desc formatted stats_src
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_src
# col_name data_type comment
-
key string default
value string default
@@ -128,13 +127,11 @@ POSTHOOK: query: desc formatted stats_part
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_part
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -170,13 +167,11 @@ POSTHOOK: query: desc formatted stats_part partition (ds='2010-04-08', hr = '11'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_part
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -210,13 +205,11 @@ POSTHOOK: query: desc formatted stats_part partition (ds='2010-04-08', hr = '12'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_part
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -270,13 +263,11 @@ POSTHOOK: query: desc formatted stats_part
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_part
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/stats15.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats15.q.out b/ql/src/test/results/clientpositive/spark/stats15.q.out
index 8501746..eb8a995 100644
--- a/ql/src/test/results/clientpositive/spark/stats15.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats15.q.out
@@ -31,7 +31,6 @@ POSTHOOK: query: desc formatted stats_src
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_src
# col_name data_type comment
-
key string default
value string default
@@ -128,13 +127,11 @@ POSTHOOK: query: desc formatted stats_part
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_part
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -170,13 +167,11 @@ POSTHOOK: query: desc formatted stats_part partition (ds='2010-04-08', hr = '11'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_part
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -210,13 +205,11 @@ POSTHOOK: query: desc formatted stats_part partition (ds='2010-04-08', hr = '12'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_part
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -270,13 +263,11 @@ POSTHOOK: query: desc formatted stats_part
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_part
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/stats16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats16.q.out b/ql/src/test/results/clientpositive/spark/stats16.q.out
index 3b371a8..659d581 100644
--- a/ql/src/test/results/clientpositive/spark/stats16.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats16.q.out
@@ -17,7 +17,6 @@ POSTHOOK: query: desc formatted stats16
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats16
# col_name data_type comment
-
key int
value string
@@ -65,7 +64,6 @@ POSTHOOK: query: desc formatted stats16
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats16
# col_name data_type comment
-
key int
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/stats18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats18.q.out b/ql/src/test/results/clientpositive/spark/stats18.q.out
index 4945808..dd54c0d 100644
--- a/ql/src/test/results/clientpositive/spark/stats18.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats18.q.out
@@ -23,13 +23,11 @@ POSTHOOK: query: desc formatted stats_part partition (ds='2010-04-08', hr='13')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_part
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -71,13 +69,11 @@ POSTHOOK: query: desc formatted stats_part partition (ds='2010-04-08', hr='13')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_part
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/stats2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats2.q.out b/ql/src/test/results/clientpositive/spark/stats2.q.out
index 0272b09..74e8678 100644
--- a/ql/src/test/results/clientpositive/spark/stats2.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats2.q.out
@@ -86,13 +86,11 @@ POSTHOOK: query: desc formatted analyze_t1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_t1
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -173,13 +171,11 @@ POSTHOOK: query: describe formatted analyze_t1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_t1
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/stats3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats3.q.out b/ql/src/test/results/clientpositive/spark/stats3.q.out
index 2f76d0e..7d4ed9b 100644
--- a/ql/src/test/results/clientpositive/spark/stats3.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats3.q.out
@@ -71,7 +71,6 @@ POSTHOOK: query: desc formatted hive_test_src
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@hive_test_src
# col_name data_type comment
-
col1 string
# Detailed Table Information
@@ -204,12 +203,10 @@ POSTHOOK: query: describe formatted hive_test_dst
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@hive_test_dst
# col_name data_type comment
-
col1 string
# Partition Information
# col_name data_type comment
-
pcol1 string
pcol2 string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/stats5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats5.q.out b/ql/src/test/results/clientpositive/spark/stats5.q.out
index 95293c0..6684abe 100644
--- a/ql/src/test/results/clientpositive/spark/stats5.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats5.q.out
@@ -47,7 +47,6 @@ POSTHOOK: query: describe formatted analyze_src
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_src
# col_name data_type comment
-
key string
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/stats6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats6.q.out b/ql/src/test/results/clientpositive/spark/stats6.q.out
index 81a80cb..704bff8 100644
--- a/ql/src/test/results/clientpositive/spark/stats6.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats6.q.out
@@ -64,13 +64,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -104,13 +102,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -144,13 +140,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-09',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -181,13 +175,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-09',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -218,13 +210,11 @@ POSTHOOK: query: describe formatted analyze_srcpart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/stats7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats7.q.out b/ql/src/test/results/clientpositive/spark/stats7.q.out
index 3605f38..9c5a71c 100644
--- a/ql/src/test/results/clientpositive/spark/stats7.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats7.q.out
@@ -78,13 +78,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -118,13 +116,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -158,13 +154,11 @@ POSTHOOK: query: describe formatted analyze_srcpart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/stats8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats8.q.out b/ql/src/test/results/clientpositive/spark/stats8.q.out
index 4bcbcfd..b83adbd 100644
--- a/ql/src/test/results/clientpositive/spark/stats8.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats8.q.out
@@ -74,13 +74,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -114,13 +112,11 @@ POSTHOOK: query: describe formatted analyze_srcpart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -189,13 +185,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -263,13 +257,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-09',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -337,13 +329,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-09',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -423,13 +413,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -463,13 +451,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -503,13 +489,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-09',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -543,13 +527,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-09',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -583,13 +565,11 @@ POSTHOOK: query: describe formatted analyze_srcpart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/stats9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats9.q.out b/ql/src/test/results/clientpositive/spark/stats9.q.out
index beb025c..c2ca23f 100644
--- a/ql/src/test/results/clientpositive/spark/stats9.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats9.q.out
@@ -53,7 +53,6 @@ POSTHOOK: query: describe formatted analyze_srcbucket
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcbucket
# col_name data_type comment
-
key int
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/stats_noscan_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats_noscan_1.q.out b/ql/src/test/results/clientpositive/spark/stats_noscan_1.q.out
index ad2ca94..6d3f413 100644
--- a/ql/src/test/results/clientpositive/spark/stats_noscan_1.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats_noscan_1.q.out
@@ -77,13 +77,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -115,13 +113,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -153,13 +149,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-09',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -190,13 +184,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-09',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -227,13 +219,11 @@ POSTHOOK: query: describe formatted analyze_srcpart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -340,13 +330,11 @@ POSTHOOK: query: describe formatted analyze_srcpart_partial PARTITION(ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart_partial
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -378,13 +366,11 @@ POSTHOOK: query: describe formatted analyze_srcpart_partial PARTITION(ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart_partial
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -416,13 +402,11 @@ POSTHOOK: query: describe formatted analyze_srcpart_partial PARTITION(ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart_partial
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -453,13 +437,11 @@ POSTHOOK: query: describe formatted analyze_srcpart_partial PARTITION(ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart_partial
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/stats_noscan_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats_noscan_2.q.out b/ql/src/test/results/clientpositive/spark/stats_noscan_2.q.out
index 1e9603e..14e131c 100644
--- a/ql/src/test/results/clientpositive/spark/stats_noscan_2.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats_noscan_2.q.out
@@ -37,7 +37,6 @@ POSTHOOK: query: describe formatted anaylyze_external
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@anaylyze_external
# col_name data_type comment
-
a int
# Detailed Table Information
@@ -78,7 +77,6 @@ POSTHOOK: query: describe formatted anaylyze_external
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@anaylyze_external
# col_name data_type comment
-
a int
# Detailed Table Information
@@ -199,13 +197,11 @@ POSTHOOK: query: describe formatted anaylyze_external PARTITION (insertdate='200
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@anaylyze_external
# col_name data_type comment
-
key string
val string
# Partition Information
# col_name data_type comment
-
insertdate string
# Detailed Partition Information
@@ -248,13 +244,11 @@ POSTHOOK: query: describe formatted anaylyze_external PARTITION (insertdate='200
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@anaylyze_external
# col_name data_type comment
-
key string
val string
# Partition Information
# col_name data_type comment
-
insertdate string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/stats_only_null.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats_only_null.q.out b/ql/src/test/results/clientpositive/spark/stats_only_null.q.out
index c73d97e..be906f6 100644
--- a/ql/src/test/results/clientpositive/spark/stats_only_null.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats_only_null.q.out
@@ -213,7 +213,6 @@ POSTHOOK: query: describe formatted stats_null_part partition (dt='2010')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_null_part
# col_name data_type comment
-
a double
b int
c string
@@ -221,7 +220,6 @@ d smallint
# Partition Information
# col_name data_type comment
-
dt string
# Detailed Partition Information
@@ -254,7 +252,6 @@ POSTHOOK: query: describe formatted stats_null_part partition (dt='2011')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_null_part
# col_name data_type comment
-
a double
b int
c string
@@ -262,7 +259,6 @@ d smallint
# Partition Information
# col_name data_type comment
-
dt string
# Detailed Partition Information
@@ -389,9 +385,18 @@ PREHOOK: Input: default@stats_null_part
POSTHOOK: query: describe formatted stats_null_part partition(dt = 1) a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_null_part
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-a double 1.0 1.0 1 1 from deserializer
+col_name a
+data_type double
+min 1.0
+max 1.0
+num_nulls 1
+distinct_count 1
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
PREHOOK: query: drop table stats_null
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@stats_null
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/stats_partscan_1_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats_partscan_1_23.q.out b/ql/src/test/results/clientpositive/spark/stats_partscan_1_23.q.out
index 50096a5..fdf111e 100644
--- a/ql/src/test/results/clientpositive/spark/stats_partscan_1_23.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats_partscan_1_23.q.out
@@ -44,13 +44,11 @@ POSTHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart_partial_scan
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -110,13 +108,11 @@ POSTHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart_partial_scan
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -147,13 +143,11 @@ POSTHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart_partial_scan
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
[08/21] hive git commit: HIVE-17519: Transpose column stats display
(Zoltan Haindrich, reviewed by Ashutosh Chauhan and Vineet Garg)
Posted by kg...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/exim_hidden_files.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/exim_hidden_files.q.out b/ql/src/test/results/clientpositive/exim_hidden_files.q.out
index ed9c03f..e83464c 100644
--- a/ql/src/test/results/clientpositive/exim_hidden_files.q.out
+++ b/ql/src/test/results/clientpositive/exim_hidden_files.q.out
@@ -60,12 +60,10 @@ POSTHOOK: query: describe formatted exim_employee
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: importer@exim_employee
# col_name data_type comment
-
emp_id int
# Partition Information
# col_name data_type comment
-
emp_country string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/extrapolate_part_stats_full.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/extrapolate_part_stats_full.q.out b/ql/src/test/results/clientpositive/extrapolate_part_stats_full.q.out
index 219e128..8933a7d 100644
--- a/ql/src/test/results/clientpositive/extrapolate_part_stats_full.q.out
+++ b/ql/src/test/results/clientpositive/extrapolate_part_stats_full.q.out
@@ -81,9 +81,18 @@ PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d PARTITION(year='2001') state
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-state string 0 3 0.75 2 HL from deserializer
+col_name state
+data_type string
+min
+max
+num_nulls 0
+distinct_count 3
+avg_col_len 0.75
+max_col_len 2
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: explain extended select state from loc_orc_1d
PREHOOK: type: QUERY
POSTHOOK: query: explain extended select state from loc_orc_1d
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/extrapolate_part_stats_partial.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/extrapolate_part_stats_partial.q.out b/ql/src/test/results/clientpositive/extrapolate_part_stats_partial.q.out
index b8bb210..8427b2d 100644
--- a/ql/src/test/results/clientpositive/extrapolate_part_stats_partial.q.out
+++ b/ql/src/test/results/clientpositive/extrapolate_part_stats_partial.q.out
@@ -89,18 +89,36 @@ PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d PARTITION(year='2001') state
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-state string 0 3 0.75 2 HL from deserializer
+col_name state
+data_type string
+min
+max
+num_nulls 0
+distinct_count 3
+avg_col_len 0.75
+max_col_len 2
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2002') state
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@loc_orc_1d
POSTHOOK: query: describe formatted loc_orc_1d PARTITION(year='2002') state
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@loc_orc_1d
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-state string 0 6 3.0 3 HL from deserializer
+col_name state
+data_type string
+min
+max
+num_nulls 0
+distinct_count 6
+avg_col_len 3.0
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: explain extended select state from loc_orc_1d
PREHOOK: type: QUERY
POSTHOOK: query: explain extended select state from loc_orc_1d
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/fm-sketch.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/fm-sketch.q.out b/ql/src/test/results/clientpositive/fm-sketch.q.out
index 7a4d395..e519084 100644
--- a/ql/src/test/results/clientpositive/fm-sketch.q.out
+++ b/ql/src/test/results/clientpositive/fm-sketch.q.out
@@ -78,9 +78,18 @@ PREHOOK: Input: default@n
POSTHOOK: query: desc formatted n key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@n
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key int 0 0 500 1 FM from deserializer
+col_name key
+data_type int
+min 0
+max 0
+num_nulls 500
+distinct_count 1
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector FM
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}}
PREHOOK: query: create table i(key int)
PREHOOK: type: CREATETABLE
@@ -162,9 +171,18 @@ PREHOOK: Input: default@i
POSTHOOK: query: desc formatted i key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@i
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key int 0 498 0 196 FM from deserializer
+col_name key
+data_type int
+min 0
+max 498
+num_nulls 0
+distinct_count 196
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector FM
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}}
PREHOOK: query: drop table i
PREHOOK: type: DROPTABLE
@@ -205,9 +223,18 @@ PREHOOK: Input: default@i
POSTHOOK: query: desc formatted i key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@i
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key double 0.0 498.0 0 234 FM from deserializer
+col_name key
+data_type double
+min 0.0
+max 498.0
+num_nulls 0
+distinct_count 234
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector FM
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}}
PREHOOK: query: drop table i
PREHOOK: type: DROPTABLE
@@ -248,9 +275,18 @@ PREHOOK: Input: default@i
POSTHOOK: query: desc formatted i key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@i
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key decimal(10,0) 0 498 0 180 FM from deserializer
+col_name key
+data_type decimal(10,0)
+min 0
+max 498
+num_nulls 0
+distinct_count 180
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector FM
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}}
PREHOOK: query: drop table i
PREHOOK: type: DROPTABLE
@@ -317,7 +353,16 @@ PREHOOK: Input: default@i
POSTHOOK: query: desc formatted i key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@i
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key date 2012-03-17 2013-08-17 0 3 FM from deserializer
+col_name key
+data_type date
+min 2012-03-17
+max 2013-08-17
+num_nulls 0
+distinct_count 3
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector FM
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}}
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/hll.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/hll.q.out b/ql/src/test/results/clientpositive/hll.q.out
index bb880b2..3b83384 100644
--- a/ql/src/test/results/clientpositive/hll.q.out
+++ b/ql/src/test/results/clientpositive/hll.q.out
@@ -78,9 +78,18 @@ PREHOOK: Input: default@n
POSTHOOK: query: desc formatted n key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@n
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key int 0 0 500 1 HL from deserializer
+col_name key
+data_type int
+min 0
+max 0
+num_nulls 500
+distinct_count 1
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}}
PREHOOK: query: create table i(key int)
PREHOOK: type: CREATETABLE
@@ -162,9 +171,18 @@ PREHOOK: Input: default@i
POSTHOOK: query: desc formatted i key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@i
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key int 0 498 0 309 HL from deserializer
+col_name key
+data_type int
+min 0
+max 498
+num_nulls 0
+distinct_count 309
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}}
PREHOOK: query: drop table i
PREHOOK: type: DROPTABLE
@@ -205,9 +223,18 @@ PREHOOK: Input: default@i
POSTHOOK: query: desc formatted i key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@i
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key double 0.0 498.0 0 309 HL from deserializer
+col_name key
+data_type double
+min 0.0
+max 498.0
+num_nulls 0
+distinct_count 309
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}}
PREHOOK: query: drop table i
PREHOOK: type: DROPTABLE
@@ -248,9 +275,18 @@ PREHOOK: Input: default@i
POSTHOOK: query: desc formatted i key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@i
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key decimal(10,0) 0 498 0 309 HL from deserializer
+col_name key
+data_type decimal(10,0)
+min 0
+max 498
+num_nulls 0
+distinct_count 309
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}}
PREHOOK: query: drop table i
PREHOOK: type: DROPTABLE
@@ -317,7 +353,16 @@ PREHOOK: Input: default@i
POSTHOOK: query: desc formatted i key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@i
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key date 2012-03-17 2013-08-17 0 4 HL from deserializer
+col_name key
+data_type date
+min 2012-03-17
+max 2013-08-17
+num_nulls 0
+distinct_count 4
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}}
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/index_skewtable.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/index_skewtable.q.out b/ql/src/test/results/clientpositive/index_skewtable.q.out
index daecb54..53334ec 100644
--- a/ql/src/test/results/clientpositive/index_skewtable.q.out
+++ b/ql/src/test/results/clientpositive/index_skewtable.q.out
@@ -28,7 +28,6 @@ POSTHOOK: query: DESCRIBE FORMATTED default__kv_kv_index__
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@default__kv_kv_index__
# col_name data_type comment
-
value string
_bucketname string
_offsets array<bigint>
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/infer_bucket_sort.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort.q.out
index f09f01d..8ed1054 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort.q.out
@@ -25,13 +25,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -76,13 +74,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -127,13 +123,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -178,13 +172,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -229,13 +221,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -280,13 +270,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -331,13 +319,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -382,13 +368,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -433,13 +417,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -484,13 +466,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -535,13 +515,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -586,13 +564,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -637,13 +613,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -688,13 +662,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -739,13 +711,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -790,13 +760,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -841,13 +809,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -892,13 +858,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -943,13 +907,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -994,13 +956,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -1045,13 +1005,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -1096,13 +1054,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -1147,13 +1103,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -1198,13 +1152,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -1249,13 +1201,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out
index 52ebe5a..70a57d5 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out
@@ -25,13 +25,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -78,13 +76,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out
index d62d0b8..3d1443b 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out
@@ -42,13 +42,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (ds='2008-04-08', hr='1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -82,13 +80,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (ds='2008-04-08', hr='1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -145,13 +141,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (ds='2008-04-08', hr='1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -185,13 +179,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (ds='2008-04-08', hr='1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -250,13 +242,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (ds='2008-04-08', hr='1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -290,13 +280,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (ds='2008-04-08', hr='1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -552,13 +540,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (ds='2008-04-08', hr='1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -592,13 +578,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (ds='2008-04-08', hr='1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
index a448ef3..7fec770 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
@@ -731,14 +731,12 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table_out PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table_out
# col_name data_type comment
-
key string
value string
agg string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -1412,7 +1410,6 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table_out_2 PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table_out_2
# col_name data_type comment
-
key string
value string
grouping_key string
@@ -1420,7 +1417,6 @@ agg string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -1536,14 +1532,12 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table_out PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table_out
# col_name data_type comment
-
key string
value string
agg string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -1590,7 +1584,6 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table_out_2 PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table_out_2
# col_name data_type comment
-
key string
value string
grouping_key string
@@ -1598,7 +1591,6 @@ agg string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -1714,14 +1706,12 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table_out PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table_out
# col_name data_type comment
-
key string
value string
agg string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -1768,7 +1758,6 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table_out_2 PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table_out_2
# col_name data_type comment
-
key string
value string
grouping_key string
@@ -1776,7 +1765,6 @@ agg string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/infer_bucket_sort_list_bucket.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_list_bucket.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_list_bucket.q.out
index 98a2f5f..98c062b 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_list_bucket.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_list_bucket.q.out
@@ -31,13 +31,11 @@ POSTHOOK: query: DESC FORMATTED list_bucketing_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -101,13 +99,11 @@ POSTHOOK: query: DESC FORMATTED list_bucketing_table2 PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_table2
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
index 6a49817..041d053 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
@@ -165,13 +165,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table_out PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table_out
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -328,13 +326,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table_out PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table_out
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -479,13 +475,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table_out PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table_out
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -606,13 +600,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table_out PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table_out
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/infer_bucket_sort_merge.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_merge.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_merge.q.out
index bf77d4c..44a9435 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_merge.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_merge.q.out
@@ -25,13 +25,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -76,13 +74,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/infer_bucket_sort_multi_insert.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_multi_insert.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_multi_insert.q.out
index 59b20fe..d915c30 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_multi_insert.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_multi_insert.q.out
@@ -31,13 +31,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -70,13 +68,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '2')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -127,13 +123,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -166,13 +160,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '2')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -223,13 +215,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -262,13 +252,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '2')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -319,13 +307,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -358,13 +344,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '2')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/infer_bucket_sort_num_buckets.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_num_buckets.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_num_buckets.q.out
index 0c61fe0..5086a97 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_num_buckets.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_num_buckets.q.out
@@ -107,13 +107,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (ds='2008-04-08', hr='0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -147,13 +145,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (ds='2008-04-08', hr='1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/infer_bucket_sort_reducers_power_two.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_reducers_power_two.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_reducers_power_two.q.out
index 53aff14..6745965 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_reducers_power_two.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_reducers_power_two.q.out
@@ -25,13 +25,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -76,13 +74,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -127,13 +123,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -178,13 +172,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -229,13 +221,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
@@ -280,13 +270,11 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/input10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input10.q.out b/ql/src/test/results/clientpositive/input10.q.out
index 7d108d8..2b08604 100644
--- a/ql/src/test/results/clientpositive/input10.q.out
+++ b/ql/src/test/results/clientpositive/input10.q.out
@@ -41,6 +41,5 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/input_part10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input_part10.q.out b/ql/src/test/results/clientpositive/input_part10.q.out
index 4b552ba..5ec24a7 100644
--- a/ql/src/test/results/clientpositive/input_part10.q.out
+++ b/ql/src/test/results/clientpositive/input_part10.q.out
@@ -112,7 +112,6 @@ ts string
# Partition Information
# col_name data_type comment
-
ds string
ts string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/inputddl2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/inputddl2.q.out b/ql/src/test/results/clientpositive/inputddl2.q.out
index 3d344d5..fbb2ece 100644
--- a/ql/src/test/results/clientpositive/inputddl2.q.out
+++ b/ql/src/test/results/clientpositive/inputddl2.q.out
@@ -39,6 +39,5 @@ country string
# Partition Information
# col_name data_type comment
-
ds string
country string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/inputddl4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/inputddl4.q.out b/ql/src/test/results/clientpositive/inputddl4.q.out
index c942963..887ac6f 100644
--- a/ql/src/test/results/clientpositive/inputddl4.q.out
+++ b/ql/src/test/results/clientpositive/inputddl4.q.out
@@ -36,7 +36,6 @@ country string
# Partition Information
# col_name data_type comment
-
ds string
country string
PREHOOK: query: DESCRIBE EXTENDED INPUTDDL4
@@ -57,7 +56,6 @@ country string
# Partition Information
# col_name data_type comment
-
ds string
country string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/inputddl6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/inputddl6.q.out b/ql/src/test/results/clientpositive/inputddl6.q.out
index d3a15a0..fd784fe 100644
--- a/ql/src/test/results/clientpositive/inputddl6.q.out
+++ b/ql/src/test/results/clientpositive/inputddl6.q.out
@@ -36,7 +36,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
@@ -52,7 +51,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/inputddl7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/inputddl7.q.out b/ql/src/test/results/clientpositive/inputddl7.q.out
index d255b39..32070f4 100644
--- a/ql/src/test/results/clientpositive/inputddl7.q.out
+++ b/ql/src/test/results/clientpositive/inputddl7.q.out
@@ -133,7 +133,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
@@ -148,7 +147,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/inputddl8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/inputddl8.q.out b/ql/src/test/results/clientpositive/inputddl8.q.out
index 8361110..eb29583 100644
--- a/ql/src/test/results/clientpositive/inputddl8.q.out
+++ b/ql/src/test/results/clientpositive/inputddl8.q.out
@@ -39,7 +39,6 @@ country string
# Partition Information
# col_name data_type comment
-
ds string
country string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/insert_values_orig_table_use_metadata.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/insert_values_orig_table_use_metadata.q.out b/ql/src/test/results/clientpositive/insert_values_orig_table_use_metadata.q.out
index 6df425f..33c785a 100644
--- a/ql/src/test/results/clientpositive/insert_values_orig_table_use_metadata.q.out
+++ b/ql/src/test/results/clientpositive/insert_values_orig_table_use_metadata.q.out
@@ -81,7 +81,6 @@ POSTHOOK: query: desc formatted acid_ivot
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@acid_ivot
# col_name data_type comment
-
ctinyint tinyint
csmallint smallint
cint int
@@ -147,7 +146,6 @@ POSTHOOK: query: desc formatted acid_ivot
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@acid_ivot
# col_name data_type comment
-
ctinyint tinyint
csmallint smallint
cint int
@@ -340,7 +338,6 @@ POSTHOOK: query: desc formatted acid_ivot
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@acid_ivot
# col_name data_type comment
-
ctinyint tinyint
csmallint smallint
cint int
@@ -462,7 +459,6 @@ POSTHOOK: query: desc formatted acid_ivot
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@acid_ivot
# col_name data_type comment
-
ctinyint tinyint
csmallint smallint
cint int
@@ -582,7 +578,6 @@ POSTHOOK: query: desc formatted acid_ivot
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@acid_ivot
# col_name data_type comment
-
ctinyint tinyint
csmallint smallint
cint int
@@ -689,7 +684,6 @@ POSTHOOK: query: desc formatted acid_ivot
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@acid_ivot
# col_name data_type comment
-
key string default
value string default
@@ -734,7 +728,6 @@ POSTHOOK: query: desc formatted acid_ivot
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@acid_ivot
# col_name data_type comment
-
key string default
value string default
@@ -815,13 +808,11 @@ POSTHOOK: query: desc formatted sp PARTITION (ds="2008-04-08", hr="11")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@sp
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -921,13 +912,11 @@ POSTHOOK: query: desc formatted sp PARTITION (ds="2008-04-08", hr="11")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@sp
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -972,13 +961,11 @@ POSTHOOK: query: desc formatted sp PARTITION (ds="2008-04-08", hr="11")
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@sp
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/lb_fs_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/lb_fs_stats.q.out b/ql/src/test/results/clientpositive/lb_fs_stats.q.out
index b07192b..3309089 100644
--- a/ql/src/test/results/clientpositive/lb_fs_stats.q.out
+++ b/ql/src/test/results/clientpositive/lb_fs_stats.q.out
@@ -31,13 +31,11 @@ POSTHOOK: query: describe formatted test_tab partition (part='1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_tab
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out
index f70f8b2..a664db3 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out
@@ -224,13 +224,11 @@ POSTHOOK: query: desc formatted list_bucketing_dynamic_part partition (ds='2008-
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_dynamic_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -269,13 +267,11 @@ POSTHOOK: query: desc formatted list_bucketing_dynamic_part partition (ds='2008-
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_dynamic_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/list_bucket_dml_11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_11.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_11.q.out
index 6920dcc..bf987e1 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_11.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_11.q.out
@@ -179,13 +179,11 @@ POSTHOOK: query: desc formatted list_bucketing_static_part partition (ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_static_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out
index 55acbb7..3c80cef 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out
@@ -182,7 +182,6 @@ POSTHOOK: query: desc formatted list_bucketing_mul_col partition (ds='2008-04-08
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_mul_col
# col_name data_type comment
-
col1 string
col2 string
col3 string
@@ -191,7 +190,6 @@ col5 string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out
index 3a1d2a4..379a730 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out
@@ -182,7 +182,6 @@ POSTHOOK: query: desc formatted list_bucketing_mul_col partition (ds='2008-04-08
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_mul_col
# col_name data_type comment
-
col1 string
col2 string
col3 string
@@ -191,7 +190,6 @@ col5 string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out
index f827991..b6b829a 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out
@@ -166,7 +166,6 @@ POSTHOOK: query: desc formatted list_bucketing
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing
# col_name data_type comment
-
key string
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out
index 01bc19c..8167730 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out
@@ -234,13 +234,11 @@ POSTHOOK: query: desc formatted list_bucketing_static_part partition (ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_static_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out
index 52646a2..aafdbb1 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out
@@ -215,13 +215,11 @@ POSTHOOK: query: desc formatted list_bucketing_static_part partition (ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_static_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out
index 84ada2b..36bd666 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out
@@ -234,13 +234,11 @@ POSTHOOK: query: desc formatted list_bucketing_static_part partition (ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_static_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -608,13 +606,11 @@ POSTHOOK: query: desc formatted list_bucketing_static_part partition (ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@list_bucketing_static_part
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
[06/21] hive git commit: HIVE-17519: Transpose column stats display
(Zoltan Haindrich, reviewed by Ashutosh Chauhan and Vineet Garg)
Posted by kg...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/columnstats_part_coltype.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/columnstats_part_coltype.q.out b/ql/src/test/results/clientpositive/llap/columnstats_part_coltype.q.out
index 9368514..72f9aa2 100644
--- a/ql/src/test/results/clientpositive/llap/columnstats_part_coltype.q.out
+++ b/ql/src/test/results/clientpositive/llap/columnstats_part_coltype.q.out
@@ -80,18 +80,36 @@ PREHOOK: Input: default@partcolstats
POSTHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-02', hr=2, part='partA') key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key int 27 484 0 20 HL from deserializer
+col_name key
+data_type int
+min 27
+max 484
+num_nulls 0
+distinct_count 20
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-02', hr=2, part='partA') value
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@partcolstats
POSTHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-02', hr=2, part='partA') value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 20 6.8 7 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 20
+avg_col_len 6.8
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-02', hr=2, part='partB') key
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@partcolstats
@@ -99,7 +117,6 @@ POSTHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-02'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstats
# col_name data_type comment
-
key int from deserializer
PREHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-02', hr=2, part='partB') value
PREHOOK: type: DESCTABLE
@@ -108,7 +125,6 @@ POSTHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-02'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstats
# col_name data_type comment
-
value string from deserializer
PREHOOK: query: analyze table partcolstats partition (ds=date '2015-04-02', hr=2, part) compute statistics for columns
PREHOOK: type: QUERY
@@ -134,18 +150,36 @@ PREHOOK: Input: default@partcolstats
POSTHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-02', hr=2, part='partB') key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key int 27 484 0 20 HL from deserializer
+col_name key
+data_type int
+min 27
+max 484
+num_nulls 0
+distinct_count 20
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-02', hr=2, part='partB') value
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@partcolstats
POSTHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-02', hr=2, part='partB') value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 20 6.8 7 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 20
+avg_col_len 6.8
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-02', hr=3, part='partA') key
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@partcolstats
@@ -153,7 +187,6 @@ POSTHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-02'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstats
# col_name data_type comment
-
key int from deserializer
PREHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-02', hr=3, part='partA') value
PREHOOK: type: DESCTABLE
@@ -162,7 +195,6 @@ POSTHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-02'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstats
# col_name data_type comment
-
value string from deserializer
PREHOOK: query: analyze table partcolstats partition (ds=date '2015-04-02', hr, part) compute statistics for columns
PREHOOK: type: QUERY
@@ -192,18 +224,36 @@ PREHOOK: Input: default@partcolstats
POSTHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-02', hr=3, part='partA') key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key int 27 495 0 30 HL from deserializer
+col_name key
+data_type int
+min 27
+max 495
+num_nulls 0
+distinct_count 30
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-02', hr=3, part='partA') value
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@partcolstats
POSTHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-02', hr=3, part='partA') value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 30 6.833333333333333 7 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 30
+avg_col_len 6.833333333333333
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-03', hr=3, part='partA') key
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@partcolstats
@@ -211,7 +261,6 @@ POSTHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-03'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstats
# col_name data_type comment
-
key int from deserializer
PREHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-03', hr=3, part='partA') value
PREHOOK: type: DESCTABLE
@@ -220,7 +269,6 @@ POSTHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-03'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstats
# col_name data_type comment
-
value string from deserializer
PREHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-03', hr=3, part='partB') key
PREHOOK: type: DESCTABLE
@@ -229,7 +277,6 @@ POSTHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-03'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstats
# col_name data_type comment
-
key int from deserializer
PREHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-03', hr=3, part='partB') value
PREHOOK: type: DESCTABLE
@@ -238,7 +285,6 @@ POSTHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-03'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstats
# col_name data_type comment
-
value string from deserializer
PREHOOK: query: analyze table partcolstats partition (ds, hr, part) compute statistics for columns
PREHOOK: type: QUERY
@@ -276,36 +322,72 @@ PREHOOK: Input: default@partcolstats
POSTHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-03', hr=3, part='partA') key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key int 15 495 0 40 HL from deserializer
+col_name key
+data_type int
+min 15
+max 495
+num_nulls 0
+distinct_count 40
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-03', hr=3, part='partA') value
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@partcolstats
POSTHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-03', hr=3, part='partA') value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 40 6.825 7 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 40
+avg_col_len 6.825
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-03', hr=3, part='partB') key
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@partcolstats
POSTHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-03', hr=3, part='partB') key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key int 15 495 0 58 HL from deserializer
+col_name key
+data_type int
+min 15
+max 495
+num_nulls 0
+distinct_count 58
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-03', hr=3, part='partB') value
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@partcolstats
POSTHOOK: query: describe formatted partcolstats partition (ds=date '2015-04-03', hr=3, part='partB') value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 58 6.883333333333334 7 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 58
+avg_col_len 6.883333333333334
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: drop table partcolstats
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@partcolstats
@@ -356,9 +438,18 @@ PREHOOK: Input: default@partcolstatsnum
POSTHOOK: query: describe formatted partcolstatsnum partition (tint=100, sint=1000, bint=1000000) value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstatsnum
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 30 6.833333333333333 7 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 30
+avg_col_len 6.833333333333333
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: drop table partcolstatsnum
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@partcolstatsnum
@@ -409,9 +500,18 @@ PREHOOK: Input: default@partcolstatsdec
POSTHOOK: query: describe formatted partcolstatsdec partition (decpart='1000.0001') value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstatsdec
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 30 6.833333333333333 7 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 30
+avg_col_len 6.833333333333333
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: drop table partcolstatsdec
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@partcolstatsdec
@@ -462,9 +562,18 @@ PREHOOK: Input: default@partcolstatschar
POSTHOOK: query: describe formatted partcolstatschar partition (varpart='part1', charpart='aaa') value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partcolstatschar
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 30 6.833333333333333 7 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 30
+avg_col_len 6.833333333333333
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: drop table partcolstatschar
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@partcolstatschar
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/ctas.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/ctas.q.out b/ql/src/test/results/clientpositive/llap/ctas.q.out
index fe492e4..1dd2dd1 100644
--- a/ql/src/test/results/clientpositive/llap/ctas.q.out
+++ b/ql/src/test/results/clientpositive/llap/ctas.q.out
@@ -142,7 +142,6 @@ POSTHOOK: query: describe formatted nzhang_CTAS1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_ctas1
# col_name data_type comment
-
k string
value string
@@ -298,7 +297,6 @@ POSTHOOK: query: describe formatted nzhang_CTAS2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_ctas2
# col_name data_type comment
-
key string
value string
@@ -454,7 +452,6 @@ POSTHOOK: query: describe formatted nzhang_CTAS3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_ctas3
# col_name data_type comment
-
half_key double
conb string
@@ -518,7 +515,6 @@ POSTHOOK: query: describe formatted nzhang_CTAS3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_ctas3
# col_name data_type comment
-
half_key double
conb string
@@ -675,7 +671,6 @@ POSTHOOK: query: describe formatted nzhang_CTAS4
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_ctas4
# col_name data_type comment
-
key string
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out b/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out
index 18fdfd4..45b9af6 100644
--- a/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out
+++ b/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out
@@ -35,7 +35,6 @@ POSTHOOK: query: describe formatted testdeci2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@testdeci2
# col_name data_type comment
-
id int
amount decimal(10,3)
sales_tax decimal(10,3)
@@ -72,9 +71,18 @@ PREHOOK: Input: default@testdeci2
POSTHOOK: query: describe formatted testdeci2 amount
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@testdeci2
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-amount decimal(10,3) from deserializer
+col_name amount
+data_type decimal(10,3)
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: analyze table testdeci2 compute statistics for columns
PREHOOK: type: QUERY
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out b/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out
index b47671b..2e62fb0 100644
--- a/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out
@@ -920,7 +920,6 @@ POSTHOOK: query: desc formatted over1k_part_orc partition(ds="foo",t=27)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_orc
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -928,7 +927,6 @@ f float
# Partition Information
# col_name data_type comment
-
ds string
t tinyint
@@ -962,7 +960,6 @@ POSTHOOK: query: desc formatted over1k_part_orc partition(ds="foo",t="__HIVE_DEF
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_orc
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -970,7 +967,6 @@ f float
# Partition Information
# col_name data_type comment
-
ds string
t tinyint
@@ -1004,7 +1000,6 @@ POSTHOOK: query: desc formatted over1k_part_limit_orc partition(ds="foo",t=27)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_limit_orc
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -1012,7 +1007,6 @@ f float
# Partition Information
# col_name data_type comment
-
ds string
t tinyint
@@ -1046,7 +1040,6 @@ POSTHOOK: query: desc formatted over1k_part_limit_orc partition(ds="foo",t="__HI
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_limit_orc
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -1054,7 +1047,6 @@ f float
# Partition Information
# col_name data_type comment
-
ds string
t tinyint
@@ -1088,7 +1080,6 @@ POSTHOOK: query: desc formatted over1k_part_buck_orc partition(t=27)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_buck_orc
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -1096,7 +1087,6 @@ f float
# Partition Information
# col_name data_type comment
-
t tinyint
# Detailed Partition Information
@@ -1129,7 +1119,6 @@ POSTHOOK: query: desc formatted over1k_part_buck_orc partition(t="__HIVE_DEFAULT
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_buck_orc
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -1137,7 +1126,6 @@ f float
# Partition Information
# col_name data_type comment
-
t tinyint
# Detailed Partition Information
@@ -1170,7 +1158,6 @@ POSTHOOK: query: desc formatted over1k_part_buck_sort_orc partition(t=27)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_buck_sort_orc
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -1178,7 +1165,6 @@ f float
# Partition Information
# col_name data_type comment
-
t tinyint
# Detailed Partition Information
@@ -1211,7 +1197,6 @@ POSTHOOK: query: desc formatted over1k_part_buck_sort_orc partition(t="__HIVE_DE
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_buck_sort_orc
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -1219,7 +1204,6 @@ f float
# Partition Information
# col_name data_type comment
-
t tinyint
# Detailed Partition Information
@@ -1737,7 +1721,6 @@ POSTHOOK: query: desc formatted over1k_part2_orc partition(ds="foo",t=27)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part2_orc
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -1745,7 +1728,6 @@ f float
# Partition Information
# col_name data_type comment
-
ds string
t tinyint
@@ -1779,7 +1761,6 @@ POSTHOOK: query: desc formatted over1k_part2_orc partition(ds="foo",t="__HIVE_DE
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part2_orc
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -1787,7 +1768,6 @@ f float
# Partition Information
# col_name data_type comment
-
ds string
t tinyint
@@ -1882,7 +1862,6 @@ POSTHOOK: query: desc formatted over1k_part2_orc partition(ds="foo",t=27)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part2_orc
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -1890,7 +1869,6 @@ f float
# Partition Information
# col_name data_type comment
-
ds string
t tinyint
@@ -1924,7 +1902,6 @@ POSTHOOK: query: desc formatted over1k_part2_orc partition(ds="foo",t="__HIVE_DE
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part2_orc
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -1932,7 +1909,6 @@ f float
# Partition Information
# col_name data_type comment
-
ds string
t tinyint
@@ -2194,7 +2170,6 @@ POSTHOOK: query: desc formatted over1k_part_buck_sort2_orc partition(t=27)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_buck_sort2_orc
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -2202,7 +2177,6 @@ f float
# Partition Information
# col_name data_type comment
-
t tinyint
# Detailed Partition Information
@@ -2235,7 +2209,6 @@ POSTHOOK: query: desc formatted over1k_part_buck_sort2_orc partition(t="__HIVE_D
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_buck_sort2_orc
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -2243,7 +2216,6 @@ f float
# Partition Information
# col_name data_type comment
-
t tinyint
# Detailed Partition Information
@@ -2412,7 +2384,6 @@ POSTHOOK: query: desc formatted over1k_part_buck_sort2_orc partition(t=27)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_buck_sort2_orc
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -2420,7 +2391,6 @@ f float
# Partition Information
# col_name data_type comment
-
t tinyint
# Detailed Partition Information
@@ -2453,7 +2423,6 @@ POSTHOOK: query: desc formatted over1k_part_buck_sort2_orc partition(t="__HIVE_D
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_buck_sort2_orc
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -2461,7 +2430,6 @@ f float
# Partition Information
# col_name data_type comment
-
t tinyint
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out
index 48896a7..5b80a32 100644
--- a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out
@@ -877,7 +877,6 @@ POSTHOOK: query: desc formatted over1k_part partition(ds="foo",t=27)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -885,7 +884,6 @@ f float
# Partition Information
# col_name data_type comment
-
ds string
t tinyint
@@ -919,7 +917,6 @@ POSTHOOK: query: desc formatted over1k_part partition(ds="foo",t="__HIVE_DEFAULT
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -927,7 +924,6 @@ f float
# Partition Information
# col_name data_type comment
-
ds string
t tinyint
@@ -961,7 +957,6 @@ POSTHOOK: query: desc formatted over1k_part_limit partition(ds="foo",t=27)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_limit
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -969,7 +964,6 @@ f float
# Partition Information
# col_name data_type comment
-
ds string
t tinyint
@@ -1003,7 +997,6 @@ POSTHOOK: query: desc formatted over1k_part_limit partition(ds="foo",t="__HIVE_D
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_limit
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -1011,7 +1004,6 @@ f float
# Partition Information
# col_name data_type comment
-
ds string
t tinyint
@@ -1045,7 +1037,6 @@ POSTHOOK: query: desc formatted over1k_part_buck partition(t=27)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_buck
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -1053,7 +1044,6 @@ f float
# Partition Information
# col_name data_type comment
-
t tinyint
# Detailed Partition Information
@@ -1086,7 +1076,6 @@ POSTHOOK: query: desc formatted over1k_part_buck partition(t="__HIVE_DEFAULT_PAR
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_buck
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -1094,7 +1083,6 @@ f float
# Partition Information
# col_name data_type comment
-
t tinyint
# Detailed Partition Information
@@ -1127,7 +1115,6 @@ POSTHOOK: query: desc formatted over1k_part_buck_sort partition(t=27)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_buck_sort
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -1135,7 +1122,6 @@ f float
# Partition Information
# col_name data_type comment
-
t tinyint
# Detailed Partition Information
@@ -1168,7 +1154,6 @@ POSTHOOK: query: desc formatted over1k_part_buck_sort partition(t="__HIVE_DEFAUL
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_buck_sort
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -1176,7 +1161,6 @@ f float
# Partition Information
# col_name data_type comment
-
t tinyint
# Detailed Partition Information
@@ -1694,7 +1678,6 @@ POSTHOOK: query: desc formatted over1k_part2 partition(ds="foo",t=27)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part2
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -1702,7 +1685,6 @@ f float
# Partition Information
# col_name data_type comment
-
ds string
t tinyint
@@ -1736,7 +1718,6 @@ POSTHOOK: query: desc formatted over1k_part2 partition(ds="foo",t="__HIVE_DEFAUL
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part2
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -1744,7 +1725,6 @@ f float
# Partition Information
# col_name data_type comment
-
ds string
t tinyint
@@ -1839,7 +1819,6 @@ POSTHOOK: query: desc formatted over1k_part2 partition(ds="foo",t=27)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part2
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -1847,7 +1826,6 @@ f float
# Partition Information
# col_name data_type comment
-
ds string
t tinyint
@@ -1881,7 +1859,6 @@ POSTHOOK: query: desc formatted over1k_part2 partition(ds="foo",t="__HIVE_DEFAUL
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part2
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -1889,7 +1866,6 @@ f float
# Partition Information
# col_name data_type comment
-
ds string
t tinyint
@@ -2151,7 +2127,6 @@ POSTHOOK: query: desc formatted over1k_part_buck_sort2 partition(t=27)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_buck_sort2
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -2159,7 +2134,6 @@ f float
# Partition Information
# col_name data_type comment
-
t tinyint
# Detailed Partition Information
@@ -2192,7 +2166,6 @@ POSTHOOK: query: desc formatted over1k_part_buck_sort2 partition(t="__HIVE_DEFAU
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_buck_sort2
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -2200,7 +2173,6 @@ f float
# Partition Information
# col_name data_type comment
-
t tinyint
# Detailed Partition Information
@@ -2294,7 +2266,6 @@ POSTHOOK: query: desc formatted over1k_part_buck_sort2 partition(t=27)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_buck_sort2
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -2302,7 +2273,6 @@ f float
# Partition Information
# col_name data_type comment
-
t tinyint
# Detailed Partition Information
@@ -2335,7 +2305,6 @@ POSTHOOK: query: desc formatted over1k_part_buck_sort2 partition(t="__HIVE_DEFAU
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@over1k_part_buck_sort2
# col_name data_type comment
-
si smallint
i int
b bigint
@@ -2343,7 +2312,6 @@ f float
# Partition Information
# col_name data_type comment
-
t tinyint
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization2.q.out b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization2.q.out
index f4a0043..568ab65 100644
--- a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization2.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization2.q.out
@@ -184,13 +184,11 @@ POSTHOOK: query: desc formatted ss_part partition(ss_sold_date_sk=2452617)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@ss_part
# col_name data_type comment
-
ss_net_paid_inc_tax float
ss_net_profit float
# Partition Information
# col_name data_type comment
-
ss_sold_date_sk int
# Detailed Partition Information
@@ -244,13 +242,11 @@ POSTHOOK: query: desc formatted ss_part partition(ss_sold_date_sk=2452638)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@ss_part
# col_name data_type comment
-
ss_net_paid_inc_tax float
ss_net_profit float
# Partition Information
# col_name data_type comment
-
ss_sold_date_sk int
# Detailed Partition Information
@@ -416,13 +412,11 @@ POSTHOOK: query: desc formatted ss_part partition(ss_sold_date_sk=2452617)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@ss_part
# col_name data_type comment
-
ss_net_paid_inc_tax float
ss_net_profit float
# Partition Information
# col_name data_type comment
-
ss_sold_date_sk int
# Detailed Partition Information
@@ -476,13 +470,11 @@ POSTHOOK: query: desc formatted ss_part partition(ss_sold_date_sk=2452638)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@ss_part
# col_name data_type comment
-
ss_net_paid_inc_tax float
ss_net_profit float
# Partition Information
# col_name data_type comment
-
ss_sold_date_sk int
# Detailed Partition Information
@@ -664,13 +656,11 @@ POSTHOOK: query: desc formatted ss_part partition(ss_sold_date_sk=2452617)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@ss_part
# col_name data_type comment
-
ss_net_paid_inc_tax float
ss_net_profit float
# Partition Information
# col_name data_type comment
-
ss_sold_date_sk int
# Detailed Partition Information
@@ -724,13 +714,11 @@ POSTHOOK: query: desc formatted ss_part partition(ss_sold_date_sk=2452638)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@ss_part
# col_name data_type comment
-
ss_net_paid_inc_tax float
ss_net_profit float
# Partition Information
# col_name data_type comment
-
ss_sold_date_sk int
# Detailed Partition Information
@@ -894,13 +882,11 @@ POSTHOOK: query: desc formatted ss_part partition(ss_sold_date_sk=2452617)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@ss_part
# col_name data_type comment
-
ss_net_paid_inc_tax float
ss_net_profit float
# Partition Information
# col_name data_type comment
-
ss_sold_date_sk int
# Detailed Partition Information
@@ -954,13 +940,11 @@ POSTHOOK: query: desc formatted ss_part partition(ss_sold_date_sk=2452638)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@ss_part
# col_name data_type comment
-
ss_net_paid_inc_tax float
ss_net_profit float
# Partition Information
# col_name data_type comment
-
ss_sold_date_sk int
# Detailed Partition Information
@@ -1197,13 +1181,11 @@ POSTHOOK: query: desc formatted ss_part_orc partition(ss_sold_date_sk=2452617)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@ss_part_orc
# col_name data_type comment
-
ss_net_paid_inc_tax float
ss_net_profit float
# Partition Information
# col_name data_type comment
-
ss_sold_date_sk int
# Detailed Partition Information
@@ -1257,13 +1239,11 @@ POSTHOOK: query: desc formatted ss_part_orc partition(ss_sold_date_sk=2452638)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@ss_part_orc
# col_name data_type comment
-
ss_net_paid_inc_tax float
ss_net_profit float
# Partition Information
# col_name data_type comment
-
ss_sold_date_sk int
# Detailed Partition Information
@@ -1427,13 +1407,11 @@ POSTHOOK: query: desc formatted ss_part_orc partition(ss_sold_date_sk=2452617)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@ss_part_orc
# col_name data_type comment
-
ss_net_paid_inc_tax float
ss_net_profit float
# Partition Information
# col_name data_type comment
-
ss_sold_date_sk int
# Detailed Partition Information
@@ -1487,13 +1465,11 @@ POSTHOOK: query: desc formatted ss_part_orc partition(ss_sold_date_sk=2452638)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@ss_part_orc
# col_name data_type comment
-
ss_net_paid_inc_tax float
ss_net_profit float
# Partition Information
# col_name data_type comment
-
ss_sold_date_sk int
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/explainuser_1.q.out b/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
index 164eb0c..b9c6cd9 100644
--- a/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
@@ -34,7 +34,6 @@ ts string
# Partition Information
# col_name data_type comment
-
ds string
ts string
[02/21] hive git commit: HIVE-17519: Transpose column stats display
(Zoltan Haindrich, reviewed by Ashutosh Chauhan and Vineet Garg)
Posted by kg...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/statsfs.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/statsfs.q.out b/ql/src/test/results/clientpositive/spark/statsfs.q.out
index d070e9a..fef2040 100644
--- a/ql/src/test/results/clientpositive/spark/statsfs.q.out
+++ b/ql/src/test/results/clientpositive/spark/statsfs.q.out
@@ -47,13 +47,11 @@ POSTHOOK: query: describe formatted t1 partition (ds='2010')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -86,13 +84,11 @@ POSTHOOK: query: describe formatted t1 partition (ds='2011')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -161,13 +157,11 @@ POSTHOOK: query: describe formatted t1 partition (ds='2010')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -200,13 +194,11 @@ POSTHOOK: query: describe formatted t1 partition (ds='2011')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -271,7 +263,6 @@ POSTHOOK: query: describe formatted t1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t1
# col_name data_type comment
-
key string
value string
@@ -332,7 +323,6 @@ POSTHOOK: query: describe formatted t1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t1
# col_name data_type comment
-
key string
value string
@@ -410,13 +400,11 @@ POSTHOOK: query: describe formatted t1 partition (ds='2008-04-08',hr='11')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -450,13 +438,11 @@ POSTHOOK: query: describe formatted t1 partition (ds='2008-04-09',hr='12')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_1.q.out b/ql/src/test/results/clientpositive/spark/union_remove_1.q.out
index 1cc1303..858cac6 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_1.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_1.q.out
@@ -145,7 +145,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_10.q.out b/ql/src/test/results/clientpositive/spark/union_remove_10.q.out
index 18438d2..6bac57b 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_10.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_10.q.out
@@ -220,7 +220,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_11.q.out b/ql/src/test/results/clientpositive/spark/union_remove_11.q.out
index 8aeb902..992ddd7 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_11.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_11.q.out
@@ -210,7 +210,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_12.q.out b/ql/src/test/results/clientpositive/spark/union_remove_12.q.out
index 020497f..fc3eb6d 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_12.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_12.q.out
@@ -212,7 +212,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_13.q.out b/ql/src/test/results/clientpositive/spark/union_remove_13.q.out
index e83f927..4ed630b 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_13.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_13.q.out
@@ -234,7 +234,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_14.q.out b/ql/src/test/results/clientpositive/spark/union_remove_14.q.out
index 020497f..fc3eb6d 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_14.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_14.q.out
@@ -212,7 +212,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_15.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_15.q.out b/ql/src/test/results/clientpositive/spark/union_remove_15.q.out
index 320d869..8a25ceb 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_15.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_15.q.out
@@ -158,13 +158,11 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_16.q.out b/ql/src/test/results/clientpositive/spark/union_remove_16.q.out
index 04b668b..8594301 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_16.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_16.q.out
@@ -200,13 +200,11 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_17.q.out b/ql/src/test/results/clientpositive/spark/union_remove_17.q.out
index f4eed3c..cef4255 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_17.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_17.q.out
@@ -136,13 +136,11 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_18.q.out b/ql/src/test/results/clientpositive/spark/union_remove_18.q.out
index 62c3598..51f2f16 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_18.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_18.q.out
@@ -170,13 +170,11 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_19.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_19.q.out b/ql/src/test/results/clientpositive/spark/union_remove_19.q.out
index 0ec066e..4e3dc8e 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_19.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_19.q.out
@@ -145,7 +145,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_2.q.out b/ql/src/test/results/clientpositive/spark/union_remove_2.q.out
index 928f266..d440f45 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_2.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_2.q.out
@@ -170,7 +170,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_20.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_20.q.out b/ql/src/test/results/clientpositive/spark/union_remove_20.q.out
index 1bc3d57..4e2d472 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_20.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_20.q.out
@@ -153,7 +153,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
values bigint
key string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_21.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_21.q.out b/ql/src/test/results/clientpositive/spark/union_remove_21.q.out
index d9fcf54..9eb2978 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_21.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_21.q.out
@@ -140,7 +140,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_22.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_22.q.out b/ql/src/test/results/clientpositive/spark/union_remove_22.q.out
index 2f9941d..072d5c9 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_22.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_22.q.out
@@ -154,7 +154,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
values2 bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_23.q.out b/ql/src/test/results/clientpositive/spark/union_remove_23.q.out
index dcc8635..89938f0 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_23.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_23.q.out
@@ -206,7 +206,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_24.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_24.q.out b/ql/src/test/results/clientpositive/spark/union_remove_24.q.out
index 8f7187b..8ba574a 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_24.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_24.q.out
@@ -153,7 +153,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key double
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_25.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_25.q.out b/ql/src/test/results/clientpositive/spark/union_remove_25.q.out
index 1949a90..f681428 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_25.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_25.q.out
@@ -163,13 +163,11 @@ POSTHOOK: query: desc formatted outputTbl1 partition(ds='2004')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -354,13 +352,11 @@ POSTHOOK: query: desc formatted outputTbl2 partition(ds='2008-04-08')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl2
# col_name data_type comment
-
key string
values bigint
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -528,13 +524,11 @@ POSTHOOK: query: desc formatted outputTbl3 partition(ds='2008-04-08', hr='11')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl3
# col_name data_type comment
-
key string
values bigint
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_3.q.out b/ql/src/test/results/clientpositive/spark/union_remove_3.q.out
index 7531472..4ce449b 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_3.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_3.q.out
@@ -160,7 +160,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_4.q.out b/ql/src/test/results/clientpositive/spark/union_remove_4.q.out
index b31ae64..405356b 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_4.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_4.q.out
@@ -195,7 +195,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_5.q.out b/ql/src/test/results/clientpositive/spark/union_remove_5.q.out
index 1380180..36046a5 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_5.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_5.q.out
@@ -220,7 +220,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_7.q.out b/ql/src/test/results/clientpositive/spark/union_remove_7.q.out
index 0fabbac..5ccadb2 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_7.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_7.q.out
@@ -145,7 +145,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_8.q.out b/ql/src/test/results/clientpositive/spark/union_remove_8.q.out
index c96f591..31680e9 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_8.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_8.q.out
@@ -170,7 +170,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/spark/union_remove_9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_9.q.out b/ql/src/test/results/clientpositive/spark/union_remove_9.q.out
index 550b2ad..43b77c8 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_9.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_9.q.out
@@ -228,7 +228,6 @@ POSTHOOK: query: desc formatted outputTbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@outputtbl1
# col_name data_type comment
-
key string
values bigint
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats0.q.out b/ql/src/test/results/clientpositive/stats0.q.out
index 0476acb..c7e8da9 100644
--- a/ql/src/test/results/clientpositive/stats0.q.out
+++ b/ql/src/test/results/clientpositive/stats0.q.out
@@ -1274,7 +1274,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
@@ -1290,7 +1289,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
@@ -2824,7 +2822,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
@@ -2840,7 +2837,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats1.q.out b/ql/src/test/results/clientpositive/stats1.q.out
index 5c6049b..075e16b 100644
--- a/ql/src/test/results/clientpositive/stats1.q.out
+++ b/ql/src/test/results/clientpositive/stats1.q.out
@@ -167,7 +167,6 @@ POSTHOOK: query: DESCRIBE FORMATTED tmptable
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tmptable
# col_name data_type comment
-
key string
value string
@@ -210,7 +209,6 @@ POSTHOOK: query: DESCRIBE FORMATTED tmptable
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tmptable
# col_name data_type comment
-
key string
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats10.q.out b/ql/src/test/results/clientpositive/stats10.q.out
index d1fe473..fa6142f 100644
--- a/ql/src/test/results/clientpositive/stats10.q.out
+++ b/ql/src/test/results/clientpositive/stats10.q.out
@@ -399,13 +399,11 @@ POSTHOOK: query: describe formatted bucket3_1 partition (ds='1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@bucket3_1
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -438,13 +436,11 @@ POSTHOOK: query: describe formatted bucket3_1 partition (ds='2')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@bucket3_1
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -477,13 +473,11 @@ POSTHOOK: query: describe formatted bucket3_1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@bucket3_1
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats12.q.out b/ql/src/test/results/clientpositive/stats12.q.out
index cebdf67..3b91cc9 100644
--- a/ql/src/test/results/clientpositive/stats12.q.out
+++ b/ql/src/test/results/clientpositive/stats12.q.out
@@ -176,13 +176,11 @@ POSTHOOK: query: desc formatted analyze_srcpart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -217,13 +215,11 @@ POSTHOOK: query: desc formatted analyze_srcpart partition (ds='2008-04-08', hr=1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -257,13 +253,11 @@ POSTHOOK: query: desc formatted analyze_srcpart partition (ds='2008-04-08', hr=1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -297,13 +291,11 @@ POSTHOOK: query: desc formatted analyze_srcpart partition (ds='2008-04-09', hr=1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -334,13 +326,11 @@ POSTHOOK: query: desc formatted analyze_srcpart partition (ds='2008-04-09', hr=1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats13.q.out b/ql/src/test/results/clientpositive/stats13.q.out
index 227dfb5..903e256 100644
--- a/ql/src/test/results/clientpositive/stats13.q.out
+++ b/ql/src/test/results/clientpositive/stats13.q.out
@@ -126,13 +126,11 @@ POSTHOOK: query: desc formatted analyze_srcpart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -167,13 +165,11 @@ POSTHOOK: query: desc formatted analyze_srcpart partition (ds='2008-04-08', hr=1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -207,13 +203,11 @@ POSTHOOK: query: desc formatted analyze_srcpart partition (ds='2008-04-08', hr=1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -244,13 +238,11 @@ POSTHOOK: query: desc formatted analyze_srcpart partition (ds='2008-04-09', hr=1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -281,13 +273,11 @@ POSTHOOK: query: desc formatted analyze_srcpart partition (ds='2008-04-09', hr=1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -326,13 +316,11 @@ POSTHOOK: query: desc formatted analyze_srcpart2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart2
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats14.q.out b/ql/src/test/results/clientpositive/stats14.q.out
index 8501746..eb8a995 100644
--- a/ql/src/test/results/clientpositive/stats14.q.out
+++ b/ql/src/test/results/clientpositive/stats14.q.out
@@ -31,7 +31,6 @@ POSTHOOK: query: desc formatted stats_src
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_src
# col_name data_type comment
-
key string default
value string default
@@ -128,13 +127,11 @@ POSTHOOK: query: desc formatted stats_part
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_part
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -170,13 +167,11 @@ POSTHOOK: query: desc formatted stats_part partition (ds='2010-04-08', hr = '11'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_part
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -210,13 +205,11 @@ POSTHOOK: query: desc formatted stats_part partition (ds='2010-04-08', hr = '12'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_part
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -270,13 +263,11 @@ POSTHOOK: query: desc formatted stats_part
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_part
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats15.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats15.q.out b/ql/src/test/results/clientpositive/stats15.q.out
index 8501746..eb8a995 100644
--- a/ql/src/test/results/clientpositive/stats15.q.out
+++ b/ql/src/test/results/clientpositive/stats15.q.out
@@ -31,7 +31,6 @@ POSTHOOK: query: desc formatted stats_src
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_src
# col_name data_type comment
-
key string default
value string default
@@ -128,13 +127,11 @@ POSTHOOK: query: desc formatted stats_part
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_part
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -170,13 +167,11 @@ POSTHOOK: query: desc formatted stats_part partition (ds='2010-04-08', hr = '11'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_part
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -210,13 +205,11 @@ POSTHOOK: query: desc formatted stats_part partition (ds='2010-04-08', hr = '12'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_part
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -270,13 +263,11 @@ POSTHOOK: query: desc formatted stats_part
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_part
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats16.q.out b/ql/src/test/results/clientpositive/stats16.q.out
index 3b371a8..659d581 100644
--- a/ql/src/test/results/clientpositive/stats16.q.out
+++ b/ql/src/test/results/clientpositive/stats16.q.out
@@ -17,7 +17,6 @@ POSTHOOK: query: desc formatted stats16
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats16
# col_name data_type comment
-
key int
value string
@@ -65,7 +64,6 @@ POSTHOOK: query: desc formatted stats16
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats16
# col_name data_type comment
-
key int
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats18.q.out b/ql/src/test/results/clientpositive/stats18.q.out
index 4945808..dd54c0d 100644
--- a/ql/src/test/results/clientpositive/stats18.q.out
+++ b/ql/src/test/results/clientpositive/stats18.q.out
@@ -23,13 +23,11 @@ POSTHOOK: query: desc formatted stats_part partition (ds='2010-04-08', hr='13')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_part
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -71,13 +69,11 @@ POSTHOOK: query: desc formatted stats_part partition (ds='2010-04-08', hr='13')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_part
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats2.q.out b/ql/src/test/results/clientpositive/stats2.q.out
index 29a659f..991b137 100644
--- a/ql/src/test/results/clientpositive/stats2.q.out
+++ b/ql/src/test/results/clientpositive/stats2.q.out
@@ -83,13 +83,11 @@ POSTHOOK: query: desc formatted analyze_t1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_t1
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -167,13 +165,11 @@ POSTHOOK: query: describe formatted analyze_t1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_t1
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats3.q.out b/ql/src/test/results/clientpositive/stats3.q.out
index 2f76d0e..7d4ed9b 100644
--- a/ql/src/test/results/clientpositive/stats3.q.out
+++ b/ql/src/test/results/clientpositive/stats3.q.out
@@ -71,7 +71,6 @@ POSTHOOK: query: desc formatted hive_test_src
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@hive_test_src
# col_name data_type comment
-
col1 string
# Detailed Table Information
@@ -204,12 +203,10 @@ POSTHOOK: query: describe formatted hive_test_dst
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@hive_test_dst
# col_name data_type comment
-
col1 string
# Partition Information
# col_name data_type comment
-
pcol1 string
pcol2 string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats4.q.out b/ql/src/test/results/clientpositive/stats4.q.out
index 8f503a9..c0c3c12 100644
--- a/ql/src/test/results/clientpositive/stats4.q.out
+++ b/ql/src/test/results/clientpositive/stats4.q.out
@@ -2289,13 +2289,11 @@ POSTHOOK: query: describe formatted nzhang_part1 partition(ds='2008-04-08',hr=11
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_part1
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -2329,13 +2327,11 @@ POSTHOOK: query: describe formatted nzhang_part1 partition(ds='2008-04-08',hr=12
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_part1
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -2369,13 +2365,11 @@ POSTHOOK: query: describe formatted nzhang_part2 partition(ds='2008-12-31',hr=11
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_part2
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -2409,13 +2403,11 @@ POSTHOOK: query: describe formatted nzhang_part2 partition(ds='2008-12-31',hr=12
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_part2
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -2449,13 +2441,11 @@ POSTHOOK: query: describe formatted nzhang_part1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_part1
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -2491,13 +2481,11 @@ POSTHOOK: query: describe formatted nzhang_part2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_part2
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats5.q.out b/ql/src/test/results/clientpositive/stats5.q.out
index 74ddadb..b71c7c1 100644
--- a/ql/src/test/results/clientpositive/stats5.q.out
+++ b/ql/src/test/results/clientpositive/stats5.q.out
@@ -44,7 +44,6 @@ POSTHOOK: query: describe formatted analyze_src
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_src
# col_name data_type comment
-
key string
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats6.q.out b/ql/src/test/results/clientpositive/stats6.q.out
index 81a80cb..704bff8 100644
--- a/ql/src/test/results/clientpositive/stats6.q.out
+++ b/ql/src/test/results/clientpositive/stats6.q.out
@@ -64,13 +64,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -104,13 +102,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -144,13 +140,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-09',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -181,13 +175,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-09',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -218,13 +210,11 @@ POSTHOOK: query: describe formatted analyze_srcpart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats7.q.out b/ql/src/test/results/clientpositive/stats7.q.out
index 4d30413..5db2619 100644
--- a/ql/src/test/results/clientpositive/stats7.q.out
+++ b/ql/src/test/results/clientpositive/stats7.q.out
@@ -75,13 +75,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -115,13 +113,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -155,13 +151,11 @@ POSTHOOK: query: describe formatted analyze_srcpart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats8.q.out b/ql/src/test/results/clientpositive/stats8.q.out
index ea5f1d0..3a617d4 100644
--- a/ql/src/test/results/clientpositive/stats8.q.out
+++ b/ql/src/test/results/clientpositive/stats8.q.out
@@ -71,13 +71,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -111,13 +109,11 @@ POSTHOOK: query: describe formatted analyze_srcpart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -183,13 +179,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -254,13 +248,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-09',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -325,13 +317,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-09',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -408,13 +398,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -448,13 +436,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -488,13 +474,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-09',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -528,13 +512,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-09',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -568,13 +550,11 @@ POSTHOOK: query: describe formatted analyze_srcpart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats9.q.out b/ql/src/test/results/clientpositive/stats9.q.out
index a073b8b..7556c05 100644
--- a/ql/src/test/results/clientpositive/stats9.q.out
+++ b/ql/src/test/results/clientpositive/stats9.q.out
@@ -50,7 +50,6 @@ POSTHOOK: query: describe formatted analyze_srcbucket
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcbucket
# col_name data_type comment
-
key int
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats_empty_partition.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats_empty_partition.q.out b/ql/src/test/results/clientpositive/stats_empty_partition.q.out
index 289d17a..b1ddac3 100644
--- a/ql/src/test/results/clientpositive/stats_empty_partition.q.out
+++ b/ql/src/test/results/clientpositive/stats_empty_partition.q.out
@@ -23,13 +23,11 @@ POSTHOOK: query: describe formatted tmptable partition (part = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tmptable
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
part string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats_invalidation.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats_invalidation.q.out b/ql/src/test/results/clientpositive/stats_invalidation.q.out
index a0e7663..77d39d4 100644
--- a/ql/src/test/results/clientpositive/stats_invalidation.q.out
+++ b/ql/src/test/results/clientpositive/stats_invalidation.q.out
@@ -33,7 +33,6 @@ POSTHOOK: query: desc formatted stats_invalid
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_invalid
# col_name data_type comment
-
key string
value string
@@ -76,7 +75,6 @@ POSTHOOK: query: desc formatted stats_invalid
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_invalid
# col_name data_type comment
-
key string
value string
new_col string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats_list_bucket.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats_list_bucket.q.out b/ql/src/test/results/clientpositive/stats_list_bucket.q.out
index 0c43b1b..f6eb799 100644
--- a/ql/src/test/results/clientpositive/stats_list_bucket.q.out
+++ b/ql/src/test/results/clientpositive/stats_list_bucket.q.out
@@ -45,13 +45,11 @@ POSTHOOK: query: desc formatted stats_list_bucket partition (ds = '2008-04-08',
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_list_bucket
# col_name data_type comment
-
c1 string
c2 string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -122,7 +120,6 @@ POSTHOOK: query: desc formatted stats_list_bucket_1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_list_bucket_1
# col_name data_type comment
-
c1 string
c2 string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats_noscan_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats_noscan_1.q.out b/ql/src/test/results/clientpositive/stats_noscan_1.q.out
index ad2ca94..6d3f413 100644
--- a/ql/src/test/results/clientpositive/stats_noscan_1.q.out
+++ b/ql/src/test/results/clientpositive/stats_noscan_1.q.out
@@ -77,13 +77,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -115,13 +113,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -153,13 +149,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-09',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -190,13 +184,11 @@ POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-09',hr
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -227,13 +219,11 @@ POSTHOOK: query: describe formatted analyze_srcpart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -340,13 +330,11 @@ POSTHOOK: query: describe formatted analyze_srcpart_partial PARTITION(ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart_partial
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -378,13 +366,11 @@ POSTHOOK: query: describe formatted analyze_srcpart_partial PARTITION(ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart_partial
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -416,13 +402,11 @@ POSTHOOK: query: describe formatted analyze_srcpart_partial PARTITION(ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart_partial
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -453,13 +437,11 @@ POSTHOOK: query: describe formatted analyze_srcpart_partial PARTITION(ds='2008-0
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart_partial
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats_noscan_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats_noscan_2.q.out b/ql/src/test/results/clientpositive/stats_noscan_2.q.out
index 1e9603e..14e131c 100644
--- a/ql/src/test/results/clientpositive/stats_noscan_2.q.out
+++ b/ql/src/test/results/clientpositive/stats_noscan_2.q.out
@@ -37,7 +37,6 @@ POSTHOOK: query: describe formatted anaylyze_external
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@anaylyze_external
# col_name data_type comment
-
a int
# Detailed Table Information
@@ -78,7 +77,6 @@ POSTHOOK: query: describe formatted anaylyze_external
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@anaylyze_external
# col_name data_type comment
-
a int
# Detailed Table Information
@@ -199,13 +197,11 @@ POSTHOOK: query: describe formatted anaylyze_external PARTITION (insertdate='200
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@anaylyze_external
# col_name data_type comment
-
key string
val string
# Partition Information
# col_name data_type comment
-
insertdate string
# Detailed Partition Information
@@ -248,13 +244,11 @@ POSTHOOK: query: describe formatted anaylyze_external PARTITION (insertdate='200
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@anaylyze_external
# col_name data_type comment
-
key string
val string
# Partition Information
# col_name data_type comment
-
insertdate string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats_only_null.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats_only_null.q.out b/ql/src/test/results/clientpositive/stats_only_null.q.out
index e7068d3..bcbc3f4 100644
--- a/ql/src/test/results/clientpositive/stats_only_null.q.out
+++ b/ql/src/test/results/clientpositive/stats_only_null.q.out
@@ -201,7 +201,6 @@ POSTHOOK: query: describe formatted stats_null_part partition (dt='2010')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_null_part
# col_name data_type comment
-
a double
b int
c string
@@ -209,7 +208,6 @@ d smallint
# Partition Information
# col_name data_type comment
-
dt string
# Detailed Partition Information
@@ -242,7 +240,6 @@ POSTHOOK: query: describe formatted stats_null_part partition (dt='2011')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_null_part
# col_name data_type comment
-
a double
b int
c string
@@ -250,7 +247,6 @@ d smallint
# Partition Information
# col_name data_type comment
-
dt string
# Detailed Partition Information
@@ -377,9 +373,18 @@ PREHOOK: Input: default@stats_null_part
POSTHOOK: query: describe formatted stats_null_part partition(dt = 1) a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_null_part
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-a double 1.0 1.0 1 1 HL from deserializer
+col_name a
+data_type double
+min 1.0
+max 1.0
+num_nulls 1
+distinct_count 1
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: drop table stats_null
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@stats_null
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/stats_partscan_1_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats_partscan_1_23.q.out b/ql/src/test/results/clientpositive/stats_partscan_1_23.q.out
index cf9867d..bc2fec5 100644
--- a/ql/src/test/results/clientpositive/stats_partscan_1_23.q.out
+++ b/ql/src/test/results/clientpositive/stats_partscan_1_23.q.out
@@ -44,13 +44,11 @@ POSTHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart_partial_scan
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -110,13 +108,11 @@ POSTHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart_partial_scan
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -150,13 +146,11 @@ POSTHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@analyze_srcpart_partial_scan
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
[16/21] hive git commit: HIVE-17519: Transpose column stats display
(Zoltan Haindrich, reviewed by Ashutosh Chauhan and Vineet Garg)
Posted by kg...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter3.q.out b/ql/src/test/results/clientpositive/alter3.q.out
index ebae93f..3bd7288 100644
--- a/ql/src/test/results/clientpositive/alter3.q.out
+++ b/ql/src/test/results/clientpositive/alter3.q.out
@@ -76,7 +76,6 @@ pcol2 string
# Partition Information
# col_name data_type comment
-
pcol1 string
pcol2 string
@@ -93,7 +92,6 @@ pcol2 string
# Partition Information
# col_name data_type comment
-
pcol1 string
pcol2 string
@@ -148,7 +146,6 @@ pcol2 string
# Partition Information
# col_name data_type comment
-
pcol1 string
pcol2 string
@@ -294,7 +291,6 @@ pcol2 string
# Partition Information
# col_name data_type comment
-
pcol1 string
pcol2 string
@@ -311,7 +307,6 @@ pcol2 string
# Partition Information
# col_name data_type comment
-
pcol1 string
pcol2 string
@@ -366,7 +361,6 @@ pcol2 string
# Partition Information
# col_name data_type comment
-
pcol1 string
pcol2 string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter5.q.out b/ql/src/test/results/clientpositive/alter5.q.out
index 4c83dc0..1eb24c2 100644
--- a/ql/src/test/results/clientpositive/alter5.q.out
+++ b/ql/src/test/results/clientpositive/alter5.q.out
@@ -42,7 +42,6 @@ dt string
# Partition Information
# col_name data_type comment
-
dt string
#### A masked pattern was here ####
@@ -82,7 +81,6 @@ dt string
# Partition Information
# col_name data_type comment
-
dt string
#### A masked pattern was here ####
@@ -185,7 +183,6 @@ dt string
# Partition Information
# col_name data_type comment
-
dt string
#### A masked pattern was here ####
@@ -225,7 +222,6 @@ dt string
# Partition Information
# col_name data_type comment
-
dt string
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alterColumnStats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alterColumnStats.q.out b/ql/src/test/results/clientpositive/alterColumnStats.q.out
index ea2416f..09f2fe1 100644
--- a/ql/src/test/results/clientpositive/alterColumnStats.q.out
+++ b/ql/src/test/results/clientpositive/alterColumnStats.q.out
@@ -17,7 +17,6 @@ POSTHOOK: query: desc formatted p
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@p
# col_name data_type comment
-
insert_num int
c1 tinyint
c2 smallint
@@ -62,7 +61,6 @@ POSTHOOK: query: desc formatted p
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@p
# col_name data_type comment
-
insert_num int
c1 tinyint
c2 smallint
@@ -106,7 +104,6 @@ POSTHOOK: query: desc formatted p
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@p
# col_name data_type comment
-
insert_num int
c1 string
c2 string
@@ -142,9 +139,18 @@ PREHOOK: Input: default@p
POSTHOOK: query: desc formatted p c1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@p
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-c1 string from deserializer
+col_name c1
+data_type string
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: desc formatted p c2
PREHOOK: type: DESCTABLE
@@ -152,7 +158,16 @@ PREHOOK: Input: default@p
POSTHOOK: query: desc formatted p c2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@p
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-c2 string from deserializer
+col_name c2
+data_type string
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alterColumnStatsPart.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alterColumnStatsPart.q.out b/ql/src/test/results/clientpositive/alterColumnStatsPart.q.out
index a315a6b..6b9b7e5 100644
--- a/ql/src/test/results/clientpositive/alterColumnStatsPart.q.out
+++ b/ql/src/test/results/clientpositive/alterColumnStatsPart.q.out
@@ -17,13 +17,11 @@ POSTHOOK: query: desc formatted p
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@p
# col_name data_type comment
-
a int
b int
# Partition Information
# col_name data_type comment
-
c int
# Detailed Table Information
@@ -66,7 +64,6 @@ POSTHOOK: query: desc formatted p partition (c=1) a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@p
# col_name data_type comment
-
a int from deserializer
PREHOOK: query: desc formatted p partition (c=1)
PREHOOK: type: DESCTABLE
@@ -75,13 +72,11 @@ POSTHOOK: query: desc formatted p partition (c=1)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@p
# col_name data_type comment
-
a int
b int
# Partition Information
# col_name data_type comment
-
c int
# Detailed Partition Information
@@ -202,13 +197,11 @@ POSTHOOK: query: desc formatted p partition(c=4)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@p
# col_name data_type comment
-
a int
b int
# Partition Information
# col_name data_type comment
-
c int
# Detailed Partition Information
@@ -296,13 +289,11 @@ POSTHOOK: query: desc formatted p partition (c=100)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@p
# col_name data_type comment
-
a int
b int
# Partition Information
# col_name data_type comment
-
c int
# Detailed Partition Information
@@ -441,13 +432,11 @@ POSTHOOK: query: desc formatted p partition(c=100)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@p
# col_name data_type comment
-
a int
b int
# Partition Information
# col_name data_type comment
-
c int
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_file_format.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_file_format.q.out b/ql/src/test/results/clientpositive/alter_file_format.q.out
index e4be931..d134bc1 100644
--- a/ql/src/test/results/clientpositive/alter_file_format.q.out
+++ b/ql/src/test/results/clientpositive/alter_file_format.q.out
@@ -13,7 +13,6 @@ POSTHOOK: query: desc FORMATTED alter_file_format_test
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter_file_format_test
# col_name data_type comment
-
key int
value string
@@ -56,7 +55,6 @@ POSTHOOK: query: desc FORMATTED alter_file_format_test
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter_file_format_test
# col_name data_type comment
-
key int
value string
@@ -100,7 +98,6 @@ POSTHOOK: query: desc FORMATTED alter_file_format_test
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter_file_format_test
# col_name data_type comment
-
key int
value string
@@ -144,7 +141,6 @@ POSTHOOK: query: desc FORMATTED alter_file_format_test
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter_file_format_test
# col_name data_type comment
-
key int
value string
@@ -188,7 +184,6 @@ POSTHOOK: query: desc FORMATTED alter_file_format_test
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter_file_format_test
# col_name data_type comment
-
key int
value string
@@ -232,7 +227,6 @@ POSTHOOK: query: desc FORMATTED alter_file_format_test
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter_file_format_test
# col_name data_type comment
-
key int
value string
@@ -276,7 +270,6 @@ POSTHOOK: query: desc FORMATTED alter_file_format_test
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter_file_format_test
# col_name data_type comment
-
key int
value string
@@ -331,13 +324,11 @@ POSTHOOK: query: desc FORMATTED alter_partition_format_test partition(ds='2010')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter_partition_format_test
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -379,13 +370,11 @@ POSTHOOK: query: desc FORMATTED alter_partition_format_test partition(ds='2010')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter_partition_format_test
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -428,13 +417,11 @@ POSTHOOK: query: desc FORMATTED alter_partition_format_test partition(ds='2010')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter_partition_format_test
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -477,13 +464,11 @@ POSTHOOK: query: desc FORMATTED alter_partition_format_test partition(ds='2010')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter_partition_format_test
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -526,13 +511,11 @@ POSTHOOK: query: desc FORMATTED alter_partition_format_test partition(ds='2010')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter_partition_format_test
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -575,13 +558,11 @@ POSTHOOK: query: desc FORMATTED alter_partition_format_test partition(ds='2010')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter_partition_format_test
# col_name data_type comment
-
key int
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_merge_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_merge_2.q.out b/ql/src/test/results/clientpositive/alter_merge_2.q.out
index e118c39..5f5778e 100644
--- a/ql/src/test/results/clientpositive/alter_merge_2.q.out
+++ b/ql/src/test/results/clientpositive/alter_merge_2.q.out
@@ -26,7 +26,6 @@ ts string
# Partition Information
# col_name data_type comment
-
ds string
ts string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_merge_2_orc.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_merge_2_orc.q.out b/ql/src/test/results/clientpositive/alter_merge_2_orc.q.out
index caa41b2..0829057 100644
--- a/ql/src/test/results/clientpositive/alter_merge_2_orc.q.out
+++ b/ql/src/test/results/clientpositive/alter_merge_2_orc.q.out
@@ -26,7 +26,6 @@ ts string
# Partition Information
# col_name data_type comment
-
ds string
ts string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_merge_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_merge_stats.q.out b/ql/src/test/results/clientpositive/alter_merge_stats.q.out
index fdd2ddc..c3f67d0 100644
--- a/ql/src/test/results/clientpositive/alter_merge_stats.q.out
+++ b/ql/src/test/results/clientpositive/alter_merge_stats.q.out
@@ -178,7 +178,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
@@ -206,7 +205,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
@@ -247,7 +245,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2_h23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2_h23.q.out b/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2_h23.q.out
index 12dcc11..3479ac3 100644
--- a/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2_h23.q.out
+++ b/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2_h23.q.out
@@ -13,13 +13,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -64,13 +62,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1 PARTITION (ds = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -111,13 +107,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -163,13 +157,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1 PARTITION (ds = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -210,13 +202,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -262,13 +252,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1 PARTITION (ds = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -309,13 +297,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -361,13 +347,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1 PARTITION (ds = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -408,13 +392,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -460,13 +442,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1 PARTITION (ds = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -507,13 +487,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -559,13 +537,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1 PARTITION (ds = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -606,13 +582,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -658,13 +632,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1 PARTITION (ds = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -705,13 +677,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -757,13 +727,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1 PARTITION (ds = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -804,13 +772,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -856,13 +822,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1 PARTITION (ds = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table_h23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table_h23.q.out b/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table_h23.q.out
index 944482c..537e776 100644
--- a/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table_h23.q.out
+++ b/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table_h23.q.out
@@ -21,13 +21,11 @@ POSTHOOK: query: describe formatted tst1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -73,13 +71,11 @@ POSTHOOK: query: describe formatted tst1 partition (ds = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -130,13 +126,11 @@ POSTHOOK: query: describe formatted tst1 partition (ds = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -169,13 +163,11 @@ POSTHOOK: query: describe formatted tst1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -218,13 +210,11 @@ POSTHOOK: query: describe formatted tst1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -260,13 +250,11 @@ POSTHOOK: query: describe formatted tst1 partition (ds = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -307,13 +295,11 @@ POSTHOOK: query: describe formatted tst1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -349,13 +335,11 @@ POSTHOOK: query: describe formatted tst1 partition (ds = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -397,13 +381,11 @@ POSTHOOK: query: describe formatted tst1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -447,13 +429,11 @@ POSTHOOK: query: describe formatted tst1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -497,13 +477,11 @@ POSTHOOK: query: describe formatted tst1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -547,13 +525,11 @@ POSTHOOK: query: describe formatted tst1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_partition_change_col.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_partition_change_col.q.out b/ql/src/test/results/clientpositive/alter_partition_change_col.q.out
index 1738aea..7e2864b 100644
--- a/ql/src/test/results/clientpositive/alter_partition_change_col.q.out
+++ b/ql/src/test/results/clientpositive/alter_partition_change_col.q.out
@@ -196,7 +196,6 @@ p2 string Column p2
# Partition Information
# col_name data_type comment
-
p1 string Column p1
p2 string Column p2
PREHOOK: query: describe alter_partition_change_col1 partition (p1='abc', p2='123')
@@ -212,7 +211,6 @@ p2 string Column p2
# Partition Information
# col_name data_type comment
-
p1 string Column p1
p2 string Column p2
PREHOOK: query: select * from alter_partition_change_col1 where p1='abc'
@@ -275,7 +273,6 @@ p2 string Column p2
# Partition Information
# col_name data_type comment
-
p1 string Changed comment for p1
p2 string Column p2
PREHOOK: query: alter table alter_partition_change_col1 partition (p1='abc', p2='123') change c2 c2 decimal(14,4)
@@ -300,7 +297,6 @@ p2 string Column p2
# Partition Information
# col_name data_type comment
-
p1 string Changed comment for p1
p2 string Column p2
PREHOOK: query: select * from alter_partition_change_col1 where p1='abc'
@@ -365,7 +361,6 @@ p2 string Column p2
# Partition Information
# col_name data_type comment
-
p1 string Changed comment for p1
p2 string Column p2
PREHOOK: query: select * from alter_partition_change_col1 where p1='abc'
@@ -430,7 +425,6 @@ p2 string Column p2
# Partition Information
# col_name data_type comment
-
p1 string Changed comment for p1
p2 string Column p2
PREHOOK: query: describe alter_partition_change_col1 partition (p1='abc', p2='123')
@@ -445,7 +439,6 @@ p2 string Column p2
# Partition Information
# col_name data_type comment
-
p1 string Changed comment for p1
p2 string Column p2
PREHOOK: query: select * from alter_partition_change_col1 where p1='abc'
@@ -508,7 +501,6 @@ p2 string Column p2
# Partition Information
# col_name data_type comment
-
p1 string Changed comment for p1
p2 string Column p2
PREHOOK: query: select * from alter_partition_change_col1 where p1='abc'
@@ -572,7 +564,6 @@ p2 string Column p2
# Partition Information
# col_name data_type comment
-
p1 string Changed comment for p1
p2 string Column p2
PREHOOK: query: describe alter_partition_change_col1 partition (p1='abc', p2='123')
@@ -587,7 +578,6 @@ p2 string Column p2
# Partition Information
# col_name data_type comment
-
p1 string Changed comment for p1
p2 string Column p2
PREHOOK: query: select * from alter_partition_change_col1 where p1='abc'
@@ -652,7 +642,6 @@ p2 string Column p2
# Partition Information
# col_name data_type comment
-
p1 string Changed comment for p1
p2 string Column p2
PREHOOK: query: select * from alter_partition_change_col1 where p1='abc'
@@ -720,7 +709,6 @@ p2 string Column p2
# Partition Information
# col_name data_type comment
-
p1 string Changed comment for p1
p2 string Column p2
PREHOOK: query: describe alter_partition_change_col1 partition (p1='__HIVE_DEFAULT_PARTITION__', p2='123')
@@ -736,7 +724,6 @@ p2 string Column p2
# Partition Information
# col_name data_type comment
-
p1 string Changed comment for p1
p2 string Column p2
PREHOOK: query: select * from alter_partition_change_col1 where p1='abc'
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out b/ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out
index d67be56..758dd23 100644
--- a/ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out
+++ b/ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out
@@ -29,13 +29,11 @@ POSTHOOK: query: desc formatted alter_table_partition_clusterby_sortby partition
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter_table_partition_clusterby_sortby
# col_name data_type comment
-
a int
b int
# Partition Information
# col_name data_type comment
-
c string
# Detailed Partition Information
@@ -78,13 +76,11 @@ POSTHOOK: query: desc formatted alter_table_partition_clusterby_sortby partition
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter_table_partition_clusterby_sortby
# col_name data_type comment
-
a int
b int
# Partition Information
# col_name data_type comment
-
c string
# Detailed Partition Information
@@ -127,13 +123,11 @@ POSTHOOK: query: desc formatted alter_table_partition_clusterby_sortby partition
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter_table_partition_clusterby_sortby
# col_name data_type comment
-
a int
b int
# Partition Information
# col_name data_type comment
-
c string
# Detailed Partition Information
@@ -167,13 +161,11 @@ POSTHOOK: query: desc formatted alter_table_partition_clusterby_sortby
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter_table_partition_clusterby_sortby
# col_name data_type comment
-
a int
b int
# Partition Information
# col_name data_type comment
-
c string
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_partition_coltype.q.out b/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
index 426a4de..72322d9 100644
--- a/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
+++ b/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
@@ -29,7 +29,6 @@ ts string
# Partition Information
# col_name data_type comment
-
dt string
ts string
PREHOOK: query: select count(*) from alter_coltype where dt = '100'
@@ -359,7 +358,6 @@ ts double
# Partition Information
# col_name data_type comment
-
dt string
ts double
PREHOOK: query: desc alter_coltype partition (dt='100', ts='6.30')
@@ -375,7 +373,6 @@ ts double
# Partition Information
# col_name data_type comment
-
dt string
ts double
PREHOOK: query: desc alter_coltype partition (dt='100', ts=3.0)
@@ -391,7 +388,6 @@ ts double
# Partition Information
# col_name data_type comment
-
dt string
ts double
PREHOOK: query: drop table alter_coltype
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out b/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out
index ea2a70c..06f94f5 100644
--- a/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out
+++ b/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out
@@ -87,7 +87,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
@@ -112,7 +111,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
@@ -137,7 +135,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
@@ -153,7 +150,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
@@ -177,7 +173,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
@@ -201,7 +196,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_partition_onto_nocurrent_db.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_partition_onto_nocurrent_db.q.out b/ql/src/test/results/clientpositive/alter_partition_onto_nocurrent_db.q.out
index f109bcc..129df95 100644
--- a/ql/src/test/results/clientpositive/alter_partition_onto_nocurrent_db.q.out
+++ b/ql/src/test/results/clientpositive/alter_partition_onto_nocurrent_db.q.out
@@ -32,7 +32,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
@@ -56,7 +55,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_partition_update_status.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_partition_update_status.q.out b/ql/src/test/results/clientpositive/alter_partition_update_status.q.out
index caa1f8d..37b24ed 100644
--- a/ql/src/test/results/clientpositive/alter_partition_update_status.q.out
+++ b/ql/src/test/results/clientpositive/alter_partition_update_status.q.out
@@ -34,9 +34,18 @@ PREHOOK: Input: default@src_stat_part_one
POSTHOOK: query: describe formatted src_stat_part_one PARTITION(partitionId=1) key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat_part_one
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 16 1.72 3 HL from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 16
+avg_col_len 1.72
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: ALTER TABLE src_stat_part_one PARTITION(partitionId=1) UPDATE STATISTICS for column key SET ('numDVs'='11','avgColLen'='2.2')
PREHOOK: type: ALTERTABLE_UPDATEPARTSTATS
POSTHOOK: query: ALTER TABLE src_stat_part_one PARTITION(partitionId=1) UPDATE STATISTICS for column key SET ('numDVs'='11','avgColLen'='2.2')
@@ -47,9 +56,18 @@ PREHOOK: Input: default@src_stat_part_one
POSTHOOK: query: describe formatted src_stat_part_one PARTITION(partitionId=1) key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat_part_one
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 11 2.2 3 HL from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 11
+avg_col_len 2.2
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: create table src_stat_part_two(key string, value string) partitioned by (px int, py string)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -86,9 +104,18 @@ PREHOOK: Input: default@src_stat_part_two
POSTHOOK: query: describe formatted src_stat_part_two PARTITION(px=1, py='a') key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat_part_two
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 16 1.72 3 HL from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 16
+avg_col_len 1.72
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: ALTER TABLE src_stat_part_two PARTITION(px=1, py='a') UPDATE STATISTICS for column key SET ('numDVs'='30','maxColLen'='40')
PREHOOK: type: ALTERTABLE_UPDATEPARTSTATS
POSTHOOK: query: ALTER TABLE src_stat_part_two PARTITION(px=1, py='a') UPDATE STATISTICS for column key SET ('numDVs'='30','maxColLen'='40')
@@ -99,9 +126,18 @@ PREHOOK: Input: default@src_stat_part_two
POSTHOOK: query: describe formatted src_stat_part_two PARTITION(px=1, py='a') key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat_part_two
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 30 1.72 40 HL from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 30
+avg_col_len 1.72
+max_col_len 40
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: create database if not exists dummydb
PREHOOK: type: CREATEDATABASE
PREHOOK: Output: database:dummydb
@@ -124,9 +160,18 @@ PREHOOK: Input: default@src_stat_part_two
POSTHOOK: query: describe formatted default.src_stat_part_two PARTITION(px=1, py='a') key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat_part_two
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 40 1.72 50 HL from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 40
+avg_col_len 1.72
+max_col_len 50
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: use default
PREHOOK: type: SWITCHDATABASE
PREHOOK: Input: database:default
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_skewed_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_skewed_table.q.out b/ql/src/test/results/clientpositive/alter_skewed_table.q.out
index e553267..ce4b509 100644
--- a/ql/src/test/results/clientpositive/alter_skewed_table.q.out
+++ b/ql/src/test/results/clientpositive/alter_skewed_table.q.out
@@ -13,7 +13,6 @@ POSTHOOK: query: describe formatted original
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@original
# col_name data_type comment
-
key string
value string
@@ -56,7 +55,6 @@ POSTHOOK: query: describe formatted original
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@original
# col_name data_type comment
-
key string
value string
@@ -116,7 +114,6 @@ POSTHOOK: query: describe formatted skew_test.original2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: skew_test@original2
# col_name data_type comment
-
key string
value string
@@ -159,7 +156,6 @@ POSTHOOK: query: describe formatted skew_test.original2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: skew_test@original2
# col_name data_type comment
-
key string
value string
@@ -213,7 +209,6 @@ POSTHOOK: query: describe formatted skew_test.original3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: skew_test@original3
# col_name data_type comment
-
key string
value string
@@ -258,7 +253,6 @@ POSTHOOK: query: describe formatted skew_test.original3
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: skew_test@original3
# col_name data_type comment
-
key string
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_table_add_partition.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_table_add_partition.q.out b/ql/src/test/results/clientpositive/alter_table_add_partition.q.out
index c96e5b4..ca941dd 100644
--- a/ql/src/test/results/clientpositive/alter_table_add_partition.q.out
+++ b/ql/src/test/results/clientpositive/alter_table_add_partition.q.out
@@ -13,12 +13,10 @@ POSTHOOK: query: desc formatted mp
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@mp
# col_name data_type comment
-
a int
# Partition Information
# col_name data_type comment
-
b int
# Detailed Table Information
@@ -60,12 +58,10 @@ POSTHOOK: query: desc formatted mp
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@mp
# col_name data_type comment
-
a int
# Partition Information
# col_name data_type comment
-
b int
# Detailed Table Information
@@ -100,12 +96,10 @@ POSTHOOK: query: desc formatted mp partition (b=1)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@mp
# col_name data_type comment
-
a int
# Partition Information
# col_name data_type comment
-
b int
# Detailed Partition Information
@@ -145,12 +139,10 @@ POSTHOOK: query: desc formatted mp
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@mp
# col_name data_type comment
-
a int
# Partition Information
# col_name data_type comment
-
b int
# Detailed Table Information
@@ -185,12 +177,10 @@ POSTHOOK: query: desc formatted mp partition (b=1)
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@mp
# col_name data_type comment
-
a int
# Partition Information
# col_name data_type comment
-
b int
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_table_cascade.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_table_cascade.q.out b/ql/src/test/results/clientpositive/alter_table_cascade.q.out
index 13e6b24..d722b90 100644
--- a/ql/src/test/results/clientpositive/alter_table_cascade.q.out
+++ b/ql/src/test/results/clientpositive/alter_table_cascade.q.out
@@ -67,7 +67,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_cascade partition (p1='abc', p2='123')
@@ -82,7 +81,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_cascade partition (p1='__HIVE_DEFAULT_PARTITION__', p2='123')
@@ -97,7 +95,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: select * from alter_table_cascade where p1='abc'
@@ -182,7 +179,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_cascade partition (p1='xyz', p2='123')
@@ -198,7 +194,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_cascade partition (p1='abc', p2='123')
@@ -214,7 +209,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_cascade partition (p1='__HIVE_DEFAULT_PARTITION__', p2='123')
@@ -230,7 +224,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: select * from alter_table_cascade where p1='xyz'
@@ -320,7 +313,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_cascade partition (p1='xyz', p2='123')
@@ -336,7 +328,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_cascade partition (p1='abc', p2='123')
@@ -352,7 +343,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_cascade partition (p1='__HIVE_DEFAULT_PARTITION__', p2='123')
@@ -368,7 +358,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: select * from alter_table_cascade where p1='xyz'
@@ -458,7 +447,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_cascade partition (p1='xyz', p2='123')
@@ -474,7 +462,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_cascade partition (p1='abc', p2='123')
@@ -490,7 +477,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_cascade partition (p1='__HIVE_DEFAULT_PARTITION__', p2='123')
@@ -506,7 +492,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: alter table alter_table_cascade change c2fromc1 c1 string comment "change position first" first cascade
@@ -536,7 +521,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_cascade partition (p1='xyz', p2='123')
@@ -552,7 +536,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_cascade partition (p1='abc', p2='123')
@@ -568,7 +551,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_cascade partition (p1='__HIVE_DEFAULT_PARTITION__', p2='123')
@@ -584,7 +566,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: alter table alter_table_cascade replace columns (c1 string) cascade
@@ -613,7 +594,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_cascade partition (p1='xyz', p2='123')
@@ -628,7 +608,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_cascade partition (p1='abc', p2='123')
@@ -643,7 +622,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_cascade partition (p1='__HIVE_DEFAULT_PARTITION__', p2='123')
@@ -658,7 +636,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: select * from alter_table_cascade where p1='xyz'
@@ -748,7 +725,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_cascade partition (p1='xyz', p2='123')
@@ -764,7 +740,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_cascade partition (p1='abc', p2='123')
@@ -780,7 +755,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_cascade partition (p1='__HIVE_DEFAULT_PARTITION__', p2='123')
@@ -796,7 +770,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: select * from alter_table_cascade where p1='xyz'
@@ -908,7 +881,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_restrict partition (p1='abc', p2='123')
@@ -923,7 +895,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_restrict partition (p1='__HIVE_DEFAULT_PARTITION__', p2='123')
@@ -938,7 +909,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: select * from alter_table_restrict where p1='abc'
@@ -1027,7 +997,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_restrict partition (p1='xyz', p2='123')
@@ -1043,7 +1012,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_restrict partition (p1='abc', p2='123')
@@ -1058,7 +1026,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_restrict partition (p1='__HIVE_DEFAULT_PARTITION__', p2='123')
@@ -1073,7 +1040,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: select * from alter_table_restrict where p1='xyz'
@@ -1157,7 +1123,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_restrict partition (p1='xyz', p2='123')
@@ -1173,7 +1138,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_restrict partition (p1='abc', p2='123')
@@ -1188,7 +1152,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_restrict partition (p1='__HIVE_DEFAULT_PARTITION__', p2='123')
@@ -1203,7 +1166,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: alter table alter_table_restrict replace columns (c1 string)
@@ -1226,7 +1188,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_restrict partition (p1='xyz', p2='123')
@@ -1242,7 +1203,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_restrict partition (p1='abc', p2='123')
@@ -1257,7 +1217,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_restrict partition (p1='__HIVE_DEFAULT_PARTITION__', p2='123')
@@ -1272,7 +1231,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: alter table alter_table_restrict add columns (c2 decimal(14,4))
@@ -1296,7 +1254,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_restrict partition (p1='xyz', p2='123')
@@ -1312,7 +1269,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_restrict partition (p1='abc', p2='123')
@@ -1327,7 +1283,6 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
PREHOOK: query: describe alter_table_restrict partition (p1='__HIVE_DEFAULT_PARTITION__', p2='123')
@@ -1342,6 +1297,5 @@ p2 string
# Partition Information
# col_name data_type comment
-
p1 string
p2 string
[12/21] hive git commit: HIVE-17519: Transpose column stats display
(Zoltan Haindrich, reviewed by Ashutosh Chauhan and Vineet Garg)
Posted by kg...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_table_update_status_disable_bitvector.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_table_update_status_disable_bitvector.q.out b/ql/src/test/results/clientpositive/alter_table_update_status_disable_bitvector.q.out
index 1dcc1fc..8e4ca0a 100644
--- a/ql/src/test/results/clientpositive/alter_table_update_status_disable_bitvector.q.out
+++ b/ql/src/test/results/clientpositive/alter_table_update_status_disable_bitvector.q.out
@@ -46,9 +46,18 @@ PREHOOK: Input: default@src_stat
POSTHOOK: query: describe formatted src_stat key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 16 1.72 3 from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 16
+avg_col_len 1.72
+max_col_len 3
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}}
PREHOOK: query: ALTER TABLE src_stat UPDATE STATISTICS for column key SET ('numDVs'='1111','avgColLen'='1.111')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -60,9 +69,18 @@ PREHOOK: Input: default@src_stat
POSTHOOK: query: describe formatted src_stat key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 1111 1.111 3 from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 1111
+avg_col_len 1.111
+max_col_len 3
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}}
PREHOOK: query: ALTER TABLE src_stat UPDATE STATISTICS for column value SET ('numDVs'='121','numNulls'='122','avgColLen'='1.23','maxColLen'='124')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -74,9 +92,18 @@ PREHOOK: Input: default@src_stat
POSTHOOK: query: describe formatted src_stat value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 122 121 1.23 124 from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 122
+distinct_count 121
+avg_col_len 1.23
+max_col_len 124
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: ANALYZE TABLE src_stat_int COMPUTE STATISTICS for columns key
PREHOOK: type: QUERY
@@ -92,9 +119,18 @@ PREHOOK: Input: default@src_stat_int
POSTHOOK: query: describe formatted src_stat_int key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat_int
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key double 66.0 406.0 10 15 from deserializer
+col_name key
+data_type double
+min 66.0
+max 406.0
+num_nulls 10
+distinct_count 15
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"key\":\"true\"}}
PREHOOK: query: ALTER TABLE src_stat_int UPDATE STATISTICS for column key SET ('numDVs'='2222','lowValue'='333.22','highValue'='22.22')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -106,9 +142,18 @@ PREHOOK: Input: default@src_stat_int
POSTHOOK: query: describe formatted src_stat_int key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat_int
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key double 333.22 22.22 10 2222 from deserializer
+col_name key
+data_type double
+min 333.22
+max 22.22
+num_nulls 10
+distinct_count 2222
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"key\":\"true\"}}
PREHOOK: query: create database if not exists dummydb
PREHOOK: type: CREATEDATABASE
@@ -132,9 +177,18 @@ PREHOOK: Input: default@src_stat
POSTHOOK: query: describe formatted default.src_stat key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 3333 2.222 3 from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 3333
+avg_col_len 2.222
+max_col_len 3
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: ALTER TABLE default.src_stat UPDATE STATISTICS for column value SET ('numDVs'='232','numNulls'='233','avgColLen'='2.34','maxColLen'='235')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -146,9 +200,18 @@ PREHOOK: Input: default@src_stat
POSTHOOK: query: describe formatted default.src_stat value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 233 232 2.34 235 from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 233
+distinct_count 232
+avg_col_len 2.34
+max_col_len 235
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: use default
PREHOOK: type: SWITCHDATABASE
@@ -246,9 +309,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats s
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-s smallint from deserializer
+col_name s
+data_type smallint
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats i
PREHOOK: type: DESCTABLE
@@ -256,9 +328,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats i
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-i int from deserializer
+col_name i
+data_type int
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats b
PREHOOK: type: DESCTABLE
@@ -266,9 +347,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats b
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-b bigint from deserializer
+col_name b
+data_type bigint
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats f
PREHOOK: type: DESCTABLE
@@ -276,9 +366,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats f
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-f float from deserializer
+col_name f
+data_type float
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats d
PREHOOK: type: DESCTABLE
@@ -286,9 +385,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats d
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-d double from deserializer
+col_name d
+data_type double
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats dem
PREHOOK: type: DESCTABLE
@@ -296,9 +404,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats dem
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-dem decimal(10,0) from deserializer
+col_name dem
+data_type decimal(10,0)
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats ts
PREHOOK: type: DESCTABLE
@@ -306,9 +423,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats ts
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-ts timestamp from deserializer
+col_name ts
+data_type timestamp
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats dt
PREHOOK: type: DESCTABLE
@@ -316,9 +442,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats dt
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-dt date from deserializer
+col_name dt
+data_type date
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats str
PREHOOK: type: DESCTABLE
@@ -326,9 +461,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats str
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-str string from deserializer
+col_name str
+data_type string
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats v
PREHOOK: type: DESCTABLE
@@ -336,9 +480,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-v varchar(12) from deserializer
+col_name v
+data_type varchar(12)
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats c
PREHOOK: type: DESCTABLE
@@ -346,9 +499,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats c
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-c char(5) from deserializer
+col_name c
+data_type char(5)
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats bl
PREHOOK: type: DESCTABLE
@@ -356,9 +518,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats bl
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-bl boolean from deserializer
+col_name bl
+data_type boolean
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats bin
PREHOOK: type: DESCTABLE
@@ -366,9 +537,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats bin
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-bin binary from deserializer
+col_name bin
+data_type binary
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: DESC FORMATTED datatype_stats t
PREHOOK: type: DESCTABLE
@@ -376,9 +556,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats t
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-t tinyint from deserializer
+col_name t
+data_type tinyint
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column t SET ('numDVs'='232','numNulls'='233','highValue'='234','lowValue'='35')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -390,9 +579,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats t
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-t tinyint 35 234 233 232 from deserializer
+col_name t
+data_type tinyint
+min 35
+max 234
+num_nulls 233
+distinct_count 232
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"t\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats s
PREHOOK: type: DESCTABLE
@@ -400,9 +598,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats s
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-s smallint from deserializer
+col_name s
+data_type smallint
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"t\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column s SET ('numDVs'='56','numNulls'='56','highValue'='489','lowValue'='25')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -414,9 +621,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats s
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-s smallint 25 489 56 56 from deserializer
+col_name s
+data_type smallint
+min 25
+max 489
+num_nulls 56
+distinct_count 56
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats i
PREHOOK: type: DESCTABLE
@@ -424,9 +640,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats i
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-i int from deserializer
+col_name i
+data_type int
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column i SET ('numDVs'='59','numNulls'='1','highValue'='889','lowValue'='5')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -438,9 +663,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats i
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-i int 5 889 1 59 from deserializer
+col_name i
+data_type int
+min 5
+max 889
+num_nulls 1
+distinct_count 59
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"i\":\"true\",\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats b
PREHOOK: type: DESCTABLE
@@ -448,9 +682,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats b
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-b bigint from deserializer
+col_name b
+data_type bigint
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"i\":\"true\",\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column b SET ('numDVs'='9','numNulls'='14','highValue'='89','lowValue'='8')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -462,9 +705,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats b
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-b bigint 8 89 14 9 from deserializer
+col_name b
+data_type bigint
+min 8
+max 89
+num_nulls 14
+distinct_count 9
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats f
PREHOOK: type: DESCTABLE
@@ -472,9 +724,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats f
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-f float from deserializer
+col_name f
+data_type float
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column f SET ('numDVs'='563','numNulls'='45','highValue'='2345.656','lowValue'='8.00')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -486,9 +747,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats f
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-f float 8.0 2345.656 45 563 from deserializer
+col_name f
+data_type float
+min 8.0
+max 2345.656
+num_nulls 45
+distinct_count 563
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats d
PREHOOK: type: DESCTABLE
@@ -496,9 +766,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats d
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-d double from deserializer
+col_name d
+data_type double
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column d SET ('numDVs'='5677','numNulls'='12','highValue'='560.3367','lowValue'='0.00455')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -510,9 +789,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats d
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-d double 0.00455 560.3367 12 5677 from deserializer
+col_name d
+data_type double
+min 0.00455
+max 560.3367
+num_nulls 12
+distinct_count 5677
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats dem
PREHOOK: type: DESCTABLE
@@ -520,9 +808,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats dem
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-dem decimal(10,0) from deserializer
+col_name dem
+data_type decimal(10,0)
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column dem SET ('numDVs'='57','numNulls'='912','highValue'='560','lowValue'='0')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -534,9 +831,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats dem
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-dem decimal(10,0) 0 560 912 57 from deserializer
+col_name dem
+data_type decimal(10,0)
+min 0
+max 560
+num_nulls 912
+distinct_count 57
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats ts
PREHOOK: type: DESCTABLE
@@ -544,9 +850,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats ts
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-ts timestamp from deserializer
+col_name ts
+data_type timestamp
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column ts SET ('numDVs'='7','numNulls'='12','highValue'='1357030923','lowValue'='1357030924')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -558,9 +873,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats ts
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-ts timestamp 1357030924 1357030923 12 7 from deserializer
+col_name ts
+data_type timestamp
+min 1357030924
+max 1357030923
+num_nulls 12
+distinct_count 7
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\",\"ts\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats dt
PREHOOK: type: DESCTABLE
@@ -568,9 +892,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats dt
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-dt date from deserializer
+col_name dt
+data_type date
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\",\"ts\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column dt SET ('numDVs'='57','numNulls'='912','highValue'='2012-01-01','lowValue'='2001-02-04')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -582,9 +915,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats dt
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-dt date 2001-02-04 2012-01-01 912 57 from deserializer
+col_name dt
+data_type date
+min 2001-02-04
+max 2012-01-01
+num_nulls 912
+distinct_count 57
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\",\"ts\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats str
PREHOOK: type: DESCTABLE
@@ -592,9 +934,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats str
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-str string from deserializer
+col_name str
+data_type string
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"t\":\"true\",\"ts\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column str SET ('numDVs'='232','numNulls'='233','avgColLen'='2.34','maxColLen'='235')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -606,9 +957,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats str
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-str string 233 232 2.34 235 from deserializer
+col_name str
+data_type string
+min
+max
+num_nulls 233
+distinct_count 232
+avg_col_len 2.34
+max_col_len 235
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"str\":\"true\",\"t\":\"true\",\"ts\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats v
PREHOOK: type: DESCTABLE
@@ -616,9 +976,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-v varchar(12) from deserializer
+col_name v
+data_type varchar(12)
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"str\":\"true\",\"t\":\"true\",\"ts\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column v SET ('numDVs'='22','numNulls'='33','avgColLen'='4.40','maxColLen'='25')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -630,9 +999,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-v varchar(12) 33 22 4.4 25 from deserializer
+col_name v
+data_type varchar(12)
+min
+max
+num_nulls 33
+distinct_count 22
+avg_col_len 4.4
+max_col_len 25
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"str\":\"true\",\"t\":\"true\",\"ts\":\"true\",\"v\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats c
PREHOOK: type: DESCTABLE
@@ -640,9 +1018,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats c
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-c char(5) from deserializer
+col_name c
+data_type char(5)
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"str\":\"true\",\"t\":\"true\",\"ts\":\"true\",\"v\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column c SET ('numDVs'='2','numNulls'='03','avgColLen'='9.00','maxColLen'='58')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -654,9 +1041,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats c
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-c char(5) 3 2 9.0 58 from deserializer
+col_name c
+data_type char(5)
+min
+max
+num_nulls 3
+distinct_count 2
+avg_col_len 9.0
+max_col_len 58
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"c\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"str\":\"true\",\"t\":\"true\",\"ts\":\"true\",\"v\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats bl
PREHOOK: type: DESCTABLE
@@ -664,9 +1060,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats bl
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-bl boolean from deserializer
+col_name bl
+data_type boolean
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"c\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"str\":\"true\",\"t\":\"true\",\"ts\":\"true\",\"v\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column bl SET ('numNulls'='1','numTrues'='9','numFalses'='8')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -678,9 +1083,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats bl
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-bl boolean 1 9 8 from deserializer
+col_name bl
+data_type boolean
+min
+max
+num_nulls 1
+distinct_count
+avg_col_len
+max_col_len
+num_trues 9
+num_falses 8
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"bl\":\"true\",\"c\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"str\":\"true\",\"t\":\"true\",\"ts\":\"true\",\"v\":\"true\"}}
PREHOOK: query: DESC FORMATTED datatype_stats bin
PREHOOK: type: DESCTABLE
@@ -688,9 +1102,18 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats bin
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-bin binary from deserializer
+col_name bin
+data_type binary
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"bl\":\"true\",\"c\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"str\":\"true\",\"t\":\"true\",\"ts\":\"true\",\"v\":\"true\"}}
PREHOOK: query: ALTER TABLE default.datatype_stats UPDATE STATISTICS for column bin SET ('numNulls'='8','avgColLen'='2.0','maxColLen'='8')
PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
@@ -702,7 +1125,16 @@ PREHOOK: Input: default@datatype_stats
POSTHOOK: query: DESC FORMATTED datatype_stats bin
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@datatype_stats
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-bin binary 8 2.0 8 from deserializer
+col_name bin
+data_type binary
+min
+max
+num_nulls 8
+distinct_count
+avg_col_len 2.0
+max_col_len 8
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"bin\":\"true\",\"bl\":\"true\",\"c\":\"true\",\"d\":\"true\",\"dem\":\"true\",\"dt\":\"true\",\"f\":\"true\",\"i\":\"true\",\"s\":\"true\",\"str\":\"true\",\"t\":\"true\",\"ts\":\"true\",\"v\":\"true\"}}
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_view_as_select.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_view_as_select.q.out b/ql/src/test/results/clientpositive/alter_view_as_select.q.out
index 4eddf94..494c9b6 100644
--- a/ql/src/test/results/clientpositive/alter_view_as_select.q.out
+++ b/ql/src/test/results/clientpositive/alter_view_as_select.q.out
@@ -25,7 +25,6 @@ POSTHOOK: query: DESCRIBE FORMATTED tv.testView
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: tv@testview
# col_name data_type comment
-
key string
value string
ds string
@@ -69,7 +68,6 @@ POSTHOOK: query: DESCRIBE FORMATTED tv.testView
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: tv@testview
# col_name data_type comment
-
value string
# Detailed Table Information
@@ -118,7 +116,6 @@ POSTHOOK: query: DESCRIBE FORMATTED tv.testView
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: tv@testview
# col_name data_type comment
-
key string
value string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/analyze_table_null_partition.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/analyze_table_null_partition.q.out b/ql/src/test/results/clientpositive/analyze_table_null_partition.q.out
index 2bfc04a..324b700 100644
--- a/ql/src/test/results/clientpositive/analyze_table_null_partition.q.out
+++ b/ql/src/test/results/clientpositive/analyze_table_null_partition.q.out
@@ -80,7 +80,6 @@ age int
# Partition Information
# col_name data_type comment
-
age int
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/analyze_tbl_date.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/analyze_tbl_date.q.out b/ql/src/test/results/clientpositive/analyze_tbl_date.q.out
index a0cdbca..6b2b85b 100644
--- a/ql/src/test/results/clientpositive/analyze_tbl_date.q.out
+++ b/ql/src/test/results/clientpositive/analyze_tbl_date.q.out
@@ -28,7 +28,6 @@ POSTHOOK: query: describe formatted test_table
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
d date
# Detailed Table Information
[09/21] hive git commit: HIVE-17519: Transpose column stats display
(Zoltan Haindrich, reviewed by Ashutosh Chauhan and Vineet Garg)
Posted by kg...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/database_location.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/database_location.q.out b/ql/src/test/results/clientpositive/database_location.q.out
index e4db000..a62ba2e 100644
--- a/ql/src/test/results/clientpositive/database_location.q.out
+++ b/ql/src/test/results/clientpositive/database_location.q.out
@@ -32,7 +32,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table_db1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: db1@table_db1
# col_name data_type comment
-
name string
value int
@@ -107,7 +106,6 @@ POSTHOOK: query: DESCRIBE FORMATTED table_db2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: db2@table_db2
# col_name data_type comment
-
name string
value int
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/dbtxnmgr_query5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/dbtxnmgr_query5.q.out b/ql/src/test/results/clientpositive/dbtxnmgr_query5.q.out
index facd497..1d7206f 100644
--- a/ql/src/test/results/clientpositive/dbtxnmgr_query5.q.out
+++ b/ql/src/test/results/clientpositive/dbtxnmgr_query5.q.out
@@ -56,7 +56,6 @@ ds string
# Partition Information
# col_name data_type comment
-
ds string
PREHOOK: query: drop view V1
PREHOOK: type: DROPVIEW
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/decimal_serde.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/decimal_serde.q.out b/ql/src/test/results/clientpositive/decimal_serde.q.out
index e0f5c74..43f7ab8 100644
--- a/ql/src/test/results/clientpositive/decimal_serde.q.out
+++ b/ql/src/test/results/clientpositive/decimal_serde.q.out
@@ -105,7 +105,6 @@ POSTHOOK: query: describe formatted DECIMAL_RC
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@decimal_rc
# col_name data_type comment
-
key decimal(10,0)
value int
@@ -158,7 +157,6 @@ POSTHOOK: query: describe formatted DECIMAL_LAZY_COL
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@decimal_lazy_col
# col_name data_type comment
-
key decimal(10,0)
value int
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/decimal_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/decimal_stats.q.out b/ql/src/test/results/clientpositive/decimal_stats.q.out
index eacad98..9d7e750 100644
--- a/ql/src/test/results/clientpositive/decimal_stats.q.out
+++ b/ql/src/test/results/clientpositive/decimal_stats.q.out
@@ -46,9 +46,18 @@ PREHOOK: Input: default@decimal_1
POSTHOOK: query: desc formatted decimal_1 v
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@decimal_1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-v decimal(10,0) 500 1 HL from deserializer
+col_name v
+data_type decimal(10,0)
+min
+max
+num_nulls 500
+distinct_count 1
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"t\":\"true\",\"u\":\"true\",\"v\":\"true\"}}
PREHOOK: query: explain select * from decimal_1 order by t limit 100
PREHOOK: type: QUERY
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/default_file_format.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/default_file_format.q.out b/ql/src/test/results/clientpositive/default_file_format.q.out
index 9e8d5ba..9eb7d2d 100644
--- a/ql/src/test/results/clientpositive/default_file_format.q.out
+++ b/ql/src/test/results/clientpositive/default_file_format.q.out
@@ -59,7 +59,6 @@ POSTHOOK: query: describe formatted t
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t
# col_name data_type comment
-
c int
# Detailed Table Information
@@ -93,7 +92,6 @@ POSTHOOK: query: describe formatted o
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@o
# col_name data_type comment
-
c int
# Detailed Table Information
@@ -127,7 +125,6 @@ POSTHOOK: query: describe formatted io
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@io
# col_name data_type comment
-
c int
# Detailed Table Information
@@ -161,7 +158,6 @@ POSTHOOK: query: describe formatted e
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@e
# col_name data_type comment
-
c int
# Detailed Table Information
@@ -191,7 +187,6 @@ POSTHOOK: query: describe formatted i
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@i
# col_name data_type comment
-
c int
# Detailed Table Information
@@ -225,7 +220,6 @@ POSTHOOK: query: describe formatted e2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@e2
# col_name data_type comment
-
c int
# Detailed Table Information
@@ -359,7 +353,6 @@ POSTHOOK: query: describe formatted t
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@t
# col_name data_type comment
-
c int
# Detailed Table Information
@@ -393,7 +386,6 @@ POSTHOOK: query: describe formatted o
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@o
# col_name data_type comment
-
c int
# Detailed Table Information
@@ -427,7 +419,6 @@ POSTHOOK: query: describe formatted io
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@io
# col_name data_type comment
-
c int
# Detailed Table Information
@@ -461,7 +452,6 @@ POSTHOOK: query: describe formatted e
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@e
# col_name data_type comment
-
c int
# Detailed Table Information
@@ -493,7 +483,6 @@ POSTHOOK: query: describe formatted i
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@i
# col_name data_type comment
-
c int
# Detailed Table Information
@@ -527,7 +516,6 @@ POSTHOOK: query: describe formatted e2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@e2
# col_name data_type comment
-
c int
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/deleteAnalyze.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/deleteAnalyze.q.out b/ql/src/test/results/clientpositive/deleteAnalyze.q.out
index d3609f8..840f053 100644
--- a/ql/src/test/results/clientpositive/deleteAnalyze.q.out
+++ b/ql/src/test/results/clientpositive/deleteAnalyze.q.out
@@ -35,7 +35,6 @@ POSTHOOK: query: describe formatted testdeci2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@testdeci2
# col_name data_type comment
-
id int
amount decimal(10,3)
sales_tax decimal(10,3)
@@ -72,9 +71,18 @@ PREHOOK: Input: default@testdeci2
POSTHOOK: query: describe formatted testdeci2 amount
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@testdeci2
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-amount decimal(10,3) from deserializer
+col_name amount
+data_type decimal(10,3)
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
PREHOOK: query: analyze table testdeci2 compute statistics for columns
PREHOOK: type: QUERY
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/desc_tbl_part_cols.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/desc_tbl_part_cols.q.out b/ql/src/test/results/clientpositive/desc_tbl_part_cols.q.out
index e874412..196f85b 100644
--- a/ql/src/test/results/clientpositive/desc_tbl_part_cols.q.out
+++ b/ql/src/test/results/clientpositive/desc_tbl_part_cols.q.out
@@ -19,7 +19,6 @@ d string
# Partition Information
# col_name data_type comment
-
c int
d string
PREHOOK: query: describe t1
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/describe_comment_indent.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/describe_comment_indent.q.out b/ql/src/test/results/clientpositive/describe_comment_indent.q.out
index 0049e2b..8da5949 100644
--- a/ql/src/test/results/clientpositive/describe_comment_indent.q.out
+++ b/ql/src/test/results/clientpositive/describe_comment_indent.q.out
@@ -41,7 +41,6 @@ POSTHOOK: query: DESCRIBE FORMATTED test_table
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_table
# col_name data_type comment
-
col1 int col1 one line comment
col2 string col2
two lines comment
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out b/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out
index 4483e88..a4d5127 100644
--- a/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out
+++ b/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out
@@ -37,7 +37,6 @@ POSTHOOK: query: DESCRIBE FORMATTED dummy
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@dummy
# col_name data_type comment
-
col1 string 한글_col1
col2 string 漢字_col2
col3 string わご_col3
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/describe_formatted_view_partitioned.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/describe_formatted_view_partitioned.q.out b/ql/src/test/results/clientpositive/describe_formatted_view_partitioned.q.out
index d47e325..fe96d50 100644
--- a/ql/src/test/results/clientpositive/describe_formatted_view_partitioned.q.out
+++ b/ql/src/test/results/clientpositive/describe_formatted_view_partitioned.q.out
@@ -43,12 +43,10 @@ POSTHOOK: query: DESCRIBE FORMATTED view_partitioned PARTITION (value='val_86')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@view_partitioned
# col_name data_type comment
-
key string
# Partition Information
# col_name data_type comment
-
value string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/describe_syntax.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/describe_syntax.q.out b/ql/src/test/results/clientpositive/describe_syntax.q.out
index 16b7763..a0c6182 100644
--- a/ql/src/test/results/clientpositive/describe_syntax.q.out
+++ b/ql/src/test/results/clientpositive/describe_syntax.q.out
@@ -52,7 +52,6 @@ part string
# Partition Information
# col_name data_type comment
-
ds string
part string
PREHOOK: query: DESCRIBE EXTENDED t1
@@ -68,7 +67,6 @@ part string
# Partition Information
# col_name data_type comment
-
ds string
part string
@@ -80,13 +78,11 @@ POSTHOOK: query: DESCRIBE FORMATTED t1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: db1@t1
# col_name data_type comment
-
key1 int
value1 string
# Partition Information
# col_name data_type comment
-
ds string
part string
@@ -128,7 +124,6 @@ part string
# Partition Information
# col_name data_type comment
-
ds string
part string
PREHOOK: query: DESCRIBE EXTENDED db1.t1
@@ -144,7 +139,6 @@ part string
# Partition Information
# col_name data_type comment
-
ds string
part string
@@ -156,13 +150,11 @@ POSTHOOK: query: DESCRIBE FORMATTED db1.t1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: db1@t1
# col_name data_type comment
-
key1 int
value1 string
# Partition Information
# col_name data_type comment
-
ds string
part string
@@ -211,9 +203,18 @@ PREHOOK: Input: db1@t1
POSTHOOK: query: DESCRIBE FORMATTED t1 key1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: db1@t1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key1 int from deserializer
+col_name key1
+data_type int
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {}
PREHOOK: query: DESCRIBE db1.t1 key1
PREHOOK: type: DESCTABLE
@@ -235,9 +236,18 @@ PREHOOK: Input: db1@t1
POSTHOOK: query: DESCRIBE FORMATTED db1.t1 key1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: db1@t1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key1 int from deserializer
+col_name key1
+data_type int
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {}
PREHOOK: query: DESCRIBE t1 key1
PREHOOK: type: DESCTABLE
@@ -259,9 +269,18 @@ PREHOOK: Input: db1@t1
POSTHOOK: query: DESCRIBE FORMATTED t1 key1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: db1@t1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key1 int from deserializer
+col_name key1
+data_type int
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {}
PREHOOK: query: DESCRIBE t1 PARTITION(ds='4', part='5')
PREHOOK: type: DESCTABLE
@@ -276,7 +295,6 @@ part string
# Partition Information
# col_name data_type comment
-
ds string
part string
PREHOOK: query: DESCRIBE EXTENDED t1 PARTITION(ds='4', part='5')
@@ -292,7 +310,6 @@ part string
# Partition Information
# col_name data_type comment
-
ds string
part string
@@ -304,13 +321,11 @@ POSTHOOK: query: DESCRIBE FORMATTED t1 PARTITION(ds='4', part='5')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: db1@t1
# col_name data_type comment
-
key1 int
value1 string
# Partition Information
# col_name data_type comment
-
ds string
part string
@@ -350,7 +365,6 @@ part string
# Partition Information
# col_name data_type comment
-
ds string
part string
PREHOOK: query: DESCRIBE EXTENDED db1.t1 PARTITION(ds='4', part='5')
@@ -366,7 +380,6 @@ part string
# Partition Information
# col_name data_type comment
-
ds string
part string
@@ -378,13 +391,11 @@ POSTHOOK: query: DESCRIBE FORMATTED db1.t1 PARTITION(ds='4', part='5')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: db1@t1
# col_name data_type comment
-
key1 int
value1 string
# Partition Information
# col_name data_type comment
-
ds string
part string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/describe_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/describe_table.q.out b/ql/src/test/results/clientpositive/describe_table.q.out
index 08f466e..8f7d0f6 100644
--- a/ql/src/test/results/clientpositive/describe_table.q.out
+++ b/ql/src/test/results/clientpositive/describe_table.q.out
@@ -11,7 +11,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
PREHOOK: query: describe srcpart key
@@ -34,7 +33,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
PREHOOK: query: describe `srcpart`
@@ -50,7 +48,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
PREHOOK: query: describe `srcpart` `key`
@@ -73,7 +70,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
PREHOOK: query: describe extended srcpart
@@ -89,7 +85,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -114,7 +109,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -132,7 +126,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -157,7 +150,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -169,13 +161,11 @@ POSTHOOK: query: describe formatted srcpart
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -210,9 +200,18 @@ PREHOOK: Input: default@srcpart
POSTHOOK: query: describe formatted srcpart key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@srcpart
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 309 2.812 3 HL from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 309
+avg_col_len 2.812
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"key\":\"true\"}}
PREHOOK: query: describe formatted srcpart PARTITION(ds='2008-04-08', hr='12')
PREHOOK: type: DESCTABLE
@@ -221,13 +220,11 @@ POSTHOOK: query: describe formatted srcpart PARTITION(ds='2008-04-08', hr='12')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -261,13 +258,11 @@ POSTHOOK: query: describe formatted `srcpart`
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -302,9 +297,18 @@ PREHOOK: Input: default@srcpart
POSTHOOK: query: describe formatted `srcpart` `key`
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@srcpart
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 309 2.812 3 HL from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 309
+avg_col_len 2.812
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"key\":\"true\"}}
PREHOOK: query: describe formatted `srcpart` PARTITION(ds='2008-04-08', hr='12')
PREHOOK: type: DESCTABLE
@@ -313,13 +317,11 @@ POSTHOOK: query: describe formatted `srcpart` PARTITION(ds='2008-04-08', hr='12'
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -352,9 +354,18 @@ PREHOOK: Input: default@srcpart
POSTHOOK: query: describe formatted `srcpart` `ds`
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@srcpart
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-ds string 0 2 100.0 100
+col_name ds
+data_type string
+min
+max
+num_nulls 0
+distinct_count 2
+avg_col_len 100.0
+max_col_len 100
+num_trues
+num_falses
+bitVector
+comment
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"ds\":\"true\"}}
PREHOOK: query: describe formatted `srcpart` `hr`
PREHOOK: type: DESCTABLE
@@ -362,9 +373,18 @@ PREHOOK: Input: default@srcpart
POSTHOOK: query: describe formatted `srcpart` `hr`
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@srcpart
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-hr string 0 2 100.0 100
+col_name hr
+data_type string
+min
+max
+num_nulls 0
+distinct_count 2
+avg_col_len 100.0
+max_col_len 100
+num_trues
+num_falses
+bitVector
+comment
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"hr\":\"true\"}}
PREHOOK: query: create table srcpart_serdeprops like srcpart
PREHOOK: type: CREATETABLE
@@ -413,13 +433,11 @@ POSTHOOK: query: describe formatted srcpart_serdeprops
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@srcpart_serdeprops
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -534,7 +552,6 @@ name3 int
# Partition Information
# col_name data_type comment
-
name3 int
PREHOOK: query: DESCRIBE name1.name1 name2
PREHOOK: type: DESCTABLE
@@ -555,7 +572,6 @@ name3 int
# Partition Information
# col_name data_type comment
-
name3 int
PREHOOK: query: DESCRIBE name1.name2
PREHOOK: type: DESCTABLE
@@ -599,7 +615,6 @@ name3 int
# Partition Information
# col_name data_type comment
-
name3 int
PREHOOK: query: DESCRIBE name1 name2
PREHOOK: type: DESCTABLE
@@ -620,7 +635,6 @@ name3 int
# Partition Information
# col_name data_type comment
-
name3 int
PREHOOK: query: DESCRIBE name1.name1
PREHOOK: type: DESCTABLE
@@ -634,7 +648,6 @@ name3 int
# Partition Information
# col_name data_type comment
-
name3 int
PREHOOK: query: DESCRIBE name1.name1 name2
PREHOOK: type: DESCTABLE
@@ -655,7 +668,6 @@ name3 int
# Partition Information
# col_name data_type comment
-
name3 int
PREHOOK: query: DESCRIBE name2
PREHOOK: type: DESCTABLE
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out b/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
index f17e7bd..65af3f8 100644
--- a/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
+++ b/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
@@ -51,9 +51,18 @@ PREHOOK: Input: default@uservisits_web_text_none
POSTHOOK: query: desc formatted UserVisits_web_text_none sourceIP
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-sourceIP string from deserializer
+col_name sourceIP
+data_type string
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
PREHOOK: query: explain
analyze table UserVisits_web_text_none compute statistics for columns sourceIP, avgTimeOnSite, adRevenue
PREHOOK: type: QUERY
@@ -242,9 +251,18 @@ PREHOOK: Input: default@uservisits_web_text_none
POSTHOOK: query: desc formatted UserVisits_web_text_none sourceIP
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-sourceIP string 0 55 12.763636363636364 13 HL from deserializer
+col_name sourceIP
+data_type string
+min
+max
+num_nulls 0
+distinct_count 55
+avg_col_len 12.763636363636364
+max_col_len 13
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"sourceip\":\"true\"}}
PREHOOK: query: desc formatted UserVisits_web_text_none avgTimeOnSite
PREHOOK: type: DESCTABLE
@@ -252,9 +270,18 @@ PREHOOK: Input: default@uservisits_web_text_none
POSTHOOK: query: desc formatted UserVisits_web_text_none avgTimeOnSite
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-avgTimeOnSite int 1 9 0 9 HL from deserializer
+col_name avgTimeOnSite
+data_type int
+min 1
+max 9
+num_nulls 0
+distinct_count 9
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"sourceip\":\"true\"}}
PREHOOK: query: desc formatted UserVisits_web_text_none adRevenue
PREHOOK: type: DESCTABLE
@@ -262,9 +289,18 @@ PREHOOK: Input: default@uservisits_web_text_none
POSTHOOK: query: desc formatted UserVisits_web_text_none adRevenue
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-adRevenue float 13.099044799804688 492.98870849609375 0 55 HL from deserializer
+col_name adRevenue
+data_type float
+min 13.099044799804688
+max 492.98870849609375
+num_nulls 0
+distinct_count 55
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"sourceip\":\"true\"}}
PREHOOK: query: CREATE TABLE empty_tab(
a int,
@@ -292,9 +328,18 @@ PREHOOK: Input: default@empty_tab
POSTHOOK: query: desc formatted empty_tab a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@empty_tab
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-a int from deserializer
+col_name a
+data_type int
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\",\"d\":\"true\",\"e\":\"true\"}}
PREHOOK: query: explain
analyze table empty_tab compute statistics for columns a,b,c,d,e
@@ -361,9 +406,18 @@ PREHOOK: Input: default@empty_tab
POSTHOOK: query: desc formatted empty_tab a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@empty_tab
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-a int 0 0 0 0 from deserializer
+col_name a
+data_type int
+min 0
+max 0
+num_nulls 0
+distinct_count 0
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\",\"d\":\"true\",\"e\":\"true\"}}
PREHOOK: query: desc formatted empty_tab b
PREHOOK: type: DESCTABLE
@@ -371,9 +425,18 @@ PREHOOK: Input: default@empty_tab
POSTHOOK: query: desc formatted empty_tab b
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@empty_tab
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-b double 0.0 0.0 0 0 from deserializer
+col_name b
+data_type double
+min 0.0
+max 0.0
+num_nulls 0
+distinct_count 0
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\",\"d\":\"true\",\"e\":\"true\"}}
PREHOOK: query: CREATE DATABASE test
PREHOOK: type: CREATEDATABASE
@@ -451,27 +514,54 @@ PREHOOK: Input: test@uservisits_web_text_none
POSTHOOK: query: desc formatted UserVisits_web_text_none sourceIP
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: test@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-sourceIP string from deserializer
+col_name sourceIP
+data_type string
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
PREHOOK: query: desc formatted test.UserVisits_web_text_none sourceIP
PREHOOK: type: DESCTABLE
PREHOOK: Input: test@uservisits_web_text_none
POSTHOOK: query: desc formatted test.UserVisits_web_text_none sourceIP
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: test@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-sourceIP string from deserializer
+col_name sourceIP
+data_type string
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
PREHOOK: query: desc formatted default.UserVisits_web_text_none sourceIP
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@uservisits_web_text_none
POSTHOOK: query: desc formatted default.UserVisits_web_text_none sourceIP
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-sourceIP string 0 55 12.763636363636364 13 HL from deserializer
+col_name sourceIP
+data_type string
+min
+max
+num_nulls 0
+distinct_count 55
+avg_col_len 12.763636363636364
+max_col_len 13
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"sourceip\":\"true\"}}
PREHOOK: query: analyze table UserVisits_web_text_none compute statistics for columns sKeyword
PREHOOK: type: QUERY
@@ -495,9 +585,18 @@ PREHOOK: Input: test@uservisits_web_text_none
POSTHOOK: query: desc formatted UserVisits_web_text_none sKeyword
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: test@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-sKeyword string 0 54 7.872727272727273 19 HL from deserializer
+col_name sKeyword
+data_type string
+min
+max
+num_nulls 0
+distinct_count 54
+avg_col_len 7.872727272727273
+max_col_len 19
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"skeyword\":\"true\"}}
PREHOOK: query: desc formatted test.UserVisits_web_text_none sKeyword
PREHOOK: type: DESCTABLE
@@ -505,7 +604,16 @@ PREHOOK: Input: test@uservisits_web_text_none
POSTHOOK: query: desc formatted test.UserVisits_web_text_none sKeyword
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: test@uservisits_web_text_none
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-sKeyword string 0 54 7.872727272727273 19 HL from deserializer
+col_name sKeyword
+data_type string
+min
+max
+num_nulls 0
+distinct_count 54
+avg_col_len 7.872727272727273
+max_col_len 19
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"skeyword\":\"true\"}}
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/drop_partitions_filter.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/drop_partitions_filter.q.out b/ql/src/test/results/clientpositive/drop_partitions_filter.q.out
index 3075ab4..4f607da 100644
--- a/ql/src/test/results/clientpositive/drop_partitions_filter.q.out
+++ b/ql/src/test/results/clientpositive/drop_partitions_filter.q.out
@@ -19,7 +19,6 @@ d string
# Partition Information
# col_name data_type comment
-
c string
d string
PREHOOK: query: alter table ptestfilter add partition (c='US', d=1)
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/drop_partitions_filter2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/drop_partitions_filter2.q.out b/ql/src/test/results/clientpositive/drop_partitions_filter2.q.out
index 92f9805..fd95b44 100644
--- a/ql/src/test/results/clientpositive/drop_partitions_filter2.q.out
+++ b/ql/src/test/results/clientpositive/drop_partitions_filter2.q.out
@@ -19,7 +19,6 @@ d int
# Partition Information
# col_name data_type comment
-
c int
d int
PREHOOK: query: alter table ptestfilter add partition (c=1, d=1)
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/drop_partitions_filter3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/drop_partitions_filter3.q.out b/ql/src/test/results/clientpositive/drop_partitions_filter3.q.out
index bfb4221..2ba9ec8 100644
--- a/ql/src/test/results/clientpositive/drop_partitions_filter3.q.out
+++ b/ql/src/test/results/clientpositive/drop_partitions_filter3.q.out
@@ -19,7 +19,6 @@ d int
# Partition Information
# col_name data_type comment
-
c string
d int
PREHOOK: query: alter table ptestfilter add partition (c='1', d=1)
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/druid_basic1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/druid_basic1.q.out b/ql/src/test/results/clientpositive/druid_basic1.q.out
index 0ba61e5..91f79bb 100644
--- a/ql/src/test/results/clientpositive/druid_basic1.q.out
+++ b/ql/src/test/results/clientpositive/druid_basic1.q.out
@@ -17,7 +17,6 @@ POSTHOOK: query: DESCRIBE FORMATTED druid_table_1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@druid_table_1
# col_name data_type comment
-
__time timestamp from deserializer
robot string from deserializer
namespace string from deserializer
@@ -79,7 +78,6 @@ POSTHOOK: query: DESCRIBE FORMATTED druid_table_2
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@druid_table_2
# col_name data_type comment
-
__time timestamp from deserializer
robot string from deserializer
namespace string from deserializer
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/druid_basic2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/druid_basic2.q.out b/ql/src/test/results/clientpositive/druid_basic2.q.out
index 2e9c340..5d6862c 100644
--- a/ql/src/test/results/clientpositive/druid_basic2.q.out
+++ b/ql/src/test/results/clientpositive/druid_basic2.q.out
@@ -17,7 +17,6 @@ POSTHOOK: query: DESCRIBE FORMATTED druid_table_1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@druid_table_1
# col_name data_type comment
-
__time timestamp from deserializer
robot string from deserializer
namespace string from deserializer
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/druid_intervals.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/druid_intervals.q.out b/ql/src/test/results/clientpositive/druid_intervals.q.out
index 433f15e..63f28d5 100644
--- a/ql/src/test/results/clientpositive/druid_intervals.q.out
+++ b/ql/src/test/results/clientpositive/druid_intervals.q.out
@@ -17,7 +17,6 @@ POSTHOOK: query: DESCRIBE FORMATTED druid_table_1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@druid_table_1
# col_name data_type comment
-
__time timestamp from deserializer
robot string from deserializer
namespace string from deserializer
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/druid_timeseries.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/druid_timeseries.q.out b/ql/src/test/results/clientpositive/druid_timeseries.q.out
index 0ce1abe..04db1e0 100644
--- a/ql/src/test/results/clientpositive/druid_timeseries.q.out
+++ b/ql/src/test/results/clientpositive/druid_timeseries.q.out
@@ -17,7 +17,6 @@ POSTHOOK: query: DESCRIBE FORMATTED druid_table_1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@druid_table_1
# col_name data_type comment
-
__time timestamp from deserializer
robot string from deserializer
namespace string from deserializer
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/druid_topn.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/druid_topn.q.out b/ql/src/test/results/clientpositive/druid_topn.q.out
index 052be15..5c31f85 100644
--- a/ql/src/test/results/clientpositive/druid_topn.q.out
+++ b/ql/src/test/results/clientpositive/druid_topn.q.out
@@ -17,7 +17,6 @@ POSTHOOK: query: DESCRIBE FORMATTED druid_table_1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@druid_table_1
# col_name data_type comment
-
__time timestamp from deserializer
robot string from deserializer
namespace string from deserializer
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/encrypted/encryption_insert_values.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_insert_values.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_insert_values.q.out
index e864588..9921abd 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_insert_values.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_insert_values.q.out
@@ -39,7 +39,6 @@ POSTHOOK: query: describe formatted values__tmp__table__1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@values__tmp__table__1
# col_name data_type comment
-
tmp_values_col1 string
tmp_values_col2 string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out
index 5ecf20d..ebe5085 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out
@@ -59,9 +59,18 @@ PREHOOK: Input: default@encrypted_table
POSTHOOK: query: DESCRIBE FORMATTED encrypted_table key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@encrypted_table
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key int 0 498 0 309 HL from deserializer
+col_name key
+data_type int
+min 0
+max 498
+num_nulls 0
+distinct_count 309
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: DESCRIBE FORMATTED encrypted_table value
PREHOOK: type: DESCTABLE
@@ -69,9 +78,18 @@ PREHOOK: Input: default@encrypted_table
POSTHOOK: query: DESCRIBE FORMATTED encrypted_table value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@encrypted_table
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 309 6.812 7 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 309
+avg_col_len 6.812
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: ALTER TABLE default.encrypted_table RENAME TO encrypted_db.encrypted_table_2
PREHOOK: type: ALTERTABLE_RENAME
@@ -92,9 +110,18 @@ PREHOOK: Input: default@encrypted_table
POSTHOOK: query: DESCRIBE FORMATTED encrypted_table key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@encrypted_table
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key int 0 498 0 309 HL from deserializer
+col_name key
+data_type int
+min 0
+max 498
+num_nulls 0
+distinct_count 309
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: DESCRIBE FORMATTED encrypted_table value
PREHOOK: type: DESCTABLE
@@ -102,9 +129,18 @@ PREHOOK: Input: default@encrypted_table
POSTHOOK: query: DESCRIBE FORMATTED encrypted_table value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@encrypted_table
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 309 6.812 7 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 309
+avg_col_len 6.812
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: ALTER TABLE default.encrypted_table RENAME TO default.plain_table
PREHOOK: type: ALTERTABLE_RENAME
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/escape_comments.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/escape_comments.q.out b/ql/src/test/results/clientpositive/escape_comments.q.out
index 42b9e01..ecd6331 100644
--- a/ql/src/test/results/clientpositive/escape_comments.q.out
+++ b/ql/src/test/results/clientpositive/escape_comments.q.out
@@ -85,13 +85,11 @@ POSTHOOK: query: describe formatted escape_comments_tbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: escape_comments_db@escape_comments_tbl1
# col_name data_type comment
-
col1 string a
b';
# Partition Information
# col_name data_type comment
-
p1 string a
b
@@ -153,7 +151,6 @@ p1 string a
# Partition Information
# col_name data_type comment
-
p1 string a
b
PREHOOK: query: show create table escape_comments_view1
@@ -170,7 +167,6 @@ POSTHOOK: query: describe formatted escape_comments_view1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: escape_comments_db@escape_comments_view1
# col_name data_type comment
-
col1 string a
b
@@ -202,8 +198,6 @@ PREHOOK: type: SHOWINDEXES
POSTHOOK: query: show formatted index on escape_comments_tbl1
POSTHOOK: type: SHOWINDEXES
idx_name tab_name col_names idx_tab_name idx_type comment
-
-
index2 escape_comments_tbl1 col1 escape_comments_db__escape_comments_tbl1_index2__ compact a
b
PREHOOK: query: drop database escape_comments_db cascade
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out b/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out
index 6273bbc..fe09241 100644
--- a/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out
+++ b/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out
@@ -62,7 +62,6 @@ emp_state string free text
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
emp_state string free text
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/exim_02_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/exim_02_part.q.out b/ql/src/test/results/clientpositive/exim_02_part.q.out
index b98515f..cb2a593 100644
--- a/ql/src/test/results/clientpositive/exim_02_part.q.out
+++ b/ql/src/test/results/clientpositive/exim_02_part.q.out
@@ -76,7 +76,6 @@ emp_state string free text
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
emp_state string free text
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/exim_04_all_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/exim_04_all_part.q.out b/ql/src/test/results/clientpositive/exim_04_all_part.q.out
index f7dfdf1..480f1ca 100644
--- a/ql/src/test/results/clientpositive/exim_04_all_part.q.out
+++ b/ql/src/test/results/clientpositive/exim_04_all_part.q.out
@@ -118,7 +118,6 @@ emp_state string free text
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
emp_state string free text
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out b/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out
index 86999f4..7cc8278 100644
--- a/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out
+++ b/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out
@@ -126,7 +126,6 @@ emp_state string 2-char code
# Partition Information
# col_name data_type comment
-
emp_country string 2-char code
emp_state string 2-char code
@@ -147,7 +146,6 @@ emp_state string 2-char code
# Partition Information
# col_name data_type comment
-
emp_country string 2-char code
emp_state string 2-char code
@@ -168,7 +166,6 @@ emp_state string 2-char code
# Partition Information
# col_name data_type comment
-
emp_country string 2-char code
emp_state string 2-char code
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/exim_05_some_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/exim_05_some_part.q.out b/ql/src/test/results/clientpositive/exim_05_some_part.q.out
index c35599f..b56e3a6 100644
--- a/ql/src/test/results/clientpositive/exim_05_some_part.q.out
+++ b/ql/src/test/results/clientpositive/exim_05_some_part.q.out
@@ -112,7 +112,6 @@ emp_state string free text
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
emp_state string free text
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/exim_06_one_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/exim_06_one_part.q.out b/ql/src/test/results/clientpositive/exim_06_one_part.q.out
index 0ea6998..84ed946 100644
--- a/ql/src/test/results/clientpositive/exim_06_one_part.q.out
+++ b/ql/src/test/results/clientpositive/exim_06_one_part.q.out
@@ -109,7 +109,6 @@ emp_state string free text
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
emp_state string free text
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out b/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out
index b55a0bd..7450949 100644
--- a/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out
+++ b/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out
@@ -144,7 +144,6 @@ emp_state string free-form text
# Partition Information
# col_name data_type comment
-
emp_country string iso code
emp_state string free-form text
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out b/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out
index d71f36f..f4cf862 100644
--- a/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out
+++ b/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out
@@ -152,7 +152,6 @@ emp_state string free text
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
emp_state string free text
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/exim_15_external_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/exim_15_external_part.q.out b/ql/src/test/results/clientpositive/exim_15_external_part.q.out
index d24f18a..bd7bb6f 100644
--- a/ql/src/test/results/clientpositive/exim_15_external_part.q.out
+++ b/ql/src/test/results/clientpositive/exim_15_external_part.q.out
@@ -159,7 +159,6 @@ emp_state string free text
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
emp_state string free text
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/exim_18_part_external.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/exim_18_part_external.q.out b/ql/src/test/results/clientpositive/exim_18_part_external.q.out
index 2ab4314..c7d11a0 100644
--- a/ql/src/test/results/clientpositive/exim_18_part_external.q.out
+++ b/ql/src/test/results/clientpositive/exim_18_part_external.q.out
@@ -117,7 +117,6 @@ emp_state string free text
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
emp_state string free text
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out b/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out
index 625f91b..d617a1d 100644
--- a/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out
+++ b/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out
@@ -95,7 +95,6 @@ emp_state string free text
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
emp_state string free text
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out b/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out
index 3ee28ce..e722113 100644
--- a/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out
+++ b/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out
@@ -120,7 +120,6 @@ emp_state string free text
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
emp_state string free text
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out b/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out
index e920fda..887e51c 100644
--- a/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out
+++ b/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out
@@ -120,7 +120,6 @@ emp_state string free text
# Partition Information
# col_name data_type comment
-
emp_country string two char iso code
emp_state string free text
[11/21] hive git commit: HIVE-17519: Transpose column stats display
(Zoltan Haindrich, reviewed by Ashutosh Chauhan and Vineet Garg)
Posted by kg...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/analyze_tbl_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/analyze_tbl_part.q.out b/ql/src/test/results/clientpositive/analyze_tbl_part.q.out
index a7a2220..0f38045 100644
--- a/ql/src/test/results/clientpositive/analyze_tbl_part.q.out
+++ b/ql/src/test/results/clientpositive/analyze_tbl_part.q.out
@@ -48,9 +48,18 @@ PREHOOK: Input: default@src_stat_part
POSTHOOK: query: describe formatted src_stat_part PARTITION(partitionId=1) key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat_part
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 16 1.72 3 HL from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 16
+avg_col_len 1.72
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: ANALYZE TABLE src_stat_part partition (partitionId) COMPUTE STATISTICS for columns key, value
PREHOOK: type: QUERY
PREHOOK: Input: default@src_stat_part
@@ -69,18 +78,36 @@ PREHOOK: Input: default@src_stat_part
POSTHOOK: query: describe formatted src_stat_part PARTITION(partitionId=1) key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat_part
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 16 1.72 3 HL from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 16
+avg_col_len 1.72
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted src_stat_part PARTITION(partitionId=2) value
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@src_stat_part
POSTHOOK: query: describe formatted src_stat_part PARTITION(partitionId=2) value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_stat_part
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 19 4.92 7 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 19
+avg_col_len 4.92
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: create table src_stat_string_part(key string, value string) partitioned by (partitionName string)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/authorization_index.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/authorization_index.q.out b/ql/src/test/results/clientpositive/authorization_index.q.out
index adc02ad..87486b3 100644
--- a/ql/src/test/results/clientpositive/authorization_index.q.out
+++ b/ql/src/test/results/clientpositive/authorization_index.q.out
@@ -20,7 +20,6 @@ POSTHOOK: query: desc formatted default__t1_t1_index__
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@default__t1_t1_index__
# col_name data_type comment
-
a int
_bucketname string
_offsets array<bigint>
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/autoColumnStats_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/autoColumnStats_3.q.out b/ql/src/test/results/clientpositive/autoColumnStats_3.q.out
index 2f70095..c6527a9 100644
--- a/ql/src/test/results/clientpositive/autoColumnStats_3.q.out
+++ b/ql/src/test/results/clientpositive/autoColumnStats_3.q.out
@@ -25,7 +25,6 @@ POSTHOOK: query: describe formatted src_multi1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_multi1
# col_name data_type comment
-
key string default
value string default
@@ -70,7 +69,6 @@ POSTHOOK: query: describe formatted src_multi1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src_multi1
# col_name data_type comment
-
key string default
value string default
@@ -119,13 +117,11 @@ POSTHOOK: query: describe formatted nzhang_part14
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_part14
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -191,13 +187,11 @@ POSTHOOK: query: desc formatted nzhang_part14 partition(ds='1', hr='3')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_part14
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -241,13 +235,11 @@ POSTHOOK: query: desc formatted nzhang_part14 partition(ds='1', hr='3')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_part14
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -281,13 +273,11 @@ POSTHOOK: query: desc formatted nzhang_part14 partition(ds='2', hr='1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_part14
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -351,13 +341,11 @@ POSTHOOK: query: desc formatted nzhang_part14 partition(ds='1', hr='3')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_part14
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -391,13 +379,11 @@ POSTHOOK: query: desc formatted nzhang_part14 partition(ds='2', hr='1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@nzhang_part14
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/autoColumnStats_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/autoColumnStats_4.q.out b/ql/src/test/results/clientpositive/autoColumnStats_4.q.out
index 7a5f8b4..9155733 100644
--- a/ql/src/test/results/clientpositive/autoColumnStats_4.q.out
+++ b/ql/src/test/results/clientpositive/autoColumnStats_4.q.out
@@ -13,7 +13,6 @@ POSTHOOK: query: desc formatted acid_dtt
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@acid_dtt
# col_name data_type comment
-
a int
b varchar(128)
@@ -187,7 +186,6 @@ POSTHOOK: query: desc formatted acid_dtt
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@acid_dtt
# col_name data_type comment
-
a int
b varchar(128)
@@ -231,7 +229,6 @@ POSTHOOK: query: desc formatted acid_dtt
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@acid_dtt
# col_name data_type comment
-
a int
b varchar(128)
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/autoColumnStats_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/autoColumnStats_5.q.out b/ql/src/test/results/clientpositive/autoColumnStats_5.q.out
index 1298d98..cc4d32b 100644
--- a/ql/src/test/results/clientpositive/autoColumnStats_5.q.out
+++ b/ql/src/test/results/clientpositive/autoColumnStats_5.q.out
@@ -154,13 +154,11 @@ POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partitioned1
col_name data_type comment
# col_name data_type comment
-
a int
b string
# Partition Information
# col_name data_type comment
-
part int
# Detailed Partition Information
@@ -192,10 +190,19 @@ PREHOOK: Input: default@partitioned1
POSTHOOK: query: desc formatted partitioned1 partition(part=1) a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partitioned1
-col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitvector
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-a int 1 4 0 4 HL from deserializer
+col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitvector comment
+col_name a
+data_type int
+min 1
+max 4
+num_nulls 0
+distinct_count 4
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: alter table partitioned1 add columns(c int, d string)
PREHOOK: type: ALTERTABLE_ADDCOLS
PREHOOK: Input: default@partitioned1
@@ -212,13 +219,11 @@ POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partitioned1
col_name data_type comment
# col_name data_type comment
-
a int
b string
# Partition Information
# col_name data_type comment
-
part int
# Detailed Partition Information
@@ -394,7 +399,6 @@ POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partitioned1
col_name data_type comment
# col_name data_type comment
-
a int
b string
c int
@@ -402,7 +406,6 @@ d string
# Partition Information
# col_name data_type comment
-
part int
# Detailed Partition Information
@@ -434,10 +437,19 @@ PREHOOK: Input: default@partitioned1
POSTHOOK: query: desc formatted partitioned1 partition(part=2) c
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partitioned1
-col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitvector
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-c int 10 40 0 4 HL from deserializer
+col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitvector comment
+col_name c
+data_type int
+min 10
+max 40
+num_nulls 0
+distinct_count 4
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: explain insert into table partitioned1 partition(part=1) values(5, 'new', 100, 'hundred'),(6, 'new', 200, 'two hundred')
PREHOOK: type: QUERY
POSTHOOK: query: explain insert into table partitioned1 partition(part=1) values(5, 'new', 100, 'hundred'),(6, 'new', 200, 'two hundred')
@@ -588,13 +600,11 @@ POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partitioned1
col_name data_type comment
# col_name data_type comment
-
a int
b string
# Partition Information
# col_name data_type comment
-
part int
# Detailed Partition Information
@@ -626,17 +636,35 @@ PREHOOK: Input: default@partitioned1
POSTHOOK: query: desc formatted partitioned1 partition(part=1) a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partitioned1
-col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitvector
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-a int 1 6 0 6 HL from deserializer
+col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitvector comment
+col_name a
+data_type int
+min 1
+max 6
+num_nulls 0
+distinct_count 6
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: desc formatted partitioned1 partition(part=1) c
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@partitioned1
POSTHOOK: query: desc formatted partitioned1 partition(part=1) c
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@partitioned1
-col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitvector
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-c int 100 200 0 2 HL from deserializer
+col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitvector comment
+col_name c
+data_type int
+min 100
+max 200
+num_nulls 0
+distinct_count 2
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/autoColumnStats_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/autoColumnStats_8.q.out b/ql/src/test/results/clientpositive/autoColumnStats_8.q.out
index c913d97..9d22aeb 100644
--- a/ql/src/test/results/clientpositive/autoColumnStats_8.q.out
+++ b/ql/src/test/results/clientpositive/autoColumnStats_8.q.out
@@ -29,7 +29,6 @@ hr string
# Partition Information
# col_name data_type comment
-
ds string
hr string
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/autoColumnStats_9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/autoColumnStats_9.q.out b/ql/src/test/results/clientpositive/autoColumnStats_9.q.out
index fda71e0..c6d12fa 100644
--- a/ql/src/test/results/clientpositive/autoColumnStats_9.q.out
+++ b/ql/src/test/results/clientpositive/autoColumnStats_9.q.out
@@ -216,7 +216,6 @@ POSTHOOK: query: desc formatted dest_j1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@dest_j1
# col_name data_type comment
-
key int
value string
@@ -250,9 +249,18 @@ PREHOOK: Input: default@dest_j1
POSTHOOK: query: desc formatted dest_j1 key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@dest_j1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key int 0 498 0 309 HL from deserializer
+col_name key
+data_type int
+min 0
+max 498
+num_nulls 0
+distinct_count 309
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: desc formatted dest_j1 value
PREHOOK: type: DESCTABLE
@@ -260,7 +268,16 @@ PREHOOK: Input: default@dest_j1
POSTHOOK: query: desc formatted dest_j1 value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@dest_j1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 309 6.834630350194552 7 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 309
+avg_col_len 6.834630350194552
+max_col_len 7
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/avro_add_column3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/avro_add_column3.q.out b/ql/src/test/results/clientpositive/avro_add_column3.q.out
index 2c8bd20..aaacb1a 100644
--- a/ql/src/test/results/clientpositive/avro_add_column3.q.out
+++ b/ql/src/test/results/clientpositive/avro_add_column3.q.out
@@ -69,7 +69,6 @@ part int
# Partition Information
# col_name data_type comment
-
part int
PREHOOK: query: SELECT * FROM doctors_copy
PREHOOK: type: QUERY
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/avro_decimal.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/avro_decimal.q.out b/ql/src/test/results/clientpositive/avro_decimal.q.out
index a9ce51b..b093a22 100644
--- a/ql/src/test/results/clientpositive/avro_decimal.q.out
+++ b/ql/src/test/results/clientpositive/avro_decimal.q.out
@@ -32,9 +32,18 @@ PREHOOK: Input: default@dec
POSTHOOK: query: DESC FORMATTED `dec` value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@dec
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value decimal(8,4) -12.25 234.79 0 10 HL from deserializer
+col_name value
+data_type decimal(8,4)
+min -12.25
+max 234.79
+num_nulls 0
+distinct_count 10
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"value\":\"true\"}}
PREHOOK: query: DROP TABLE IF EXISTS avro_dec
PREHOOK: type: DROPTABLE
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/avro_decimal_native.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/avro_decimal_native.q.out b/ql/src/test/results/clientpositive/avro_decimal_native.q.out
index 822882e..abf5937 100644
--- a/ql/src/test/results/clientpositive/avro_decimal_native.q.out
+++ b/ql/src/test/results/clientpositive/avro_decimal_native.q.out
@@ -36,9 +36,18 @@ PREHOOK: Input: default@dec
POSTHOOK: query: DESC FORMATTED `dec` value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@dec
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value decimal(8,4) -12.25 234.79 0 10 HL from deserializer
+col_name value
+data_type decimal(8,4)
+min -12.25
+max 234.79
+num_nulls 0
+distinct_count 10
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"value\":\"true\"}}
PREHOOK: query: DROP TABLE IF EXISTS avro_dec
PREHOOK: type: DROPTABLE
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/avro_schema_evolution_native.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/avro_schema_evolution_native.q.out b/ql/src/test/results/clientpositive/avro_schema_evolution_native.q.out
index ea0d7c1..7626a73 100644
--- a/ql/src/test/results/clientpositive/avro_schema_evolution_native.q.out
+++ b/ql/src/test/results/clientpositive/avro_schema_evolution_native.q.out
@@ -86,14 +86,12 @@ POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@episodes_partitioned
col_name data_type comment
# col_name data_type comment
-
title string episode title
air_date string initial date
doctor int main actor playing the Doctor in episode
# Partition Information
# col_name data_type comment
-
doctor_pt int
# Detailed Table Information
@@ -197,7 +195,6 @@ POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@episodes_partitioned
col_name data_type comment
# col_name data_type comment
-
title string episode title
air_date string initial date
doctor int main actor playing the Doctor in episode
@@ -205,7 +202,6 @@ value int default value
# Partition Information
# col_name data_type comment
-
doctor_pt int
# Detailed Table Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/beeline/escape_comments.q.out
----------------------------------------------------------------------
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 aa26c57..9e17935 100644
--- a/ql/src/test/results/clientpositive/beeline/escape_comments.q.out
+++ b/ql/src/test/results/clientpositive/beeline/escape_comments.q.out
@@ -84,13 +84,11 @@ PREHOOK: Input: escape_comments_db@escape_comments_tbl1
POSTHOOK: query: describe formatted escape_comments_tbl1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: escape_comments_db@escape_comments_tbl1
-# col_name data_type comment
- NULL NULL
+# col_name data_type comment
col1 string a\nb';
NULL NULL
# Partition Information NULL NULL
-# col_name data_type comment
- NULL NULL
+# col_name data_type comment
p1 string a\nb
NULL NULL
# Detailed Table Information NULL NULL
@@ -148,8 +146,7 @@ col1 string a\nb';
p1 string a\nb
NULL NULL
# Partition Information NULL NULL
-# col_name data_type comment
- NULL NULL
+# col_name data_type comment
p1 string a\nb
PREHOOK: query: show create table escape_comments_view1
PREHOOK: type: SHOW_CREATETABLE
@@ -164,8 +161,7 @@ PREHOOK: Input: escape_comments_db@escape_comments_view1
POSTHOOK: query: describe formatted escape_comments_view1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: escape_comments_db@escape_comments_view1
-# col_name data_type comment
- NULL NULL
+# col_name data_type comment
col1 string a\nb
NULL NULL
# Detailed Table Information NULL NULL
@@ -196,8 +192,6 @@ PREHOOK: type: SHOWINDEXES
POSTHOOK: query: show formatted index on escape_comments_tbl1
POSTHOOK: type: SHOWINDEXES
idx_name tab_name col_names idx_tab_name idx_type comment
- NULL NULL NULL NULL NULL
- NULL NULL NULL NULL NULL
index2 escape_comments_tbl1 col1 escape_comments_db__escape_comments_tbl1_index2__ compact a\nb
PREHOOK: query: drop database escape_comments_db cascade
PREHOOK: type: DROPDATABASE
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/bitvector.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bitvector.q.out b/ql/src/test/results/clientpositive/bitvector.q.out
index 96550ce..1e0284f 100644
--- a/ql/src/test/results/clientpositive/bitvector.q.out
+++ b/ql/src/test/results/clientpositive/bitvector.q.out
@@ -4,7 +4,16 @@ PREHOOK: Input: default@src
POSTHOOK: query: desc formatted src key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@src
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key string 0 309 2.812 3 HL from deserializer
+col_name key
+data_type string
+min
+max
+num_nulls 0
+distinct_count 309
+avg_col_len 2.812
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/colstats_all_nulls.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/colstats_all_nulls.q.out b/ql/src/test/results/clientpositive/colstats_all_nulls.q.out
index 9efab75..b56ad7f 100644
--- a/ql/src/test/results/clientpositive/colstats_all_nulls.q.out
+++ b/ql/src/test/results/clientpositive/colstats_all_nulls.q.out
@@ -41,9 +41,18 @@ PREHOOK: Input: default@all_nulls
POSTHOOK: query: describe formatted all_nulls a
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@all_nulls
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-a bigint 0 0 5 1 HL from deserializer
+col_name a
+data_type bigint
+min 0
+max 0
+num_nulls 5
+distinct_count 1
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\"}}
PREHOOK: query: describe formatted all_nulls b
PREHOOK: type: DESCTABLE
@@ -51,9 +60,18 @@ PREHOOK: Input: default@all_nulls
POSTHOOK: query: describe formatted all_nulls b
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@all_nulls
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-b double 0.0 0.0 5 1 HL from deserializer
+col_name b
+data_type double
+min 0.0
+max 0.0
+num_nulls 5
+distinct_count 1
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\"}}
PREHOOK: query: drop table all_nulls
PREHOOK: type: DROPTABLE
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/columnStatsUpdateForStatsOptimizer_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/columnStatsUpdateForStatsOptimizer_2.q.out b/ql/src/test/results/clientpositive/columnStatsUpdateForStatsOptimizer_2.q.out
index 4e430b3..0d78ea2 100644
--- a/ql/src/test/results/clientpositive/columnStatsUpdateForStatsOptimizer_2.q.out
+++ b/ql/src/test/results/clientpositive/columnStatsUpdateForStatsOptimizer_2.q.out
@@ -25,7 +25,6 @@ POSTHOOK: query: desc formatted calendar
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@calendar
# col_name data_type comment
-
year int
month int
@@ -68,7 +67,6 @@ POSTHOOK: query: desc formatted calendar
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@calendar
# col_name data_type comment
-
year int
month int
@@ -157,7 +155,6 @@ POSTHOOK: query: desc formatted calendar
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@calendar
# col_name data_type comment
-
year1 int
month int
@@ -279,7 +276,6 @@ POSTHOOK: query: desc formatted calendar
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@calendar
# col_name data_type comment
-
year1 int
month int
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/column_names_with_leading_and_trailing_spaces.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/column_names_with_leading_and_trailing_spaces.q.out b/ql/src/test/results/clientpositive/column_names_with_leading_and_trailing_spaces.q.out
index 345434f..2b87d50 100644
--- a/ql/src/test/results/clientpositive/column_names_with_leading_and_trailing_spaces.q.out
+++ b/ql/src/test/results/clientpositive/column_names_with_leading_and_trailing_spaces.q.out
@@ -13,7 +13,6 @@ POSTHOOK: query: desc formatted space
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@space
# col_name data_type comment
-
left string
middle string
right string
@@ -48,9 +47,18 @@ PREHOOK: Input: default@space
POSTHOOK: query: desc formatted space ` left`
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@space
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
- left string from deserializer
+col_name left
+data_type string
+min
+max
+num_nulls
+distinct_count
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\" left\":\"true\",\" middle \":\"true\",\"right \":\"true\"}}
PREHOOK: query: insert into space values ("1", "2", "3")
PREHOOK: type: QUERY
@@ -67,9 +75,18 @@ PREHOOK: Input: default@space
POSTHOOK: query: desc formatted space ` left`
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@space
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
- left string 0 1 1.0 1 HL from deserializer
+col_name left
+data_type string
+min
+max
+num_nulls 0
+distinct_count 1
+avg_col_len 1.0
+max_col_len 1
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\" left\":\"true\",\" middle \":\"true\",\"right \":\"true\"}}
PREHOOK: query: select * from space
PREHOOK: type: QUERY
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/column_pruner_multiple_children.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/column_pruner_multiple_children.q.out b/ql/src/test/results/clientpositive/column_pruner_multiple_children.q.out
index c480422..66ff79f 100644
--- a/ql/src/test/results/clientpositive/column_pruner_multiple_children.q.out
+++ b/ql/src/test/results/clientpositive/column_pruner_multiple_children.q.out
@@ -139,7 +139,6 @@ POSTHOOK: query: desc formatted DEST1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@dest1
# col_name data_type comment
-
key int
value string
@@ -173,9 +172,18 @@ PREHOOK: Input: default@dest1
POSTHOOK: query: desc formatted DEST1 key
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@dest1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-key int 10 10 0 1 HL from deserializer
+col_name key
+data_type int
+min 10
+max 10
+num_nulls 0
+distinct_count 1
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
PREHOOK: query: desc formatted DEST1 value
PREHOOK: type: DESCTABLE
@@ -183,7 +191,16 @@ PREHOOK: Input: default@dest1
POSTHOOK: query: desc formatted DEST1 value
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@dest1
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-value string 0 1 4.0 4 HL from deserializer
+col_name value
+data_type string
+min
+max
+num_nulls 0
+distinct_count 1
+avg_col_len 4.0
+max_col_len 4
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/columnstats_infinity.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/columnstats_infinity.q.out b/ql/src/test/results/clientpositive/columnstats_infinity.q.out
index 23ca486..777345c 100644
--- a/ql/src/test/results/clientpositive/columnstats_infinity.q.out
+++ b/ql/src/test/results/clientpositive/columnstats_infinity.q.out
@@ -72,7 +72,6 @@ POSTHOOK: query: desc formatted table_change_numeric_group_string_group_floating
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table_change_numeric_group_string_group_floating_string_group
# col_name data_type comment
-
insert_num int
c1 decimal(38,18)
c2 float
@@ -130,7 +129,6 @@ POSTHOOK: query: desc formatted table_change_numeric_group_string_group_floating
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table_change_numeric_group_string_group_floating_string_group
# col_name data_type comment
-
insert_num int
c1 decimal(38,18)
c2 float
@@ -250,7 +248,6 @@ POSTHOOK: query: desc formatted table_change_numeric_group_string_group_floating
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table_change_numeric_group_string_group_floating_string_group
# col_name data_type comment
-
insert_num int
c1 decimal(38,18)
c2 float
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/columnstats_partlvl.q.out b/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
index 1e1c55d..08f1709 100644
--- a/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
+++ b/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
@@ -509,18 +509,36 @@ PREHOOK: Input: default@employee_part
POSTHOOK: query: describe formatted Employee_Part partition (employeeSalary=2000.0) employeeID
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@employee_part
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-employeeID int 16 34 1 12 HL from deserializer
+col_name employeeID
+data_type int
+min 16
+max 34
+num_nulls 1
+distinct_count 12
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted Employee_Part partition (employeeSalary=2000.0) employeeName
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@employee_part
POSTHOOK: query: describe formatted Employee_Part partition (employeeSalary=2000.0) employeeName
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@employee_part
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-employeeName string 1 12 4.3076923076923075 6 HL from deserializer
+col_name employeeName
+data_type string
+min
+max
+num_nulls 1
+distinct_count 12
+avg_col_len 4.3076923076923075
+max_col_len 6
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: explain
analyze table Employee_Part compute statistics for columns
PREHOOK: type: QUERY
@@ -598,18 +616,36 @@ PREHOOK: Input: default@employee_part
POSTHOOK: query: describe formatted Employee_Part partition(employeeSalary=2000.0) employeeID
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@employee_part
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-employeeID int 16 34 1 12 HL from deserializer
+col_name employeeID
+data_type int
+min 16
+max 34
+num_nulls 1
+distinct_count 12
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted Employee_Part partition(employeeSalary=4000.0) employeeID
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@employee_part
POSTHOOK: query: describe formatted Employee_Part partition(employeeSalary=4000.0) employeeID
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@employee_part
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-employeeID int 16 34 1 12 HL from deserializer
+col_name employeeID
+data_type int
+min 16
+max 34
+num_nulls 1
+distinct_count 12
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: explain
analyze table Employee_Part compute statistics for columns
PREHOOK: type: QUERY
@@ -679,9 +715,18 @@ PREHOOK: Input: default@employee_part
POSTHOOK: query: describe formatted Employee_Part employeeID
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@employee_part
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-employeeID int 16 34 2 12 HL from deserializer
+col_name employeeID
+data_type int
+min 16
+max 34
+num_nulls 2
+distinct_count 12
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"employeeid\":\"true\",\"employeename\":\"true\"}}
PREHOOK: query: create database if not exists dummydb
PREHOOK: type: CREATEDATABASE
@@ -711,9 +756,18 @@ PREHOOK: Input: default@employee_part
POSTHOOK: query: describe formatted default.Employee_Part partition (employeeSalary=2000.0) employeeID
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@employee_part
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-employeeID int 16 34 1 12 HL from deserializer
+col_name employeeID
+data_type int
+min 16
+max 34
+num_nulls 1
+distinct_count 12
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"employeeid\":\"true\",\"employeename\":\"true\"}}
PREHOOK: query: analyze table default.Employee_Part compute statistics for columns
PREHOOK: type: QUERY
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out b/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out
index 0739b49..a626597 100644
--- a/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out
+++ b/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out
@@ -141,9 +141,18 @@ PREHOOK: Input: default@employee_part
POSTHOOK: query: describe formatted Employee_Part partition (employeeSalary='4000.0', country='USA') employeeName
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@employee_part
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-employeeName string 0 7 5.142857142857143 6 HL from deserializer
+col_name employeeName
+data_type string
+min
+max
+num_nulls 0
+distinct_count 7
+avg_col_len 5.142857142857143
+max_col_len 6
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: explain
analyze table Employee_Part partition (employeeSalary='2000.0') compute statistics for columns employeeID
PREHOOK: type: QUERY
@@ -221,18 +230,36 @@ PREHOOK: Input: default@employee_part
POSTHOOK: query: describe formatted Employee_Part partition (employeeSalary='2000.0', country='USA') employeeID
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@employee_part
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-employeeID int 16 34 1 12 HL from deserializer
+col_name employeeID
+data_type int
+min 16
+max 34
+num_nulls 1
+distinct_count 12
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted Employee_Part partition (employeeSalary='2000.0', country='UK') employeeID
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@employee_part
POSTHOOK: query: describe formatted Employee_Part partition (employeeSalary='2000.0', country='UK') employeeID
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@employee_part
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-employeeID int 16 31 0 7 HL from deserializer
+col_name employeeID
+data_type int
+min 16
+max 31
+num_nulls 0
+distinct_count 7
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: explain
analyze table Employee_Part partition (employeeSalary) compute statistics for columns employeeID
PREHOOK: type: QUERY
@@ -318,9 +345,18 @@ PREHOOK: Input: default@employee_part
POSTHOOK: query: describe formatted Employee_Part partition (employeeSalary='3000.0', country='UK') employeeID
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@employee_part
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-employeeID int 16 34 1 12 HL from deserializer
+col_name employeeID
+data_type int
+min 16
+max 34
+num_nulls 1
+distinct_count 12
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: explain
analyze table Employee_Part partition (employeeSalary,country) compute statistics for columns
PREHOOK: type: QUERY
@@ -406,9 +442,18 @@ PREHOOK: Input: default@employee_part
POSTHOOK: query: describe formatted Employee_Part partition (employeeSalary='3500.0', country='UK') employeeName
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@employee_part
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-employeeName string 0 12 5.142857142857143 6 HL from deserializer
+col_name employeeName
+data_type string
+min
+max
+num_nulls 0
+distinct_count 12
+avg_col_len 5.142857142857143
+max_col_len 6
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: drop table Employee
PREHOOK: type: DROPTABLE
POSTHOOK: query: drop table Employee
@@ -481,9 +526,18 @@ PREHOOK: Input: default@employee
POSTHOOK: query: describe formatted Employee partition (employeeSalary='3500.0', country='UK') employeeName
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@employee
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-employeeName string 0 12 5.142857142857143 6 HL from deserializer
+col_name employeeName
+data_type string
+min
+max
+num_nulls 0
+distinct_count 12
+avg_col_len 5.142857142857143
+max_col_len 6
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee partition(employeeSalary='3000.0', country='USA')
PREHOOK: type: LOAD
#### A masked pattern was here ####
@@ -528,9 +582,18 @@ PREHOOK: Input: default@employee
POSTHOOK: query: describe formatted Employee partition (employeeSalary='3000.0', country='USA') employeeName
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@employee
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-employeeName string 0 12 5.142857142857143 6 HL from deserializer
+col_name employeeName
+data_type string
+min
+max
+num_nulls 0
+distinct_count 12
+avg_col_len 5.142857142857143
+max_col_len 6
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: alter table Employee add columns (c int ,d string)
PREHOOK: type: ALTERTABLE_ADDCOLS
PREHOOK: Input: default@employee
@@ -564,24 +627,51 @@ PREHOOK: Input: default@employee
POSTHOOK: query: describe formatted Employee partition (employeeSalary='6000.0', country='UK') employeeName
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@employee
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-employeeName string 0 9 4.777777777777778 6 HL from deserializer
+col_name employeeName
+data_type string
+min
+max
+num_nulls 0
+distinct_count 9
+avg_col_len 4.777777777777778
+max_col_len 6
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted Employee partition (employeeSalary='6000.0', country='UK') c
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@employee
POSTHOOK: query: describe formatted Employee partition (employeeSalary='6000.0', country='UK') c
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@employee
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-c int 2000 4000 0 3 HL from deserializer
+col_name c
+data_type int
+min 2000
+max 4000
+num_nulls 0
+distinct_count 3
+avg_col_len
+max_col_len
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
PREHOOK: query: describe formatted Employee partition (employeeSalary='6000.0', country='UK') d
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@employee
POSTHOOK: query: describe formatted Employee partition (employeeSalary='6000.0', country='UK') d
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@employee
-# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector
-
-d string 0 2 2.4444444444444446 3 HL from deserializer
+col_name d
+data_type string
+min
+max
+num_nulls 0
+distinct_count 2
+avg_col_len 2.4444444444444446
+max_col_len 3
+num_trues
+num_falses
+bitVector HL
+comment from deserializer
[14/21] hive git commit: HIVE-17519: Transpose column stats display
(Zoltan Haindrich, reviewed by Ashutosh Chauhan and Vineet Garg)
Posted by kg...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_table_not_sorted.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_table_not_sorted.q.out b/ql/src/test/results/clientpositive/alter_table_not_sorted.q.out
index 5813207..dbd4b7f 100644
--- a/ql/src/test/results/clientpositive/alter_table_not_sorted.q.out
+++ b/ql/src/test/results/clientpositive/alter_table_not_sorted.q.out
@@ -13,7 +13,6 @@ POSTHOOK: query: desc formatted alter_table_not_sorted
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter_table_not_sorted
# col_name data_type comment
-
a int
b int
@@ -57,7 +56,6 @@ POSTHOOK: query: desc formatted alter_table_not_sorted
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@alter_table_not_sorted
# col_name data_type comment
-
a int
b int
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_table_serde.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_table_serde.q.out b/ql/src/test/results/clientpositive/alter_table_serde.q.out
index f414bde..1370625 100644
--- a/ql/src/test/results/clientpositive/alter_table_serde.q.out
+++ b/ql/src/test/results/clientpositive/alter_table_serde.q.out
@@ -91,7 +91,6 @@ dt string
# Partition Information
# col_name data_type comment
-
dt string
#### A masked pattern was here ####
@@ -116,7 +115,6 @@ dt string
# Partition Information
# col_name data_type comment
-
dt string
#### A masked pattern was here ####
@@ -141,7 +139,6 @@ dt string
# Partition Information
# col_name data_type comment
-
dt string
#### A masked pattern was here ####
@@ -167,7 +164,6 @@ dt string
# Partition Information
# col_name data_type comment
-
dt string
#### A masked pattern was here ####
@@ -193,7 +189,6 @@ dt string
# Partition Information
# col_name data_type comment
-
dt string
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_table_serde2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_table_serde2.q.out b/ql/src/test/results/clientpositive/alter_table_serde2.q.out
index ae0ef54..1c798b0 100644
--- a/ql/src/test/results/clientpositive/alter_table_serde2.q.out
+++ b/ql/src/test/results/clientpositive/alter_table_serde2.q.out
@@ -13,13 +13,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -64,13 +62,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1 PARTITION (ds = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
@@ -111,13 +107,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Table Information
@@ -164,13 +158,11 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1 PARTITION (ds = '1')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@tst1
# col_name data_type comment
-
key string
value string
# Partition Information
# col_name data_type comment
-
ds string
# Detailed Partition Information
http://git-wip-us.apache.org/repos/asf/hive/blob/38a594f3/ql/src/test/results/clientpositive/alter_table_stats_status.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_table_stats_status.q.out b/ql/src/test/results/clientpositive/alter_table_stats_status.q.out
index 3404f88..7ca949d 100644
--- a/ql/src/test/results/clientpositive/alter_table_stats_status.q.out
+++ b/ql/src/test/results/clientpositive/alter_table_stats_status.q.out
@@ -41,7 +41,6 @@ POSTHOOK: query: describe formatted srctable
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb@srctable
# col_name data_type comment
-
key string default
value string default
@@ -117,7 +116,6 @@ POSTHOOK: query: describe formatted statstable
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb@statstable
# col_name data_type comment
-
key string default
value string default
newcol string
@@ -163,7 +161,6 @@ POSTHOOK: query: describe formatted statstable
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb@statstable
# col_name data_type comment
-
key string default
value string default
newcol string
@@ -208,7 +205,6 @@ POSTHOOK: query: describe formatted statstable
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb@statstable
# col_name data_type comment
-
key string default
value string default
newcol string
@@ -256,7 +252,6 @@ POSTHOOK: query: describe formatted statstable
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb@statstable
# col_name data_type comment
-
key string default
value string default
newcol string
@@ -339,13 +334,11 @@ POSTHOOK: query: describe formatted srcpart partition (ds='2008-04-08', hr='11')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb@srcpart
# col_name data_type comment
-
key string default
value string default
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -423,14 +416,12 @@ POSTHOOK: query: describe formatted srcpart partition (ds='2017-01-19', hr='11')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb@srcpart
# col_name data_type comment
-
key string default
value string default
newcol string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -474,14 +465,12 @@ POSTHOOK: query: describe formatted srcpart partition (ds='2017-01-19', hr='11')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb@srcpart
# col_name data_type comment
-
key string default
value string default
newcol string
# Partition Information
# col_name data_type comment
-
ds string
hr string
@@ -527,14 +516,12 @@ POSTHOOK: query: describe formatted srcpart partition (ds='2017-01-19', hr='11')
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: statsdb@srcpart
# col_name data_type comment
-
key string default
value string default
newcol string
# Partition Information
# col_name data_type comment
-
ds string
hr string