You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2018/07/21 19:51:52 UTC
[4/4] hive git commit: HIVE-19416 : merge master into branch (Sergey
Shelukhin) 0721
HIVE-19416 : merge master into branch (Sergey Shelukhin) 0721
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/5c8b5d8b
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/5c8b5d8b
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/5c8b5d8b
Branch: refs/heads/master-txnstats
Commit: 5c8b5d8b62beaffedd0681683638bf8bb7d98402
Parents: ddef895 788daf6
Author: sergey <se...@apache.org>
Authored: Sat Jul 21 12:51:36 2018 -0700
Committer: sergey <se...@apache.org>
Committed: Sat Jul 21 12:51:36 2018 -0700
----------------------------------------------------------------------
.../test/resources/testconfiguration.properties | 1 +
.../hive/ql/optimizer/GenMRTableScan1.java | 5 +-
.../hive/ql/parse/DDLSemanticAnalyzer.java | 12 +-
.../org/apache/hadoop/hive/ql/parse/HiveLexer.g | 1 +
.../apache/hadoop/hive/ql/parse/HiveParser.g | 11 +-
.../hive/ql/parse/ProcessAnalyzeTable.java | 5 +-
.../hadoop/hive/ql/parse/TaskCompiler.java | 6 +-
.../parse/spark/SparkProcessAnalyzeTable.java | 5 +-
.../hive/ql/stats/BasicStatsNoJobTask.java | 9 +
.../queries/clientpositive/acid_no_buckets.q | 8 +
.../clientpositive/truncate_external_force.q | 16 ++
.../clientpositive/acid_table_stats.q.out | 16 +-
.../materialized_view_create_rewrite.q.out | 58 ++---
.../clientpositive/llap/acid_no_buckets.q.out | 210 +++++++++++++++++--
.../materialized_view_create_rewrite_4.q.out | 6 +-
.../materialized_view_create_rewrite_5.q.out | 2 +-
.../llap/truncate_external_force.q.out | 85 ++++++++
17 files changed, 393 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/5c8b5d8b/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/5c8b5d8b/ql/src/java/org/apache/hadoop/hive/ql/stats/BasicStatsNoJobTask.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/5c8b5d8b/ql/src/test/results/clientpositive/acid_table_stats.q.out
----------------------------------------------------------------------
diff --cc ql/src/test/results/clientpositive/acid_table_stats.q.out
index f3ada34,2fe4f97..32badd0
--- a/ql/src/test/results/clientpositive/acid_table_stats.q.out
+++ b/ql/src/test/results/clientpositive/acid_table_stats.q.out
@@@ -174,10 -211,9 +176,10 @@@ Database: defaul
Table: acid
#### A masked pattern was here ####
Partition Parameters:
+ COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
numFiles 2
numRows 1000
- rawDataSize 208000
+ rawDataSize 0
totalSize 4063
#### A masked pattern was here ####
@@@ -225,10 -261,10 +227,10 @@@ Database: defaul
Table: acid
#### A masked pattern was here ####
Partition Parameters:
- COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
+ COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
numFiles 2
numRows 1000
- rawDataSize 208000
+ rawDataSize 0
totalSize 4063
#### A masked pattern was here ####
@@@ -317,11 -389,10 +319,11 @@@ Database: defaul
Table: acid
#### A masked pattern was here ####
Partition Parameters:
+ COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
numFiles 4
- numRows 3000
+ numRows 2000
- rawDataSize 208000
+ rawDataSize 0
- totalSize 8118
+ totalSize 8126
#### A masked pattern was here ####
# Storage Information
@@@ -364,11 -437,10 +368,11 @@@ Database: defaul
Table: acid
#### A masked pattern was here ####
Partition Parameters:
+ COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
numFiles 4
numRows 2000
- rawDataSize 416000
+ rawDataSize 0
- totalSize 8118
+ totalSize 8126
#### A masked pattern was here ####
# Storage Information
@@@ -433,11 -541,11 +437,11 @@@ STAGE PLANS
TableScan
alias: acid
filterExpr: (ds = '2008-04-08') (type: boolean)
- Statistics: Num rows: 2000 Data size: 416000 Basic stats: COMPLETE Column stats: NONE
- Statistics: Num rows: 2000 Data size: 81180 Basic stats: COMPLETE Column stats: NONE
++ Statistics: Num rows: 2000 Data size: 81260 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: key (type: string)
outputColumnNames: key
- Statistics: Num rows: 2000 Data size: 416000 Basic stats: COMPLETE Column stats: NONE
- Statistics: Num rows: 2000 Data size: 81180 Basic stats: COMPLETE Column stats: NONE
++ Statistics: Num rows: 2000 Data size: 81260 Basic stats: COMPLETE Column stats: NONE
Group By Operator
aggregations: max(key)
mode: hash
http://git-wip-us.apache.org/repos/asf/hive/blob/5c8b5d8b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
----------------------------------------------------------------------
diff --cc ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
index fe46bfd,bfa204e..42bfa4b
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
@@@ -949,8 -948,8 +949,8 @@@ Table Parameters
bucketing_version 2
numFiles 3
numRows 3
- rawDataSize 248
+ rawDataSize 0
- totalSize 1508
+ totalSize 1500
transactional true
transactional_properties default
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/5c8b5d8b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out
----------------------------------------------------------------------