Repository: hive
Updated Branches:
  refs/heads/master 7a3028502 -> d7f71fb4a


http://git-wip-us.apache.org/repos/asf/hive/blob/d7f71fb4/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_analyze.q.out 
b/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
index 91f363b..fdfb74a 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               3202                
+       totalSize               3197                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -150,7 +150,7 @@ Table Parameters:
        numFiles                1                   
        numRows                 100                 
        rawDataSize             52600               
-       totalSize               3202                
+       totalSize               3197                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -198,7 +198,7 @@ Table Parameters:
        numFiles                1                   
        numRows                 100                 
        rawDataSize             52600               
-       totalSize               3202                
+       totalSize               3197                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -285,7 +285,7 @@ Table Parameters:
        numFiles                1                   
        numRows                 100                 
        rawDataSize             52600               
-       totalSize               3202                
+       totalSize               3197                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -395,7 +395,7 @@ Partition Parameters:
        numFiles                1                   
        numRows                 50                  
        rawDataSize             21950               
-       totalSize               2102                
+       totalSize               2099                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -438,7 +438,7 @@ Partition Parameters:
        numFiles                1                   
        numRows                 50                  
        rawDataSize             22050               
-       totalSize               2118                
+       totalSize               2113                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -493,7 +493,7 @@ Partition Parameters:
        numFiles                1                   
        numRows                 50                  
        rawDataSize             21950               
-       totalSize               2102                
+       totalSize               2099                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -536,7 +536,7 @@ Partition Parameters:
        numFiles                1                   
        numRows                 50                  
        rawDataSize             22050               
-       totalSize               2118                
+       totalSize               2113                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -591,7 +591,7 @@ Partition Parameters:
        numFiles                1                   
        numRows                 50                  
        rawDataSize             21950               
-       totalSize               2102                
+       totalSize               2099                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -634,7 +634,7 @@ Partition Parameters:
        numFiles                1                   
        numRows                 50                  
        rawDataSize             22050               
-       totalSize               2118                
+       totalSize               2113                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -732,7 +732,7 @@ Partition Parameters:
        numFiles                1                   
        numRows                 50                  
        rawDataSize             21950               
-       totalSize               2102                
+       totalSize               2099                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -775,7 +775,7 @@ Partition Parameters:
        numFiles                1                   
        numRows                 50                  
        rawDataSize             22050               
-       totalSize               2118                
+       totalSize               2113                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -891,7 +891,7 @@ Partition Parameters:
        numFiles                4                   
        numRows                 50                  
        rawDataSize             21975               
-       totalSize               5263                
+       totalSize               5259                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -934,7 +934,7 @@ Partition Parameters:
        numFiles                4                   
        numRows                 50                  
        rawDataSize             22043               
-       totalSize               5336                
+       totalSize               5326                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -989,7 +989,7 @@ Partition Parameters:
        numFiles                4                   
        numRows                 50                  
        rawDataSize             21975               
-       totalSize               5263                
+       totalSize               5259                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -1032,7 +1032,7 @@ Partition Parameters:
        numFiles                4                   
        numRows                 50                  
        rawDataSize             22043               
-       totalSize               5336                
+       totalSize               5326                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -1087,7 +1087,7 @@ Partition Parameters:
        numFiles                4                   
        numRows                 50                  
        rawDataSize             21975               
-       totalSize               5263                
+       totalSize               5259                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -1130,7 +1130,7 @@ Partition Parameters:
        numFiles                4                   
        numRows                 50                  
        rawDataSize             22043               
-       totalSize               5336                
+       totalSize               5326                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -1234,7 +1234,7 @@ Partition Parameters:
        numFiles                4                   
        numRows                 50                  
        rawDataSize             21975               
-       totalSize               5263                
+       totalSize               5259                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -1277,7 +1277,7 @@ Partition Parameters:
        numFiles                4                   
        numRows                 50                  
        rawDataSize             22043               
-       totalSize               5336                
+       totalSize               5326                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -1387,7 +1387,7 @@ Partition Parameters:
        numFiles                1                   
        numRows                 50                  
        rawDataSize             21950               
-       totalSize               2102                
+       totalSize               2099                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -1442,7 +1442,7 @@ Partition Parameters:
        numFiles                1                   
        numRows                 50                  
        rawDataSize             21950               
-       totalSize               2102                
+       totalSize               2099                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -1497,7 +1497,7 @@ Partition Parameters:
        numFiles                1                   
        numRows                 50                  
        rawDataSize             21950               
-       totalSize               2102                
+       totalSize               2099                
 #### A masked pattern was here ####
                 
 # Storage Information           

http://git-wip-us.apache.org/repos/asf/hive/blob/d7f71fb4/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out 
b/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out
index bc3915a..318858b 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
@@ -233,7 +233,7 @@ Table Parameters:
        orc.bloom.filter.columns        *                   
        orc.row.index.stride    1000                
        rawDataSize             1139514             
-       totalSize               57100               
+       totalSize               55376               
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -251,7 +251,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 16677
+   HDFS_BYTES_READ: 16673
    HDFS_BYTES_WRITTEN: 104
    HDFS_READ_OPS: 5
    HDFS_LARGE_READ_OPS: 0
@@ -288,7 +288,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 1467
+   HDFS_BYTES_READ: 1344
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -697,7 +697,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 6132
+   HDFS_BYTES_READ: 5980
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0

http://git-wip-us.apache.org/repos/asf/hive/blob/d7f71fb4/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out 
b/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out
index 5c54622..2fb204e 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
@@ -233,7 +233,7 @@ Table Parameters:
        orc.bloom.filter.columns        *                   
        orc.row.index.stride    1000                
        rawDataSize             1139514             
-       totalSize               57100               
+       totalSize               55376               
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -251,7 +251,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 17875
+   HDFS_BYTES_READ: 17728
    HDFS_BYTES_WRITTEN: 104
    HDFS_READ_OPS: 6
    HDFS_LARGE_READ_OPS: 0

http://git-wip-us.apache.org/repos/asf/hive/blob/d7f71fb4/ql/src/test/results/clientpositive/llap/orc_merge10.q.out
----------------------------------------------------------------------
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 bac45ee..0197592 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge10.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge10.q.out
@@ -542,7 +542,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 HIVE_13083
+File Version: 0.12 with ORC_101
 Rows: 242
 Compression: SNAPPY
 Compression size: 4096
@@ -568,13 +568,13 @@ File Statistics:
   Column 2: count: 242 hasNull: false min: val_0 max: val_97 sum: 1646
 
 Stripes:
-  Stripe: offset: 3 data: 616 rows: 90 tail: 61 index: 76
+  Stripe: offset: 3 data: 613 rows: 90 tail: 61 index: 76
     Stream: column 0 section ROW_INDEX start: 3 length 11
     Stream: column 1 section ROW_INDEX start: 14 length 27
     Stream: column 2 section ROW_INDEX start: 41 length 38
     Stream: column 1 section DATA start: 79 length 185
     Stream: column 2 section DATA start: 264 length 377
-    Stream: column 2 section LENGTH start: 641 length 54
+    Stream: column 2 section LENGTH start: 641 length 51
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -584,13 +584,13 @@ Stripes:
       Entry 0: count: 90 hasNull: false min: 0 max: 495 sum: 22736 positions: 
0,0,0
     Row group indices for column 2:
       Entry 0: count: 90 hasNull: false min: val_0 max: val_86 sum: 612 
positions: 0,0,0,0,0
-  Stripe: offset: 756 data: 544 rows: 78 tail: 61 index: 76
-    Stream: column 0 section ROW_INDEX start: 756 length 11
-    Stream: column 1 section ROW_INDEX start: 767 length 27
-    Stream: column 2 section ROW_INDEX start: 794 length 38
-    Stream: column 1 section DATA start: 832 length 161
-    Stream: column 2 section DATA start: 993 length 332
-    Stream: column 2 section LENGTH start: 1325 length 51
+  Stripe: offset: 753 data: 541 rows: 78 tail: 61 index: 76
+    Stream: column 0 section ROW_INDEX start: 753 length 11
+    Stream: column 1 section ROW_INDEX start: 764 length 27
+    Stream: column 2 section ROW_INDEX start: 791 length 38
+    Stream: column 1 section DATA start: 829 length 161
+    Stream: column 2 section DATA start: 990 length 332
+    Stream: column 2 section LENGTH start: 1322 length 48
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -600,13 +600,13 @@ Stripes:
       Entry 0: count: 78 hasNull: false min: 0 max: 497 sum: 18371 positions: 
0,0,0
     Row group indices for column 2:
       Entry 0: count: 78 hasNull: false min: val_0 max: val_95 sum: 529 
positions: 0,0,0,0,0
-  Stripe: offset: 1437 data: 519 rows: 74 tail: 61 index: 78
-    Stream: column 0 section ROW_INDEX start: 1437 length 11
-    Stream: column 1 section ROW_INDEX start: 1448 length 27
-    Stream: column 2 section ROW_INDEX start: 1475 length 40
-    Stream: column 1 section DATA start: 1515 length 153
-    Stream: column 2 section DATA start: 1668 length 331
-    Stream: column 2 section LENGTH start: 1999 length 35
+  Stripe: offset: 1431 data: 516 rows: 74 tail: 61 index: 78
+    Stream: column 0 section ROW_INDEX start: 1431 length 11
+    Stream: column 1 section ROW_INDEX start: 1442 length 27
+    Stream: column 2 section ROW_INDEX start: 1469 length 40
+    Stream: column 1 section DATA start: 1509 length 153
+    Stream: column 2 section DATA start: 1662 length 331
+    Stream: column 2 section LENGTH start: 1993 length 32
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -617,7 +617,7 @@ Stripes:
     Row group indices for column 2:
       Entry 0: count: 74 hasNull: false min: val_105 max: val_97 sum: 505 
positions: 0,0,0,0,0
 
-File length: 2393 bytes
+File length: 2384 bytes
 Padding length: 0 bytes
 Padding ratio: 0%
 
________________________________________________________________________________________________________________________
@@ -631,7 +631,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 HIVE_13083
+File Version: 0.12 with ORC_101
 Rows: 242
 Compression: SNAPPY
 Compression size: 4096
@@ -657,13 +657,13 @@ File Statistics:
   Column 2: count: 242 hasNull: false min: val_0 max: val_97 sum: 1646
 
 Stripes:
-  Stripe: offset: 3 data: 616 rows: 90 tail: 61 index: 76
+  Stripe: offset: 3 data: 613 rows: 90 tail: 61 index: 76
     Stream: column 0 section ROW_INDEX start: 3 length 11
     Stream: column 1 section ROW_INDEX start: 14 length 27
     Stream: column 2 section ROW_INDEX start: 41 length 38
     Stream: column 1 section DATA start: 79 length 185
     Stream: column 2 section DATA start: 264 length 377
-    Stream: column 2 section LENGTH start: 641 length 54
+    Stream: column 2 section LENGTH start: 641 length 51
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -673,13 +673,13 @@ Stripes:
       Entry 0: count: 90 hasNull: false min: 0 max: 495 sum: 22736 positions: 
0,0,0
     Row group indices for column 2:
       Entry 0: count: 90 hasNull: false min: val_0 max: val_86 sum: 612 
positions: 0,0,0,0,0
-  Stripe: offset: 756 data: 544 rows: 78 tail: 61 index: 76
-    Stream: column 0 section ROW_INDEX start: 756 length 11
-    Stream: column 1 section ROW_INDEX start: 767 length 27
-    Stream: column 2 section ROW_INDEX start: 794 length 38
-    Stream: column 1 section DATA start: 832 length 161
-    Stream: column 2 section DATA start: 993 length 332
-    Stream: column 2 section LENGTH start: 1325 length 51
+  Stripe: offset: 753 data: 541 rows: 78 tail: 61 index: 76
+    Stream: column 0 section ROW_INDEX start: 753 length 11
+    Stream: column 1 section ROW_INDEX start: 764 length 27
+    Stream: column 2 section ROW_INDEX start: 791 length 38
+    Stream: column 1 section DATA start: 829 length 161
+    Stream: column 2 section DATA start: 990 length 332
+    Stream: column 2 section LENGTH start: 1322 length 48
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -689,13 +689,13 @@ Stripes:
       Entry 0: count: 78 hasNull: false min: 0 max: 497 sum: 18371 positions: 
0,0,0
     Row group indices for column 2:
       Entry 0: count: 78 hasNull: false min: val_0 max: val_95 sum: 529 
positions: 0,0,0,0,0
-  Stripe: offset: 1437 data: 519 rows: 74 tail: 61 index: 78
-    Stream: column 0 section ROW_INDEX start: 1437 length 11
-    Stream: column 1 section ROW_INDEX start: 1448 length 27
-    Stream: column 2 section ROW_INDEX start: 1475 length 40
-    Stream: column 1 section DATA start: 1515 length 153
-    Stream: column 2 section DATA start: 1668 length 331
-    Stream: column 2 section LENGTH start: 1999 length 35
+  Stripe: offset: 1431 data: 516 rows: 74 tail: 61 index: 78
+    Stream: column 0 section ROW_INDEX start: 1431 length 11
+    Stream: column 1 section ROW_INDEX start: 1442 length 27
+    Stream: column 2 section ROW_INDEX start: 1469 length 40
+    Stream: column 1 section DATA start: 1509 length 153
+    Stream: column 2 section DATA start: 1662 length 331
+    Stream: column 2 section LENGTH start: 1993 length 32
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -706,7 +706,7 @@ Stripes:
     Row group indices for column 2:
       Entry 0: count: 74 hasNull: false min: val_105 max: val_97 sum: 505 
positions: 0,0,0,0,0
 
-File length: 2393 bytes
+File length: 2384 bytes
 Padding length: 0 bytes
 Padding ratio: 0%
 
________________________________________________________________________________________________________________________

http://git-wip-us.apache.org/repos/asf/hive/blob/d7f71fb4/ql/src/test/results/clientpositive/llap/orc_merge11.q.out
----------------------------------------------------------------------
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 a8ab854..9c50f6d 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
 #### A masked pattern was here ####
 -- BEGIN ORC FILE DUMP --
 #### A masked pattern was here ####
-File Version: 0.12 with HIVE_13083
+File Version: 0.12 with ORC_101
 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 HIVE_13083
+File Version: 0.12 with ORC_101
 Rows: 50000
 Compression: ZLIB
 Compression size: 4096
@@ -275,7 +275,7 @@ PREHOOK: Input: default@orcfile_merge1
 #### A masked pattern was here ####
 -- BEGIN ORC FILE DUMP --
 #### A masked pattern was here ####
-File Version: 0.12 with HIVE_13083
+File Version: 0.12 with ORC_101
 Rows: 100000
 Compression: ZLIB
 Compression size: 4096

http://git-wip-us.apache.org/repos/asf/hive/blob/d7f71fb4/ql/src/test/results/clientpositive/llap/orc_merge12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge12.q.out 
b/ql/src/test/results/clientpositive/llap/orc_merge12.q.out
index 6a86fcf..2c49e0f 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge12.q.out
+++ b/ql/src/test/results/clientpositive/llap/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 HIVE_13083
+File Version: 0.12 with ORC_101
 Rows: 24576
 Compression: ZLIB
 Compression size: 262144

http://git-wip-us.apache.org/repos/asf/hive/blob/d7f71fb4/ql/src/test/results/clientpositive/llap/orc_ppd_basic.q.out
----------------------------------------------------------------------
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 e28ed5d..5748659 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
@@ -203,7 +203,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 16677
+   HDFS_BYTES_READ: 16673
    HDFS_BYTES_WRITTEN: 104
    HDFS_READ_OPS: 5
    HDFS_LARGE_READ_OPS: 0
@@ -240,7 +240,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 1467
+   HDFS_BYTES_READ: 1344
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -649,7 +649,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 6132
+   HDFS_BYTES_READ: 5980
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -1171,7 +1171,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 5181
+   HDFS_BYTES_READ: 5201
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0

http://git-wip-us.apache.org/repos/asf/hive/blob/d7f71fb4/ql/src/test/results/clientpositive/llap/orc_ppd_schema_evol_3a.q.out
----------------------------------------------------------------------
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 4cc8984..c90dcb5 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
@@ -203,7 +203,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 17012
+   HDFS_BYTES_READ: 17008
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 6
    HDFS_LARGE_READ_OPS: 0
@@ -347,7 +347,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 16902
+   HDFS_BYTES_READ: 16898
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -380,7 +380,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 16902
+   HDFS_BYTES_READ: 16898
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -399,7 +399,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 17875
+   HDFS_BYTES_READ: 17728
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -418,7 +418,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 16902
+   HDFS_BYTES_READ: 16898
    HDFS_BYTES_WRITTEN: 102
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -437,7 +437,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 17875
+   HDFS_BYTES_READ: 17728
    HDFS_BYTES_WRITTEN: 102
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -460,7 +460,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 16902
+   HDFS_BYTES_READ: 16898
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -493,7 +493,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 16902
+   HDFS_BYTES_READ: 16898
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -512,7 +512,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 17875
+   HDFS_BYTES_READ: 17728
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -531,7 +531,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 16902
+   HDFS_BYTES_READ: 16898
    HDFS_BYTES_WRITTEN: 102
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -550,7 +550,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 17875
+   HDFS_BYTES_READ: 17728
    HDFS_BYTES_WRITTEN: 102
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -573,7 +573,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 16902
+   HDFS_BYTES_READ: 16898
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -606,7 +606,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 16902
+   HDFS_BYTES_READ: 16898
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -625,7 +625,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 17875
+   HDFS_BYTES_READ: 17728
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -644,7 +644,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 16902
+   HDFS_BYTES_READ: 16898
    HDFS_BYTES_WRITTEN: 102
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -663,7 +663,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 17875
+   HDFS_BYTES_READ: 17728
    HDFS_BYTES_WRITTEN: 102
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -686,7 +686,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 16902
+   HDFS_BYTES_READ: 16898
    HDFS_BYTES_WRITTEN: 104
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -705,7 +705,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 17875
+   HDFS_BYTES_READ: 17728
    HDFS_BYTES_WRITTEN: 104
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -724,7 +724,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 16902
+   HDFS_BYTES_READ: 16898
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -743,7 +743,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 17875
+   HDFS_BYTES_READ: 17728
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -762,7 +762,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 16902
+   HDFS_BYTES_READ: 16898
    HDFS_BYTES_WRITTEN: 102
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -781,7 +781,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 17875
+   HDFS_BYTES_READ: 17728
    HDFS_BYTES_WRITTEN: 102
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -800,7 +800,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 5181
+   HDFS_BYTES_READ: 5201
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -857,7 +857,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 21462
+   HDFS_BYTES_READ: 21458
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -876,7 +876,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 23522
+   HDFS_BYTES_READ: 23336
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -899,7 +899,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 21462
+   HDFS_BYTES_READ: 21458
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -918,7 +918,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 23522
+   HDFS_BYTES_READ: 23336
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -937,7 +937,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 4368
+   HDFS_BYTES_READ: 4388
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -994,7 +994,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 20633
+   HDFS_BYTES_READ: 20629
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -1013,7 +1013,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 22540
+   HDFS_BYTES_READ: 22364
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -1036,7 +1036,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 20633
+   HDFS_BYTES_READ: 20629
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -1055,7 +1055,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 22540
+   HDFS_BYTES_READ: 22364
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -1078,7 +1078,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 20633
+   HDFS_BYTES_READ: 20629
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -1097,7 +1097,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 22540
+   HDFS_BYTES_READ: 22364
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -1174,7 +1174,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 18751
+   HDFS_BYTES_READ: 18747
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -1193,7 +1193,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 18751
+   HDFS_BYTES_READ: 18747
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -1212,7 +1212,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 20222
+   HDFS_BYTES_READ: 20073
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0
@@ -1231,7 +1231,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 Stage-1 FILE SYSTEM COUNTERS:
-   HDFS_BYTES_READ: 20222
+   HDFS_BYTES_READ: 20073
    HDFS_BYTES_WRITTEN: 101
    HDFS_READ_OPS: 4
    HDFS_LARGE_READ_OPS: 0

http://git-wip-us.apache.org/repos/asf/hive/blob/d7f71fb4/ql/src/test/results/clientpositive/materialized_view_drop.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/materialized_view_drop.q.out 
b/ql/src/test/results/clientpositive/materialized_view_drop.q.out
index 3cf13d0..ceb34f7 100644
--- a/ql/src/test/results/clientpositive/materialized_view_drop.q.out
+++ b/ql/src/test/results/clientpositive/materialized_view_drop.q.out
@@ -20,9 +20,9 @@ columns:struct columns { i32 cint, string cstring1}
 partitioned:false
 partitionColumns:
 totalNumberFiles:1
-totalFileSize:47140
-maxFileSize:47140
-minFileSize:47140
+totalFileSize:47120
+maxFileSize:47120
+minFileSize:47120
 #### A masked pattern was here ####
 
 PREHOOK: query: drop materialized view dmv_mat_view

http://git-wip-us.apache.org/repos/asf/hive/blob/d7f71fb4/ql/src/test/results/clientpositive/orc_file_dump.q.out
----------------------------------------------------------------------
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 4cc8e3b..67c75d0 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
 #### A masked pattern was here ####
 -- BEGIN ORC FILE DUMP --
 #### A masked pattern was here ####
-File Version: 0.12 with HIVE_13083
+File Version: 0.12 with ORC_101
 Rows: 1049
 Compression: ZLIB
 Compression size: 262144
@@ -129,49 +129,49 @@ File Statistics:
   Column 11: count: 1049 hasNull: false sum: 13278
 
 Stripes:
-  Stripe: offset: 3 data: 22593 rows: 1049 tail: 250 index: 9943
+  Stripe: offset: 3 data: 22593 rows: 1049 tail: 250 index: 8963
     Stream: column 0 section ROW_INDEX start: 3 length 20
-    Stream: column 0 section BLOOM_FILTER start: 23 length 45
-    Stream: column 1 section ROW_INDEX start: 68 length 58
-    Stream: column 1 section BLOOM_FILTER start: 126 length 799
-    Stream: column 2 section ROW_INDEX start: 925 length 58
-    Stream: column 2 section BLOOM_FILTER start: 983 length 978
-    Stream: column 3 section ROW_INDEX start: 1961 length 61
-    Stream: column 3 section BLOOM_FILTER start: 2022 length 983
-    Stream: column 4 section ROW_INDEX start: 3005 length 69
-    Stream: column 4 section BLOOM_FILTER start: 3074 length 963
-    Stream: column 5 section ROW_INDEX start: 4037 length 78
-    Stream: column 5 section BLOOM_FILTER start: 4115 length 1291
-    Stream: column 6 section ROW_INDEX start: 5406 length 85
-    Stream: column 6 section BLOOM_FILTER start: 5491 length 1280
-    Stream: column 7 section ROW_INDEX start: 6771 length 41
-    Stream: column 7 section BLOOM_FILTER start: 6812 length 45
-    Stream: column 8 section ROW_INDEX start: 6857 length 86
-    Stream: column 8 section BLOOM_FILTER start: 6943 length 1157
-    Stream: column 9 section ROW_INDEX start: 8100 length 50
-    Stream: column 9 section BLOOM_FILTER start: 8150 length 62
-    Stream: column 10 section ROW_INDEX start: 8212 length 82
-    Stream: column 10 section BLOOM_FILTER start: 8294 length 1297
-    Stream: column 11 section ROW_INDEX start: 9591 length 47
-    Stream: column 11 section BLOOM_FILTER start: 9638 length 308
-    Stream: column 1 section PRESENT start: 9946 length 17
-    Stream: column 1 section DATA start: 9963 length 962
-    Stream: column 2 section PRESENT start: 10925 length 17
-    Stream: column 2 section DATA start: 10942 length 1441
-    Stream: column 3 section DATA start: 12383 length 1704
-    Stream: column 4 section DATA start: 14087 length 1998
-    Stream: column 5 section DATA start: 16085 length 2925
-    Stream: column 6 section DATA start: 19010 length 3323
-    Stream: column 7 section DATA start: 22333 length 137
-    Stream: column 8 section DATA start: 22470 length 1572
-    Stream: column 8 section LENGTH start: 24042 length 310
-    Stream: column 8 section DICTIONARY_DATA start: 24352 length 1548
-    Stream: column 9 section DATA start: 25900 length 19
-    Stream: column 9 section SECONDARY start: 25919 length 1783
-    Stream: column 10 section DATA start: 27702 length 2138
-    Stream: column 10 section SECONDARY start: 29840 length 231
-    Stream: column 11 section DATA start: 30071 length 1877
-    Stream: column 11 section LENGTH start: 31948 length 591
+    Stream: column 0 section BLOOM_FILTER_UTF8 start: 23 length 34
+    Stream: column 1 section ROW_INDEX start: 57 length 58
+    Stream: column 1 section BLOOM_FILTER_UTF8 start: 115 length 696
+    Stream: column 2 section ROW_INDEX start: 811 length 58
+    Stream: column 2 section BLOOM_FILTER_UTF8 start: 869 length 867
+    Stream: column 3 section ROW_INDEX start: 1736 length 61
+    Stream: column 3 section BLOOM_FILTER_UTF8 start: 1797 length 861
+    Stream: column 4 section ROW_INDEX start: 2658 length 69
+    Stream: column 4 section BLOOM_FILTER_UTF8 start: 2727 length 850
+    Stream: column 5 section ROW_INDEX start: 3577 length 78
+    Stream: column 5 section BLOOM_FILTER_UTF8 start: 3655 length 1172
+    Stream: column 6 section ROW_INDEX start: 4827 length 85
+    Stream: column 6 section BLOOM_FILTER_UTF8 start: 4912 length 1167
+    Stream: column 7 section ROW_INDEX start: 6079 length 41
+    Stream: column 7 section BLOOM_FILTER_UTF8 start: 6120 length 34
+    Stream: column 8 section ROW_INDEX start: 6154 length 86
+    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 53
+    Stream: column 10 section ROW_INDEX start: 7394 length 82
+    Stream: column 10 section BLOOM_FILTER_UTF8 start: 7476 length 1189
+    Stream: column 11 section ROW_INDEX start: 8665 length 47
+    Stream: column 11 section BLOOM_FILTER_UTF8 start: 8712 length 254
+    Stream: column 1 section PRESENT start: 8966 length 17
+    Stream: column 1 section DATA start: 8983 length 962
+    Stream: column 2 section PRESENT start: 9945 length 17
+    Stream: column 2 section DATA start: 9962 length 1441
+    Stream: column 3 section DATA start: 11403 length 1704
+    Stream: column 4 section DATA start: 13107 length 1998
+    Stream: column 5 section DATA start: 15105 length 2925
+    Stream: column 6 section DATA start: 18030 length 3323
+    Stream: column 7 section DATA start: 21353 length 137
+    Stream: column 8 section DATA start: 21490 length 1572
+    Stream: column 8 section LENGTH start: 23062 length 310
+    Stream: column 8 section DICTIONARY_DATA start: 23372 length 1548
+    Stream: column 9 section DATA start: 24920 length 19
+    Stream: column 9 section SECONDARY start: 24939 length 1783
+    Stream: column 10 section DATA start: 26722 length 2138
+    Stream: column 10 section SECONDARY start: 28860 length 231
+    Stream: column 11 section DATA start: 29091 length 1877
+    Stream: column 11 section LENGTH start: 30968 length 591
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT
     Encoding column 2: DIRECT_V2
@@ -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: 33416 bytes
+File length: 32435 bytes
 Padding length: 0 bytes
 Padding ratio: 0%
 
________________________________________________________________________________________________________________________
@@ -290,7 +290,7 @@ PREHOOK: Input: default@orc_ppd
 #### A masked pattern was here ####
 -- BEGIN ORC FILE DUMP --
 #### A masked pattern was here ####
-File Version: 0.12 with HIVE_13083
+File Version: 0.12 with ORC_101
 Rows: 1049
 Compression: ZLIB
 Compression size: 262144
@@ -326,49 +326,49 @@ File Statistics:
   Column 11: count: 1049 hasNull: false sum: 13278
 
 Stripes:
-  Stripe: offset: 3 data: 22593 rows: 1049 tail: 250 index: 15095
+  Stripe: offset: 3 data: 22593 rows: 1049 tail: 246 index: 13609
     Stream: column 0 section ROW_INDEX start: 3 length 20
-    Stream: column 0 section BLOOM_FILTER start: 23 length 56
-    Stream: column 1 section ROW_INDEX start: 79 length 58
-    Stream: column 1 section BLOOM_FILTER start: 137 length 1258
-    Stream: column 2 section ROW_INDEX start: 1395 length 58
-    Stream: column 2 section BLOOM_FILTER start: 1453 length 1544
-    Stream: column 3 section ROW_INDEX start: 2997 length 61
-    Stream: column 3 section BLOOM_FILTER start: 3058 length 1543
-    Stream: column 4 section ROW_INDEX start: 4601 length 69
-    Stream: column 4 section BLOOM_FILTER start: 4670 length 1556
-    Stream: column 5 section ROW_INDEX start: 6226 length 78
-    Stream: column 5 section BLOOM_FILTER start: 6304 length 1991
-    Stream: column 6 section ROW_INDEX start: 8295 length 85
-    Stream: column 6 section BLOOM_FILTER start: 8380 length 1964
-    Stream: column 7 section ROW_INDEX start: 10344 length 41
-    Stream: column 7 section BLOOM_FILTER start: 10385 length 56
-    Stream: column 8 section ROW_INDEX start: 10441 length 86
-    Stream: column 8 section BLOOM_FILTER start: 10527 length 1829
-    Stream: column 9 section ROW_INDEX start: 12356 length 50
-    Stream: column 9 section BLOOM_FILTER start: 12406 length 95
-    Stream: column 10 section ROW_INDEX start: 12501 length 82
-    Stream: column 10 section BLOOM_FILTER start: 12583 length 1994
-    Stream: column 11 section ROW_INDEX start: 14577 length 47
-    Stream: column 11 section BLOOM_FILTER start: 14624 length 474
-    Stream: column 1 section PRESENT start: 15098 length 17
-    Stream: column 1 section DATA start: 15115 length 962
-    Stream: column 2 section PRESENT start: 16077 length 17
-    Stream: column 2 section DATA start: 16094 length 1441
-    Stream: column 3 section DATA start: 17535 length 1704
-    Stream: column 4 section DATA start: 19239 length 1998
-    Stream: column 5 section DATA start: 21237 length 2925
-    Stream: column 6 section DATA start: 24162 length 3323
-    Stream: column 7 section DATA start: 27485 length 137
-    Stream: column 8 section DATA start: 27622 length 1572
-    Stream: column 8 section LENGTH start: 29194 length 310
-    Stream: column 8 section DICTIONARY_DATA start: 29504 length 1548
-    Stream: column 9 section DATA start: 31052 length 19
-    Stream: column 9 section SECONDARY start: 31071 length 1783
-    Stream: column 10 section DATA start: 32854 length 2138
-    Stream: column 10 section SECONDARY start: 34992 length 231
-    Stream: column 11 section DATA start: 35223 length 1877
-    Stream: column 11 section LENGTH start: 37100 length 591
+    Stream: column 0 section BLOOM_FILTER_UTF8 start: 23 length 43
+    Stream: column 1 section ROW_INDEX start: 66 length 58
+    Stream: column 1 section BLOOM_FILTER_UTF8 start: 124 length 1091
+    Stream: column 2 section ROW_INDEX start: 1215 length 58
+    Stream: column 2 section BLOOM_FILTER_UTF8 start: 1273 length 1372
+    Stream: column 3 section ROW_INDEX start: 2645 length 61
+    Stream: column 3 section BLOOM_FILTER_UTF8 start: 2706 length 1374
+    Stream: column 4 section ROW_INDEX start: 4080 length 69
+    Stream: column 4 section BLOOM_FILTER_UTF8 start: 4149 length 1375
+    Stream: column 5 section ROW_INDEX start: 5524 length 78
+    Stream: column 5 section BLOOM_FILTER_UTF8 start: 5602 length 1824
+    Stream: column 6 section ROW_INDEX start: 7426 length 85
+    Stream: column 6 section BLOOM_FILTER_UTF8 start: 7511 length 1795
+    Stream: column 7 section ROW_INDEX start: 9306 length 41
+    Stream: column 7 section BLOOM_FILTER_UTF8 start: 9347 length 43
+    Stream: column 8 section ROW_INDEX start: 9390 length 86
+    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 82
+    Stream: column 10 section BLOOM_FILTER_UTF8 start: 11341 length 1802
+    Stream: column 11 section ROW_INDEX start: 13143 length 47
+    Stream: column 11 section BLOOM_FILTER_UTF8 start: 13190 length 422
+    Stream: column 1 section PRESENT start: 13612 length 17
+    Stream: column 1 section DATA start: 13629 length 962
+    Stream: column 2 section PRESENT start: 14591 length 17
+    Stream: column 2 section DATA start: 14608 length 1441
+    Stream: column 3 section DATA start: 16049 length 1704
+    Stream: column 4 section DATA start: 17753 length 1998
+    Stream: column 5 section DATA start: 19751 length 2925
+    Stream: column 6 section DATA start: 22676 length 3323
+    Stream: column 7 section DATA start: 25999 length 137
+    Stream: column 8 section DATA start: 26136 length 1572
+    Stream: column 8 section LENGTH start: 27708 length 310
+    Stream: column 8 section DICTIONARY_DATA start: 28018 length 1548
+    Stream: column 9 section DATA start: 29566 length 19
+    Stream: column 9 section SECONDARY start: 29585 length 1783
+    Stream: column 10 section DATA start: 31368 length 2138
+    Stream: column 10 section SECONDARY start: 33506 length 231
+    Stream: column 11 section DATA start: 33737 length 1877
+    Stream: column 11 section LENGTH start: 35614 length 591
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT
     Encoding column 2: DIRECT_V2
@@ -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: 38568 bytes
+File length: 37078 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 HIVE_13083
+File Version: 0.12 with ORC_101
 Rows: 1049
 Compression: ZLIB
 Compression size: 262144
@@ -535,49 +535,49 @@ File Statistics:
   Column 11: count: 1049 hasNull: false sum: 13278
 
 Stripes:
-  Stripe: offset: 3 data: 22593 rows: 1049 tail: 250 index: 9943
+  Stripe: offset: 3 data: 22593 rows: 1049 tail: 250 index: 8963
     Stream: column 0 section ROW_INDEX start: 3 length 20
-    Stream: column 0 section BLOOM_FILTER start: 23 length 45
-    Stream: column 1 section ROW_INDEX start: 68 length 58
-    Stream: column 1 section BLOOM_FILTER start: 126 length 799
-    Stream: column 2 section ROW_INDEX start: 925 length 58
-    Stream: column 2 section BLOOM_FILTER start: 983 length 978
-    Stream: column 3 section ROW_INDEX start: 1961 length 61
-    Stream: column 3 section BLOOM_FILTER start: 2022 length 983
-    Stream: column 4 section ROW_INDEX start: 3005 length 69
-    Stream: column 4 section BLOOM_FILTER start: 3074 length 963
-    Stream: column 5 section ROW_INDEX start: 4037 length 78
-    Stream: column 5 section BLOOM_FILTER start: 4115 length 1291
-    Stream: column 6 section ROW_INDEX start: 5406 length 85
-    Stream: column 6 section BLOOM_FILTER start: 5491 length 1280
-    Stream: column 7 section ROW_INDEX start: 6771 length 41
-    Stream: column 7 section BLOOM_FILTER start: 6812 length 45
-    Stream: column 8 section ROW_INDEX start: 6857 length 86
-    Stream: column 8 section BLOOM_FILTER start: 6943 length 1157
-    Stream: column 9 section ROW_INDEX start: 8100 length 50
-    Stream: column 9 section BLOOM_FILTER start: 8150 length 62
-    Stream: column 10 section ROW_INDEX start: 8212 length 82
-    Stream: column 10 section BLOOM_FILTER start: 8294 length 1297
-    Stream: column 11 section ROW_INDEX start: 9591 length 47
-    Stream: column 11 section BLOOM_FILTER start: 9638 length 308
-    Stream: column 1 section PRESENT start: 9946 length 17
-    Stream: column 1 section DATA start: 9963 length 962
-    Stream: column 2 section PRESENT start: 10925 length 17
-    Stream: column 2 section DATA start: 10942 length 1441
-    Stream: column 3 section DATA start: 12383 length 1704
-    Stream: column 4 section DATA start: 14087 length 1998
-    Stream: column 5 section DATA start: 16085 length 2925
-    Stream: column 6 section DATA start: 19010 length 3323
-    Stream: column 7 section DATA start: 22333 length 137
-    Stream: column 8 section DATA start: 22470 length 1572
-    Stream: column 8 section LENGTH start: 24042 length 310
-    Stream: column 8 section DICTIONARY_DATA start: 24352 length 1548
-    Stream: column 9 section DATA start: 25900 length 19
-    Stream: column 9 section SECONDARY start: 25919 length 1783
-    Stream: column 10 section DATA start: 27702 length 2138
-    Stream: column 10 section SECONDARY start: 29840 length 231
-    Stream: column 11 section DATA start: 30071 length 1877
-    Stream: column 11 section LENGTH start: 31948 length 591
+    Stream: column 0 section BLOOM_FILTER_UTF8 start: 23 length 34
+    Stream: column 1 section ROW_INDEX start: 57 length 58
+    Stream: column 1 section BLOOM_FILTER_UTF8 start: 115 length 696
+    Stream: column 2 section ROW_INDEX start: 811 length 58
+    Stream: column 2 section BLOOM_FILTER_UTF8 start: 869 length 867
+    Stream: column 3 section ROW_INDEX start: 1736 length 61
+    Stream: column 3 section BLOOM_FILTER_UTF8 start: 1797 length 861
+    Stream: column 4 section ROW_INDEX start: 2658 length 69
+    Stream: column 4 section BLOOM_FILTER_UTF8 start: 2727 length 850
+    Stream: column 5 section ROW_INDEX start: 3577 length 78
+    Stream: column 5 section BLOOM_FILTER_UTF8 start: 3655 length 1172
+    Stream: column 6 section ROW_INDEX start: 4827 length 85
+    Stream: column 6 section BLOOM_FILTER_UTF8 start: 4912 length 1167
+    Stream: column 7 section ROW_INDEX start: 6079 length 41
+    Stream: column 7 section BLOOM_FILTER_UTF8 start: 6120 length 34
+    Stream: column 8 section ROW_INDEX start: 6154 length 86
+    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 53
+    Stream: column 10 section ROW_INDEX start: 7394 length 82
+    Stream: column 10 section BLOOM_FILTER_UTF8 start: 7476 length 1189
+    Stream: column 11 section ROW_INDEX start: 8665 length 47
+    Stream: column 11 section BLOOM_FILTER_UTF8 start: 8712 length 254
+    Stream: column 1 section PRESENT start: 8966 length 17
+    Stream: column 1 section DATA start: 8983 length 962
+    Stream: column 2 section PRESENT start: 9945 length 17
+    Stream: column 2 section DATA start: 9962 length 1441
+    Stream: column 3 section DATA start: 11403 length 1704
+    Stream: column 4 section DATA start: 13107 length 1998
+    Stream: column 5 section DATA start: 15105 length 2925
+    Stream: column 6 section DATA start: 18030 length 3323
+    Stream: column 7 section DATA start: 21353 length 137
+    Stream: column 8 section DATA start: 21490 length 1572
+    Stream: column 8 section LENGTH start: 23062 length 310
+    Stream: column 8 section DICTIONARY_DATA start: 23372 length 1548
+    Stream: column 9 section DATA start: 24920 length 19
+    Stream: column 9 section SECONDARY start: 24939 length 1783
+    Stream: column 10 section DATA start: 26722 length 2138
+    Stream: column 10 section SECONDARY start: 28860 length 231
+    Stream: column 11 section DATA start: 29091 length 1877
+    Stream: column 11 section LENGTH start: 30968 length 591
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT
     Encoding column 2: DIRECT_V2
@@ -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: 33416 bytes
+File length: 32435 bytes
 Padding length: 0 bytes
 Padding ratio: 0%
 
________________________________________________________________________________________________________________________

http://git-wip-us.apache.org/repos/asf/hive/blob/d7f71fb4/ql/src/test/results/clientpositive/orc_merge10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/orc_merge10.q.out 
b/ql/src/test/results/clientpositive/orc_merge10.q.out
index 8d4cb0d..61c6cdc 100644
--- a/ql/src/test/results/clientpositive/orc_merge10.q.out
+++ b/ql/src/test/results/clientpositive/orc_merge10.q.out
@@ -501,7 +501,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 HIVE_13083
+File Version: 0.12 with ORC_101
 Rows: 242
 Compression: SNAPPY
 Compression size: 4096
@@ -540,13 +540,13 @@ Stripes:
       Entry 0: count: 152 hasNull: false min: 0 max: 497 sum: 38034 positions: 
0,0,0
     Row group indices for column 2:
       Entry 0: count: 152 hasNull: false min: val_0 max: val_97 sum: 1034 
positions: 0,0,0
-  Stripe: offset: 1140 data: 616 rows: 90 tail: 61 index: 76
+  Stripe: offset: 1140 data: 613 rows: 90 tail: 61 index: 76
     Stream: column 0 section ROW_INDEX start: 1140 length 11
     Stream: column 1 section ROW_INDEX start: 1151 length 27
     Stream: column 2 section ROW_INDEX start: 1178 length 38
     Stream: column 1 section DATA start: 1216 length 185
     Stream: column 2 section DATA start: 1401 length 377
-    Stream: column 2 section LENGTH start: 1778 length 54
+    Stream: column 2 section LENGTH start: 1778 length 51
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -557,7 +557,7 @@ Stripes:
     Row group indices for column 2:
       Entry 0: count: 90 hasNull: false min: val_0 max: val_86 sum: 612 
positions: 0,0,0,0,0
 
-File length: 2137 bytes
+File length: 2134 bytes
 Padding length: 0 bytes
 Padding ratio: 0%
 
________________________________________________________________________________________________________________________
@@ -571,7 +571,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 HIVE_13083
+File Version: 0.12 with ORC_101
 Rows: 242
 Compression: SNAPPY
 Compression size: 4096
@@ -610,13 +610,13 @@ Stripes:
       Entry 0: count: 152 hasNull: false min: 0 max: 497 sum: 38034 positions: 
0,0,0
     Row group indices for column 2:
       Entry 0: count: 152 hasNull: false min: val_0 max: val_97 sum: 1034 
positions: 0,0,0
-  Stripe: offset: 1140 data: 616 rows: 90 tail: 61 index: 76
+  Stripe: offset: 1140 data: 613 rows: 90 tail: 61 index: 76
     Stream: column 0 section ROW_INDEX start: 1140 length 11
     Stream: column 1 section ROW_INDEX start: 1151 length 27
     Stream: column 2 section ROW_INDEX start: 1178 length 38
     Stream: column 1 section DATA start: 1216 length 185
     Stream: column 2 section DATA start: 1401 length 377
-    Stream: column 2 section LENGTH start: 1778 length 54
+    Stream: column 2 section LENGTH start: 1778 length 51
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DIRECT_V2
@@ -627,7 +627,7 @@ Stripes:
     Row group indices for column 2:
       Entry 0: count: 90 hasNull: false min: val_0 max: val_86 sum: 612 
positions: 0,0,0,0,0
 
-File length: 2137 bytes
+File length: 2134 bytes
 Padding length: 0 bytes
 Padding ratio: 0%
 
________________________________________________________________________________________________________________________

http://git-wip-us.apache.org/repos/asf/hive/blob/d7f71fb4/ql/src/test/results/clientpositive/orc_merge11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/orc_merge11.q.out 
b/ql/src/test/results/clientpositive/orc_merge11.q.out
index a8ab854..9c50f6d 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
 #### A masked pattern was here ####
 -- BEGIN ORC FILE DUMP --
 #### A masked pattern was here ####
-File Version: 0.12 with HIVE_13083
+File Version: 0.12 with ORC_101
 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 HIVE_13083
+File Version: 0.12 with ORC_101
 Rows: 50000
 Compression: ZLIB
 Compression size: 4096
@@ -275,7 +275,7 @@ PREHOOK: Input: default@orcfile_merge1
 #### A masked pattern was here ####
 -- BEGIN ORC FILE DUMP --
 #### A masked pattern was here ####
-File Version: 0.12 with HIVE_13083
+File Version: 0.12 with ORC_101
 Rows: 100000
 Compression: ZLIB
 Compression size: 4096

http://git-wip-us.apache.org/repos/asf/hive/blob/d7f71fb4/ql/src/test/results/clientpositive/orc_merge12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/orc_merge12.q.out 
b/ql/src/test/results/clientpositive/orc_merge12.q.out
index 6a86fcf..2c49e0f 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 HIVE_13083
+File Version: 0.12 with ORC_101
 Rows: 24576
 Compression: ZLIB
 Compression size: 262144

http://git-wip-us.apache.org/repos/asf/hive/blob/d7f71fb4/ql/src/test/results/clientpositive/orc_remove_cols.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/orc_remove_cols.q.out 
b/ql/src/test/results/clientpositive/orc_remove_cols.q.out
index 178a974..c090466 100644
--- a/ql/src/test/results/clientpositive/orc_remove_cols.q.out
+++ b/ql/src/test/results/clientpositive/orc_remove_cols.q.out
@@ -34,11 +34,11 @@ POSTHOOK: query: ALTER TABLE orc_partitioned SET SERDE 
'org.apache.hadoop.hive.s
 POSTHOOK: type: ALTERTABLE_SERIALIZER
 POSTHOOK: Input: default@orc_partitioned
 POSTHOOK: Output: default@orc_partitioned
-PREHOOK: query: ALTER TABLE orc_partitioned REPLACE COLUMNS (cint int)
+PREHOOK: query: ALTER TABLE orc_partitioned REPLACE COLUMNS (a int)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: default@orc_partitioned
 PREHOOK: Output: default@orc_partitioned
-POSTHOOK: query: ALTER TABLE orc_partitioned REPLACE COLUMNS (cint int)
+POSTHOOK: query: ALTER TABLE orc_partitioned REPLACE COLUMNS (a int)
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
 POSTHOOK: Input: default@orc_partitioned
 POSTHOOK: Output: default@orc_partitioned

http://git-wip-us.apache.org/repos/asf/hive/blob/d7f71fb4/ql/src/test/results/clientpositive/orc_schema_evolution.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/orc_schema_evolution.q.out 
b/ql/src/test/results/clientpositive/orc_schema_evolution.q.out
index b536a75..b2f4d9d 100644
--- a/ql/src/test/results/clientpositive/orc_schema_evolution.q.out
+++ b/ql/src/test/results/clientpositive/orc_schema_evolution.q.out
@@ -103,11 +103,11 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_orc2
 #### A masked pattern was here ####
 36214430891
-PREHOOK: query: alter table src_orc2 replace columns (k smallint, v string)
+PREHOOK: query: alter table src_orc2 replace columns (key smallint, val string)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: default@src_orc2
 PREHOOK: Output: default@src_orc2
-POSTHOOK: query: alter table src_orc2 replace columns (k smallint, v string)
+POSTHOOK: query: alter table src_orc2 replace columns (key smallint, val 
string)
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
 POSTHOOK: Input: default@src_orc2
 POSTHOOK: Output: default@src_orc2
@@ -120,11 +120,11 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_orc2
 #### A masked pattern was here ####
 36214430891
-PREHOOK: query: alter table src_orc2 replace columns (k int, v string)
+PREHOOK: query: alter table src_orc2 replace columns (key int, val string)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: default@src_orc2
 PREHOOK: Output: default@src_orc2
-POSTHOOK: query: alter table src_orc2 replace columns (k int, v string)
+POSTHOOK: query: alter table src_orc2 replace columns (key int, val string)
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
 POSTHOOK: Input: default@src_orc2
 POSTHOOK: Output: default@src_orc2
@@ -137,11 +137,11 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_orc2
 #### A masked pattern was here ####
 36214430891
-PREHOOK: query: alter table src_orc2 replace columns (k bigint, v string)
+PREHOOK: query: alter table src_orc2 replace columns (key bigint, val string)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: default@src_orc2
 PREHOOK: Output: default@src_orc2
-POSTHOOK: query: alter table src_orc2 replace columns (k bigint, v string)
+POSTHOOK: query: alter table src_orc2 replace columns (key bigint, val string)
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
 POSTHOOK: Input: default@src_orc2
 POSTHOOK: Output: default@src_orc2
@@ -154,11 +154,11 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_orc2
 #### A masked pattern was here ####
 36214430891
-PREHOOK: query: alter table src_orc2 replace columns (k bigint, v string, z 
int)
+PREHOOK: query: alter table src_orc2 replace columns (key bigint, val string, 
z int)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: default@src_orc2
 PREHOOK: Output: default@src_orc2
-POSTHOOK: query: alter table src_orc2 replace columns (k bigint, v string, z 
int)
+POSTHOOK: query: alter table src_orc2 replace columns (key bigint, val string, 
z int)
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
 POSTHOOK: Input: default@src_orc2
 POSTHOOK: Output: default@src_orc2
@@ -171,11 +171,11 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_orc2
 #### A masked pattern was here ####
 -586749626187
-PREHOOK: query: alter table src_orc2 replace columns (k bigint, v string, z 
bigint)
+PREHOOK: query: alter table src_orc2 replace columns (key bigint, val string, 
z bigint)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: default@src_orc2
 PREHOOK: Output: default@src_orc2
-POSTHOOK: query: alter table src_orc2 replace columns (k bigint, v string, z 
bigint)
+POSTHOOK: query: alter table src_orc2 replace columns (key bigint, val string, 
z bigint)
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
 POSTHOOK: Input: default@src_orc2
 POSTHOOK: Output: default@src_orc2
@@ -188,11 +188,11 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_orc2
 #### A masked pattern was here ####
 -586749626187
-PREHOOK: query: alter table src_orc2 replace columns (k bigint, v string, z 
bigint, y float)
+PREHOOK: query: alter table src_orc2 replace columns (key bigint, val string, 
z bigint, y float)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: default@src_orc2
 PREHOOK: Output: default@src_orc2
-POSTHOOK: query: alter table src_orc2 replace columns (k bigint, v string, z 
bigint, y float)
+POSTHOOK: query: alter table src_orc2 replace columns (key bigint, val string, 
z bigint, y float)
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
 POSTHOOK: Input: default@src_orc2
 POSTHOOK: Output: default@src_orc2

http://git-wip-us.apache.org/repos/asf/hive/blob/d7f71fb4/ql/src/test/results/clientpositive/tez/orc_merge12.q.out
----------------------------------------------------------------------
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 6a86fcf..2c49e0f 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
 #### A masked pattern was here ####
 -- BEGIN ORC FILE DUMP --
 #### A masked pattern was here ####
-File Version: 0.12 with HIVE_13083
+File Version: 0.12 with ORC_101
 Rows: 24576
 Compression: ZLIB
 Compression size: 262144

http://git-wip-us.apache.org/repos/asf/hive/blob/d7f71fb4/storage-api/src/java/org/apache/hadoop/hive/ql/io/sarg/SearchArgumentImpl.java
----------------------------------------------------------------------
diff --git 
a/storage-api/src/java/org/apache/hadoop/hive/ql/io/sarg/SearchArgumentImpl.java
 
b/storage-api/src/java/org/apache/hadoop/hive/ql/io/sarg/SearchArgumentImpl.java
index db0a582..6d8c83b 100644
--- 
a/storage-api/src/java/org/apache/hadoop/hive/ql/io/sarg/SearchArgumentImpl.java
+++ 
b/storage-api/src/java/org/apache/hadoop/hive/ql/io/sarg/SearchArgumentImpl.java
@@ -59,6 +59,14 @@ public final class SearchArgumentImpl implements 
SearchArgument {
                              Type type,
                              String columnName,
                              Object literal,
+                             List<Object> literalList) {
+      this(operator, type, columnName, literal, literalList, null);
+    }
+
+    public PredicateLeafImpl(Operator operator,
+                             Type type,
+                             String columnName,
+                             Object literal,
                              List<Object> literalList, Configuration conf) {
       this.operator = operator;
       this.type = type;

http://git-wip-us.apache.org/repos/asf/hive/blob/d7f71fb4/testutils/ptest2/conf/deployed/master-mr2.properties
----------------------------------------------------------------------
diff --git a/testutils/ptest2/conf/deployed/master-mr2.properties 
b/testutils/ptest2/conf/deployed/master-mr2.properties
index 375d50d..05c0405 100644
--- a/testutils/ptest2/conf/deployed/master-mr2.properties
+++ b/testutils/ptest2/conf/deployed/master-mr2.properties
@@ -39,9 +39,6 @@ ut.hbase-handler.batchSize=0
 unitTests.module.metastore=metastore
 ut.metastore.batchSize=12
 
-unitTests.module.orc=orc
-ut.orc.batchSize=10
-
 unitTests.module.ql=ql
 ut.ql.batchSize=10
 ut.ql.skipBatching=TestDbTxnManager2 
TestTxnCommands2WithSplitUpdateAndVectorization TestTxnCommands2WithSplitUpdate 
TestOrcFile TestTxnCommands2 TestCompactor TestInitiator TestWorker TestWorker2 
TestExecDriver

http://git-wip-us.apache.org/repos/asf/hive/blob/d7f71fb4/testutils/ptest2/src/test/resources/test-configuration2.properties
----------------------------------------------------------------------
diff --git a/testutils/ptest2/src/test/resources/test-configuration2.properties 
b/testutils/ptest2/src/test/resources/test-configuration2.properties
index 0ba2f3b..5f15a59 100644
--- a/testutils/ptest2/src/test/resources/test-configuration2.properties
+++ b/testutils/ptest2/src/test/resources/test-configuration2.properties
@@ -69,9 +69,6 @@ ut.hbase-handler.batchSize=0
 unitTests.module.metastore=metastore
 ut.metastore.batchSize=12
 
-unitTests.module.orc=orc
-ut.orc.batchSize=0
-
 unitTests.module.service=service
 ut.service.batchSize=8
 

Reply via email to