You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pr...@apache.org on 2015/07/02 21:45:54 UTC

[3/3] hive git commit: HIVE-11122: ORC should not record the timezone information when there are no timestamp columns (Prasanth Jayachandran reviewed by Gopal V)

HIVE-11122: ORC should not record the timezone information when there are no timestamp columns (Prasanth Jayachandran reviewed by Gopal V)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/42c0580e
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/42c0580e
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/42c0580e

Branch: refs/heads/master
Commit: 42c0580e33e6d31535f9f989955866b3faf13e65
Parents: 45c741e
Author: Prasanth Jayachandran <j....@gmail.com>
Authored: Thu Jul 2 12:45:37 2015 -0700
Committer: Prasanth Jayachandran <j....@gmail.com>
Committed: Thu Jul 2 12:45:37 2015 -0700

----------------------------------------------------------------------
 .../hadoop/hive/ql/io/orc/WriterImpl.java       |  16 ++-
 .../hive/ql/io/orc/TestInputOutputFormat.java   |  12 +--
 .../resources/orc-file-dump-bloomfilter.out     |  92 ++++++++--------
 .../resources/orc-file-dump-bloomfilter2.out    |  92 ++++++++--------
 .../orc-file-dump-dictionary-threshold.out      |  76 ++++++-------
 ql/src/test/resources/orc-file-dump.json        | 108 +++++++++----------
 ql/src/test/resources/orc-file-dump.out         |  84 +++++++--------
 ql/src/test/resources/orc-file-has-null.out     |  62 +++++------
 .../clientpositive/alter_merge_orc.q.out        |  24 ++---
 .../clientpositive/alter_merge_stats_orc.q.out  |  22 ++--
 .../clientpositive/annotate_stats_part.q.out    |   6 +-
 .../clientpositive/annotate_stats_table.q.out   |   4 +-
 .../dynpart_sort_opt_vectorization.q.out        |  16 +--
 .../dynpart_sort_optimization2.q.out            |   8 +-
 .../encryption_insert_partition_dynamic.q.out   |  18 ++--
 .../encryption_insert_partition_static.q.out    |  24 ++---
 .../extrapolate_part_stats_full.q.out           |  24 ++---
 .../extrapolate_part_stats_partial.q.out        |  76 ++++++-------
 .../extrapolate_part_stats_partial_ndv.q.out    |  38 +++----
 .../clientpositive/spark/alter_merge_orc.q.out  |  24 ++---
 .../spark/alter_merge_stats_orc.q.out           |  22 ++--
 .../clientpositive/spark/vectorized_ptf.q.out   | 108 +++++++++----------
 .../clientpositive/tez/alter_merge_orc.q.out    |  24 ++---
 .../tez/alter_merge_stats_orc.q.out             |  22 ++--
 .../tez/dynpart_sort_opt_vectorization.q.out    |  16 +--
 .../tez/dynpart_sort_optimization2.q.out        |   8 +-
 .../clientpositive/tez/explainuser_1.q.out      |   8 +-
 .../clientpositive/tez/vectorized_ptf.q.out     | 108 +++++++++----------
 .../results/clientpositive/vectorized_ptf.q.out | 104 +++++++++---------
 29 files changed, 627 insertions(+), 619 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/42c0580e/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java
