diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java index 21f82683f7..a79bc4513d 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java @@ -1204,7 +1204,7 @@ protected FSPaths getDynOutPaths(List row, String lbDir) throws HiveExce } else if (prevFsp.updaters[0] != null) { stats = prevFsp.updaters[0].getStats(); } - if (stats != null) { + if (stats != null && !conf.isFullAcidTable()) { prevFsp.addToStat(StatsSetupConst.RAW_DATA_SIZE, stats.getRawDataSize()); prevFsp.addToStat(StatsSetupConst.ROW_COUNT, stats.getRowCount()); } diff --git ql/src/test/results/clientpositive/acid_table_stats.q.out ql/src/test/results/clientpositive/acid_table_stats.q.out index 084d232ecd..985c822c12 100644 --- ql/src/test/results/clientpositive/acid_table_stats.q.out +++ ql/src/test/results/clientpositive/acid_table_stats.q.out @@ -93,7 +93,10 @@ Database: default 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 0 totalSize 4063 #### A masked pattern was here #### @@ -123,58 +126,22 @@ PREHOOK: type: QUERY POSTHOOK: query: explain select count(*) from acid where ds='2008-04-08' POSTHOOK: type: QUERY STAGE DEPENDENCIES: - Stage-1 is a root stage - Stage-0 depends on stages: Stage-1 + Stage-0 is a root stage STAGE PLANS: - Stage: Stage-1 - Map Reduce - Map Operator Tree: - TableScan - alias: acid - filterExpr: (ds = '2008-04-08') (type: boolean) - Statistics: Num rows: 83 Data size: 40630 Basic stats: PARTIAL Column stats: NONE - Select Operator - Statistics: Num rows: 83 Data size: 40630 Basic stats: PARTIAL Column stats: NONE - Group By Operator - aggregations: count() - mode: hash - outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 8 Basic stats: PARTIAL Column stats: NONE - Reduce Output Operator - sort order: - Statistics: Num rows: 1 Data size: 8 Basic stats: PARTIAL Column stats: NONE - value expressions: _col0 (type: bigint) - Execution mode: vectorized - Reduce Operator Tree: - Group By Operator - aggregations: count(VALUE._col0) - mode: mergepartial - outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 8 Basic stats: PARTIAL Column stats: NONE - File Output Operator - compressed: false - Statistics: Num rows: 1 Data size: 8 Basic stats: PARTIAL Column stats: NONE - table: - input format: org.apache.hadoop.mapred.SequenceFileInputFormat - output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat - serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - Stage: Stage-0 Fetch Operator - limit: -1 + limit: 1 Processor Tree: ListSink PREHOOK: query: select count(*) from acid where ds='2008-04-08' PREHOOK: type: QUERY PREHOOK: Input: default@acid -PREHOOK: Input: default@acid@ds=2008-04-08 #### A masked pattern was here #### POSTHOOK: query: select count(*) from acid where ds='2008-04-08' POSTHOOK: type: QUERY POSTHOOK: Input: default@acid -POSTHOOK: Input: default@acid@ds=2008-04-08 #### A masked pattern was here #### 1000 PREHOOK: query: analyze table acid partition(ds='2008-04-08') compute statistics @@ -207,7 +174,6 @@ Database: default Table: acid #### A masked pattern was here #### Partition Parameters: - COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} numFiles 2 numRows 1000 rawDataSize 208000 @@ -258,7 +224,7 @@ Database: default Table: acid #### A masked pattern was here #### Partition Parameters: - COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} numFiles 2 numRows 1000 rawDataSize 208000 @@ -386,7 +352,10 @@ Database: default Table: acid #### A masked pattern was here #### Partition Parameters: + COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} numFiles 4 + numRows 2000 + rawDataSize 208000 totalSize 8118 #### A masked pattern was here #### @@ -430,7 +399,6 @@ Database: default Table: acid #### A masked pattern was here #### Partition Parameters: - COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} numFiles 4 numRows 2000 rawDataSize 416000