diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java b/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java index 6a00220f6d..85a42f9456 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java @@ -782,7 +782,7 @@ private boolean determineRgsToRead(int rowIndexStride, sargApp = new RecordReaderImpl.SargApplier(sarg, rowIndexStride, evolution, OrcFile.WriterVersion.from(OrcFile.WriterImplementation.ORC_JAVA, fileMetadata.getWriterVersionNum()), - false); + true); } boolean hasAnyData = false; // stripeRgs should have been initialized by this time with an empty array. diff --git a/pom.xml b/pom.xml index 7649af10a7..4c956c412e 100644 --- a/pom.xml +++ b/pom.xml @@ -187,7 +187,7 @@ 0.9.3 2.10.0 2.3 - 1.5.4 + 1.5.6 1.10.19 1.7.4 2.0.0-M5 diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java index 707e38c321..f350f1b5a5 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java @@ -2313,7 +2313,7 @@ private static boolean isStripeSatisfyPredicate( } PredicateLeaf leaf = predLeaves.get(pred); try { - truthValues[pred] = RecordReaderImpl.evaluatePredicate(stats, leaf, null); + truthValues[pred] = RecordReaderImpl.evaluatePredicate(stats, leaf, null, true); } catch (NoDynamicValuesException dve) { LOG.debug("Dynamic values are not available here {}", dve.getMessage()); boolean hasNulls = stats.hasNull() || leaf.getOperator() != Operator.NULL_SAFE_EQUALS; diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/sarg/ConvertAstToSearchArg.java b/ql/src/java/org/apache/hadoop/hive/ql/io/sarg/ConvertAstToSearchArg.java index 27fe828b75..bfabdce736 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/sarg/ConvertAstToSearchArg.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/io/sarg/ConvertAstToSearchArg.java @@ -204,6 +204,9 @@ private static Object boxLiteral(ExprNodeConstantDesc constantDesc, } return fl.doubleValue(); case TIMESTAMP: + if (lit instanceof org.apache.hadoop.hive.common.type.Timestamp) { + return ((org.apache.hadoop.hive.common.type.Timestamp) lit).toSqlTimestamp(); + } return Timestamp.valueOf(lit.toString()); case DATE: return Date.valueOf(lit.toString()); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/FixedBucketPruningOptimizer.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/FixedBucketPruningOptimizer.java index 35053e3ca6..3a40b319a4 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/FixedBucketPruningOptimizer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/FixedBucketPruningOptimizer.java @@ -251,7 +251,8 @@ private Object convertLiteral(Object o) { if (o instanceof java.sql.Date) { return Date.valueOf(o.toString()); } else if (o instanceof java.sql.Timestamp) { - return Timestamp.valueOf(o.toString()); + java.sql.Timestamp sqlTimestamp = (java.sql.Timestamp)o; + return Timestamp.ofEpochMilli(sqlTimestamp.getTime(), sqlTimestamp.getNanos()); } return o; } diff --git a/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestInputOutputFormat.java b/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestInputOutputFormat.java index b5958fa9cc..22f26fed5e 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestInputOutputFormat.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestInputOutputFormat.java @@ -3223,10 +3223,8 @@ public void testNonVectorReaderNoFooterSerialize() throws Exception { } } // call-1: open to read footer - split 1 => mock:/mocktable1/0_0 - // call-2: open to read data - split 1 => mock:/mocktable1/0_0 - // call-3: open to read footer - split 2 => mock:/mocktable1/0_1 - // call-4: open to read data - split 2 => mock:/mocktable1/0_1 - assertEquals(4, readOpsDelta); + // call-2: open to read footer - split 2 => mock:/mocktable1/0_1 + assertEquals(2, readOpsDelta); // revert back to local fs conf.set("fs.defaultFS", "file:///"); @@ -3368,10 +3366,8 @@ public void testVectorReaderNoFooterSerialize() throws Exception { } } // call-1: open to read footer - split 1 => mock:/mocktable3/0_0 - // call-2: open to read data - split 1 => mock:/mocktable3/0_0 - // call-3: open to read footer - split 2 => mock:/mocktable3/0_1 - // call-4: open to read data - split 2 => mock:/mocktable3/0_1 - assertEquals(4, readOpsDelta); + // call-2: open to read footer - split 2 => mock:/mocktable3/0_1 + assertEquals(2, readOpsDelta); // revert back to local fs conf.set("fs.defaultFS", "file:///"); @@ -3518,14 +3514,12 @@ public void testACIDReaderNoFooterSerialize() throws Exception { } } // call-1: open to read footer - split 1 => mock:/mocktable5/0_0 - // call-2: open to read data - split 1 => mock:/mocktable5/0_0 - // call-3: getAcidState - split 1 => mock:/mocktable5 (to compute offset for original read) - // call-4: open to read footer - split 2 => mock:/mocktable5/0_1 - // call-5: open to read data - split 2 => mock:/mocktable5/0_1 - // call-6: getAcidState - split 2 => mock:/mocktable5 (to compute offset for original read) - // call-7: open to read footer - split 2 => mock:/mocktable5/0_0 (to get row count) - // call-8: file status - split 2 => mock:/mocktable5/0_0 - assertEquals(8, readOpsDelta); + // call-2: getAcidState - split 1 => mock:/mocktable5 (to compute offset for original read) + // call-3: open to read footer - split 2 => mock:/mocktable5/0_1 + // call-4: getAcidState - split 2 => mock:/mocktable5 (to compute offset for original read) + // call-5: open to read footer - split 2 => mock:/mocktable5/0_0 (to get row count) + // call-6: file status - split 2 => mock:/mocktable5/0_0 + assertEquals(6, readOpsDelta); // revert back to local fs conf.set("fs.defaultFS", "file:///"); @@ -3679,7 +3673,7 @@ public void testACIDReaderNoFooterSerializeWithDeltas() throws Exception { readOpsDelta = statistics.getReadOps() - readOpsBefore; } } - assertEquals(7, readOpsDelta); + assertEquals(5, readOpsDelta); // revert back to local fs conf.set("fs.defaultFS", "file:///"); diff --git a/ql/src/test/queries/clientpositive/change_allowincompatible_vectorization_false_date.q b/ql/src/test/queries/clientpositive/change_allowincompatible_vectorization_false_date.q index e750c59ded..02d923b322 100644 --- a/ql/src/test/queries/clientpositive/change_allowincompatible_vectorization_false_date.q +++ b/ql/src/test/queries/clientpositive/change_allowincompatible_vectorization_false_date.q @@ -27,3 +27,5 @@ insert into table change_allowincompatible_vectorization_false_date partition (s select ts from change_allowincompatible_vectorization_false_date where ts='2038-03-22 07:26:48.0' and s='aaa'; +set hive.vectorized.execution.enabled=true; +select ts from change_allowincompatible_vectorization_false_date where ts='2038-03-22 07:26:48.0' and s='aaa'; diff --git a/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out b/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out index 728ae97668..3fd6b20473 100644 --- a/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out +++ b/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out @@ -60,7 +60,7 @@ numFiles 1 numFilesErasureCoded 0 numRows 2 rawDataSize 408 -totalSize 457 +totalSize 467 #### A masked pattern was here #### PREHOOK: query: create materialized view if not exists cmv_mat_view2_n4 as select a, c from cmv_basetable_n10 where a = 3 @@ -94,7 +94,7 @@ numFiles 1 numFilesErasureCoded 0 numRows 2 rawDataSize 232 -totalSize 326 +totalSize 332 #### A masked pattern was here #### PREHOOK: query: explain select a, c from cmv_basetable_n10 where a = 3 diff --git a/ql/src/test/results/clientpositive/deleteAnalyze.q.out b/ql/src/test/results/clientpositive/deleteAnalyze.q.out index 4de1f7b780..987fc516d6 100644 --- a/ql/src/test/results/clientpositive/deleteAnalyze.q.out +++ b/ql/src/test/results/clientpositive/deleteAnalyze.q.out @@ -54,7 +54,7 @@ Table Parameters: numFiles 1 numRows 2 rawDataSize 634 - totalSize 579 + totalSize 595 #### A masked pattern was here #### # Storage Information diff --git a/ql/src/test/results/clientpositive/llap/change_allowincompatible_vectorization_false_date.q.out b/ql/src/test/results/clientpositive/llap/change_allowincompatible_vectorization_false_date.q.out index 4661a03571..f3716b1e8c 100644 --- a/ql/src/test/results/clientpositive/llap/change_allowincompatible_vectorization_false_date.q.out +++ b/ql/src/test/results/clientpositive/llap/change_allowincompatible_vectorization_false_date.q.out @@ -84,3 +84,14 @@ POSTHOOK: Input: default@change_allowincompatible_vectorization_false_date POSTHOOK: Input: default@change_allowincompatible_vectorization_false_date@s=aaa #### A masked pattern was here #### 2038-03-22 07:26:48 +PREHOOK: query: select ts from change_allowincompatible_vectorization_false_date where ts='2038-03-22 07:26:48.0' and s='aaa' +PREHOOK: type: QUERY +PREHOOK: Input: default@change_allowincompatible_vectorization_false_date +PREHOOK: Input: default@change_allowincompatible_vectorization_false_date@s=aaa +#### A masked pattern was here #### +POSTHOOK: query: select ts from change_allowincompatible_vectorization_false_date where ts='2038-03-22 07:26:48.0' and s='aaa' +POSTHOOK: type: QUERY +POSTHOOK: Input: default@change_allowincompatible_vectorization_false_date +POSTHOOK: Input: default@change_allowincompatible_vectorization_false_date@s=aaa +#### A masked pattern was here #### +2038-03-22 07:26:48 diff --git a/ql/src/test/results/clientpositive/llap/default_constraint.q.out b/ql/src/test/results/clientpositive/llap/default_constraint.q.out index e7c060c28d..8614170777 100644 --- a/ql/src/test/results/clientpositive/llap/default_constraint.q.out +++ b/ql/src/test/results/clientpositive/llap/default_constraint.q.out @@ -1542,7 +1542,7 @@ Table Type: MANAGED_TABLE Table Parameters: bucketing_version 2 numFiles 1 - totalSize 1096 + totalSize 1099 transactional true transactional_properties default #### A masked pattern was here #### @@ -1716,7 +1716,7 @@ Table Parameters: bucketing_version 2 #### A masked pattern was here #### numFiles 2 - totalSize 2193 + totalSize 2198 transactional true transactional_properties default #### A masked pattern was here #### @@ -1796,7 +1796,7 @@ Table Parameters: bucketing_version 2 #### A masked pattern was here #### numFiles 2 - totalSize 2193 + totalSize 2198 transactional true transactional_properties default #### A masked pattern was here #### @@ -1977,7 +1977,7 @@ Table Parameters: bucketing_version 2 #### A masked pattern was here #### numFiles 3 - totalSize 3278 + totalSize 3281 transactional true transactional_properties default #### A masked pattern was here #### @@ -2056,7 +2056,7 @@ Table Parameters: bucketing_version 2 #### A masked pattern was here #### numFiles 3 - totalSize 3278 + totalSize 3281 transactional true transactional_properties default #### A masked pattern was here #### @@ -2136,7 +2136,7 @@ Table Parameters: bucketing_version 2 #### A masked pattern was here #### numFiles 3 - totalSize 3278 + totalSize 3281 transactional true transactional_properties default #### A masked pattern was here #### @@ -2728,7 +2728,7 @@ Table Type: MANAGED_TABLE Table Parameters: bucketing_version 2 numFiles 1 - totalSize 1096 + totalSize 1099 transactional true transactional_properties default #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out b/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out index 9fef44ab4f..cb653266f8 100644 --- a/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out +++ b/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out @@ -54,7 +54,7 @@ Table Parameters: numFiles 1 numRows 2 rawDataSize 634 - totalSize 579 + totalSize 595 #### A masked pattern was here #### # Storage Information 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 916db931b6..1fb91f1fad 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 @@ -299,7 +299,7 @@ STAGE PLANS: serialization.ddl struct loc_orc_1d_n0 { string state, double locid, decimal(10,0) cnt, i32 zip} serialization.format 1 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde - totalSize 539 + totalSize 542 #### A masked pattern was here #### serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde @@ -345,7 +345,7 @@ STAGE PLANS: serialization.ddl struct loc_orc_1d_n0 { string state, double locid, decimal(10,0) cnt, i32 zip} serialization.format 1 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde - totalSize 576 + totalSize 581 #### A masked pattern was here #### serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde @@ -391,7 +391,7 @@ STAGE PLANS: serialization.ddl struct loc_orc_1d_n0 { string state, double locid, decimal(10,0) cnt, i32 zip} serialization.format 1 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde - totalSize 594 + totalSize 597 #### A masked pattern was here #### serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde @@ -437,7 +437,7 @@ STAGE PLANS: serialization.ddl struct loc_orc_1d_n0 { string state, double locid, decimal(10,0) cnt, i32 zip} serialization.format 1 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde - totalSize 612 + totalSize 620 #### A masked pattern was here #### serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde @@ -690,7 +690,7 @@ STAGE PLANS: serialization.ddl struct loc_orc_1d_n0 { string state, double locid, decimal(10,0) cnt, i32 zip} serialization.format 1 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde - totalSize 539 + totalSize 542 #### A masked pattern was here #### serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde @@ -736,7 +736,7 @@ STAGE PLANS: serialization.ddl struct loc_orc_1d_n0 { string state, double locid, decimal(10,0) cnt, i32 zip} serialization.format 1 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde - totalSize 576 + totalSize 581 #### A masked pattern was here #### serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde @@ -782,7 +782,7 @@ STAGE PLANS: serialization.ddl struct loc_orc_1d_n0 { string state, double locid, decimal(10,0) cnt, i32 zip} serialization.format 1 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde - totalSize 594 + totalSize 597 #### A masked pattern was here #### serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde @@ -828,7 +828,7 @@ STAGE PLANS: serialization.ddl struct loc_orc_1d_n0 { string state, double locid, decimal(10,0) cnt, i32 zip} serialization.format 1 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde - totalSize 612 + totalSize 620 #### A masked pattern was here #### serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde @@ -1131,7 +1131,7 @@ STAGE PLANS: serialization.ddl struct loc_orc_2d_n0 { string state, i32 locid, decimal(10,0) cnt} serialization.format 1 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde - totalSize 402 + totalSize 399 #### A masked pattern was here #### serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde @@ -1225,7 +1225,7 @@ STAGE PLANS: serialization.ddl struct loc_orc_2d_n0 { string state, i32 locid, decimal(10,0) cnt} serialization.format 1 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde - totalSize 432 + totalSize 438 #### A masked pattern was here #### serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde @@ -1272,7 +1272,7 @@ STAGE PLANS: serialization.ddl struct loc_orc_2d_n0 { string state, i32 locid, decimal(10,0) cnt} serialization.format 1 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde - totalSize 401 + totalSize 399 #### A masked pattern was here #### serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde @@ -1319,7 +1319,7 @@ STAGE PLANS: serialization.ddl struct loc_orc_2d_n0 { string state, i32 locid, decimal(10,0) cnt} serialization.format 1 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde - totalSize 405 + totalSize 407 #### A masked pattern was here #### serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde @@ -1366,7 +1366,7 @@ STAGE PLANS: serialization.ddl struct loc_orc_2d_n0 { string state, i32 locid, decimal(10,0) cnt} serialization.format 1 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde - totalSize 405 + totalSize 402 #### A masked pattern was here #### serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde @@ -1413,7 +1413,7 @@ STAGE PLANS: serialization.ddl struct loc_orc_2d_n0 { string state, i32 locid, decimal(10,0) cnt} serialization.format 1 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde - totalSize 424 + totalSize 423 #### A masked pattern was here #### serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde @@ -1460,7 +1460,7 @@ STAGE PLANS: serialization.ddl struct loc_orc_2d_n0 { string state, i32 locid, decimal(10,0) cnt} serialization.format 1 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde - totalSize 380 + totalSize 378 #### A masked pattern was here #### serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde @@ -1507,7 +1507,7 @@ STAGE PLANS: serialization.ddl struct loc_orc_2d_n0 { string state, i32 locid, decimal(10,0) cnt} serialization.format 1 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde - totalSize 375 + totalSize 373 #### A masked pattern was here #### serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde @@ -1554,7 +1554,7 @@ STAGE PLANS: serialization.ddl struct loc_orc_2d_n0 { string state, i32 locid, decimal(10,0) cnt} serialization.format 1 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde - totalSize 424 + totalSize 427 #### A masked pattern was here #### serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde @@ -1601,7 +1601,7 @@ STAGE PLANS: serialization.ddl struct loc_orc_2d_n0 { string state, i32 locid, decimal(10,0) cnt} serialization.format 1 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde - totalSize 424 + totalSize 428 #### A masked pattern was here #### serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out index 15404830d6..105203dc33 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out @@ -50,7 +50,7 @@ Table Parameters: numFiles 1 numRows 5 rawDataSize 1025 - totalSize 501 + totalSize 509 #### A masked pattern was here #### # Storage Information @@ -112,7 +112,7 @@ Table Parameters: numFiles 1 numRows 5 rawDataSize 580 - totalSize 345 + totalSize 354 #### A masked pattern was here #### # Storage Information @@ -250,7 +250,7 @@ numFiles 1 numFilesErasureCoded 0 numRows 5 rawDataSize 1605 -totalSize 703 +totalSize 725 #### A masked pattern was here #### PREHOOK: query: drop materialized view cmv_mat_view_n4 PREHOOK: type: DROP_MATERIALIZED_VIEW diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out index 22b0a9012a..53f723387e 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out @@ -60,7 +60,7 @@ numFiles 1 numFilesErasureCoded 0 numRows 2 rawDataSize 408 -totalSize 457 +totalSize 467 #### A masked pattern was here #### PREHOOK: query: create materialized view if not exists cmv_mat_view2_n4 as select a, c from cmv_basetable_n10 where a = 3 @@ -94,7 +94,7 @@ numFiles 1 numFilesErasureCoded 0 numRows 2 rawDataSize 232 -totalSize 326 +totalSize 332 #### A masked pattern was here #### PREHOOK: query: explain select a, c from cmv_basetable_n10 where a = 3 diff --git 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 index 2ebcb344db..77bc231b11 100644 --- 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 @@ -275,7 +275,7 @@ Table Parameters: numFiles 1 numRows 2 rawDataSize 0 - totalSize 809 + totalSize 819 transactional true transactional_properties default #### A masked pattern was here #### @@ -505,7 +505,7 @@ Table Parameters: numFiles 1 numRows 2 rawDataSize 0 - totalSize 809 + totalSize 819 transactional true transactional_properties default #### A masked pattern was here #### @@ -978,7 +978,7 @@ Table Parameters: numFiles 2 numRows 3 rawDataSize 0 - totalSize 1573 + totalSize 1576 transactional true transactional_properties default #### A masked pattern was here #### @@ -1265,7 +1265,7 @@ Table Parameters: numFiles 1 numRows 3 rawDataSize 0 - totalSize 814 + totalSize 822 transactional true transactional_properties default #### A masked pattern was here #### @@ -1552,7 +1552,7 @@ Table Parameters: numFiles 1 numRows 2 rawDataSize 0 - totalSize 812 + totalSize 820 transactional true transactional_properties default #### A masked pattern was here #### @@ -1955,7 +1955,7 @@ Table Parameters: numFiles 2 numRows 3 rawDataSize 0 - totalSize 1573 + totalSize 1576 transactional true transactional_properties default #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out index c821c677ca..1e59666f29 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out @@ -382,7 +382,7 @@ Table Parameters: numFiles 2 numRows 5 rawDataSize 0 - totalSize 1498 + totalSize 1502 transactional true transactional_properties default #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out index 51a4a12bad..25c89a546c 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out @@ -60,7 +60,7 @@ numFiles 1 numFilesErasureCoded 0 numRows 2 rawDataSize 408 -totalSize 457 +totalSize 467 #### A masked pattern was here #### PREHOOK: query: create materialized view if not exists cmv_mat_view2 as select a, c from cmv_basetable_n0 where a = 3 @@ -94,7 +94,7 @@ numFiles 1 numFilesErasureCoded 0 numRows 2 rawDataSize 232 -totalSize 326 +totalSize 332 #### A masked pattern was here #### PREHOOK: query: explain select a, c from cmv_basetable_n0 where a = 3 diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out index 4bf5c2f972..d94baca8c9 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out @@ -84,7 +84,7 @@ numFiles 1 numFilesErasureCoded 0 numRows 2 rawDataSize 408 -totalSize 457 +totalSize 467 #### A masked pattern was here #### PREHOOK: query: create materialized view if not exists cmv_mat_view2_n2 as select a, c from db1.cmv_basetable_n7 where a = 3 @@ -118,7 +118,7 @@ numFiles 1 numFilesErasureCoded 0 numRows 2 rawDataSize 232 -totalSize 326 +totalSize 332 #### A masked pattern was here #### PREHOOK: query: create database db3 PREHOOK: type: CREATEDATABASE diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out index 5f3d007a22..7da22c0616 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out @@ -280,7 +280,7 @@ Table Parameters: numRows 2 rawDataSize 232 rewriting.time.window 5min - totalSize 608 + totalSize 606 #### A masked pattern was here #### # Storage Information @@ -505,7 +505,7 @@ Table Parameters: numRows 2 rawDataSize 232 rewriting.time.window 5min - totalSize 608 + totalSize 606 #### A masked pattern was here #### # Storage Information @@ -834,7 +834,7 @@ Table Parameters: numRows 3 rawDataSize 348 rewriting.time.window 5min - totalSize 628 + totalSize 636 #### A masked pattern was here #### # Storage Information diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window_2.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window_2.q.out index b382fa49b5..aee7e8b450 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window_2.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window_2.q.out @@ -94,7 +94,7 @@ Table Parameters: numFiles 2 numRows 2 rawDataSize 232 - totalSize 608 + totalSize 606 #### A masked pattern was here #### # Storage Information @@ -153,7 +153,7 @@ Table Parameters: numFiles 2 numRows 2 rawDataSize 232 - totalSize 608 + totalSize 606 #### A masked pattern was here #### # Storage Information @@ -212,7 +212,7 @@ Table Parameters: numFiles 2 numRows 3 rawDataSize 348 - totalSize 628 + totalSize 636 #### A masked pattern was here #### # Storage Information diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out index 00577c052c..62cac0e18e 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out @@ -73,7 +73,7 @@ Table Parameters: numFiles 1 numRows 5 rawDataSize 580 - totalSize 345 + totalSize 354 #### A masked pattern was here #### # Storage Information @@ -102,7 +102,7 @@ numFiles 1 numFilesErasureCoded 0 numRows 5 rawDataSize 580 -totalSize 345 +totalSize 354 #### A masked pattern was here #### PREHOOK: query: select a, c from cmv_mat_view_n8 PREHOOK: type: QUERY @@ -245,7 +245,7 @@ Table Parameters: numFiles 1 numRows 5 rawDataSize 1025 - totalSize 501 + totalSize 509 #### A masked pattern was here #### # Storage Information 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 1389de0c83..04ab995749 100644 --- a/ql/src/test/results/clientpositive/llap/orc_analyze.q.out +++ b/ql/src/test/results/clientpositive/llap/orc_analyze.q.out @@ -102,7 +102,7 @@ Table Parameters: numFiles 1 numRows 100 rawDataSize 52600 - totalSize 3222 + totalSize 3227 #### A masked pattern was here #### # Storage Information @@ -150,7 +150,7 @@ Table Parameters: numFiles 1 numRows 100 rawDataSize 52600 - totalSize 3222 + totalSize 3227 #### A masked pattern was here #### # Storage Information @@ -237,7 +237,7 @@ Table Parameters: numFiles 1 numRows 100 rawDataSize 52600 - totalSize 3222 + totalSize 3227 #### A masked pattern was here #### # Storage Information @@ -345,7 +345,7 @@ Partition Parameters: numFiles 1 numRows 50 rawDataSize 21950 - totalSize 2123 + totalSize 2129 #### A masked pattern was here #### # Storage Information @@ -386,7 +386,7 @@ Partition Parameters: numFiles 1 numRows 50 rawDataSize 22050 - totalSize 2134 + totalSize 2142 #### A masked pattern was here #### # Storage Information @@ -439,7 +439,7 @@ Partition Parameters: numFiles 1 numRows 50 rawDataSize 21950 - totalSize 2123 + totalSize 2129 #### A masked pattern was here #### # Storage Information @@ -480,7 +480,7 @@ Partition Parameters: numFiles 1 numRows 50 rawDataSize 22050 - totalSize 2134 + totalSize 2142 #### A masked pattern was here #### # Storage Information @@ -576,7 +576,7 @@ Partition Parameters: numFiles 1 numRows 50 rawDataSize 21950 - totalSize 2123 + totalSize 2129 #### A masked pattern was here #### # Storage Information @@ -617,7 +617,7 @@ Partition Parameters: numFiles 1 numRows 50 rawDataSize 22050 - totalSize 2134 + totalSize 2142 #### A masked pattern was here #### # Storage Information @@ -731,7 +731,7 @@ Partition Parameters: numFiles 4 numRows 50 rawDataSize 21955 - totalSize 5341 + totalSize 5382 #### A masked pattern was here #### # Storage Information @@ -772,7 +772,7 @@ Partition Parameters: numFiles 4 numRows 50 rawDataSize 22043 - totalSize 5336 + totalSize 5371 #### A masked pattern was here #### # Storage Information @@ -825,7 +825,7 @@ Partition Parameters: numFiles 4 numRows 50 rawDataSize 21955 - totalSize 5341 + totalSize 5382 #### A masked pattern was here #### # Storage Information @@ -866,7 +866,7 @@ Partition Parameters: numFiles 4 numRows 50 rawDataSize 22043 - totalSize 5336 + totalSize 5371 #### A masked pattern was here #### # Storage Information @@ -968,7 +968,7 @@ Partition Parameters: numFiles 4 numRows 50 rawDataSize 21955 - totalSize 5341 + totalSize 5382 #### A masked pattern was here #### # Storage Information @@ -1009,7 +1009,7 @@ Partition Parameters: numFiles 4 numRows 50 rawDataSize 22043 - totalSize 5336 + totalSize 5371 #### A masked pattern was here #### # Storage Information @@ -1117,7 +1117,7 @@ Partition Parameters: numFiles 1 numRows 50 rawDataSize 21950 - totalSize 2123 + totalSize 2129 #### A masked pattern was here #### # Storage Information @@ -1170,7 +1170,7 @@ Partition Parameters: numFiles 1 numRows 50 rawDataSize 21950 - totalSize 2123 + totalSize 2129 #### A masked pattern was here #### # Storage Information 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 007ab041dd..9c5695ae60 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 @@ -237,7 +237,7 @@ Table Parameters: orc.bloom.filter.columns * orc.row.index.stride 1000 rawDataSize 1139514 - totalSize 55686 + totalSize 55694 #### A masked pattern was here #### # Storage Information @@ -255,9 +255,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n1 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 16681 + HDFS_BYTES_READ: 16680 HDFS_BYTES_WRITTEN: 104 - HDFS_READ_OPS: 7 + HDFS_READ_OPS: 6 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -317,7 +317,7 @@ PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: HDFS_BYTES_READ: 1047 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -952,7 +952,7 @@ PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: HDFS_BYTES_READ: 5911 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: 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 28e27185d4..f9b5f8f0d4 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 @@ -237,7 +237,7 @@ Table Parameters: orc.bloom.filter.columns * orc.row.index.stride 1000 rawDataSize 1139514 - totalSize 55686 + totalSize 55694 #### A masked pattern was here #### # Storage Information @@ -255,9 +255,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 17728 + HDFS_BYTES_READ: 17727 HDFS_BYTES_WRITTEN: 104 - HDFS_READ_OPS: 8 + HDFS_READ_OPS: 6 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: diff --git a/ql/src/test/results/clientpositive/llap/orc_merge10.q.out b/ql/src/test/results/clientpositive/llap/orc_merge10.q.out index 7b69b39cd3..84a320e7e2 100644 --- a/ql/src/test/results/clientpositive/llap/orc_merge10.q.out +++ b/ql/src/test/results/clientpositive/llap/orc_merge10.q.out @@ -735,7 +735,7 @@ PREHOOK: Input: default@orcfile_merge1@ds=1/part=0 PREHOOK: Output: hdfs://### HDFS PATH ### -- BEGIN ORC FILE DUMP -- Structure for hdfs://### HDFS PATH ### -File Version: 0.12 with ORC_135 +File Version: 0.12 with ORC_517 Rows: 242 Compression: SNAPPY Compression size: 4096 @@ -785,7 +785,7 @@ PREHOOK: Input: default@orcfile_merge1c@ds=1/part=0 PREHOOK: Output: hdfs://### HDFS PATH ### -- BEGIN ORC FILE DUMP -- Structure for hdfs://### HDFS PATH ### -File Version: 0.12 with ORC_135 +File Version: 0.12 with ORC_517 Rows: 242 Compression: SNAPPY Compression size: 4096 diff --git a/ql/src/test/results/clientpositive/llap/orc_merge11.q.out b/ql/src/test/results/clientpositive/llap/orc_merge11.q.out index cfb23379da..6a8aae4ae2 100644 --- a/ql/src/test/results/clientpositive/llap/orc_merge11.q.out +++ b/ql/src/test/results/clientpositive/llap/orc_merge11.q.out @@ -72,7 +72,7 @@ PREHOOK: Input: default@orcfile_merge1_n2 #### A masked pattern was here #### -- BEGIN ORC FILE DUMP -- #### A masked pattern was here #### -File Version: 0.12 with ORC_135 +File Version: 0.12 with ORC_517 Rows: 50000 Compression: ZLIB Compression size: 4096 @@ -163,7 +163,7 @@ ________________________________________________________________________________ -- END ORC FILE DUMP -- -- BEGIN ORC FILE DUMP -- #### A masked pattern was here #### -File Version: 0.12 with ORC_135 +File Version: 0.12 with ORC_517 Rows: 50000 Compression: ZLIB Compression size: 4096 @@ -275,7 +275,7 @@ PREHOOK: Input: default@orcfile_merge1_n2 #### A masked pattern was here #### -- BEGIN ORC FILE DUMP -- #### A masked pattern was here #### -File Version: 0.12 with ORC_135 +File Version: 0.12 with ORC_517 Rows: 100000 Compression: ZLIB Compression size: 4096 diff --git a/ql/src/test/results/clientpositive/llap/orc_merge9.q.out b/ql/src/test/results/clientpositive/llap/orc_merge9.q.out index d925e03cda..28e51b21a1 100644 --- a/ql/src/test/results/clientpositive/llap/orc_merge9.q.out +++ b/ql/src/test/results/clientpositive/llap/orc_merge9.q.out @@ -128,7 +128,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@a_merge #### A masked pattern was here #### 24576 -Found 1 items +Found 2 items #### A masked pattern was here #### PREHOOK: query: insert into table a_merge select * from alltypesorc PREHOOK: type: QUERY @@ -150,7 +150,7 @@ POSTHOOK: Lineage: a_merge.cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema POSTHOOK: Lineage: a_merge.ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] POSTHOOK: Lineage: a_merge.ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ] POSTHOOK: Lineage: a_merge.ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:null), ] -Found 2 items +Found 3 items #### A masked pattern was here #### PREHOOK: query: select count(*) from a_merge PREHOOK: type: QUERY @@ -178,5 +178,5 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@a_merge #### A masked pattern was here #### 36864 -Found 1 items +Found 2 items #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/llap/orc_ppd_basic.q.out b/ql/src/test/results/clientpositive/llap/orc_ppd_basic.q.out index b49fce447a..9ad0a9b7fa 100644 --- a/ql/src/test/results/clientpositive/llap/orc_ppd_basic.q.out +++ b/ql/src/test/results/clientpositive/llap/orc_ppd_basic.q.out @@ -207,9 +207,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n2 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 16681 + HDFS_BYTES_READ: 16680 HDFS_BYTES_WRITTEN: 104 - HDFS_READ_OPS: 7 + HDFS_READ_OPS: 6 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -269,7 +269,7 @@ PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: HDFS_BYTES_READ: 1047 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -904,7 +904,7 @@ PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: HDFS_BYTES_READ: 5911 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1871,7 +1871,7 @@ PREHOOK: Output: default@orc_ppd_1 Stage-1 FILE SYSTEM COUNTERS: HDFS_BYTES_READ: 10583 HDFS_BYTES_WRITTEN: 1467 - HDFS_READ_OPS: 6 + HDFS_READ_OPS: 5 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 3 Stage-1 HIVE COUNTERS: @@ -1889,7 +1889,7 @@ Stage-1 HIVE COUNTERS: Stage-1 LLAP IO COUNTERS: ALLOCATED_BYTES: 2359296 ALLOCATED_USED_BYTES: 44198 - CACHE_HIT_BYTES: 30620 + CACHE_HIT_BYTES: 30633 CACHE_MISS_BYTES: 10583 METADATA_CACHE_HIT: 2 NUM_DECODED_BATCHES: 1 @@ -1908,7 +1908,7 @@ PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: HDFS_BYTES_READ: 1591 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 7 + HDFS_READ_OPS: 6 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: diff --git a/ql/src/test/results/clientpositive/llap/orc_ppd_schema_evol_3a.q.out b/ql/src/test/results/clientpositive/llap/orc_ppd_schema_evol_3a.q.out index 8a6a004896..3e99e0ee62 100644 --- a/ql/src/test/results/clientpositive/llap/orc_ppd_schema_evol_3a.q.out +++ b/ql/src/test/results/clientpositive/llap/orc_ppd_schema_evol_3a.q.out @@ -207,9 +207,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 17011 + HDFS_BYTES_READ: 17010 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 7 + HDFS_READ_OPS: 6 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1075,9 +1075,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 16905 + HDFS_BYTES_READ: 16904 HDFS_BYTES_WRITTEN: 104 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1107,9 +1107,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 17728 + HDFS_BYTES_READ: 17727 HDFS_BYTES_WRITTEN: 104 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1139,9 +1139,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 16905 + HDFS_BYTES_READ: 16904 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1171,9 +1171,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 17728 + HDFS_BYTES_READ: 17727 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1203,9 +1203,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 16905 + HDFS_BYTES_READ: 16904 HDFS_BYTES_WRITTEN: 102 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1235,9 +1235,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 17728 + HDFS_BYTES_READ: 17727 HDFS_BYTES_WRITTEN: 102 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1351,9 +1351,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 21446 + HDFS_BYTES_READ: 21445 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1383,9 +1383,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 23332 + HDFS_BYTES_READ: 23331 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1419,9 +1419,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 21446 + HDFS_BYTES_READ: 21445 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1451,9 +1451,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 23332 + HDFS_BYTES_READ: 23331 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1567,9 +1567,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 20864 + HDFS_BYTES_READ: 20863 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1599,9 +1599,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 22592 + HDFS_BYTES_READ: 22591 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1635,9 +1635,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 20864 + HDFS_BYTES_READ: 20863 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1667,9 +1667,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 22592 + HDFS_BYTES_READ: 22591 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1703,9 +1703,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 20864 + HDFS_BYTES_READ: 20863 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1735,9 +1735,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 22592 + HDFS_BYTES_READ: 22591 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1851,9 +1851,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 18631 + HDFS_BYTES_READ: 18630 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1883,9 +1883,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 18631 + HDFS_BYTES_READ: 18630 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1915,9 +1915,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 19950 + HDFS_BYTES_READ: 19949 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: @@ -1947,9 +1947,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_n3 PREHOOK: Output: hdfs://### HDFS PATH ### Stage-1 FILE SYSTEM COUNTERS: - HDFS_BYTES_READ: 19950 + HDFS_BYTES_READ: 19949 HDFS_BYTES_WRITTEN: 101 - HDFS_READ_OPS: 5 + HDFS_READ_OPS: 4 HDFS_LARGE_READ_OPS: 0 HDFS_WRITE_OPS: 2 Stage-1 HIVE COUNTERS: diff --git a/ql/src/test/results/clientpositive/orc_file_dump.q.out b/ql/src/test/results/clientpositive/orc_file_dump.q.out index fde2785c9c..2af84f8947 100644 --- a/ql/src/test/results/clientpositive/orc_file_dump.q.out +++ b/ql/src/test/results/clientpositive/orc_file_dump.q.out @@ -93,7 +93,7 @@ PREHOOK: Input: default@orc_ppd_n0 #### A masked pattern was here #### -- BEGIN ORC FILE DUMP -- #### A masked pattern was here #### -File Version: 0.12 with ORC_135 +File Version: 0.12 with ORC_517 Rows: 1049 Compression: ZLIB Compression size: 262144 @@ -111,7 +111,7 @@ Stripe Statistics: Column 7: count: 1049 hasNull: false bytesOnDisk: 137 true: 526 Column 8: count: 1049 hasNull: false bytesOnDisk: 3430 min: max: zach zipper sum: 13443 Column 9: count: 1049 hasNull: false bytesOnDisk: 1802 min: 2013-03-01 09:11:58.703 max: 2013-03-01 09:11:58.703 - Column 10: count: 1049 hasNull: false bytesOnDisk: 2181 min: 0 max: 99.94 sum: 53646.16 + Column 10: count: 1049 hasNull: false bytesOnDisk: 2181 min: 0.08 max: 99.94 sum: 53646.16 Column 11: count: 1049 hasNull: false bytesOnDisk: 2468 sum: 13278 File Statistics: @@ -125,11 +125,11 @@ File Statistics: Column 7: count: 1049 hasNull: false bytesOnDisk: 137 true: 526 Column 8: count: 1049 hasNull: false bytesOnDisk: 3430 min: max: zach zipper sum: 13443 Column 9: count: 1049 hasNull: false bytesOnDisk: 1802 min: 2013-03-01 09:11:58.703 max: 2013-03-01 09:11:58.703 - Column 10: count: 1049 hasNull: false bytesOnDisk: 2181 min: 0 max: 99.94 sum: 53646.16 + Column 10: count: 1049 hasNull: false bytesOnDisk: 2181 min: 0.08 max: 99.94 sum: 53646.16 Column 11: count: 1049 hasNull: false bytesOnDisk: 2468 sum: 13278 Stripes: - Stripe: offset: 3 data: 22405 rows: 1049 tail: 242 index: 8956 + Stripe: offset: 3 data: 22405 rows: 1049 tail: 242 index: 8960 Stream: column 0 section ROW_INDEX start: 3 length 20 Stream: column 0 section BLOOM_FILTER_UTF8 start: 23 length 34 Stream: column 1 section ROW_INDEX start: 57 length 58 @@ -150,28 +150,28 @@ Stripes: Stream: column 8 section BLOOM_FILTER_UTF8 start: 6240 length 1051 Stream: column 9 section ROW_INDEX start: 7291 length 50 Stream: column 9 section BLOOM_FILTER_UTF8 start: 7341 length 52 - Stream: column 10 section ROW_INDEX start: 7393 length 76 - Stream: column 10 section BLOOM_FILTER_UTF8 start: 7469 length 1189 - Stream: column 11 section ROW_INDEX start: 8658 length 47 - Stream: column 11 section BLOOM_FILTER_UTF8 start: 8705 length 254 - Stream: column 1 section PRESENT start: 8959 length 17 - Stream: column 1 section DATA start: 8976 length 962 - Stream: column 2 section PRESENT start: 9938 length 17 - Stream: column 2 section DATA start: 9955 length 1441 - Stream: column 3 section DATA start: 11396 length 1704 - Stream: column 4 section DATA start: 13100 length 1998 - Stream: column 5 section DATA start: 15098 length 2925 - Stream: column 6 section DATA start: 18023 length 3323 - Stream: column 7 section DATA start: 21346 length 137 - Stream: column 8 section DATA start: 21483 length 1572 - Stream: column 8 section LENGTH start: 23055 length 310 - Stream: column 8 section DICTIONARY_DATA start: 23365 length 1548 - Stream: column 9 section DATA start: 24913 length 19 - Stream: column 9 section SECONDARY start: 24932 length 1783 - Stream: column 10 section DATA start: 26715 length 2166 - Stream: column 10 section SECONDARY start: 28881 length 15 - Stream: column 11 section DATA start: 28896 length 1877 - Stream: column 11 section LENGTH start: 30773 length 591 + Stream: column 10 section ROW_INDEX start: 7393 length 80 + Stream: column 10 section BLOOM_FILTER_UTF8 start: 7473 length 1189 + Stream: column 11 section ROW_INDEX start: 8662 length 47 + Stream: column 11 section BLOOM_FILTER_UTF8 start: 8709 length 254 + Stream: column 1 section PRESENT start: 8963 length 17 + Stream: column 1 section DATA start: 8980 length 962 + Stream: column 2 section PRESENT start: 9942 length 17 + Stream: column 2 section DATA start: 9959 length 1441 + Stream: column 3 section DATA start: 11400 length 1704 + Stream: column 4 section DATA start: 13104 length 1998 + Stream: column 5 section DATA start: 15102 length 2925 + Stream: column 6 section DATA start: 18027 length 3323 + Stream: column 7 section DATA start: 21350 length 137 + Stream: column 8 section DATA start: 21487 length 1572 + Stream: column 8 section LENGTH start: 23059 length 310 + Stream: column 8 section DICTIONARY_DATA start: 23369 length 1548 + Stream: column 9 section DATA start: 24917 length 19 + Stream: column 9 section SECONDARY start: 24936 length 1783 + Stream: column 10 section DATA start: 26719 length 2166 + Stream: column 10 section SECONDARY start: 28885 length 15 + Stream: column 11 section DATA start: 28900 length 1877 + Stream: column 11 section LENGTH start: 30777 length 591 Encoding column 0: DIRECT Encoding column 1: DIRECT Encoding column 2: DIRECT_V2 @@ -255,8 +255,8 @@ Stripes: Entry 1: numHashFunctions: 4 bitCount: 6272 popCount: 4 loadFactor: 0.0006 expectedFpp: 1.6543056E-13 Stripe level merge: numHashFunctions: 4 bitCount: 6272 popCount: 4 loadFactor: 0.0006 expectedFpp: 1.6543056E-13 Row group indices for column 10: - Entry 0: count: 1000 hasNull: false min: 0 max: 9994 sum: 5118211 positions: 0,0,0,0,0 - Entry 1: count: 49 hasNull: false min: 0 max: 9490 sum: 246405 positions: 0,2194,0,4,488 + Entry 0: count: 1000 hasNull: false min: 8 max: 9994 sum: 5118211 positions: 0,0,0,0,0 + Entry 1: count: 49 hasNull: false min: 248 max: 9490 sum: 246405 positions: 0,2194,0,4,488 Bloom filters for column 10: Entry 0: numHashFunctions: 4 bitCount: 6272 popCount: 2848 loadFactor: 0.4541 expectedFpp: 0.042514365 Entry 1: numHashFunctions: 4 bitCount: 6272 popCount: 194 loadFactor: 0.0309 expectedFpp: 9.153406E-7 @@ -269,7 +269,7 @@ Stripes: Entry 1: numHashFunctions: 4 bitCount: 6272 popCount: 98 loadFactor: 0.0156 expectedFpp: 5.9604645E-8 Stripe level merge: numHashFunctions: 4 bitCount: 6272 popCount: 102 loadFactor: 0.0163 expectedFpp: 6.9948186E-8 -File length: 32298 bytes +File length: 32312 bytes Padding length: 0 bytes Padding ratio: 0% ________________________________________________________________________________________________________________________ @@ -290,7 +290,7 @@ PREHOOK: Input: default@orc_ppd_n0 #### A masked pattern was here #### -- BEGIN ORC FILE DUMP -- #### A masked pattern was here #### -File Version: 0.12 with ORC_135 +File Version: 0.12 with ORC_517 Rows: 1049 Compression: ZLIB Compression size: 262144 @@ -308,7 +308,7 @@ Stripe Statistics: Column 7: count: 1049 hasNull: false bytesOnDisk: 137 true: 526 Column 8: count: 1049 hasNull: false bytesOnDisk: 3430 min: max: zach zipper sum: 13443 Column 9: count: 1049 hasNull: false bytesOnDisk: 1802 min: 2013-03-01 09:11:58.703 max: 2013-03-01 09:11:58.703 - Column 10: count: 1049 hasNull: false bytesOnDisk: 2181 min: 0 max: 99.94 sum: 53646.16 + Column 10: count: 1049 hasNull: false bytesOnDisk: 2181 min: 0.08 max: 99.94 sum: 53646.16 Column 11: count: 1049 hasNull: false bytesOnDisk: 2468 sum: 13278 File Statistics: @@ -322,11 +322,11 @@ File Statistics: Column 7: count: 1049 hasNull: false bytesOnDisk: 137 true: 526 Column 8: count: 1049 hasNull: false bytesOnDisk: 3430 min: max: zach zipper sum: 13443 Column 9: count: 1049 hasNull: false bytesOnDisk: 1802 min: 2013-03-01 09:11:58.703 max: 2013-03-01 09:11:58.703 - Column 10: count: 1049 hasNull: false bytesOnDisk: 2181 min: 0 max: 99.94 sum: 53646.16 + Column 10: count: 1049 hasNull: false bytesOnDisk: 2181 min: 0.08 max: 99.94 sum: 53646.16 Column 11: count: 1049 hasNull: false bytesOnDisk: 2468 sum: 13278 Stripes: - Stripe: offset: 3 data: 22405 rows: 1049 tail: 240 index: 13603 + Stripe: offset: 3 data: 22405 rows: 1049 tail: 239 index: 13607 Stream: column 0 section ROW_INDEX start: 3 length 20 Stream: column 0 section BLOOM_FILTER_UTF8 start: 23 length 43 Stream: column 1 section ROW_INDEX start: 66 length 58 @@ -347,28 +347,28 @@ Stripes: Stream: column 8 section BLOOM_FILTER_UTF8 start: 9476 length 1653 Stream: column 9 section ROW_INDEX start: 11129 length 50 Stream: column 9 section BLOOM_FILTER_UTF8 start: 11179 length 80 - Stream: column 10 section ROW_INDEX start: 11259 length 76 - Stream: column 10 section BLOOM_FILTER_UTF8 start: 11335 length 1802 - Stream: column 11 section ROW_INDEX start: 13137 length 47 - Stream: column 11 section BLOOM_FILTER_UTF8 start: 13184 length 422 - Stream: column 1 section PRESENT start: 13606 length 17 - Stream: column 1 section DATA start: 13623 length 962 - Stream: column 2 section PRESENT start: 14585 length 17 - Stream: column 2 section DATA start: 14602 length 1441 - Stream: column 3 section DATA start: 16043 length 1704 - Stream: column 4 section DATA start: 17747 length 1998 - Stream: column 5 section DATA start: 19745 length 2925 - Stream: column 6 section DATA start: 22670 length 3323 - Stream: column 7 section DATA start: 25993 length 137 - Stream: column 8 section DATA start: 26130 length 1572 - Stream: column 8 section LENGTH start: 27702 length 310 - Stream: column 8 section DICTIONARY_DATA start: 28012 length 1548 - Stream: column 9 section DATA start: 29560 length 19 - Stream: column 9 section SECONDARY start: 29579 length 1783 - Stream: column 10 section DATA start: 31362 length 2166 - Stream: column 10 section SECONDARY start: 33528 length 15 - Stream: column 11 section DATA start: 33543 length 1877 - Stream: column 11 section LENGTH start: 35420 length 591 + Stream: column 10 section ROW_INDEX start: 11259 length 80 + Stream: column 10 section BLOOM_FILTER_UTF8 start: 11339 length 1802 + Stream: column 11 section ROW_INDEX start: 13141 length 47 + Stream: column 11 section BLOOM_FILTER_UTF8 start: 13188 length 422 + Stream: column 1 section PRESENT start: 13610 length 17 + Stream: column 1 section DATA start: 13627 length 962 + Stream: column 2 section PRESENT start: 14589 length 17 + Stream: column 2 section DATA start: 14606 length 1441 + Stream: column 3 section DATA start: 16047 length 1704 + Stream: column 4 section DATA start: 17751 length 1998 + Stream: column 5 section DATA start: 19749 length 2925 + Stream: column 6 section DATA start: 22674 length 3323 + Stream: column 7 section DATA start: 25997 length 137 + Stream: column 8 section DATA start: 26134 length 1572 + Stream: column 8 section LENGTH start: 27706 length 310 + Stream: column 8 section DICTIONARY_DATA start: 28016 length 1548 + Stream: column 9 section DATA start: 29564 length 19 + Stream: column 9 section SECONDARY start: 29583 length 1783 + Stream: column 10 section DATA start: 31366 length 2166 + Stream: column 10 section SECONDARY start: 33532 length 15 + Stream: column 11 section DATA start: 33547 length 1877 + Stream: column 11 section LENGTH start: 35424 length 591 Encoding column 0: DIRECT Encoding column 1: DIRECT Encoding column 2: DIRECT_V2 @@ -452,8 +452,8 @@ Stripes: Entry 1: numHashFunctions: 7 bitCount: 9600 popCount: 7 loadFactor: 0.0007 expectedFpp: 1.0959422E-22 Stripe level merge: numHashFunctions: 7 bitCount: 9600 popCount: 7 loadFactor: 0.0007 expectedFpp: 1.0959422E-22 Row group indices for column 10: - Entry 0: count: 1000 hasNull: false min: 0 max: 9994 sum: 5118211 positions: 0,0,0,0,0 - Entry 1: count: 49 hasNull: false min: 0 max: 9490 sum: 246405 positions: 0,2194,0,4,488 + Entry 0: count: 1000 hasNull: false min: 8 max: 9994 sum: 5118211 positions: 0,0,0,0,0 + Entry 1: count: 49 hasNull: false min: 248 max: 9490 sum: 246405 positions: 0,2194,0,4,488 Bloom filters for column 10: Entry 0: numHashFunctions: 7 bitCount: 9600 popCount: 4796 loadFactor: 0.4996 expectedFpp: 0.0077670407 Entry 1: numHashFunctions: 7 bitCount: 9600 popCount: 339 loadFactor: 0.0353 expectedFpp: 6.846983E-11 @@ -466,7 +466,7 @@ Stripes: Entry 1: numHashFunctions: 7 bitCount: 9600 popCount: 174 loadFactor: 0.0181 expectedFpp: 6.426078E-13 Stripe level merge: numHashFunctions: 7 bitCount: 9600 popCount: 181 loadFactor: 0.0189 expectedFpp: 8.4693775E-13 -File length: 36943 bytes +File length: 36956 bytes Padding length: 0 bytes Padding ratio: 0% ________________________________________________________________________________________________________________________ @@ -499,7 +499,7 @@ PREHOOK: Input: default@orc_ppd_part@ds=2015/hr=10 #### A masked pattern was here #### -- BEGIN ORC FILE DUMP -- #### A masked pattern was here #### -File Version: 0.12 with ORC_135 +File Version: 0.12 with ORC_517 Rows: 1049 Compression: ZLIB Compression size: 262144 @@ -517,7 +517,7 @@ Stripe Statistics: Column 7: count: 1049 hasNull: false bytesOnDisk: 137 true: 526 Column 8: count: 1049 hasNull: false bytesOnDisk: 3430 min: max: zach zipper sum: 13443 Column 9: count: 1049 hasNull: false bytesOnDisk: 1802 min: 2013-03-01 09:11:58.703 max: 2013-03-01 09:11:58.703 - Column 10: count: 1049 hasNull: false bytesOnDisk: 2181 min: 0 max: 99.94 sum: 53646.16 + Column 10: count: 1049 hasNull: false bytesOnDisk: 2181 min: 0.08 max: 99.94 sum: 53646.16 Column 11: count: 1049 hasNull: false bytesOnDisk: 2468 sum: 13278 File Statistics: @@ -531,11 +531,11 @@ File Statistics: Column 7: count: 1049 hasNull: false bytesOnDisk: 137 true: 526 Column 8: count: 1049 hasNull: false bytesOnDisk: 3430 min: max: zach zipper sum: 13443 Column 9: count: 1049 hasNull: false bytesOnDisk: 1802 min: 2013-03-01 09:11:58.703 max: 2013-03-01 09:11:58.703 - Column 10: count: 1049 hasNull: false bytesOnDisk: 2181 min: 0 max: 99.94 sum: 53646.16 + Column 10: count: 1049 hasNull: false bytesOnDisk: 2181 min: 0.08 max: 99.94 sum: 53646.16 Column 11: count: 1049 hasNull: false bytesOnDisk: 2468 sum: 13278 Stripes: - Stripe: offset: 3 data: 22405 rows: 1049 tail: 242 index: 8956 + Stripe: offset: 3 data: 22405 rows: 1049 tail: 242 index: 8960 Stream: column 0 section ROW_INDEX start: 3 length 20 Stream: column 0 section BLOOM_FILTER_UTF8 start: 23 length 34 Stream: column 1 section ROW_INDEX start: 57 length 58 @@ -556,28 +556,28 @@ Stripes: Stream: column 8 section BLOOM_FILTER_UTF8 start: 6240 length 1051 Stream: column 9 section ROW_INDEX start: 7291 length 50 Stream: column 9 section BLOOM_FILTER_UTF8 start: 7341 length 52 - Stream: column 10 section ROW_INDEX start: 7393 length 76 - Stream: column 10 section BLOOM_FILTER_UTF8 start: 7469 length 1189 - Stream: column 11 section ROW_INDEX start: 8658 length 47 - Stream: column 11 section BLOOM_FILTER_UTF8 start: 8705 length 254 - Stream: column 1 section PRESENT start: 8959 length 17 - Stream: column 1 section DATA start: 8976 length 962 - Stream: column 2 section PRESENT start: 9938 length 17 - Stream: column 2 section DATA start: 9955 length 1441 - Stream: column 3 section DATA start: 11396 length 1704 - Stream: column 4 section DATA start: 13100 length 1998 - Stream: column 5 section DATA start: 15098 length 2925 - Stream: column 6 section DATA start: 18023 length 3323 - Stream: column 7 section DATA start: 21346 length 137 - Stream: column 8 section DATA start: 21483 length 1572 - Stream: column 8 section LENGTH start: 23055 length 310 - Stream: column 8 section DICTIONARY_DATA start: 23365 length 1548 - Stream: column 9 section DATA start: 24913 length 19 - Stream: column 9 section SECONDARY start: 24932 length 1783 - Stream: column 10 section DATA start: 26715 length 2166 - Stream: column 10 section SECONDARY start: 28881 length 15 - Stream: column 11 section DATA start: 28896 length 1877 - Stream: column 11 section LENGTH start: 30773 length 591 + Stream: column 10 section ROW_INDEX start: 7393 length 80 + Stream: column 10 section BLOOM_FILTER_UTF8 start: 7473 length 1189 + Stream: column 11 section ROW_INDEX start: 8662 length 47 + Stream: column 11 section BLOOM_FILTER_UTF8 start: 8709 length 254 + Stream: column 1 section PRESENT start: 8963 length 17 + Stream: column 1 section DATA start: 8980 length 962 + Stream: column 2 section PRESENT start: 9942 length 17 + Stream: column 2 section DATA start: 9959 length 1441 + Stream: column 3 section DATA start: 11400 length 1704 + Stream: column 4 section DATA start: 13104 length 1998 + Stream: column 5 section DATA start: 15102 length 2925 + Stream: column 6 section DATA start: 18027 length 3323 + Stream: column 7 section DATA start: 21350 length 137 + Stream: column 8 section DATA start: 21487 length 1572 + Stream: column 8 section LENGTH start: 23059 length 310 + Stream: column 8 section DICTIONARY_DATA start: 23369 length 1548 + Stream: column 9 section DATA start: 24917 length 19 + Stream: column 9 section SECONDARY start: 24936 length 1783 + Stream: column 10 section DATA start: 26719 length 2166 + Stream: column 10 section SECONDARY start: 28885 length 15 + Stream: column 11 section DATA start: 28900 length 1877 + Stream: column 11 section LENGTH start: 30777 length 591 Encoding column 0: DIRECT Encoding column 1: DIRECT Encoding column 2: DIRECT_V2 @@ -661,8 +661,8 @@ Stripes: Entry 1: numHashFunctions: 4 bitCount: 6272 popCount: 4 loadFactor: 0.0006 expectedFpp: 1.6543056E-13 Stripe level merge: numHashFunctions: 4 bitCount: 6272 popCount: 4 loadFactor: 0.0006 expectedFpp: 1.6543056E-13 Row group indices for column 10: - Entry 0: count: 1000 hasNull: false min: 0 max: 9994 sum: 5118211 positions: 0,0,0,0,0 - Entry 1: count: 49 hasNull: false min: 0 max: 9490 sum: 246405 positions: 0,2194,0,4,488 + Entry 0: count: 1000 hasNull: false min: 8 max: 9994 sum: 5118211 positions: 0,0,0,0,0 + Entry 1: count: 49 hasNull: false min: 248 max: 9490 sum: 246405 positions: 0,2194,0,4,488 Bloom filters for column 10: Entry 0: numHashFunctions: 4 bitCount: 6272 popCount: 2848 loadFactor: 0.4541 expectedFpp: 0.042514365 Entry 1: numHashFunctions: 4 bitCount: 6272 popCount: 194 loadFactor: 0.0309 expectedFpp: 9.153406E-7 @@ -675,7 +675,7 @@ Stripes: Entry 1: numHashFunctions: 4 bitCount: 6272 popCount: 98 loadFactor: 0.0156 expectedFpp: 5.9604645E-8 Stripe level merge: numHashFunctions: 4 bitCount: 6272 popCount: 102 loadFactor: 0.0163 expectedFpp: 6.9948186E-8 -File length: 32298 bytes +File length: 32312 bytes Padding length: 0 bytes Padding ratio: 0% ________________________________________________________________________________________________________________________ diff --git a/ql/src/test/results/clientpositive/orc_merge10.q.out b/ql/src/test/results/clientpositive/orc_merge10.q.out index 1f70773226..e4ebf6557b 100644 --- a/ql/src/test/results/clientpositive/orc_merge10.q.out +++ b/ql/src/test/results/clientpositive/orc_merge10.q.out @@ -706,7 +706,7 @@ PREHOOK: Input: default@orcfile_merge1@ds=1/part=0 #### A masked pattern was here #### -- BEGIN ORC FILE DUMP -- #### A masked pattern was here #### -File Version: 0.12 with ORC_135 +File Version: 0.12 with ORC_517 Rows: 242 Compression: SNAPPY Compression size: 4096 @@ -756,7 +756,7 @@ PREHOOK: Input: default@orcfile_merge1c@ds=1/part=0 #### A masked pattern was here #### -- BEGIN ORC FILE DUMP -- #### A masked pattern was here #### -File Version: 0.12 with ORC_135 +File Version: 0.12 with ORC_517 Rows: 242 Compression: SNAPPY Compression size: 4096 diff --git a/ql/src/test/results/clientpositive/orc_merge11.q.out b/ql/src/test/results/clientpositive/orc_merge11.q.out index cfb23379da..6a8aae4ae2 100644 --- a/ql/src/test/results/clientpositive/orc_merge11.q.out +++ b/ql/src/test/results/clientpositive/orc_merge11.q.out @@ -72,7 +72,7 @@ PREHOOK: Input: default@orcfile_merge1_n2 #### A masked pattern was here #### -- BEGIN ORC FILE DUMP -- #### A masked pattern was here #### -File Version: 0.12 with ORC_135 +File Version: 0.12 with ORC_517 Rows: 50000 Compression: ZLIB Compression size: 4096 @@ -163,7 +163,7 @@ ________________________________________________________________________________ -- END ORC FILE DUMP -- -- BEGIN ORC FILE DUMP -- #### A masked pattern was here #### -File Version: 0.12 with ORC_135 +File Version: 0.12 with ORC_517 Rows: 50000 Compression: ZLIB Compression size: 4096 @@ -275,7 +275,7 @@ PREHOOK: Input: default@orcfile_merge1_n2 #### A masked pattern was here #### -- BEGIN ORC FILE DUMP -- #### A masked pattern was here #### -File Version: 0.12 with ORC_135 +File Version: 0.12 with ORC_517 Rows: 100000 Compression: ZLIB Compression size: 4096 diff --git a/ql/src/test/results/clientpositive/orc_merge12.q.out b/ql/src/test/results/clientpositive/orc_merge12.q.out index a9ffb9d2ab..7966084138 100644 --- a/ql/src/test/results/clientpositive/orc_merge12.q.out +++ b/ql/src/test/results/clientpositive/orc_merge12.q.out @@ -144,7 +144,7 @@ PREHOOK: Input: default@alltypesorc3xcols #### A masked pattern was here #### -- BEGIN ORC FILE DUMP -- #### A masked pattern was here #### -File Version: 0.12 with ORC_135 +File Version: 0.12 with ORC_517 Rows: 24576 Compression: ZLIB Compression size: 131072 diff --git a/ql/src/test/results/clientpositive/orc_merge9.q.out b/ql/src/test/results/clientpositive/orc_merge9.q.out index d925e03cda..28e51b21a1 100644 --- a/ql/src/test/results/clientpositive/orc_merge9.q.out +++ b/ql/src/test/results/clientpositive/orc_merge9.q.out @@ -128,7 +128,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@a_merge #### A masked pattern was here #### 24576 -Found 1 items +Found 2 items #### A masked pattern was here #### PREHOOK: query: insert into table a_merge select * from alltypesorc PREHOOK: type: QUERY @@ -150,7 +150,7 @@ POSTHOOK: Lineage: a_merge.cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema POSTHOOK: Lineage: a_merge.ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] POSTHOOK: Lineage: a_merge.ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ] POSTHOOK: Lineage: a_merge.ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:null), ] -Found 2 items +Found 3 items #### A masked pattern was here #### PREHOOK: query: select count(*) from a_merge PREHOOK: type: QUERY @@ -178,5 +178,5 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@a_merge #### A masked pattern was here #### 36864 -Found 1 items +Found 2 items #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/orc_merge8.q.out b/ql/src/test/results/clientpositive/spark/orc_merge8.q.out index 5361ba94ce..10b59ef9f7 100644 --- a/ql/src/test/results/clientpositive/spark/orc_merge8.q.out +++ b/ql/src/test/results/clientpositive/spark/orc_merge8.q.out @@ -117,10 +117,10 @@ POSTHOOK: Lineage: alltypes_orc_n1.ti SIMPLE [(alltypes_n1)alltypes_n1.FieldSche POSTHOOK: Lineage: alltypes_orc_n1.ts SIMPLE [(alltypes_n1)alltypes_n1.FieldSchema(name:ts, type:timestamp, comment:null), ] POSTHOOK: Lineage: alltypes_orc_n1.vc SIMPLE [(alltypes_n1)alltypes_n1.FieldSchema(name:vc, type:varchar(5), comment:null), ] Found 4 items --rw-r--r-- 3 ### USER ### ### GROUP ### 1637 ### HDFS DATE ### hdfs://### HDFS PATH ### --rw-r--r-- 3 ### USER ### ### GROUP ### 1637 ### HDFS DATE ### hdfs://### HDFS PATH ### --rw-r--r-- 3 ### USER ### ### GROUP ### 1652 ### HDFS DATE ### hdfs://### HDFS PATH ### --rw-r--r-- 3 ### USER ### ### GROUP ### 1652 ### HDFS DATE ### hdfs://### HDFS PATH ### +-rw-r--r-- 3 ### USER ### ### GROUP ### 1638 ### HDFS DATE ### hdfs://### HDFS PATH ### +-rw-r--r-- 3 ### USER ### ### GROUP ### 1638 ### HDFS DATE ### hdfs://### HDFS PATH ### +-rw-r--r-- 3 ### USER ### ### GROUP ### 1649 ### HDFS DATE ### hdfs://### HDFS PATH ### +-rw-r--r-- 3 ### USER ### ### GROUP ### 1649 ### HDFS DATE ### hdfs://### HDFS PATH ### PREHOOK: query: alter table alltypes_orc_n1 concatenate PREHOOK: type: ALTER_TABLE_MERGE PREHOOK: Input: default@alltypes_orc_n1 @@ -130,4 +130,4 @@ POSTHOOK: type: ALTER_TABLE_MERGE POSTHOOK: Input: default@alltypes_orc_n1 POSTHOOK: Output: default@alltypes_orc_n1 Found 1 items --rw-r--r-- 3 ### USER ### ### GROUP ### 4648 ### HDFS DATE ### hdfs://### HDFS PATH ### +-rw-r--r-- 3 ### USER ### ### GROUP ### 4650 ### HDFS DATE ### hdfs://### HDFS PATH ### diff --git a/ql/src/test/results/clientpositive/spark/orc_merge9.q.out b/ql/src/test/results/clientpositive/spark/orc_merge9.q.out index 6a3bb8bbab..6f7f0fd107 100644 --- a/ql/src/test/results/clientpositive/spark/orc_merge9.q.out +++ b/ql/src/test/results/clientpositive/spark/orc_merge9.q.out @@ -130,8 +130,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@a_merge POSTHOOK: Output: hdfs://### HDFS PATH ### 24576 -Found 1 items --rw-r--r-- 3 ### USER ### ### GROUP ### 590716 ### HDFS DATE ### hdfs://### HDFS PATH ### +Found 2 items +-rw-r--r-- 3 ### USER ### ### GROUP ### 295765 ### HDFS DATE ### hdfs://### HDFS PATH ### +-rw-r--r-- 3 ### USER ### ### GROUP ### 295616 ### HDFS DATE ### hdfs://### HDFS PATH ### PREHOOK: query: insert into table a_merge select * from alltypesorc PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc @@ -152,8 +153,9 @@ POSTHOOK: Lineage: a_merge.cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema POSTHOOK: Lineage: a_merge.ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] POSTHOOK: Lineage: a_merge.ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ] POSTHOOK: Lineage: a_merge.ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:null), ] -Found 2 items --rw-r--r-- 3 ### USER ### ### GROUP ### 590716 ### HDFS DATE ### hdfs://### HDFS PATH ### +Found 3 items +-rw-r--r-- 3 ### USER ### ### GROUP ### 295765 ### HDFS DATE ### hdfs://### HDFS PATH ### +-rw-r--r-- 3 ### USER ### ### GROUP ### 295616 ### HDFS DATE ### hdfs://### HDFS PATH ### -rw-r--r-- 3 ### USER ### ### GROUP ### 295765 ### HDFS DATE ### hdfs://### HDFS PATH ### PREHOOK: query: select count(*) from a_merge PREHOOK: type: QUERY @@ -181,5 +183,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@a_merge POSTHOOK: Output: hdfs://### HDFS PATH ### 36864 -Found 1 items --rw-r--r-- 3 ### USER ### ### GROUP ### 885665 ### HDFS DATE ### hdfs://### HDFS PATH ### +Found 2 items +-rw-r--r-- 3 ### USER ### ### GROUP ### 590713 ### HDFS DATE ### hdfs://### HDFS PATH ### +-rw-r--r-- 3 ### USER ### ### GROUP ### 295616 ### HDFS DATE ### hdfs://### HDFS PATH ### diff --git a/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out b/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out index afc4cc6011..2c19196476 100644 --- a/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out +++ b/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out @@ -370,10 +370,10 @@ POSTHOOK: Lineage: over10k_orc_bucketed_n0.si SIMPLE [(over10k_n9)over10k_n9.Fie POSTHOOK: Lineage: over10k_orc_bucketed_n0.t SIMPLE [(over10k_n9)over10k_n9.FieldSchema(name:t, type:tinyint, comment:null), ] POSTHOOK: Lineage: over10k_orc_bucketed_n0.ts SIMPLE [(over10k_n9)over10k_n9.FieldSchema(name:ts, type:timestamp, comment:null), ] Found 4 items --rw-rw-rw- 3 ### USER ### ### GROUP ### 8903 ### HDFS DATE ### hdfs://### HDFS PATH ### --rw-rw-rw- 3 ### USER ### ### GROUP ### 7698 ### HDFS DATE ### hdfs://### HDFS PATH ### --rw-rw-rw- 3 ### USER ### ### GROUP ### 7273 ### HDFS DATE ### hdfs://### HDFS PATH ### --rw-rw-rw- 3 ### USER ### ### GROUP ### 7180 ### HDFS DATE ### hdfs://### HDFS PATH ### +-rw-rw-rw- 3 ### USER ### ### GROUP ### 8912 ### HDFS DATE ### hdfs://### HDFS PATH ### +-rw-rw-rw- 3 ### USER ### ### GROUP ### 7709 ### HDFS DATE ### hdfs://### HDFS PATH ### +-rw-rw-rw- 3 ### USER ### ### GROUP ### 7288 ### HDFS DATE ### hdfs://### HDFS PATH ### +-rw-rw-rw- 3 ### USER ### ### GROUP ### 7188 ### HDFS DATE ### hdfs://### HDFS PATH ### PREHOOK: query: insert into over10k_orc_bucketed_n0 select * from over10k_n9 PREHOOK: type: QUERY PREHOOK: Input: default@over10k_n9 @@ -394,14 +394,14 @@ POSTHOOK: Lineage: over10k_orc_bucketed_n0.si SIMPLE [(over10k_n9)over10k_n9.Fie POSTHOOK: Lineage: over10k_orc_bucketed_n0.t SIMPLE [(over10k_n9)over10k_n9.FieldSchema(name:t, type:tinyint, comment:null), ] POSTHOOK: Lineage: over10k_orc_bucketed_n0.ts SIMPLE [(over10k_n9)over10k_n9.FieldSchema(name:ts, type:timestamp, comment:null), ] Found 8 items --rw-rw-rw- 3 ### USER ### ### GROUP ### 8903 ### HDFS DATE ### hdfs://### HDFS PATH ### --rw-rw-rw- 3 ### USER ### ### GROUP ### 8903 ### HDFS DATE ### hdfs://### HDFS PATH ### --rw-rw-rw- 3 ### USER ### ### GROUP ### 7698 ### HDFS DATE ### hdfs://### HDFS PATH ### --rw-rw-rw- 3 ### USER ### ### GROUP ### 7698 ### HDFS DATE ### hdfs://### HDFS PATH ### --rw-rw-rw- 3 ### USER ### ### GROUP ### 7273 ### HDFS DATE ### hdfs://### HDFS PATH ### --rw-rw-rw- 3 ### USER ### ### GROUP ### 7273 ### HDFS DATE ### hdfs://### HDFS PATH ### --rw-rw-rw- 3 ### USER ### ### GROUP ### 7180 ### HDFS DATE ### hdfs://### HDFS PATH ### --rw-rw-rw- 3 ### USER ### ### GROUP ### 7180 ### HDFS DATE ### hdfs://### HDFS PATH ### +-rw-rw-rw- 3 ### USER ### ### GROUP ### 8912 ### HDFS DATE ### hdfs://### HDFS PATH ### +-rw-rw-rw- 3 ### USER ### ### GROUP ### 8912 ### HDFS DATE ### hdfs://### HDFS PATH ### +-rw-rw-rw- 3 ### USER ### ### GROUP ### 7709 ### HDFS DATE ### hdfs://### HDFS PATH ### +-rw-rw-rw- 3 ### USER ### ### GROUP ### 7709 ### HDFS DATE ### hdfs://### HDFS PATH ### +-rw-rw-rw- 3 ### USER ### ### GROUP ### 7288 ### HDFS DATE ### hdfs://### HDFS PATH ### +-rw-rw-rw- 3 ### USER ### ### GROUP ### 7288 ### HDFS DATE ### hdfs://### HDFS PATH ### +-rw-rw-rw- 3 ### USER ### ### GROUP ### 7188 ### HDFS DATE ### hdfs://### HDFS PATH ### +-rw-rw-rw- 3 ### USER ### ### GROUP ### 7188 ### HDFS DATE ### hdfs://### HDFS PATH ### PREHOOK: query: select distinct 7 as seven, INPUT__FILE__NAME from over10k_orc_bucketed_n0 PREHOOK: type: QUERY PREHOOK: Input: default@over10k_orc_bucketed_n0 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 3278ef42fe..419f6fdf49 100644 --- a/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out +++ b/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out @@ -325,7 +325,7 @@ Stage-3 Output:["_col0","_col1","_col3"] Filter Operator [FIL_9] (rows=2/2 width=226) predicate:(de) IN (109.23, 119.23) - TableScan [TS_0] (rows=4/4 width=226) + TableScan [TS_0] (rows=4/2 width=226) default@acid_uami_n2,acid_uami_n2, ACID table,Tbl:COMPLETE,Col:COMPLETE,Output:["i","de","vc"] PREHOOK: query: select * from acid_uami_n2 order by de diff --git a/ql/src/test/results/clientpositive/tez/orc_merge12.q.out b/ql/src/test/results/clientpositive/tez/orc_merge12.q.out index 91aaf9b781..42659b033d 100644 --- a/ql/src/test/results/clientpositive/tez/orc_merge12.q.out +++ b/ql/src/test/results/clientpositive/tez/orc_merge12.q.out @@ -144,7 +144,7 @@ PREHOOK: Input: default@alltypesorc3xcols PREHOOK: Output: hdfs://### HDFS PATH ### -- BEGIN ORC FILE DUMP -- Structure for hdfs://### HDFS PATH ### -File Version: 0.12 with ORC_135 +File Version: 0.12 with ORC_517 Rows: 24576 Compression: ZLIB Compression size: 131072