index 0053a19..d6e4a96 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java
@@ -152,6 +152,7 @@ public class WriterImpl implements Writer, MemoryManager.Callback {
   private final OrcFile.CompressionStrategy compressionStrategy;
   private final boolean[] bloomFilterColumns;
   private final double bloomFilterFpp;
+  private boolean writeTimeZone;
 
   WriterImpl(FileSystem fs,
       Path path,
@@ -616,6 +617,14 @@ public class WriterImpl implements Writer, MemoryManager.Callback {
     public OrcFile.Version getVersion() {
       return version;
     }
+
+    public void useWriterTimeZone(boolean val) {
+      writeTimeZone = val;
+    }
+
+    public boolean hasWriterTimeZone() {
+      return writeTimeZone;
+    }
   }
 
   /**
@@ -645,6 +654,7 @@ public class WriterImpl implements Writer, MemoryManager.Callback {
     private boolean foundNulls;
     private OutStream isPresentOutStream;
     private final List<StripeStatistics.Builder> stripeStatsBuilders;
+    private final StreamFactory streamFactory;
 
     /**
      * Create a tree writer.
@@ -657,6 +667,7 @@ public class WriterImpl implements Writer, MemoryManager.Callback {
     TreeWriter(int columnId, ObjectInspector inspector,
                StreamFactory streamFactory,
                boolean nullable) throws IOException {
+      this.streamFactory = streamFactory;
       this.isCompressed = streamFactory.isCompressed();
       this.id = columnId;
       this.inspector = inspector;
@@ -796,7 +807,9 @@ public class WriterImpl implements Writer, MemoryManager.Callback {
       foundNulls = false;
 
       builder.addColumns(getEncoding());
-      builder.setWriterTimezone(TimeZone.getDefault().getID());
+      if (streamFactory.hasWriterTimeZone()) {
+        builder.setWriterTimezone(TimeZone.getDefault().getID());
+      }
       if (rowIndexStream != null) {
         if (rowIndex.getEntryCount() != requiredIndexEntries) {
           throw new IllegalArgumentException("Column has wrong number of " +
@@ -1526,6 +1539,7 @@ public class WriterImpl implements Writer, MemoryManager.Callback {
       recordPosition(rowIndexPosition);
       // for unit tests to set different time zones
       this.base_timestamp = Timestamp.valueOf(BASE_TIMESTAMP_STRING).getTime() / MILLIS_PER_SECOND;
+      writer.useWriterTimeZone(true);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/hive/blob/42c0580e/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestInputOutputFormat.java
----------------------------------------------------------------------
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 12ae902..56e5f9f 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
@@ -23,11 +23,8 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.sql.Date;
@@ -36,10 +33,8 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.TimeZone;
@@ -70,7 +65,6 @@ import org.apache.hadoop.hive.ql.io.HiveInputFormat;
 import org.apache.hadoop.hive.ql.io.HiveOutputFormat;
 import org.apache.hadoop.hive.ql.io.InputFormatChecker;
 import org.apache.hadoop.hive.ql.io.orc.OrcInputFormat.SplitStrategy;
-import org.apache.hadoop.hive.ql.io.orc.OrcInputFormat.SplitStrategyKind;
 import org.apache.hadoop.hive.ql.io.sarg.PredicateLeaf;
 import org.apache.hadoop.hive.ql.io.sarg.SearchArgument;
 import org.apache.hadoop.hive.ql.io.sarg.SearchArgumentFactory;
@@ -1703,14 +1697,14 @@ public class TestInputOutputFormat {
     assertEquals("mock:/combinationAcid/p=0/base_0000010/bucket_00000",
         split.getPath().toString());
     assertEquals(0, split.getStart());
-    assertEquals(625, split.getLength());
+    assertEquals(607, split.getLength());
     split = (HiveInputFormat.HiveInputSplit) splits[1];
     assertEquals("org.apache.hadoop.hive.ql.io.orc.OrcInputFormat",
         split.inputFormatClassName());
     assertEquals("mock:/combinationAcid/p=0/base_0000010/bucket_00001",
         split.getPath().toString());
     assertEquals(0, split.getStart());
-    assertEquals(647, split.getLength());
+    assertEquals(629, split.getLength());
     CombineHiveInputFormat.CombineHiveInputSplit combineSplit =
         (CombineHiveInputFormat.CombineHiveInputSplit) splits[2];
     assertEquals(BUCKETS, combineSplit.getNumPaths());
@@ -1718,7 +1712,7 @@ public class TestInputOutputFormat {
       assertEquals("mock:/combinationAcid/p=1/00000" + bucket + "_0",
           combineSplit.getPath(bucket).toString());
       assertEquals(0, combineSplit.getOffset(bucket));
-      assertEquals(253, combineSplit.getLength(bucket));
+      assertEquals(241, combineSplit.getLength(bucket));
     }
     String[] hosts = combineSplit.getLocations();
     assertEquals(2, hosts.length);

http://git-wip-us.apache.org/repos/asf/hive/blob/42c0580e/ql/src/test/resources/orc-file-dump-bloomfilter.out
----------------------------------------------------------------------
diff --git a/ql/src/test/resources/orc-file-dump-bloomfilter.out b/ql/src/test/resources/orc-file-dump-bloomfilter.out
index 21b094f..add163c 100644
--- a/ql/src/test/resources/orc-file-dump-bloomfilter.out
+++ b/ql/src/test/resources/orc-file-dump-bloomfilter.out
@@ -39,7 +39,7 @@ File Statistics:
   Column 3: count: 21000 hasNull: false min: Darkness, max: worst sum: 81761
 
 Stripes:
-  Stripe: offset: 3 data: 63765 rows: 5000 tail: 98 index: 845
+  Stripe: offset: 3 data: 63765 rows: 5000 tail: 86 index: 845
     Stream: column 0 section ROW_INDEX start: 3 length 17
     Stream: column 1 section ROW_INDEX start: 20 length 164
     Stream: column 2 section ROW_INDEX start: 184 length 173
@@ -67,17 +67,17 @@ Stripes:
       Entry 3: numHashFunctions: 4 bitCount: 6272 popCount: 138 loadFactor: 0.022 expectedFpp: 2.343647E-7
       Entry 4: numHashFunctions: 4 bitCount: 6272 popCount: 138 loadFactor: 0.022 expectedFpp: 2.343647E-7
       Stripe level merge: numHashFunctions: 4 bitCount: 6272 popCount: 138 loadFactor: 0.022 expectedFpp: 2.343647E-7
-  Stripe: offset: 64711 data: 63754 rows: 5000 tail: 98 index: 837
-    Stream: column 0 section ROW_INDEX start: 64711 length 17
-    Stream: column 1 section ROW_INDEX start: 64728 length 162
-    Stream: column 2 section ROW_INDEX start: 64890 length 171
-    Stream: column 3 section ROW_INDEX start: 65061 length 83
-    Stream: column 3 section BLOOM_FILTER start: 65144 length 404
-    Stream: column 1 section DATA start: 65548 length 20029
-    Stream: column 2 section DATA start: 85577 length 40035
-    Stream: column 3 section DATA start: 125612 length 3532
-    Stream: column 3 section LENGTH start: 129144 length 25
-    Stream: column 3 section DICTIONARY_DATA start: 129169 length 133
+  Stripe: offset: 64699 data: 63754 rows: 5000 tail: 86 index: 837
+    Stream: column 0 section ROW_INDEX start: 64699 length 17
+    Stream: column 1 section ROW_INDEX start: 64716 length 162
+    Stream: column 2 section ROW_INDEX start: 64878 length 171
+    Stream: column 3 section ROW_INDEX start: 65049 length 83
+    Stream: column 3 section BLOOM_FILTER start: 65132 length 404
+    Stream: column 1 section DATA start: 65536 length 20029
+    Stream: column 2 section DATA start: 85565 length 40035
+    Stream: column 3 section DATA start: 125600 length 3532
+    Stream: column 3 section LENGTH start: 129132 length 25
+    Stream: column 3 section DICTIONARY_DATA start: 129157 length 133
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -95,17 +95,17 @@ Stripes:
       Entry 3: numHashFunctions: 4 bitCount: 6272 popCount: 138 loadFactor: 0.022 expectedFpp: 2.343647E-7
       Entry 4: numHashFunctions: 4 bitCount: 6272 popCount: 138 loadFactor: 0.022 expectedFpp: 2.343647E-7
       Stripe level merge: numHashFunctions: 4 bitCount: 6272 popCount: 138 loadFactor: 0.022 expectedFpp: 2.343647E-7
-  Stripe: offset: 129400 data: 63766 rows: 5000 tail: 98 index: 841
-    Stream: column 0 section ROW_INDEX start: 129400 length 17
-    Stream: column 1 section ROW_INDEX start: 129417 length 159
-    Stream: column 2 section ROW_INDEX start: 129576 length 171
-    Stream: column 3 section ROW_INDEX start: 129747 length 90
-    Stream: column 3 section BLOOM_FILTER start: 129837 length 404
-    Stream: column 1 section DATA start: 130241 length 20029
-    Stream: column 2 section DATA start: 150270 length 40035
-    Stream: column 3 section DATA start: 190305 length 3544
-    Stream: column 3 section LENGTH start: 193849 length 25
-    Stream: column 3 section DICTIONARY_DATA start: 193874 length 133
+  Stripe: offset: 129376 data: 63766 rows: 5000 tail: 86 index: 841
+    Stream: column 0 section ROW_INDEX start: 129376 length 17
+    Stream: column 1 section ROW_INDEX start: 129393 length 159
+    Stream: column 2 section ROW_INDEX start: 129552 length 171
+    Stream: column 3 section ROW_INDEX start: 129723 length 90
+    Stream: column 3 section BLOOM_FILTER start: 129813 length 404
+    Stream: column 1 section DATA start: 130217 length 20029
+    Stream: column 2 section DATA start: 150246 length 40035
+    Stream: column 3 section DATA start: 190281 length 3544
+    Stream: column 3 section LENGTH start: 193825 length 25
+    Stream: column 3 section DICTIONARY_DATA start: 193850 length 133
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -123,17 +123,17 @@ Stripes:
       Entry 3: numHashFunctions: 4 bitCount: 6272 popCount: 138 loadFactor: 0.022 expectedFpp: 2.343647E-7
       Entry 4: numHashFunctions: 4 bitCount: 6272 popCount: 138 loadFactor: 0.022 expectedFpp: 2.343647E-7
       Stripe level merge: numHashFunctions: 4 bitCount: 6272 popCount: 138 loadFactor: 0.022 expectedFpp: 2.343647E-7
-  Stripe: offset: 194105 data: 63796 rows: 5000 tail: 98 index: 844
-    Stream: column 0 section ROW_INDEX start: 194105 length 17
-    Stream: column 1 section ROW_INDEX start: 194122 length 162
-    Stream: column 2 section ROW_INDEX start: 194284 length 170
-    Stream: column 3 section ROW_INDEX start: 194454 length 91
-    Stream: column 3 section BLOOM_FILTER start: 194545 length 404
-    Stream: column 1 section DATA start: 194949 length 20029
-    Stream: column 2 section DATA start: 214978 length 40035
-    Stream: column 3 section DATA start: 255013 length 3574
-    Stream: column 3 section LENGTH start: 258587 length 25
-    Stream: column 3 section DICTIONARY_DATA start: 258612 length 133
+  Stripe: offset: 194069 data: 63796 rows: 5000 tail: 86 index: 844
+    Stream: column 0 section ROW_INDEX start: 194069 length 17
+    Stream: column 1 section ROW_INDEX start: 194086 length 162
+    Stream: column 2 section ROW_INDEX start: 194248 length 170
+    Stream: column 3 section ROW_INDEX start: 194418 length 91
+    Stream: column 3 section BLOOM_FILTER start: 194509 length 404
+    Stream: column 1 section DATA start: 194913 length 20029
+    Stream: column 2 section DATA start: 214942 length 40035
+    Stream: column 3 section DATA start: 254977 length 3574
+    Stream: column 3 section LENGTH start: 258551 length 25
+    Stream: column 3 section DICTIONARY_DATA start: 258576 length 133
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -151,17 +151,17 @@ Stripes:
       Entry 3: numHashFunctions: 4 bitCount: 6272 popCount: 138 loadFactor: 0.022 expectedFpp: 2.343647E-7
       Entry 4: numHashFunctions: 4 bitCount: 6272 popCount: 138 loadFactor: 0.022 expectedFpp: 2.343647E-7
       Stripe level merge: numHashFunctions: 4 bitCount: 6272 popCount: 138 loadFactor: 0.022 expectedFpp: 2.343647E-7
-  Stripe: offset: 258843 data: 12940 rows: 1000 tail: 90 index: 432
-    Stream: column 0 section ROW_INDEX start: 258843 length 12
-    Stream: column 1 section ROW_INDEX start: 258855 length 38
-    Stream: column 2 section ROW_INDEX start: 258893 length 41
-    Stream: column 3 section ROW_INDEX start: 258934 length 40
-    Stream: column 3 section BLOOM_FILTER start: 258974 length 301
-    Stream: column 1 section DATA start: 259275 length 4007
-    Stream: column 2 section DATA start: 263282 length 8007
-    Stream: column 3 section DATA start: 271289 length 768
-    Stream: column 3 section LENGTH start: 272057 length 25
-    Stream: column 3 section DICTIONARY_DATA start: 272082 length 133
+  Stripe: offset: 258795 data: 12940 rows: 1000 tail: 78 index: 432
+    Stream: column 0 section ROW_INDEX start: 258795 length 12
+    Stream: column 1 section ROW_INDEX start: 258807 length 38
+    Stream: column 2 section ROW_INDEX start: 258845 length 41
+    Stream: column 3 section ROW_INDEX start: 258886 length 40
+    Stream: column 3 section BLOOM_FILTER start: 258926 length 301
+    Stream: column 1 section DATA start: 259227 length 4007
+    Stream: column 2 section DATA start: 263234 length 8007
+    Stream: column 3 section DATA start: 271241 length 768
+    Stream: column 3 section LENGTH start: 272009 length 25
+    Stream: column 3 section DICTIONARY_DATA start: 272034 length 133
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -172,6 +172,6 @@ Stripes:
       Entry 0: numHashFunctions: 4 bitCount: 6272 popCount: 138 loadFactor: 0.022 expectedFpp: 2.343647E-7
       Stripe level merge: numHashFunctions: 4 bitCount: 6272 popCount: 138 loadFactor: 0.022 expectedFpp: 2.343647E-7
 
-File length: 272850 bytes
+File length: 272790 bytes
 Padding length: 0 bytes
 Padding ratio: 0%

http://git-wip-us.apache.org/repos/asf/hive/blob/42c0580e/ql/src/test/resources/orc-file-dump-bloomfilter2.out
----------------------------------------------------------------------
diff --git a/ql/src/test/resources/orc-file-dump-bloomfilter2.out b/ql/src/test/resources/orc-file-dump-bloomfilter2.out
index baf1a88..06b65ce 100644
--- a/ql/src/test/resources/orc-file-dump-bloomfilter2.out
+++ b/ql/src/test/resources/orc-file-dump-bloomfilter2.out
@@ -39,7 +39,7 @@ File Statistics:
   Column 3: count: 21000 hasNull: false min: Darkness, max: worst sum: 81761
 
 Stripes:
-  Stripe: offset: 3 data: 63765 rows: 5000 tail: 97 index: 6935
+  Stripe: offset: 3 data: 63765 rows: 5000 tail: 85 index: 6935
     Stream: column 0 section ROW_INDEX start: 3 length 17
     Stream: column 1 section ROW_INDEX start: 20 length 164
     Stream: column 2 section ROW_INDEX start: 184 length 173
@@ -67,17 +67,17 @@ Stripes:
       Entry 3: numHashFunctions: 7 bitCount: 9600 popCount: 4971 loadFactor: 0.5178 expectedFpp: 0.009981772
       Entry 4: numHashFunctions: 7 bitCount: 9600 popCount: 4949 loadFactor: 0.5155 expectedFpp: 0.009676614
       Stripe level merge: numHashFunctions: 7 bitCount: 9600 popCount: 9347 loadFactor: 0.9736 expectedFpp: 0.829482
-  Stripe: offset: 70800 data: 63754 rows: 5000 tail: 97 index: 6917
-    Stream: column 0 section ROW_INDEX start: 70800 length 17
-    Stream: column 1 section ROW_INDEX start: 70817 length 162
-    Stream: column 2 section ROW_INDEX start: 70979 length 171
-    Stream: column 2 section BLOOM_FILTER start: 71150 length 6484
-    Stream: column 3 section ROW_INDEX start: 77634 length 83
-    Stream: column 1 section DATA start: 77717 length 20029
-    Stream: column 2 section DATA start: 97746 length 40035
-    Stream: column 3 section DATA start: 137781 length 3532
-    Stream: column 3 section LENGTH start: 141313 length 25
-    Stream: column 3 section DICTIONARY_DATA start: 141338 length 133
+  Stripe: offset: 70788 data: 63754 rows: 5000 tail: 85 index: 6917
+    Stream: column 0 section ROW_INDEX start: 70788 length 17
+    Stream: column 1 section ROW_INDEX start: 70805 length 162
+    Stream: column 2 section ROW_INDEX start: 70967 length 171
+    Stream: column 2 section BLOOM_FILTER start: 71138 length 6484
+    Stream: column 3 section ROW_INDEX start: 77622 length 83
+    Stream: column 1 section DATA start: 77705 length 20029
+    Stream: column 2 section DATA start: 97734 length 40035
+    Stream: column 3 section DATA start: 137769 length 3532
+    Stream: column 3 section LENGTH start: 141301 length 25
+    Stream: column 3 section DICTIONARY_DATA start: 141326 length 133
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -95,17 +95,17 @@ Stripes:
       Entry 3: numHashFunctions: 7 bitCount: 9600 popCount: 4962 loadFactor: 0.5169 expectedFpp: 0.009855959
       Entry 4: numHashFunctions: 7 bitCount: 9600 popCount: 4966 loadFactor: 0.5173 expectedFpp: 0.009911705
       Stripe level merge: numHashFunctions: 7 bitCount: 9600 popCount: 9344 loadFactor: 0.9733 expectedFpp: 0.8276205
-  Stripe: offset: 141568 data: 63766 rows: 5000 tail: 97 index: 6924
-    Stream: column 0 section ROW_INDEX start: 141568 length 17
-    Stream: column 1 section ROW_INDEX start: 141585 length 159
-    Stream: column 2 section ROW_INDEX start: 141744 length 171
-    Stream: column 2 section BLOOM_FILTER start: 141915 length 6487
-    Stream: column 3 section ROW_INDEX start: 148402 length 90
-    Stream: column 1 section DATA start: 148492 length 20029
-    Stream: column 2 section DATA start: 168521 length 40035
-    Stream: column 3 section DATA start: 208556 length 3544
-    Stream: column 3 section LENGTH start: 212100 length 25
-    Stream: column 3 section DICTIONARY_DATA start: 212125 length 133
+  Stripe: offset: 141544 data: 63766 rows: 5000 tail: 85 index: 6924
+    Stream: column 0 section ROW_INDEX start: 141544 length 17
+    Stream: column 1 section ROW_INDEX start: 141561 length 159
+    Stream: column 2 section ROW_INDEX start: 141720 length 171
+    Stream: column 2 section BLOOM_FILTER start: 141891 length 6487
+    Stream: column 3 section ROW_INDEX start: 148378 length 90
+    Stream: column 1 section DATA start: 148468 length 20029
+    Stream: column 2 section DATA start: 168497 length 40035
+    Stream: column 3 section DATA start: 208532 length 3544
+    Stream: column 3 section LENGTH start: 212076 length 25
+    Stream: column 3 section DICTIONARY_DATA start: 212101 length 133
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -123,17 +123,17 @@ Stripes:
       Entry 3: numHashFunctions: 7 bitCount: 9600 popCount: 4943 loadFactor: 0.5149 expectedFpp: 0.009594797
       Entry 4: numHashFunctions: 7 bitCount: 9600 popCount: 4930 loadFactor: 0.5135 expectedFpp: 0.009419539
       Stripe level merge: numHashFunctions: 7 bitCount: 9600 popCount: 9333 loadFactor: 0.9722 expectedFpp: 0.82082444
-  Stripe: offset: 212355 data: 63796 rows: 5000 tail: 97 index: 6925
-    Stream: column 0 section ROW_INDEX start: 212355 length 17
-    Stream: column 1 section ROW_INDEX start: 212372 length 162
-    Stream: column 2 section ROW_INDEX start: 212534 length 170
-    Stream: column 2 section BLOOM_FILTER start: 212704 length 6485
-    Stream: column 3 section ROW_INDEX start: 219189 length 91
-    Stream: column 1 section DATA start: 219280 length 20029
-    Stream: column 2 section DATA start: 239309 length 40035
-    Stream: column 3 section DATA start: 279344 length 3574
-    Stream: column 3 section LENGTH start: 282918 length 25
-    Stream: column 3 section DICTIONARY_DATA start: 282943 length 133
+  Stripe: offset: 212319 data: 63796 rows: 5000 tail: 85 index: 6925
+    Stream: column 0 section ROW_INDEX start: 212319 length 17
+    Stream: column 1 section ROW_INDEX start: 212336 length 162
+    Stream: column 2 section ROW_INDEX start: 212498 length 170
+    Stream: column 2 section BLOOM_FILTER start: 212668 length 6485
+    Stream: column 3 section ROW_INDEX start: 219153 length 91
+    Stream: column 1 section DATA start: 219244 length 20029
+    Stream: column 2 section DATA start: 239273 length 40035
+    Stream: column 3 section DATA start: 279308 length 3574
+    Stream: column 3 section LENGTH start: 282882 length 25
+    Stream: column 3 section DICTIONARY_DATA start: 282907 length 133
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -151,17 +151,17 @@ Stripes:
       Entry 3: numHashFunctions: 7 bitCount: 9600 popCount: 4941 loadFactor: 0.5147 expectedFpp: 0.009567649
       Entry 4: numHashFunctions: 7 bitCount: 9600 popCount: 4993 loadFactor: 0.5201 expectedFpp: 0.010295142
       Stripe level merge: numHashFunctions: 7 bitCount: 9600 popCount: 9353 loadFactor: 0.9743 expectedFpp: 0.8332165
-  Stripe: offset: 283173 data: 12940 rows: 1000 tail: 90 index: 1468
-    Stream: column 0 section ROW_INDEX start: 283173 length 12
-    Stream: column 1 section ROW_INDEX start: 283185 length 38
-    Stream: column 2 section ROW_INDEX start: 283223 length 41
-    Stream: column 2 section BLOOM_FILTER start: 283264 length 1337
-    Stream: column 3 section ROW_INDEX start: 284601 length 40
-    Stream: column 1 section DATA start: 284641 length 4007
-    Stream: column 2 section DATA start: 288648 length 8007
-    Stream: column 3 section DATA start: 296655 length 768
-    Stream: column 3 section LENGTH start: 297423 length 25
-    Stream: column 3 section DICTIONARY_DATA start: 297448 length 133
+  Stripe: offset: 283125 data: 12940 rows: 1000 tail: 78 index: 1468
+    Stream: column 0 section ROW_INDEX start: 283125 length 12
+    Stream: column 1 section ROW_INDEX start: 283137 length 38
+    Stream: column 2 section ROW_INDEX start: 283175 length 41
+    Stream: column 2 section BLOOM_FILTER start: 283216 length 1337
+    Stream: column 3 section ROW_INDEX start: 284553 length 40
+    Stream: column 1 section DATA start: 284593 length 4007
+    Stream: column 2 section DATA start: 288600 length 8007
+    Stream: column 3 section DATA start: 296607 length 768
+    Stream: column 3 section LENGTH start: 297375 length 25
+    Stream: column 3 section DICTIONARY_DATA start: 297400 length 133
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -172,6 +172,6 @@ Stripes:
       Entry 0: numHashFunctions: 7 bitCount: 9600 popCount: 4948 loadFactor: 0.5154 expectedFpp: 0.00966294
       Stripe level merge: numHashFunctions: 7 bitCount: 9600 popCount: 4948 loadFactor: 0.5154 expectedFpp: 0.00966294
 
-File length: 298215 bytes
+File length: 298155 bytes
 Padding length: 0 bytes
 Padding ratio: 0%

http://git-wip-us.apache.org/repos/asf/hive/blob/42c0580e/ql/src/test/resources/orc-file-dump-dictionary-threshold.out
----------------------------------------------------------------------
diff --git a/ql/src/test/resources/orc-file-dump-dictionary-threshold.out b/ql/src/test/resources/orc-file-dump-dictionary-threshold.out
index 87c4350..13e316e 100644
--- a/ql/src/test/resources/orc-file-dump-dictionary-threshold.out
+++ b/ql/src/test/resources/orc-file-dump-dictionary-threshold.out
@@ -39,7 +39,7 @@ File Statistics:
   Column 3: count: 21000 hasNull: false min: Darkness,-230 max: worst-54-290-346-648-908-996-1038-1080-1560-1584-1620-1744-1770-1798-1852-1966-2162-2244-2286-2296-2534-2660-3114-3676-3788-4068-4150-4706-4744-5350-5420-5582-5696-5726-6006-6020-6024-6098-6184-6568-6636-6802-6994-7004-7318-7498-7758-7780-7798-7920-7952-7960-7988-8232-8256-8390-8416-8478-8620-8840-8984-9038-9128-9236-9248-9344-9594-9650-9714-9928-9938-10178-10368-10414-10502-10732-10876-11008-11158-11410-11722-11836-11964-12054-12096-12126-12136-12202-12246-12298-12616-12774-12782-12790-12802-12976-13216-13246-13502-13766-14454-14974-15004-15124-15252-15294-15356-15530-15610-16316-16936-17024-17122-17214-17310-17528-17682-17742-17870-17878-18010-18410-18524-18788-19204-19254-19518-19596-19786-19874-19904-20390-20752-20936 sum: 6910238
 
 Stripes:
-  Stripe: offset: 3 data: 151108 rows: 5000 tail: 80 index: 718
+  Stripe: offset: 3 data: 151108 rows: 5000 tail: 68 index: 718
     Stream: column 0 section ROW_INDEX start: 3 length 17
     Stream: column 1 section ROW_INDEX start: 20 length 162
     Stream: column 2 section ROW_INDEX start: 182 length 174
@@ -70,15 +70,15 @@ Stripes:
       Entry 2: count: 1000 hasNull: false min: Darkness,-230-368-488-586-862-930-1686-2044 max: worst-54-290-346-648-908-996-1038-1080-1560-1584-1620-1744-1770-1798-1852-1966-2162-2244-2286-2296-2534-2660 sum: 75448 positions: 13595,4780,0,1554,14
       Entry 3: count: 1000 hasNull: false min: Darkness,-230-368-488-586-862-930-1686-2044-2636-2652-2872-3108 max: worst-54-290-346-648-908-996-1038-1080-1560-1584-1620-1744-1770-1798-1852-1966-2162-2244-2286-2296-2534-2660-3114-3676-3788 sum: 104868 positions: 31432,228,0,2372,90
       Entry 4: count: 1000 hasNull: false min: Darkness,-230-368-488-586-862-930-1686-2044-2636-2652-2872-3108-3162-3192-3404-3442-3508-3542-3550-3712-3980-4146 max: worst-54-290-346-648-908-996-1038-1080-1560-1584-1620-1744-1770-1798-1852-1966-2162-2244-2286-2296-2534-2660-3114-3676-3788-4068-4150-4706-4744 sum: 136158 positions: 54111,5096,0,3354,108
-  Stripe: offset: 151909 data: 336358 rows: 5000 tail: 81 index: 954
-    Stream: column 0 section ROW_INDEX start: 151909 length 17
-    Stream: column 1 section ROW_INDEX start: 151926 length 153
-    Stream: column 2 section ROW_INDEX start: 152079 length 169
-    Stream: column 3 section ROW_INDEX start: 152248 length 615
-    Stream: column 1 section DATA start: 152863 length 20029
-    Stream: column 2 section DATA start: 172892 length 40035
-    Stream: column 3 section DATA start: 212927 length 270789
-    Stream: column 3 section LENGTH start: 483716 length 5505
+  Stripe: offset: 151897 data: 336358 rows: 5000 tail: 69 index: 954
+    Stream: column 0 section ROW_INDEX start: 151897 length 17
+    Stream: column 1 section ROW_INDEX start: 151914 length 153
+    Stream: column 2 section ROW_INDEX start: 152067 length 169
+    Stream: column 3 section ROW_INDEX start: 152236 length 615
+    Stream: column 1 section DATA start: 152851 length 20029
+    Stream: column 2 section DATA start: 172880 length 40035
+    Stream: column 3 section DATA start: 212915 length 270789
+    Stream: column 3 section LENGTH start: 483704 length 5505
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -101,15 +101,15 @@ Stripes:
       Entry 2: count: 1000 hasNull: false min: Darkness,-230-368-488-586-862-930-1686-2044-2636-2652-2872-3108-3162-3192-3404-3442-3508-3542-3550-3712-3980-4146-4204-4336-4390-4418-4424-4490-4512-4650-4768-4924-4950-5210-5524-5630-5678-5710-5758-5952-6238-6252-6300-6366-6668-6712-6926-6942-7100 max: worst-54-290-346-648-908-996-1038-1080-1560-1584-1620-1744-1770-1798-1852-1966-2162-2244-2286-2296-2534-2660-3114-3676-3788-4068-4150-4706-4744-5350-5420-5582-5696-5726-6006-6020-6024-6098-6184-6568-6636-6802-6994-7004-7318-7498-7758-7780-7798-7920-7952-7960-7988 sum: 224740 positions: 80822,9756,0,1945,222
       Entry 3: count: 1000 hasNull: false min: Darkness,-230-368-488-586-862-930-1686-2044-2636-2652-2872-3108-3162-3192-3404-3442-3508-3542-3550-3712-3980-4146-4204-4336-4390-4418-4424-4490-4512-4650-4768-4924-4950-5210-5524-5630-5678-5710-5758-5952-6238-6252-6300-6366-6668-6712-6926-6942-7100-7194-7802-8030 max: worst-54-290-346-648-908-996-1038-1080-1560-1584-1620-1744-1770-1798-1852-1966-2162-2244-2286-2296-2534-2660-3114-3676-3788-4068-4150-4706-4744-5350-5420-5582-5696-5726-6006-6020-6024-6098-6184-6568-6636-6802-6994-7004-7318-7498-7758-7780-7798-7920-7952-7960-7988-8232-8256-8390-8416-8478-8620-8840-8984 sum: 252094 positions: 137149,4496,0,3268,48
       Entry 4: count: 1000 hasNull: false min: Darkness,-230-368-488-586-862-930-1686-2044-2636-2652-2872-3108-3162-3192-3404-3442-3508-3542-3550-3712-3980-4146-4204-4336-4390-4418-4424-4490-4512-4650-4768-4924-4950-5210-5524-5630-5678-5710-5758-5952-6238-6252-6300-6366-6668-6712-6926-6942-7100-7194-7802-8030-8452-8608-8640-8862-8868-9134 max: worst-54-290-346-648-908-996-1038-1080-1560-1584-1620-1744-1770-1798-1852-1966-2162-2244-2286-2296-2534-2660-3114-3676-3788-4068-4150-4706-4744-5350-5420-5582-5696-5726-6006-6020-6024-6098-6184-6568-6636-6802-6994-7004-7318-7498-7758-7780-7798-7920-7952-7960-7988-8232-8256-8390-8416-8478-8620-8840-8984-9038-9128-9236-9248-9344-9594-9650-9714-9928-9938 sum: 281404 positions: 197972,6590,0,4064,342
-  Stripe: offset: 489302 data: 558031 rows: 5000 tail: 81 index: 1181
-    Stream: column 0 section ROW_INDEX start: 489302 length 17
-    Stream: column 1 section ROW_INDEX start: 489319 length 166
-    Stream: column 2 section ROW_INDEX start: 489485 length 171
-    Stream: column 3 section ROW_INDEX start: 489656 length 827
-    Stream: column 1 section DATA start: 490483 length 20029
-    Stream: column 2 section DATA start: 510512 length 40035
-    Stream: column 3 section DATA start: 550547 length 492258
-    Stream: column 3 section LENGTH start: 1042805 length 5709
+  Stripe: offset: 489278 data: 558031 rows: 5000 tail: 69 index: 1181
+    Stream: column 0 section ROW_INDEX start: 489278 length 17
+    Stream: column 1 section ROW_INDEX start: 489295 length 166
+    Stream: column 2 section ROW_INDEX start: 489461 length 171
+    Stream: column 3 section ROW_INDEX start: 489632 length 827
+    Stream: column 1 section DATA start: 490459 length 20029
+    Stream: column 2 section DATA start: 510488 length 40035
+    Stream: column 3 section DATA start: 550523 length 492258
+    Stream: column 3 section LENGTH start: 1042781 length 5709
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -132,15 +132,15 @@ Stripes:
       Entry 2: count: 1000 hasNull: false min: Darkness,-230-368-488-586-862-930-1686-2044-2636-2652-2872-3108-3162-3192-3404-3442-3508-3542-3550-3712-3980-4146-4204-4336-4390-4418-4424-4490-4512-4650-4768-4924-4950-5210-5524-5630-5678-5710-5758-5952-6238-6252-6300-6366-6668-6712-6926-6942-7100-7194-7802-8030-8452-8608-8640-8862-8868-9134-9234-9412-9602-9608-9642-9678-9740-9780-10426-10510-10514-10706-10814-10870-10942-11028-11244-11326-11462-11496-11656-11830-12022 max: worst-54-290-346-648-908-996-1038-1080-1560-1584-1620-1744-1770-1798-1852-1966-2162-2244-2286-2296-2534-2660-3114-3676-3788-4068-4150-4706-4744-5350-5420-5582-5696-5726-6006-6020-6024-6098-6184-6568-6636-6802-6994-7004-7318-7498-7758-7780-7798-7920-7952-7960-7988-8232-8256-8390-8416-8478-8620-8840-8984-9038-9128-9236-9248-9344-9594-9650-9714-9928-9938-10178-10368-10414-10502-10732-10876-11008-11158-11410-11722-11836-11964-12054-12096-12126-12136-12202-12246-12298-12616-12774-12782-12790-12802-12976 sum: 386538 posit
 ions: 170641,3422,0,2077,162
       Entry 3: count: 1000 hasNull: false min: Darkness,-230-368-488-586-862-930-1686-2044-2636-2652-2872-3108-3162-3192-3404-3442-3508-3542-3550-3712-3980-4146-4204-4336-4390-4418-4424-4490-4512-4650-4768-4924-4950-5210-5524-5630-5678-5710-5758-5952-6238-6252-6300-6366-6668-6712-6926-6942-7100-7194-7802-8030-8452-8608-8640-8862-8868-9134-9234-9412-9602-9608-9642-9678-9740-9780-10426-10510-10514-10706-10814-10870-10942-11028-11244-11326-11462-11496-11656-11830-12022-12178-12418-12832-13304 max: worst-54-290-346-648-908-996-1038-1080-1560-1584-1620-1744-1770-1798-1852-1966-2162-2244-2286-2296-2534-2660-3114-3676-3788-4068-4150-4706-4744-5350-5420-5582-5696-5726-6006-6020-6024-6098-6184-6568-6636-6802-6994-7004-7318-7498-7758-7780-7798-7920-7952-7960-7988-8232-8256-8390-8416-8478-8620-8840-8984-9038-9128-9236-9248-9344-9594-9650-9714-9928-9938-10178-10368-10414-10502-10732-10876-11008-11158-11410-11722-11836-11964-12054-12096-12126-12136-12202-12246-12298-12616-12774-12782-12790-12802
 -12976-13216-13246-13502-13766 sum: 421660 positions: 268420,9960,0,3369,16
       Entry 4: count: 1000 hasNull: false min: Darkness,-230-368-488-586-862-930-1686-2044-2636-2652-2872-3108-3162-3192-3404-3442-3508-3542-3550-3712-3980-4146-4204-4336-4390-4418-4424-4490-4512-4650-4768-4924-4950-5210-5524-5630-5678-5710-5758-5952-6238-6252-6300-6366-6668-6712-6926-6942-7100-7194-7802-8030-8452-8608-8640-8862-8868-9134-9234-9412-9602-9608-9642-9678-9740-9780-10426-10510-10514-10706-10814-10870-10942-11028-11244-11326-11462-11496-11656-11830-12022-12178-12418-12832-13304-13448-13590-13618-13908-14188 max: worst-54-290-346-648-908-996-1038-1080-1560-1584-1620-1744-1770-1798-1852-1966-2162-2244-2286-2296-2534-2660-3114-3676-3788-4068-4150-4706-4744-5350-5420-5582-5696-5726-6006-6020-6024-6098-6184-6568-6636-6802-6994-7004-7318-7498-7758-7780-7798-7920-7952-7960-7988-8232-8256-8390-8416-8478-8620-8840-8984-9038-9128-9236-9248-9344-9594-9650-9714-9928-9938-10178-10368-10414-10502-10732-10876-11008-11158-11410-11722-11836-11964-12054-12096-12126-12136-12202-12246-12298
 -12616-12774-12782-12790-12802-12976-13216-13246-13502-13766-14454-14974 sum: 453606 positions: 377916,1620,0,4041,470
-  Stripe: offset: 1048595 data: 792850 rows: 5000 tail: 81 index: 1369
-    Stream: column 0 section ROW_INDEX start: 1048595 length 17
-    Stream: column 1 section ROW_INDEX start: 1048612 length 153
-    Stream: column 2 section ROW_INDEX start: 1048765 length 172
-    Stream: column 3 section ROW_INDEX start: 1048937 length 1027
-    Stream: column 1 section DATA start: 1049964 length 20029
-    Stream: column 2 section DATA start: 1069993 length 40035
-    Stream: column 3 section DATA start: 1110028 length 727038
-    Stream: column 3 section LENGTH start: 1837066 length 5748
+  Stripe: offset: 1048559 data: 792850 rows: 5000 tail: 69 index: 1369
+    Stream: column 0 section ROW_INDEX start: 1048559 length 17
+    Stream: column 1 section ROW_INDEX start: 1048576 length 153
+    Stream: column 2 section ROW_INDEX start: 1048729 length 172
+    Stream: column 3 section ROW_INDEX start: 1048901 length 1027
+    Stream: column 1 section DATA start: 1049928 length 20029
+    Stream: column 2 section DATA start: 1069957 length 40035
+    Stream: column 3 section DATA start: 1109992 length 727038
+    Stream: column 3 section LENGTH start: 1837030 length 5748
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -163,15 +163,15 @@ Stripes:
       Entry 2: count: 1000 hasNull: false min: Darkness,-230-368-488-586-862-930-1686-2044-2636-2652-2872-3108-3162-3192-3404-3442-3508-3542-3550-3712-3980-4146-4204-4336-4390-4418-4424-4490-4512-4650-4768-4924-4950-5210-5524-5630-5678-5710-5758-5952-6238-6252-6300-6366-6668-6712-6926-6942-7100-7194-7802-8030-8452-8608-8640-8862-8868-9134-9234-9412-9602-9608-9642-9678-9740-9780-10426-10510-10514-10706-10814-10870-10942-11028-11244-11326-11462-11496-11656-11830-12022-12178-12418-12832-13304-13448-13590-13618-13908-14188-14246-14340-14364-14394-14762-14850-14964-15048-15494-15674-15726-16006-16056-16180-16304-16332-16452-16598-16730-16810-16994-17210 max: worst-54-290-346-648-908-996-1038-1080-1560-1584-1620-1744-1770-1798-1852-1966-2162-2244-2286-2296-2534-2660-3114-3676-3788-4068-4150-4706-4744-5350-5420-5582-5696-5726-6006-6020-6024-6098-6184-6568-6636-6802-6994-7004-7318-7498-7758-7780-7798-7920-7952-7960-7988-8232-8256-8390-8416-8478-8620-8840-8984-9038-9128-9236-9248-9344-9594-9
 650-9714-9928-9938-10178-10368-10414-10502-10732-10876-11008-11158-11410-11722-11836-11964-12054-12096-12126-12136-12202-12246-12298-12616-12774-12782-12790-12802-12976-13216-13246-13502-13766-14454-14974-15004-15124-15252-15294-15356-15530-15610-16316-16936-17024-17122-17214-17310-17528-17682-17742-17870-17878 sum: 568274 positions: 263111,206,0,1926,462
       Entry 3: count: 1000 hasNull: false min: Darkness,-230-368-488-586-862-930-1686-2044-2636-2652-2872-3108-3162-3192-3404-3442-3508-3542-3550-3712-3980-4146-4204-4336-4390-4418-4424-4490-4512-4650-4768-4924-4950-5210-5524-5630-5678-5710-5758-5952-6238-6252-6300-6366-6668-6712-6926-6942-7100-7194-7802-8030-8452-8608-8640-8862-8868-9134-9234-9412-9602-9608-9642-9678-9740-9780-10426-10510-10514-10706-10814-10870-10942-11028-11244-11326-11462-11496-11656-11830-12022-12178-12418-12832-13304-13448-13590-13618-13908-14188-14246-14340-14364-14394-14762-14850-14964-15048-15494-15674-15726-16006-16056-16180-16304-16332-16452-16598-16730-16810-16994-17210-17268-17786-17962-18214 max: worst-54-290-346-648-908-996-1038-1080-1560-1584-1620-1744-1770-1798-1852-1966-2162-2244-2286-2296-2534-2660-3114-3676-3788-4068-4150-4706-4744-5350-5420-5582-5696-5726-6006-6020-6024-6098-6184-6568-6636-6802-6994-7004-7318-7498-7758-7780-7798-7920-7952-7960-7988-8232-8256-8390-8416-8478-8620-8840-8984-9038-91
 28-9236-9248-9344-9594-9650-9714-9928-9938-10178-10368-10414-10502-10732-10876-11008-11158-11410-11722-11836-11964-12054-12096-12126-12136-12202-12246-12298-12616-12774-12782-12790-12802-12976-13216-13246-13502-13766-14454-14974-15004-15124-15252-15294-15356-15530-15610-16316-16936-17024-17122-17214-17310-17528-17682-17742-17870-17878-18010-18410-18524-18788 sum: 594578 positions: 407371,8480,0,3444,250
       Entry 4: count: 1000 hasNull: false min: Darkness,-230-368-488-586-862-930-1686-2044-2636-2652-2872-3108-3162-3192-3404-3442-3508-3542-3550-3712-3980-4146-4204-4336-4390-4418-4424-4490-4512-4650-4768-4924-4950-5210-5524-5630-5678-5710-5758-5952-6238-6252-6300-6366-6668-6712-6926-6942-7100-7194-7802-8030-8452-8608-8640-8862-8868-9134-9234-9412-9602-9608-9642-9678-9740-9780-10426-10510-10514-10706-10814-10870-10942-11028-11244-11326-11462-11496-11656-11830-12022-12178-12418-12832-13304-13448-13590-13618-13908-14188-14246-14340-14364-14394-14762-14850-14964-15048-15494-15674-15726-16006-16056-16180-16304-16332-16452-16598-16730-16810-16994-17210-17268-17786-17962-18214-18444-18446-18724-18912-18952-19164 max: worst-54-290-346-648-908-996-1038-1080-1560-1584-1620-1744-1770-1798-1852-1966-2162-2244-2286-2296-2534-2660-3114-3676-3788-4068-4150-4706-4744-5350-5420-5582-5696-5726-6006-6020-6024-6098-6184-6568-6636-6802-6994-7004-7318-7498-7758-7780-7798-7920-7952-7960-7988-8232-8256-8
 390-8416-8478-8620-8840-8984-9038-9128-9236-9248-9344-9594-9650-9714-9928-9938-10178-10368-10414-10502-10732-10876-11008-11158-11410-11722-11836-11964-12054-12096-12126-12136-12202-12246-12298-12616-12774-12782-12790-12802-12976-13216-13246-13502-13766-14454-14974-15004-15124-15252-15294-15356-15530-15610-16316-16936-17024-17122-17214-17310-17528-17682-17742-17870-17878-18010-18410-18524-18788-19204-19254-19518-19596-19786-19874-19904 sum: 631944 positions: 562094,3058,0,4643,292
-  Stripe: offset: 1842895 data: 188033 rows: 1000 tail: 79 index: 841
-    Stream: column 0 section ROW_INDEX start: 1842895 length 12
-    Stream: column 1 section ROW_INDEX start: 1842907 length 38
-    Stream: column 2 section ROW_INDEX start: 1842945 length 41
-    Stream: column 3 section ROW_INDEX start: 1842986 length 750
-    Stream: column 1 section DATA start: 1843736 length 4007
-    Stream: column 2 section DATA start: 1847743 length 8007
-    Stream: column 3 section DATA start: 1855750 length 174759
-    Stream: column 3 section LENGTH start: 2030509 length 1260
+  Stripe: offset: 1842847 data: 188033 rows: 1000 tail: 67 index: 841
+    Stream: column 0 section ROW_INDEX start: 1842847 length 12
+    Stream: column 1 section ROW_INDEX start: 1842859 length 38
+    Stream: column 2 section ROW_INDEX start: 1842897 length 41
+    Stream: column 3 section ROW_INDEX start: 1842938 length 750
+    Stream: column 1 section DATA start: 1843688 length 4007
+    Stream: column 2 section DATA start: 1847695 length 8007
+    Stream: column 3 section DATA start: 1855702 length 174759
+    Stream: column 3 section LENGTH start: 2030461 length 1260
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -183,6 +183,6 @@ Stripes:
     Row group indices for column 3:
       Entry 0: count: 1000 hasNull: false min: Darkness,-230-368-488-586-862-930-1686-2044-2636-2652-2872-3108-3162-3192-3404-3442-3508-3542-3550-3712-3980-4146-4204-4336-4390-4418-4424-4490-4512-4650-4768-4924-4950-5210-5524-5630-5678-5710-5758-5952-6238-6252-6300-6366-6668-6712-6926-6942-7100-7194-7802-8030-8452-8608-8640-8862-8868-9134-9234-9412-9602-9608-9642-9678-9740-9780-10426-10510-10514-10706-10814-10870-10942-11028-11244-11326-11462-11496-11656-11830-12022-12178-12418-12832-13304-13448-13590-13618-13908-14188-14246-14340-14364-14394-14762-14850-14964-15048-15494-15674-15726-16006-16056-16180-16304-16332-16452-16598-16730-16810-16994-17210-17268-17786-17962-18214-18444-18446-18724-18912-18952-19164-19348-19400-19546-19776-19896-20084 max: worst-54-290-346-648-908-996-1038-1080-1560-1584-1620-1744-1770-1798-1852-1966-2162-2244-2286-2296-2534-2660-3114-3676-3788-4068-4150-4706-4744-5350-5420-5582-5696-5726-6006-6020-6024-6098-6184-6568-6636-6802-6994-7004-7318-7498-7758-7780-
 7798-7920-7952-7960-7988-8232-8256-8390-8416-8478-8620-8840-8984-9038-9128-9236-9248-9344-9594-9650-9714-9928-9938-10178-10368-10414-10502-10732-10876-11008-11158-11410-11722-11836-11964-12054-12096-12126-12136-12202-12246-12298-12616-12774-12782-12790-12802-12976-13216-13246-13502-13766-14454-14974-15004-15124-15252-15294-15356-15530-15610-16316-16936-17024-17122-17214-17310-17528-17682-17742-17870-17878-18010-18410-18524-18788-19204-19254-19518-19596-19786-19874-19904-20390-20752-20936 sum: 670762 positions: 0,0,0,0,0
 
-File length: 2033704 bytes
+File length: 2033643 bytes
 Padding length: 0 bytes
 Padding ratio: 0%

http://git-wip-us.apache.org/repos/asf/hive/blob/42c0580e/ql/src/test/resources/orc-file-dump.json
----------------------------------------------------------------------
diff --git a/ql/src/test/resources/orc-file-dump.json b/ql/src/test/resources/orc-file-dump.json
index 125a32e..fe31d5e 100644
--- a/ql/src/test/resources/orc-file-dump.json
+++ b/ql/src/test/resources/orc-file-dump.json
@@ -256,7 +256,7 @@
         "offset": 3,
         "indexLength": 863,
         "dataLength": 63749,
-        "footerLength": 103,
+        "footerLength": 90,
         "rowCount": 5000
       },
       "streams": [
@@ -494,77 +494,77 @@
     {
       "stripeNumber": 2,
       "stripeInformation": {
-        "offset": 64718,
+        "offset": 64705,
         "indexLength": 854,
         "dataLength": 63742,
-        "footerLength": 103,
+        "footerLength": 90,
         "rowCount": 5000
       },
       "streams": [
         {
           "columnId": 0,
           "section": "ROW_INDEX",
-          "startOffset": 64718,
+          "startOffset": 64705,
           "length": 17
         },
         {
           "columnId": 1,
           "section": "ROW_INDEX",
-          "startOffset": 64735,
+          "startOffset": 64722,
           "length": 164
         },
         {
           "columnId": 2,
           "section": "ROW_INDEX",
-          "startOffset": 64899,
+          "startOffset": 64886,
           "length": 169
         },
         {
           "columnId": 3,
           "section": "ROW_INDEX",
-          "startOffset": 65068,
+          "startOffset": 65055,
           "length": 100
         },
         {
           "columnId": 3,
           "section": "BLOOM_FILTER",
-          "startOffset": 65168,
+          "startOffset": 65155,
           "length": 404
         },
         {
           "columnId": 1,
           "section": "DATA",
-          "startOffset": 65572,
+          "startOffset": 65559,
           "length": 20029
         },
         {
           "columnId": 2,
           "section": "DATA",
-          "startOffset": 85601,
+          "startOffset": 85588,
           "length": 40035
         },
         {
           "columnId": 3,
           "section": "PRESENT",
-          "startOffset": 125636,
+          "startOffset": 125623,
           "length": 17
         },
         {
           "columnId": 3,
           "section": "DATA",
-          "startOffset": 125653,
+          "startOffset": 125640,
           "length": 3503
         },
         {
           "columnId": 3,
           "section": "LENGTH",
-          "startOffset": 129156,
+          "startOffset": 129143,
           "length": 25
         },
         {
           "columnId": 3,
           "section": "DICTIONARY_DATA",
-          "startOffset": 129181,
+          "startOffset": 129168,
           "length": 133
         }
       ],
@@ -735,77 +735,77 @@
     {
       "stripeNumber": 3,
       "stripeInformation": {
-        "offset": 129417,
+        "offset": 129391,
         "indexLength": 853,
         "dataLength": 63749,
-        "footerLength": 103,
+        "footerLength": 90,
         "rowCount": 5000
       },
       "streams": [
         {
           "columnId": 0,
           "section": "ROW_INDEX",
-          "startOffset": 129417,
+          "startOffset": 129391,
           "length": 17
         },
         {
           "columnId": 1,
           "section": "ROW_INDEX",
-          "startOffset": 129434,
+          "startOffset": 129408,
           "length": 160
         },
         {
           "columnId": 2,
           "section": "ROW_INDEX",
-          "startOffset": 129594,
+          "startOffset": 129568,
           "length": 170
         },
         {
           "columnId": 3,
           "section": "ROW_INDEX",
-          "startOffset": 129764,
+          "startOffset": 129738,
           "length": 102
         },
         {
           "columnId": 3,
           "section": "BLOOM_FILTER",
-          "startOffset": 129866,
+          "startOffset": 129840,
           "length": 404
         },
         {
           "columnId": 1,
           "section": "DATA",
-          "startOffset": 130270,
+          "startOffset": 130244,
           "length": 20029
         },
         {
           "columnId": 2,
           "section": "DATA",
-          "startOffset": 150299,
+          "startOffset": 150273,
           "length": 40035
         },
         {
           "columnId": 3,
           "section": "PRESENT",
-          "startOffset": 190334,
+          "startOffset": 190308,
           "length": 17
         },
         {
           "columnId": 3,
           "section": "DATA",
-          "startOffset": 190351,
+          "startOffset": 190325,
           "length": 3510
         },
         {
           "columnId": 3,
           "section": "LENGTH",
-          "startOffset": 193861,
+          "startOffset": 193835,
           "length": 25
         },
         {
           "columnId": 3,
           "section": "DICTIONARY_DATA",
-          "startOffset": 193886,
+          "startOffset": 193860,
           "length": 133
         }
       ],
@@ -976,77 +976,77 @@
     {
       "stripeNumber": 4,
       "stripeInformation": {
-        "offset": 194122,
+        "offset": 194083,
         "indexLength": 866,
         "dataLength": 63735,
-        "footerLength": 103,
+        "footerLength": 90,
         "rowCount": 5000
       },
       "streams": [
         {
           "columnId": 0,
           "section": "ROW_INDEX",
-          "startOffset": 194122,
+          "startOffset": 194083,
           "length": 17
         },
         {
           "columnId": 1,
           "section": "ROW_INDEX",
-          "startOffset": 194139,
+          "startOffset": 194100,
           "length": 164
         },
         {
           "columnId": 2,
           "section": "ROW_INDEX",
-          "startOffset": 194303,
+          "startOffset": 194264,
           "length": 174
         },
         {
           "columnId": 3,
           "section": "ROW_INDEX",
-          "startOffset": 194477,
+          "startOffset": 194438,
           "length": 107
         },
         {
           "columnId": 3,
           "section": "BLOOM_FILTER",
-          "startOffset": 194584,
+          "startOffset": 194545,
           "length": 404
         },
         {
           "columnId": 1,
           "section": "DATA",
-          "startOffset": 194988,
+          "startOffset": 194949,
           "length": 20029
         },
         {
           "columnId": 2,
           "section": "DATA",
-          "startOffset": 215017,
+          "startOffset": 214978,
           "length": 40035
         },
         {
           "columnId": 3,
           "section": "PRESENT",
-          "startOffset": 255052,
+          "startOffset": 255013,
           "length": 17
         },
         {
           "columnId": 3,
           "section": "DATA",
-          "startOffset": 255069,
+          "startOffset": 255030,
           "length": 3496
         },
         {
           "columnId": 3,
           "section": "LENGTH",
-          "startOffset": 258565,
+          "startOffset": 258526,
           "length": 25
         },
         {
           "columnId": 3,
           "section": "DICTIONARY_DATA",
-          "startOffset": 258590,
+          "startOffset": 258551,
           "length": 133
         }
       ],
@@ -1217,77 +1217,77 @@
     {
       "stripeNumber": 5,
       "stripeInformation": {
-        "offset": 258826,
+        "offset": 258774,
         "indexLength": 433,
         "dataLength": 12940,
-        "footerLength": 95,
+        "footerLength": 83,
         "rowCount": 1000
       },
       "streams": [
         {
           "columnId": 0,
           "section": "ROW_INDEX",
-          "startOffset": 258826,
+          "startOffset": 258774,
           "length": 12
         },
         {
           "columnId": 1,
           "section": "ROW_INDEX",
-          "startOffset": 258838,
+          "startOffset": 258786,
           "length": 38
         },
         {
           "columnId": 2,
           "section": "ROW_INDEX",
-          "startOffset": 258876,
+          "startOffset": 258824,
           "length": 41
         },
         {
           "columnId": 3,
           "section": "ROW_INDEX",
-          "startOffset": 258917,
+          "startOffset": 258865,
           "length": 41
         },
         {
           "columnId": 3,
           "section": "BLOOM_FILTER",
-          "startOffset": 258958,
+          "startOffset": 258906,
           "length": 301
         },
         {
           "columnId": 1,
           "section": "DATA",
-          "startOffset": 259259,
+          "startOffset": 259207,
           "length": 4007
         },
         {
           "columnId": 2,
           "section": "DATA",
-          "startOffset": 263266,
+          "startOffset": 263214,
           "length": 8007
         },
         {
           "columnId": 3,
           "section": "PRESENT",
-          "startOffset": 271273,
+          "startOffset": 271221,
           "length": 16
         },
         {
           "columnId": 3,
           "section": "DATA",
-          "startOffset": 271289,
+          "startOffset": 271237,
           "length": 752
         },
         {
           "columnId": 3,
           "section": "LENGTH",
-          "startOffset": 272041,
+          "startOffset": 271989,
           "length": 25
         },
         {
           "columnId": 3,
           "section": "DICTIONARY_DATA",
-          "startOffset": 272066,
+          "startOffset": 272014,
           "length": 133
         }
       ],
@@ -1348,7 +1348,7 @@
       }]
     }
   ],
-  "fileLength": 272842,
+  "fileLength": 272779,
   "paddingLength": 0,
   "paddingRatio": 0
 }

http://git-wip-us.apache.org/repos/asf/hive/blob/42c0580e/ql/src/test/resources/orc-file-dump.out
----------------------------------------------------------------------
diff --git a/ql/src/test/resources/orc-file-dump.out b/ql/src/test/resources/orc-file-dump.out
index 4c15fa6..2f5962b 100644
--- a/ql/src/test/resources/orc-file-dump.out
+++ b/ql/src/test/resources/orc-file-dump.out
@@ -39,7 +39,7 @@ File Statistics:
   Column 3: count: 21000 hasNull: false min: Darkness, max: worst sum: 81761
 
 Stripes:
-  Stripe: offset: 3 data: 63765 rows: 5000 tail: 91 index: 441
+  Stripe: offset: 3 data: 63765 rows: 5000 tail: 79 index: 441
     Stream: column 0 section ROW_INDEX start: 3 length 17
     Stream: column 1 section ROW_INDEX start: 20 length 164
     Stream: column 2 section ROW_INDEX start: 184 length 173
@@ -71,16 +71,16 @@ Stripes:
       Entry 2: count: 1000 hasNull: false min: Darkness, max: worst sum: 3893 positions: 0,1531,3
       Entry 3: count: 1000 hasNull: false min: Darkness, max: worst sum: 3798 positions: 0,2281,32
       Entry 4: count: 1000 hasNull: false min: Darkness, max: worst sum: 3843 positions: 0,3033,45
-  Stripe: offset: 64300 data: 63754 rows: 5000 tail: 91 index: 433
-    Stream: column 0 section ROW_INDEX start: 64300 length 17
-    Stream: column 1 section ROW_INDEX start: 64317 length 162
-    Stream: column 2 section ROW_INDEX start: 64479 length 171
-    Stream: column 3 section ROW_INDEX start: 64650 length 83
-    Stream: column 1 section DATA start: 64733 length 20029
-    Stream: column 2 section DATA start: 84762 length 40035
-    Stream: column 3 section DATA start: 124797 length 3532
-    Stream: column 3 section LENGTH start: 128329 length 25
-    Stream: column 3 section DICTIONARY_DATA start: 128354 length 133
+  Stripe: offset: 64288 data: 63754 rows: 5000 tail: 79 index: 433
+    Stream: column 0 section ROW_INDEX start: 64288 length 17
+    Stream: column 1 section ROW_INDEX start: 64305 length 162
+    Stream: column 2 section ROW_INDEX start: 64467 length 171
+    Stream: column 3 section ROW_INDEX start: 64638 length 83
+    Stream: column 1 section DATA start: 64721 length 20029
+    Stream: column 2 section DATA start: 84750 length 40035
+    Stream: column 3 section DATA start: 124785 length 3532
+    Stream: column 3 section LENGTH start: 128317 length 25
+    Stream: column 3 section DICTIONARY_DATA start: 128342 length 133
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -103,16 +103,16 @@ Stripes:
       Entry 2: count: 1000 hasNull: false min: Darkness, max: worst sum: 3817 positions: 0,1472,70
       Entry 3: count: 1000 hasNull: false min: Darkness, max: worst sum: 3931 positions: 0,2250,43
       Entry 4: count: 1000 hasNull: false min: Darkness, max: worst sum: 3964 positions: 0,2978,88
-  Stripe: offset: 128578 data: 63766 rows: 5000 tail: 91 index: 437
-    Stream: column 0 section ROW_INDEX start: 128578 length 17
-    Stream: column 1 section ROW_INDEX start: 128595 length 159
-    Stream: column 2 section ROW_INDEX start: 128754 length 171
-    Stream: column 3 section ROW_INDEX start: 128925 length 90
-    Stream: column 1 section DATA start: 129015 length 20029
-    Stream: column 2 section DATA start: 149044 length 40035
-    Stream: column 3 section DATA start: 189079 length 3544
-    Stream: column 3 section LENGTH start: 192623 length 25
-    Stream: column 3 section DICTIONARY_DATA start: 192648 length 133
+  Stripe: offset: 128554 data: 63766 rows: 5000 tail: 79 index: 437
+    Stream: column 0 section ROW_INDEX start: 128554 length 17
+    Stream: column 1 section ROW_INDEX start: 128571 length 159
+    Stream: column 2 section ROW_INDEX start: 128730 length 171
+    Stream: column 3 section ROW_INDEX start: 128901 length 90
+    Stream: column 1 section DATA start: 128991 length 20029
+    Stream: column 2 section DATA start: 149020 length 40035
+    Stream: column 3 section DATA start: 189055 length 3544
+    Stream: column 3 section LENGTH start: 192599 length 25
+    Stream: column 3 section DICTIONARY_DATA start: 192624 length 133
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -135,16 +135,16 @@ Stripes:
       Entry 2: count: 1000 hasNull: false min: Darkness, max: worst sum: 3999 positions: 0,1469,69
       Entry 3: count: 1000 hasNull: false min: Darkness, max: worst sum: 3817 positions: 0,2133,194
       Entry 4: count: 1000 hasNull: false min: Darkness, max: worst sum: 4000 positions: 0,3005,43
-  Stripe: offset: 192872 data: 63796 rows: 5000 tail: 91 index: 440
-    Stream: column 0 section ROW_INDEX start: 192872 length 17
-    Stream: column 1 section ROW_INDEX start: 192889 length 162
-    Stream: column 2 section ROW_INDEX start: 193051 length 170
-    Stream: column 3 section ROW_INDEX start: 193221 length 91
-    Stream: column 1 section DATA start: 193312 length 20029
-    Stream: column 2 section DATA start: 213341 length 40035
-    Stream: column 3 section DATA start: 253376 length 3574
-    Stream: column 3 section LENGTH start: 256950 length 25
-    Stream: column 3 section DICTIONARY_DATA start: 256975 length 133
+  Stripe: offset: 192836 data: 63796 rows: 5000 tail: 79 index: 440
+    Stream: column 0 section ROW_INDEX start: 192836 length 17
+    Stream: column 1 section ROW_INDEX start: 192853 length 162
+    Stream: column 2 section ROW_INDEX start: 193015 length 170
+    Stream: column 3 section ROW_INDEX start: 193185 length 91
+    Stream: column 1 section DATA start: 193276 length 20029
+    Stream: column 2 section DATA start: 213305 length 40035
+    Stream: column 3 section DATA start: 253340 length 3574
+    Stream: column 3 section LENGTH start: 256914 length 25
+    Stream: column 3 section DICTIONARY_DATA start: 256939 length 133
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -167,16 +167,16 @@ Stripes:
       Entry 2: count: 1000 hasNull: false min: Darkness, max: worst sum: 3909 positions: 0,1485,52
       Entry 3: count: 1000 hasNull: false min: Darkness, max: worst sum: 3947 positions: 0,2196,104
       Entry 4: count: 1000 hasNull: false min: Darkness, max: worst sum: 3813 positions: 0,2934,131
-  Stripe: offset: 257199 data: 12940 rows: 1000 tail: 83 index: 131
-    Stream: column 0 section ROW_INDEX start: 257199 length 12
-    Stream: column 1 section ROW_INDEX start: 257211 length 38
-    Stream: column 2 section ROW_INDEX start: 257249 length 41
-    Stream: column 3 section ROW_INDEX start: 257290 length 40
-    Stream: column 1 section DATA start: 257330 length 4007
-    Stream: column 2 section DATA start: 261337 length 8007
-    Stream: column 3 section DATA start: 269344 length 768
-    Stream: column 3 section LENGTH start: 270112 length 25
-    Stream: column 3 section DICTIONARY_DATA start: 270137 length 133
+  Stripe: offset: 257151 data: 12940 rows: 1000 tail: 71 index: 131
+    Stream: column 0 section ROW_INDEX start: 257151 length 12
+    Stream: column 1 section ROW_INDEX start: 257163 length 38
+    Stream: column 2 section ROW_INDEX start: 257201 length 41
+    Stream: column 3 section ROW_INDEX start: 257242 length 40
+    Stream: column 1 section DATA start: 257282 length 4007
+    Stream: column 2 section DATA start: 261289 length 8007
+    Stream: column 3 section DATA start: 269296 length 768
+    Stream: column 3 section LENGTH start: 270064 length 25
+    Stream: column 3 section DICTIONARY_DATA start: 270089 length 133
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -188,6 +188,6 @@ Stripes:
     Row group indices for column 3:
       Entry 0: count: 1000 hasNull: false min: Darkness, max: worst sum: 3866 positions: 0,0,0
 
-File length: 270898 bytes
+File length: 270838 bytes
 Padding length: 0 bytes
 Padding ratio: 0%

http://git-wip-us.apache.org/repos/asf/hive/blob/42c0580e/ql/src/test/resources/orc-file-has-null.out
----------------------------------------------------------------------
diff --git a/ql/src/test/resources/orc-file-has-null.out b/ql/src/test/resources/orc-file-has-null.out
index f76190e..fdc3862 100644
--- a/ql/src/test/resources/orc-file-has-null.out
+++ b/ql/src/test/resources/orc-file-has-null.out
@@ -29,7 +29,7 @@ File Statistics:
   Column 2: count: 7000 hasNull: true min: RG1 max: STRIPE-3 sum: 46000
 
 Stripes:
-  Stripe: offset: 3 data: 195 rows: 5000 tail: 76 index: 162
+  Stripe: offset: 3 data: 195 rows: 5000 tail: 64 index: 162
     Stream: column 0 section ROW_INDEX start: 3 length 17
     Stream: column 1 section ROW_INDEX start: 20 length 63
     Stream: column 2 section ROW_INDEX start: 83 length 82
@@ -48,16 +48,16 @@ Stripes:
       Entry 2: count: 1000 hasNull: false min: RG3 max: RG3 sum: 3000 positions: 0,2,125,0,0,66,488
       Entry 3: count: 0 hasNull: true positions: 0,4,125,0,0,136,488
       Entry 4: count: 0 hasNull: true positions: 0,6,125,0,0,136,488
-  Stripe: offset: 436 data: 156 rows: 5000 tail: 72 index: 119
-    Stream: column 0 section ROW_INDEX start: 436 length 17
-    Stream: column 1 section ROW_INDEX start: 453 length 63
-    Stream: column 2 section ROW_INDEX start: 516 length 39
-    Stream: column 1 section DATA start: 555 length 113
-    Stream: column 1 section LENGTH start: 668 length 32
-    Stream: column 2 section PRESENT start: 700 length 11
-    Stream: column 2 section DATA start: 711 length 0
-    Stream: column 2 section LENGTH start: 711 length 0
-    Stream: column 2 section DICTIONARY_DATA start: 711 length 0
+  Stripe: offset: 424 data: 156 rows: 5000 tail: 60 index: 119
+    Stream: column 0 section ROW_INDEX start: 424 length 17
+    Stream: column 1 section ROW_INDEX start: 441 length 63
+    Stream: column 2 section ROW_INDEX start: 504 length 39
+    Stream: column 1 section DATA start: 543 length 113
+    Stream: column 1 section LENGTH start: 656 length 32
+    Stream: column 2 section PRESENT start: 688 length 11
+    Stream: column 2 section DATA start: 699 length 0
+    Stream: column 2 section LENGTH start: 699 length 0
+    Stream: column 2 section DICTIONARY_DATA start: 699 length 0
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DICTIONARY_V2[0]
@@ -67,15 +67,15 @@ Stripes:
       Entry 2: count: 0 hasNull: true positions: 0,2,120,0,0,0,0
       Entry 3: count: 0 hasNull: true positions: 0,4,115,0,0,0,0
       Entry 4: count: 0 hasNull: true positions: 0,6,110,0,0,0,0
-  Stripe: offset: 783 data: 186 rows: 5000 tail: 72 index: 148
-    Stream: column 0 section ROW_INDEX start: 783 length 17
-    Stream: column 1 section ROW_INDEX start: 800 length 63
-    Stream: column 2 section ROW_INDEX start: 863 length 68
-    Stream: column 1 section DATA start: 931 length 113
-    Stream: column 1 section LENGTH start: 1044 length 32
-    Stream: column 2 section DATA start: 1076 length 24
-    Stream: column 2 section LENGTH start: 1100 length 6
-    Stream: column 2 section DICTIONARY_DATA start: 1106 length 11
+  Stripe: offset: 759 data: 186 rows: 5000 tail: 60 index: 148
+    Stream: column 0 section ROW_INDEX start: 759 length 17
+    Stream: column 1 section ROW_INDEX start: 776 length 63
+    Stream: column 2 section ROW_INDEX start: 839 length 68
+    Stream: column 1 section DATA start: 907 length 113
+    Stream: column 1 section LENGTH start: 1020 length 32
+    Stream: column 2 section DATA start: 1052 length 24
+    Stream: column 2 section LENGTH start: 1076 length 6
+    Stream: column 2 section DICTIONARY_DATA start: 1082 length 11
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DICTIONARY_V2[1]
@@ -85,16 +85,16 @@ Stripes:
       Entry 2: count: 1000 hasNull: false min: STRIPE-3 max: STRIPE-3 sum: 8000 positions: 0,198,464
       Entry 3: count: 1000 hasNull: false min: STRIPE-3 max: STRIPE-3 sum: 8000 positions: 0,330,440
       Entry 4: count: 1000 hasNull: false min: STRIPE-3 max: STRIPE-3 sum: 8000 positions: 0,462,416
-  Stripe: offset: 1189 data: 156 rows: 5000 tail: 72 index: 119
-    Stream: column 0 section ROW_INDEX start: 1189 length 17
-    Stream: column 1 section ROW_INDEX start: 1206 length 63
-    Stream: column 2 section ROW_INDEX start: 1269 length 39
-    Stream: column 1 section DATA start: 1308 length 113
-    Stream: column 1 section LENGTH start: 1421 length 32
-    Stream: column 2 section PRESENT start: 1453 length 11
-    Stream: column 2 section DATA start: 1464 length 0
-    Stream: column 2 section LENGTH start: 1464 length 0
-    Stream: column 2 section DICTIONARY_DATA start: 1464 length 0
+  Stripe: offset: 1153 data: 156 rows: 5000 tail: 60 index: 119
+    Stream: column 0 section ROW_INDEX start: 1153 length 17
+    Stream: column 1 section ROW_INDEX start: 1170 length 63
+    Stream: column 2 section ROW_INDEX start: 1233 length 39
+    Stream: column 1 section DATA start: 1272 length 113
+    Stream: column 1 section LENGTH start: 1385 length 32
+    Stream: column 2 section PRESENT start: 1417 length 11
+    Stream: column 2 section DATA start: 1428 length 0
+    Stream: column 2 section LENGTH start: 1428 length 0
+    Stream: column 2 section DICTIONARY_DATA start: 1428 length 0
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DICTIONARY_V2[0]
@@ -105,6 +105,6 @@ Stripes:
       Entry 3: count: 0 hasNull: true positions: 0,4,115,0,0,0,0
       Entry 4: count: 0 hasNull: true positions: 0,6,110,0,0,0,0
 
-File length: 1784 bytes
+File length: 1736 bytes
 Padding length: 0 bytes
 Padding ratio: 0%

http://git-wip-us.apache.org/repos/asf/hive/blob/42c0580e/ql/src/test/results/clientpositive/alter_merge_orc.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_merge_orc.q.out b/ql/src/test/results/clientpositive/alter_merge_orc.q.out
index 32c7763..b5a6d04 100644
--- a/ql/src/test/results/clientpositive/alter_merge_orc.q.out
+++ b/ql/src/test/results/clientpositive/alter_merge_orc.q.out
@@ -48,9 +48,9 @@ columns:struct columns { i32 key, string value}
 partitioned:false
 partitionColumns:
 totalNumberFiles:3
-totalFileSize:7581
-maxFileSize:2527
-minFileSize:2527
+totalFileSize:7545
+maxFileSize:2515
+minFileSize:2515
 #### A masked pattern was here ####
 
 PREHOOK: query: select count(1) from src_orc_merge_test
@@ -91,9 +91,9 @@ columns:struct columns { i32 key, string value}
 partitioned:false
 partitionColumns:
 totalNumberFiles:1
-totalFileSize:7234
-maxFileSize:7234
-minFileSize:7234
+totalFileSize:7198
+maxFileSize:7198
+minFileSize:7198
 #### A masked pattern was here ####
 
 PREHOOK: query: select count(1) from src_orc_merge_test
@@ -171,9 +171,9 @@ columns:struct columns { i32 key, string value}
 partitioned:true
 partitionColumns:struct partition_columns { string ds}
 totalNumberFiles:3
-totalFileSize:7581
-maxFileSize:2527
-minFileSize:2527
+totalFileSize:7545
+maxFileSize:2515
+minFileSize:2515
 #### A masked pattern was here ####
 
 PREHOOK: query: select count(1) from src_orc_merge_test_part
@@ -218,9 +218,9 @@ columns:struct columns { i32 key, string value}
 partitioned:true
 partitionColumns:struct partition_columns { string ds}
 totalNumberFiles:1
-totalFileSize:7234
-maxFileSize:7234
-minFileSize:7234
+totalFileSize:7198
+maxFileSize:7198
+minFileSize:7198
 #### A masked pattern was here ####
 
 PREHOOK: query: select count(1) from src_orc_merge_test_part

http://git-wip-us.apache.org/repos/asf/hive/blob/42c0580e/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out b/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out
index c97e649..43cc4ef 100644
--- a/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out
+++ b/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out
@@ -48,9 +48,9 @@ columns:struct columns { i32 key, string value}
 partitioned:false
 partitionColumns:
 totalNumberFiles:3
-totalFileSize:7581
-maxFileSize:2527
-minFileSize:2527
+totalFileSize:7545
+maxFileSize:2515
+minFileSize:2515
 #### A masked pattern was here ####
 
 PREHOOK: query: desc extended src_orc_merge_test_stat
@@ -94,7 +94,7 @@ Table Parameters:
 	numFiles            	3                   
 	numRows             	1500                
 	rawDataSize         	141000              
-	totalSize           	7581                
+	totalSize           	7545                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -146,7 +146,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1500                
 	rawDataSize         	141000              
-	totalSize           	7234                
+	totalSize           	7198                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -216,9 +216,9 @@ columns:struct columns { i32 key, string value}
 partitioned:true
 partitionColumns:struct partition_columns { string ds}
 totalNumberFiles:3
-totalFileSize:7581
-maxFileSize:2527
-minFileSize:2527
+totalFileSize:7545
+maxFileSize:2515
+minFileSize:2515
 #### A masked pattern was here ####
 
 PREHOOK: query: desc formatted src_orc_merge_test_part_stat partition (ds='2011')
@@ -249,7 +249,7 @@ Partition Parameters:
 	numFiles            	3                   
 	numRows             	1500                
 	rawDataSize         	141000              
-	totalSize           	7581                
+	totalSize           	7545                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -300,7 +300,7 @@ Partition Parameters:
 	numFiles            	3                   
 	numRows             	1500                
 	rawDataSize         	141000              
-	totalSize           	7581                
+	totalSize           	7545                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -359,7 +359,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1500                
 	rawDataSize         	141000              
-	totalSize           	7234                
+	totalSize           	7198                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 

http://git-wip-us.apache.org/repos/asf/hive/blob/42c0580e/ql/src/test/results/clientpositive/annotate_stats_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_part.q.out b/ql/src/test/results/clientpositive/annotate_stats_part.q.out
index fc65ef7..2bec917 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_part.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_part.q.out
@@ -98,7 +98,7 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: loc_orc
-          Statistics: Num rows: 6 Data size: 795 Basic stats: COMPLETE Column stats: PARTIAL
+          Statistics: Num rows: 6 Data size: 767 Basic stats: COMPLETE Column stats: PARTIAL
           Select Operator
             expressions: state (type: string), locid (type: int), zip (type: bigint), year (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
@@ -133,11 +133,11 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: loc_orc
-          Statistics: Num rows: 3 Data size: 355 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 3 Data size: 342 Basic stats: COMPLETE Column stats: NONE
           Select Operator
             expressions: state (type: string), locid (type: int), zip (type: bigint), '__HIVE_DEFAULT_PARTITION__' (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
-            Statistics: Num rows: 3 Data size: 355 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 3 Data size: 342 Basic stats: COMPLETE Column stats: NONE
             ListSink
 
 PREHOOK: query: -- basicStatState: PARTIAL colStatState: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/42c0580e/ql/src/test/results/clientpositive/annotate_stats_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_table.q.out b/ql/src/test/results/clientpositive/annotate_stats_table.q.out
index 9221ba8..87e2fa6 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_table.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_table.q.out
@@ -89,11 +89,11 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: emp_orc
-          Statistics: Num rows: 3 Data size: 396 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 3 Data size: 384 Basic stats: COMPLETE Column stats: NONE
           Select Operator
             expressions: lastname (type: string), deptid (type: int)
             outputColumnNames: _col0, _col1
-            Statistics: Num rows: 3 Data size: 396 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 3 Data size: 384 Basic stats: COMPLETE Column stats: NONE
             ListSink
 
 PREHOOK: query: -- table level analyze statistics

http://git-wip-us.apache.org/repos/asf/hive/blob/42c0580e/ql/src/test/results/clientpositive/dynpart_sort_opt_vectorization.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/dynpart_sort_opt_vectorization.q.out b/ql/src/test/results/clientpositive/dynpart_sort_opt_vectorization.q.out
index d000a4c..4c8ddd3 100644
--- a/ql/src/test/results/clientpositive/dynpart_sort_opt_vectorization.q.out
+++ b/ql/src/test/results/clientpositive/dynpart_sort_opt_vectorization.q.out
@@ -896,7 +896,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	32                  
 	rawDataSize         	640                 
-	totalSize           	1424                
+	totalSize           	1400                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -940,7 +940,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	6                   
 	rawDataSize         	120                 
-	totalSize           	1128                
+	totalSize           	1102                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -984,7 +984,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	14                  
 	rawDataSize         	280                 
-	totalSize           	1240                
+	totalSize           	1216                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1028,7 +1028,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	6                   
 	rawDataSize         	120                 
-	totalSize           	1128                
+	totalSize           	1102                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1071,7 +1071,7 @@ Partition Parameters:
 	numFiles            	8                   
 	numRows             	32                  
 	rawDataSize         	640                 
-	totalSize           	4644                
+	totalSize           	4548                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1114,7 +1114,7 @@ Partition Parameters:
 	numFiles            	8                   
 	numRows             	6                   
 	rawDataSize         	120                 
-	totalSize           	2262                
+	totalSize           	2212                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1157,7 +1157,7 @@ Partition Parameters:
 	numFiles            	8                   
 	numRows             	32                  
 	rawDataSize         	640                 
-	totalSize           	4630                
+	totalSize           	4534                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1200,7 +1200,7 @@ Partition Parameters:
 	numFiles            	8                   
 	numRows             	6                   
 	rawDataSize         	120                 
-	totalSize           	2262                
+	totalSize           	2212                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 

http://git-wip-us.apache.org/repos/asf/hive/blob/42c0580e/ql/src/test/results/clientpositive/dynpart_sort_optimization2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/dynpart_sort_optimization2.q.out b/ql/src/test/results/clientpositive/dynpart_sort_optimization2.q.out
index 1ec7556..4dda248 100644
--- a/ql/src/test/results/clientpositive/dynpart_sort_optimization2.q.out
+++ b/ql/src/test/results/clientpositive/dynpart_sort_optimization2.q.out
@@ -1175,7 +1175,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	11                  
 	rawDataSize         	88                  
-	totalSize           	445                 
+	totalSize           	433                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1237,7 +1237,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	13                  
 	rawDataSize         	104                 
-	totalSize           	468                 
+	totalSize           	456                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1396,7 +1396,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	11                  
 	rawDataSize         	88                  
-	totalSize           	445                 
+	totalSize           	433                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1458,7 +1458,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	13                  
 	rawDataSize         	104                 
-	totalSize           	468                 
+	totalSize           	456                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 

http://git-wip-us.apache.org/repos/asf/hive/blob/42c0580e/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_dynamic.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_dynamic.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_dynamic.q.out
index 939e206..6b280b1 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_dynamic.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_dynamic.q.out
@@ -554,16 +554,16 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: encryptedtable
-            Statistics: Num rows: 24 Data size: 2447 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 21 Data size: 2372 Basic stats: COMPLETE Column stats: NONE
             GatherStats: false
             Select Operator
               expressions: value (type: string), key (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 24 Data size: 2447 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 21 Data size: 2372 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 sort order: 
                 Map-reduce partition columns: _col0 (type: string)
-                Statistics: Num rows: 24 Data size: 2447 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 21 Data size: 2372 Basic stats: COMPLETE Column stats: NONE
                 tag: -1
                 value expressions: _col0 (type: string), _col1 (type: string)
                 auto parallelism: false
@@ -594,7 +594,7 @@ STAGE PLANS:
               serialization.ddl struct encryptedtable { string value}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 618
+              totalSize 600
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -642,7 +642,7 @@ STAGE PLANS:
               serialization.ddl struct encryptedtable { string value}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 611
+              totalSize 592
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -690,7 +690,7 @@ STAGE PLANS:
               serialization.ddl struct encryptedtable { string value}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 611
+              totalSize 592
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -738,7 +738,7 @@ STAGE PLANS:
               serialization.ddl struct encryptedtable { string value}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 607
+              totalSize 588
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -772,13 +772,13 @@ STAGE PLANS:
         Select Operator
           expressions: VALUE._col0 (type: string), VALUE._col1 (type: string)
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 24 Data size: 2447 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 21 Data size: 2372 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
             GlobalTableId: 1
 #### A PARTIAL masked pattern was here #### data/warehouse/unencryptedtable/.hive-staging
             NumFilesPerFileSink: 1
-            Statistics: Num rows: 24 Data size: 2447 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 21 Data size: 2372 Basic stats: COMPLETE Column stats: NONE
 #### A PARTIAL masked pattern was here #### data/warehouse/unencryptedtable/.hive-staging
             table:
                 input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat