You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ay...@apache.org on 2022/07/14 07:02:11 UTC

[hive] branch master updated: HIVE-26366: PTF Vectorization: BoundaryScanner for boolean. (#3412). (Ayush Saxena, reviewed by Laszlo Bodor and Ramesh Kumar Thangarajan)

This is an automated email from the ASF dual-hosted git repository.

ayushsaxena pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new c6b07f27903 HIVE-26366: PTF Vectorization: BoundaryScanner for boolean. (#3412). (Ayush Saxena, reviewed by Laszlo Bodor and Ramesh Kumar Thangarajan)
c6b07f27903 is described below

commit c6b07f27903f7d6856a6edf1b5d756119fa522c1
Author: Ayush Saxena <ay...@apache.org>
AuthorDate: Thu Jul 14 12:32:04 2022 +0530

    HIVE-26366: PTF Vectorization: BoundaryScanner for boolean. (#3412). (Ayush Saxena, reviewed by Laszlo Bodor and Ramesh Kumar Thangarajan)
---
 .../files/vector_ptf_part_simple_all_datatypes.txt |   80 +-
 .../hive/ql/udf/ptf/ValueBoundaryScanner.java      |   55 +
 .../hive/ql/udf/ptf/TestValueBoundaryScanner.java  |   22 +
 .../clientpositive/vector_ptf_bounded_start.q      |   56 +-
 .../llap/vector_ptf_bounded_start.q.out            | 1465 +++++++++++++++-----
 5 files changed, 1271 insertions(+), 407 deletions(-)

diff --git a/data/files/vector_ptf_part_simple_all_datatypes.txt b/data/files/vector_ptf_part_simple_all_datatypes.txt
index 4ac49a777dd..4ee784fb14d 100644
--- a/data/files/vector_ptf_part_simple_all_datatypes.txt
+++ b/data/files/vector_ptf_part_simple_all_datatypes.txt
@@ -1,40 +1,40 @@
-Manufacturer#2,almond aquamarine rose maroon antique,NULL,900.66,A,DA,1
-Manufacturer#1,almond aquamarine burnished black steel,1970-01-02,1414.42,B,AB,2
-Manufacturer#2,almond aquamarine rose maroon antique,1970-01-03,1698.66,C,CA,3
-Manufacturer#1,almond aquamarine pink moccasin thistle,1970-01-04,NULL,A,DE,4
-Manufacturer#1,almond antique chartreuse lavender yellow,1970-01-05,1753.76,B,AC,5
-Manufacturer#5,almond antique medium spring khaki,1970-01-01,1611.66,C,AA,6
-Manufacturer#5,almond antique blue firebrick mint,NULL,1789.69,D,FD,7
-Manufacturer#1,almond antique burnished rose metallic,1970-01-03,1173.15,A,SM,8
-Manufacturer#1,almond aquamarine pink moccasin thistle,1970-01-04,1632.66,B,AK,9
-Manufacturer#3,almond antique forest lavender goldenrod,1970-01-05,1190.27,C,AY,10
-Manufacturer#4,almond aquamarine yellow dodger mint,1970-01-01,1844.92,D,FD,11
-Manufacturer#1,almond antique chartreuse lavender yellow,1970-01-02,1753.76,D,DA,12
-Manufacturer#2,almond antique violet turquoise frosted,NULL,1800.7,B,AC,13
-Manufacturer#3,almond antique forest lavender goldenrod,1970-01-04,NULL,C,BB,14
-Manufacturer#2,almond antique violet chocolate turquoise,1970-01-05,1690.68,D,LM,15
-Manufacturer#4,almond antique violet mint lemon,1970-01-01,1375.42,B,OP,16
-Manufacturer#1,almond aquamarine pink moccasin thistle,1970-01-02,1632.66,D,RS,17
-Manufacturer#5,almond azure blanched chiffon midnight,1970-01-03,1464.48,C,AB,18
-Manufacturer#3,almond antique forest lavender goldenrod,NULL,590.27,D,CD,19
-Manufacturer#1,almond antique chartreuse lavender yellow,1970-01-05,1753.76,A,EF,20
-Manufacturer#2,almond antique violet turquoise frosted,1970-01-01,1800.7,B,AA,21
-Manufacturer#5,almond antique sky peru orange,1970-01-02,1788.73,A,BB,22
-Manufacturer#1,almond aquamarine pink moccasin thistle,1970-01-03,1632.66,D,CC,23
-Manufacturer#3,almond antique chartreuse khaki white,1970-01-04,99.68,C,DD,24
-Manufacturer#4,almond antique gainsboro frosted violet,NULL,NULL,A,EE,25
-Manufacturer#1,almond antique chartreuse lavender yellow,NULL,1753.76,C,AD,26
-Manufacturer#2,almond antique violet turquoise frosted,1970-01-02,1800.7,D,AB,27
-Manufacturer#3,almond antique olive coral navajo,1970-01-03,1337.29,A,AC,28
-Manufacturer#5,almond antique medium spring khaki,1970-01-04,1611.66,B,AA,29
-Manufacturer#1,almond antique salmon chartreuse burlywood,1970-01-05,1602.59,C,BB,30
-Manufacturer#3,almond antique misty red olive,1970-01-01,1922.98,D,BC,31
-Manufacturer#2,almond aquamarine sandy cyan gainsboro,NULL,1000.6,A,BD,32
-Manufacturer#3,almond antique forest lavender goldenrod,1970-01-03,1190.27,B,CA,33
-Manufacturer#2,almond aquamarine midnight light salmon,1970-01-04,2031.98,C,CB,34
-Manufacturer#4,almond aquamarine floral ivory bisque,1970-01-05,NULL,A,CC,35
-Manufacturer#5,almond aquamarine dodger light gainsboro,1970-01-01,1018.1,B,CD,36
-Manufacturer#4,almond azure aquamarine papaya violet,1970-01-02,1290.35,C,DA,37
-Manufacturer#3,almond antique metallic orange dim,NULL,55.39,D,DB,38
-Manufacturer#1,almond antique burnished rose metallic,1970-01-04,1173.15,D,DC,39
-Manufacturer#4,almond aquamarine floral ivory bisque,1970-01-05,1206.26,C,DD,40
\ No newline at end of file
+Manufacturer#2,almond aquamarine rose maroon antique,NULL,900.66,A,DA,true,1
+Manufacturer#1,almond aquamarine burnished black steel,1970-01-02,1414.42,B,AB,true,2
+Manufacturer#2,almond aquamarine rose maroon antique,1970-01-03,1698.66,C,CA,true,3
+Manufacturer#1,almond aquamarine pink moccasin thistle,1970-01-04,NULL,A,DE,true,4
+Manufacturer#1,almond antique chartreuse lavender yellow,1970-01-05,1753.76,B,AC,false,5
+Manufacturer#5,almond antique medium spring khaki,1970-01-01,1611.66,C,AA,false,6
+Manufacturer#5,almond antique blue firebrick mint,NULL,1789.69,D,FD,true,7
+Manufacturer#1,almond antique burnished rose metallic,1970-01-03,1173.15,A,SM,false,8
+Manufacturer#1,almond aquamarine pink moccasin thistle,1970-01-04,1632.66,B,AK,false,9
+Manufacturer#3,almond antique forest lavender goldenrod,1970-01-05,1190.27,C,AY,true,10
+Manufacturer#4,almond aquamarine yellow dodger mint,1970-01-01,1844.92,D,FD,false,11
+Manufacturer#1,almond antique chartreuse lavender yellow,1970-01-02,1753.76,D,DA,true,12
+Manufacturer#2,almond antique violet turquoise frosted,NULL,1800.7,B,AC,false,13
+Manufacturer#3,almond antique forest lavender goldenrod,1970-01-04,NULL,C,BB,false,14
+Manufacturer#2,almond antique violet chocolate turquoise,1970-01-05,1690.68,D,LM,NULL,15
+Manufacturer#4,almond antique violet mint lemon,1970-01-01,1375.42,B,OP,true,16
+Manufacturer#1,almond aquamarine pink moccasin thistle,1970-01-02,1632.66,D,RS,true,17
+Manufacturer#5,almond azure blanched chiffon midnight,1970-01-03,1464.48,C,AB,true,18
+Manufacturer#3,almond antique forest lavender goldenrod,NULL,590.27,D,CD,true,19
+Manufacturer#1,almond antique chartreuse lavender yellow,1970-01-05,1753.76,A,EF,false,20
+Manufacturer#2,almond antique violet turquoise frosted,1970-01-01,1800.7,B,AA,false,21
+Manufacturer#5,almond antique sky peru orange,1970-01-02,1788.73,A,BB,false,22
+Manufacturer#1,almond aquamarine pink moccasin thistle,1970-01-03,1632.66,D,CC,true,23
+Manufacturer#3,almond antique chartreuse khaki white,1970-01-04,99.68,C,DD,false,24
+Manufacturer#4,almond antique gainsboro frosted violet,NULL,NULL,A,EE,false,25
+Manufacturer#1,almond antique chartreuse lavender yellow,NULL,1753.76,C,AD,true,26
+Manufacturer#2,almond antique violet turquoise frosted,1970-01-02,1800.7,D,AB,true,27
+Manufacturer#3,almond antique olive coral navajo,1970-01-03,1337.29,A,AC,false,28
+Manufacturer#5,almond antique medium spring khaki,1970-01-04,1611.66,B,AA,false,29
+Manufacturer#1,almond antique salmon chartreuse burlywood,1970-01-05,1602.59,C,BB,true,30
+Manufacturer#3,almond antique misty red olive,1970-01-01,1922.98,D,BC,false,31
+Manufacturer#2,almond aquamarine sandy cyan gainsboro,NULL,1000.6,A,BD,NULL,32
+Manufacturer#3,almond antique forest lavender goldenrod,1970-01-03,1190.27,B,CA,false,33
+Manufacturer#2,almond aquamarine midnight light salmon,1970-01-04,2031.98,C,CB,true,34
+Manufacturer#4,almond aquamarine floral ivory bisque,1970-01-05,NULL,A,CC,false,35
+Manufacturer#5,almond aquamarine dodger light gainsboro,1970-01-01,1018.1,B,CD,true,36
+Manufacturer#4,almond azure aquamarine papaya violet,1970-01-02,1290.35,C,DA,NULL,37
+Manufacturer#3,almond antique metallic orange dim,NULL,55.39,D,DB,true,38
+Manufacturer#1,almond antique burnished rose metallic,1970-01-04,1173.15,D,DC,false,39
+Manufacturer#4,almond aquamarine floral ivory bisque,1970-01-05,1206.26,C,DD,true,40
\ No newline at end of file
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/ptf/ValueBoundaryScanner.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/ptf/ValueBoundaryScanner.java
index c7325c93e7b..b433e390cf6 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/ptf/ValueBoundaryScanner.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/ptf/ValueBoundaryScanner.java
@@ -746,6 +746,8 @@ abstract class SingleValueBoundaryScanner extends ValueBoundaryScanner {
       return new CharValueBoundaryScanner(start, end, exprDef, nullsLast);
     case VARCHAR:
       return new VarcharValueBoundaryScanner(start, end, exprDef, nullsLast);
+    case BOOLEAN:
+      return new BooleanValueBoundaryScanner(start, end, exprDef, nullsLast);
     default:
       throw new HiveException(String
           .format("Internal Error: attempt to setup a Window for datatype: '%s'", primitiveCategory));
@@ -768,6 +770,8 @@ abstract class SingleValueBoundaryScanner extends ValueBoundaryScanner {
       return new DatePrimitiveValueBoundaryScanner(start, end, exprDef, nullsLast);
     case "string":
       return new StringPrimitiveValueBoundaryScanner(start, end, exprDef, nullsLast);
+    case "boolean":
+      return new BooleanPrimitiveValueBoundaryScanner(start, end, exprDef, nullsLast);
     default:
       // The following types includes scale/precision: "decimal(10,4), char(10) and varchar(15)"
       if (typeString.startsWith("char") || typeString.startsWith("varchar")) {
@@ -1221,6 +1225,23 @@ class StringPrimitiveValueBoundaryScanner extends SinglePrimitiveValueBoundarySc
   }
 }
 
+class BooleanPrimitiveValueBoundaryScanner extends SinglePrimitiveValueBoundaryScanner<Long> {
+  public BooleanPrimitiveValueBoundaryScanner(BoundaryDef start, BoundaryDef end,
+      OrderExpressionDef expressionDef, boolean nullsLast) {
+    super(start, end, expressionDef, nullsLast);
+  }
+
+  @Override
+  public boolean isDistanceGreaterPrimitive(Long s1, Long s2, int amt) {
+    return s1 != null && s2 != null && s1.compareTo(s2) > 0;
+  }
+
+  @Override
+  public boolean isEqualPrimitive(Long s1, Long s2) {
+    return (s1 == null && s2 == null) || (s1 != null && s1.equals(s2));
+  }
+}
+
 class CharValueBoundaryScanner extends SingleValueBoundaryScanner {
   public CharValueBoundaryScanner(BoundaryDef start, BoundaryDef end,
       OrderExpressionDef expressionDef, boolean nullsLast) {
@@ -1270,6 +1291,40 @@ class VarcharValueBoundaryScanner extends SingleValueBoundaryScanner {
     return (s1 == null && s2 == null) || (s1 != null && s1.equals(s2));
   }
 }
+
+class BooleanValueBoundaryScanner extends SingleValueBoundaryScanner {
+  public BooleanValueBoundaryScanner(BoundaryDef start, BoundaryDef end,
+      OrderExpressionDef expressionDef, boolean nullsLast) {
+    super(start, end, expressionDef, nullsLast);
+  }
+
+  @Override
+  public boolean isDistanceGreater(Object v1, Object v2, int amt) {
+    if (v1 != null && v2 != null) {
+      boolean b1 = PrimitiveObjectInspectorUtils.getBoolean(v1,
+          (PrimitiveObjectInspector) expressionDef.getOI());
+      boolean b2 = PrimitiveObjectInspectorUtils.getBoolean(v2,
+          (PrimitiveObjectInspector) expressionDef.getOI());
+
+      return Boolean.compare(b1, b2) > 0;
+    }
+    return false;
+  }
+
+  @Override
+  public boolean isEqual(Object v1, Object v2) {
+    if (v1 != null & v2 != null) {
+      boolean b1 = PrimitiveObjectInspectorUtils.getBoolean(v1,
+          (PrimitiveObjectInspector) expressionDef.getOI());
+      boolean b2 = PrimitiveObjectInspectorUtils.getBoolean(v2,
+          (PrimitiveObjectInspector) expressionDef.getOI());
+      return b1 == b2;
+    }
+    return v1 == null && v2 == null; // True if both are null
+  }
+}
+
+
 /*
  */
  class MultiValueBoundaryScanner extends ValueBoundaryScanner {
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/udf/ptf/TestValueBoundaryScanner.java b/ql/src/test/org/apache/hadoop/hive/ql/udf/ptf/TestValueBoundaryScanner.java
index cc7f5394af8..2c45017fc4f 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/udf/ptf/TestValueBoundaryScanner.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/udf/ptf/TestValueBoundaryScanner.java
@@ -33,6 +33,7 @@ import org.apache.hadoop.hive.serde2.io.HiveVarcharWritable;
 import org.apache.hadoop.hive.serde2.io.TimestampLocalTZWritable;
 import org.apache.hadoop.hive.serde2.io.TimestampWritableV2;
 import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory;
+import org.apache.hadoop.io.BooleanWritable;
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.Text;
 import org.junit.Assert;
@@ -230,6 +231,27 @@ public class TestValueBoundaryScanner {
     Assert.assertTrue(scanner.isEqual(null, null));
   }
 
+  @Test
+  public void testBooleanEquals() {
+    PTFExpressionDef argDef = new PTFExpressionDef();
+    argDef.setOI(PrimitiveObjectInspectorFactory.writableBooleanObjectInspector);
+
+    BooleanValueBoundaryScanner scanner =
+        new BooleanValueBoundaryScanner(null, null, new OrderExpressionDef(argDef), false);
+    BooleanWritable b1 = new BooleanWritable(true);
+    BooleanWritable b2 =  new BooleanWritable(false);
+
+    Assert.assertTrue(scanner.isEqual(b1, b1));
+
+    Assert.assertFalse(scanner.isEqual(b1, b2));
+    Assert.assertFalse(scanner.isEqual(b2, b1));
+
+    Assert.assertFalse(scanner.isEqual(null, b2));
+    Assert.assertFalse(scanner.isEqual(b1, null));
+
+    Assert.assertTrue(scanner.isEqual(null, null));
+  }
+
   @Test
   public void testTimestampIsDistanceGreater() {
     PTFExpressionDef argDef = new PTFExpressionDef();
diff --git a/ql/src/test/queries/clientpositive/vector_ptf_bounded_start.q b/ql/src/test/queries/clientpositive/vector_ptf_bounded_start.q
index 9ae99dce716..5341f4c2063 100644
--- a/ql/src/test/queries/clientpositive/vector_ptf_bounded_start.q
+++ b/ql/src/test/queries/clientpositive/vector_ptf_bounded_start.q
@@ -4,15 +4,15 @@ set hive.vectorized.execution.ptf.enabled=true;
 set hive.fetch.task.conversion=none;
 
 CREATE TABLE vector_ptf_part_simple_text(p_mfgr string, p_name string, p_date date, p_retailprice double,
-  p_char char(1), p_varchar varchar(5), rowindex int)
+  p_char char(1), p_varchar varchar(5), p_boolean boolean, rowindex int)
         ROW FORMAT DELIMITED
         FIELDS TERMINATED BY ','
         STORED AS TEXTFILE;
 LOAD DATA LOCAL INPATH '../../data/files/vector_ptf_part_simple_all_datatypes.txt' OVERWRITE INTO TABLE vector_ptf_part_simple_text;
 
 CREATE TABLE vector_ptf_part_simple_orc (p_mfgr string, p_name string, p_date date, p_timestamp timestamp,
-  p_int int, p_retailprice double, p_decimal decimal(10,4), p_char char(1), p_varchar varchar(5),rowindex int) stored
-as orc;
+  p_int int, p_retailprice double, p_decimal decimal(10,4), p_char char(1), p_varchar varchar(5),
+  p_boolean boolean, rowindex int) stored as orc;
 
 SELECT * FROM vector_ptf_part_simple_text;
 
@@ -24,6 +24,7 @@ CAST(UNIX_TIMESTAMP(p_date) as int), p_retailprice,
 CAST(p_retailprice as DECIMAL(10,4)),
 p_char,
 p_varchar,
+p_boolean,
 rowindex 
 FROM vector_ptf_part_simple_text;
 
@@ -726,4 +727,51 @@ EXPLAIN VECTORIZATION DETAIL select p_mfgr, p_name, p_timestamp, rowindex, p_dat
                                     count(*) over(partition by p_varchar) as cs,
                                     sum(p_retailprice) over(partition by p_varchar) as s
 from vector_ptf_part_simple_orc
-where p_varchar = 'DA';
\ No newline at end of file
+where p_varchar = 'DA';
+
+select "************ BOOLEAN WINDOW RANGE TYPE ************";
+set hive.vectorized.execution.ptf.enabled=false;
+
+select "************ BOOLEAN WINDOW RANGE TYPE (NON-VECTORIZED REFERENCE) ************";
+select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice, p_char, p_boolean,
+       count(*) over(partition by p_mfgr order by p_boolean range between 3 preceding and current row) as cs,
+       sum(p_retailprice) over(partition by p_mfgr order by p_boolean range between 3 preceding and current row) as s
+from vector_ptf_part_simple_orc;
+
+select "************ BOOLEAN WINDOW RANGE TYPE (VECTORIZED) ************";
+set hive.vectorized.execution.ptf.enabled=true;
+
+EXPLAIN VECTORIZATION DETAIL select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice,p_char, p_boolean,
+                                    count(*) over(partition by p_mfgr order by p_boolean range between 3 preceding and
+                                    current row) as cs,
+                                    sum(p_retailprice) over(partition by p_mfgr order by p_boolean range between 3 preceding and current row) as s
+from vector_ptf_part_simple_orc;
+
+select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice, p_char, p_boolean,
+       count(*) over(partition by p_mfgr order by p_boolean range between 3 preceding and current row) as cs,
+       sum(p_retailprice) over(partition by p_mfgr order by p_boolean range between 3 preceding and current row) as s
+from vector_ptf_part_simple_orc;
+
+select "************ BOOLEAN PARTITION ************";
+EXPLAIN VECTORIZATION DETAIL select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice,p_char,p_boolean,
+                                    count(*) over(partition by p_boolean) as cs,
+                                    sum(p_retailprice) over(partition by p_boolean) as s
+from vector_ptf_part_simple_orc;
+
+select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice,p_char,p_boolean,
+       count(*) over(partition by p_boolean) as cs,
+       sum(p_retailprice) over(partition by p_boolean) as s
+from vector_ptf_part_simple_orc;
+
+select "************ BOOLEAN PARTITION WITH CONSTANT PARTITION EXPRESSION ************";
+EXPLAIN VECTORIZATION DETAIL select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice,p_char,p_boolean,
+                                    count(*) over(partition by p_boolean) as cs,
+                                    sum(p_retailprice) over(partition by p_boolean) as s
+from vector_ptf_part_simple_orc
+where p_boolean = true;
+
+select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice, p_char,p_boolean,
+       count(*) over(partition by p_boolean) as cs,
+       sum(p_retailprice) over(partition by p_boolean) as s
+from vector_ptf_part_simple_orc
+where p_boolean = false;
\ No newline at end of file
diff --git a/ql/src/test/results/clientpositive/llap/vector_ptf_bounded_start.q.out b/ql/src/test/results/clientpositive/llap/vector_ptf_bounded_start.q.out
index 167f7b7e8e5..87a54a46fe3 100644
--- a/ql/src/test/results/clientpositive/llap/vector_ptf_bounded_start.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_ptf_bounded_start.q.out
@@ -1,5 +1,5 @@
 PREHOOK: query: CREATE TABLE vector_ptf_part_simple_text(p_mfgr string, p_name string, p_date date, p_retailprice double,
-  p_char char(1), p_varchar varchar(5), rowindex int)
+  p_char char(1), p_varchar varchar(5), p_boolean boolean, rowindex int)
         ROW FORMAT DELIMITED
         FIELDS TERMINATED BY ','
         STORED AS TEXTFILE
@@ -7,7 +7,7 @@ PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@vector_ptf_part_simple_text
 POSTHOOK: query: CREATE TABLE vector_ptf_part_simple_text(p_mfgr string, p_name string, p_date date, p_retailprice double,
-  p_char char(1), p_varchar varchar(5), rowindex int)
+  p_char char(1), p_varchar varchar(5), p_boolean boolean, rowindex int)
         ROW FORMAT DELIMITED
         FIELDS TERMINATED BY ','
         STORED AS TEXTFILE
@@ -23,14 +23,14 @@ POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@vector_ptf_part_simple_text
 PREHOOK: query: CREATE TABLE vector_ptf_part_simple_orc (p_mfgr string, p_name string, p_date date, p_timestamp timestamp,
-  p_int int, p_retailprice double, p_decimal decimal(10,4), p_char char(1), p_varchar varchar(5),rowindex int) stored
-as orc
+  p_int int, p_retailprice double, p_decimal decimal(10,4), p_char char(1), p_varchar varchar(5),
+  p_boolean boolean, rowindex int) stored as orc
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@vector_ptf_part_simple_orc
 POSTHOOK: query: CREATE TABLE vector_ptf_part_simple_orc (p_mfgr string, p_name string, p_date date, p_timestamp timestamp,
-  p_int int, p_retailprice double, p_decimal decimal(10,4), p_char char(1), p_varchar varchar(5),rowindex int) stored
-as orc
+  p_int int, p_retailprice double, p_decimal decimal(10,4), p_char char(1), p_varchar varchar(5),
+  p_boolean boolean, rowindex int) stored as orc
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@vector_ptf_part_simple_orc
@@ -42,47 +42,47 @@ POSTHOOK: query: SELECT * FROM vector_ptf_part_simple_text
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@vector_ptf_part_simple_text
 #### A masked pattern was here ####
-vector_ptf_part_simple_text.p_mfgr	vector_ptf_part_simple_text.p_name	vector_ptf_part_simple_text.p_date	vector_ptf_part_simple_text.p_retailprice	vector_ptf_part_simple_text.p_char	vector_ptf_part_simple_text.p_varchar	vector_ptf_part_simple_text.rowindex
-Manufacturer#2	almond aquamarine rose maroon antique	NULL	900.66	A	DA	1
-Manufacturer#1	almond aquamarine burnished black steel	1970-01-02	1414.42	B	AB	2
-Manufacturer#2	almond aquamarine rose maroon antique	1970-01-03	1698.66	C	CA	3
-Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-04	NULL	A	DE	4
-Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-05	1753.76	B	AC	5
-Manufacturer#5	almond antique medium spring khaki	1970-01-01	1611.66	C	AA	6
-Manufacturer#5	almond antique blue firebrick mint	NULL	1789.69	D	FD	7
-Manufacturer#1	almond antique burnished rose metallic	1970-01-03	1173.15	A	SM	8
-Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-04	1632.66	B	AK	9
-Manufacturer#3	almond antique forest lavender goldenrod	1970-01-05	1190.27	C	AY	10
-Manufacturer#4	almond aquamarine yellow dodger mint	1970-01-01	1844.92	D	FD	11
-Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-02	1753.76	D	DA	12
-Manufacturer#2	almond antique violet turquoise frosted	NULL	1800.7	B	AC	13
-Manufacturer#3	almond antique forest lavender goldenrod	1970-01-04	NULL	C	BB	14
-Manufacturer#2	almond antique violet chocolate turquoise	1970-01-05	1690.68	D	LM	15
-Manufacturer#4	almond antique violet mint lemon	1970-01-01	1375.42	B	OP	16
-Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-02	1632.66	D	RS	17
-Manufacturer#5	almond azure blanched chiffon midnight	1970-01-03	1464.48	C	AB	18
-Manufacturer#3	almond antique forest lavender goldenrod	NULL	590.27	D	CD	19
-Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-05	1753.76	A	EF	20
-Manufacturer#2	almond antique violet turquoise frosted	1970-01-01	1800.7	B	AA	21
-Manufacturer#5	almond antique sky peru orange	1970-01-02	1788.73	A	BB	22
-Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-03	1632.66	D	CC	23
-Manufacturer#3	almond antique chartreuse khaki white	1970-01-04	99.68	C	DD	24
-Manufacturer#4	almond antique gainsboro frosted violet	NULL	NULL	A	EE	25
-Manufacturer#1	almond antique chartreuse lavender yellow	NULL	1753.76	C	AD	26
-Manufacturer#2	almond antique violet turquoise frosted	1970-01-02	1800.7	D	AB	27
-Manufacturer#3	almond antique olive coral navajo	1970-01-03	1337.29	A	AC	28
-Manufacturer#5	almond antique medium spring khaki	1970-01-04	1611.66	B	AA	29
-Manufacturer#1	almond antique salmon chartreuse burlywood	1970-01-05	1602.59	C	BB	30
-Manufacturer#3	almond antique misty red olive	1970-01-01	1922.98	D	BC	31
-Manufacturer#2	almond aquamarine sandy cyan gainsboro	NULL	1000.6	A	BD	32
-Manufacturer#3	almond antique forest lavender goldenrod	1970-01-03	1190.27	B	CA	33
-Manufacturer#2	almond aquamarine midnight light salmon	1970-01-04	2031.98	C	CB	34
-Manufacturer#4	almond aquamarine floral ivory bisque	1970-01-05	NULL	A	CC	35
-Manufacturer#5	almond aquamarine dodger light gainsboro	1970-01-01	1018.1	B	CD	36
-Manufacturer#4	almond azure aquamarine papaya violet	1970-01-02	1290.35	C	DA	37
-Manufacturer#3	almond antique metallic orange dim	NULL	55.39	D	DB	38
-Manufacturer#1	almond antique burnished rose metallic	1970-01-04	1173.15	D	DC	39
-Manufacturer#4	almond aquamarine floral ivory bisque	1970-01-05	1206.26	C	DD	40
+vector_ptf_part_simple_text.p_mfgr	vector_ptf_part_simple_text.p_name	vector_ptf_part_simple_text.p_date	vector_ptf_part_simple_text.p_retailprice	vector_ptf_part_simple_text.p_char	vector_ptf_part_simple_text.p_varchar	vector_ptf_part_simple_text.p_boolean	vector_ptf_part_simple_text.rowindex
+Manufacturer#2	almond aquamarine rose maroon antique	NULL	900.66	A	DA	true	1
+Manufacturer#1	almond aquamarine burnished black steel	1970-01-02	1414.42	B	AB	true	2
+Manufacturer#2	almond aquamarine rose maroon antique	1970-01-03	1698.66	C	CA	true	3
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-04	NULL	A	DE	true	4
+Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-05	1753.76	B	AC	false	5
+Manufacturer#5	almond antique medium spring khaki	1970-01-01	1611.66	C	AA	false	6
+Manufacturer#5	almond antique blue firebrick mint	NULL	1789.69	D	FD	true	7
+Manufacturer#1	almond antique burnished rose metallic	1970-01-03	1173.15	A	SM	false	8
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-04	1632.66	B	AK	false	9
+Manufacturer#3	almond antique forest lavender goldenrod	1970-01-05	1190.27	C	AY	true	10
+Manufacturer#4	almond aquamarine yellow dodger mint	1970-01-01	1844.92	D	FD	false	11
+Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-02	1753.76	D	DA	true	12
+Manufacturer#2	almond antique violet turquoise frosted	NULL	1800.7	B	AC	false	13
+Manufacturer#3	almond antique forest lavender goldenrod	1970-01-04	NULL	C	BB	false	14
+Manufacturer#2	almond antique violet chocolate turquoise	1970-01-05	1690.68	D	LM	NULL	15
+Manufacturer#4	almond antique violet mint lemon	1970-01-01	1375.42	B	OP	true	16
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-02	1632.66	D	RS	true	17
+Manufacturer#5	almond azure blanched chiffon midnight	1970-01-03	1464.48	C	AB	true	18
+Manufacturer#3	almond antique forest lavender goldenrod	NULL	590.27	D	CD	true	19
+Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-05	1753.76	A	EF	false	20
+Manufacturer#2	almond antique violet turquoise frosted	1970-01-01	1800.7	B	AA	false	21
+Manufacturer#5	almond antique sky peru orange	1970-01-02	1788.73	A	BB	false	22
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-03	1632.66	D	CC	true	23
+Manufacturer#3	almond antique chartreuse khaki white	1970-01-04	99.68	C	DD	false	24
+Manufacturer#4	almond antique gainsboro frosted violet	NULL	NULL	A	EE	false	25
+Manufacturer#1	almond antique chartreuse lavender yellow	NULL	1753.76	C	AD	true	26
+Manufacturer#2	almond antique violet turquoise frosted	1970-01-02	1800.7	D	AB	true	27
+Manufacturer#3	almond antique olive coral navajo	1970-01-03	1337.29	A	AC	false	28
+Manufacturer#5	almond antique medium spring khaki	1970-01-04	1611.66	B	AA	false	29
+Manufacturer#1	almond antique salmon chartreuse burlywood	1970-01-05	1602.59	C	BB	true	30
+Manufacturer#3	almond antique misty red olive	1970-01-01	1922.98	D	BC	false	31
+Manufacturer#2	almond aquamarine sandy cyan gainsboro	NULL	1000.6	A	BD	NULL	32
+Manufacturer#3	almond antique forest lavender goldenrod	1970-01-03	1190.27	B	CA	false	33
+Manufacturer#2	almond aquamarine midnight light salmon	1970-01-04	2031.98	C	CB	true	34
+Manufacturer#4	almond aquamarine floral ivory bisque	1970-01-05	NULL	A	CC	false	35
+Manufacturer#5	almond aquamarine dodger light gainsboro	1970-01-01	1018.1	B	CD	true	36
+Manufacturer#4	almond azure aquamarine papaya violet	1970-01-02	1290.35	C	DA	NULL	37
+Manufacturer#3	almond antique metallic orange dim	NULL	55.39	D	DB	true	38
+Manufacturer#1	almond antique burnished rose metallic	1970-01-04	1173.15	D	DC	false	39
+Manufacturer#4	almond aquamarine floral ivory bisque	1970-01-05	1206.26	C	DD	true	40
 PREHOOK: query: INSERT INTO TABLE vector_ptf_part_simple_orc 
 SELECT 
 p_mfgr, p_name, p_date, 
@@ -91,6 +91,7 @@ CAST(UNIX_TIMESTAMP(p_date) as int), p_retailprice,
 CAST(p_retailprice as DECIMAL(10,4)),
 p_char,
 p_varchar,
+p_boolean,
 rowindex 
 FROM vector_ptf_part_simple_text
 PREHOOK: type: QUERY
@@ -104,11 +105,13 @@ CAST(UNIX_TIMESTAMP(p_date) as int), p_retailprice,
 CAST(p_retailprice as DECIMAL(10,4)),
 p_char,
 p_varchar,
+p_boolean,
 rowindex 
 FROM vector_ptf_part_simple_text
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@vector_ptf_part_simple_text
 POSTHOOK: Output: default@vector_ptf_part_simple_orc
+POSTHOOK: Lineage: vector_ptf_part_simple_orc.p_boolean SIMPLE [(vector_ptf_part_simple_text)vector_ptf_part_simple_text.FieldSchema(name:p_boolean, type:boolean, comment:null), ]
 POSTHOOK: Lineage: vector_ptf_part_simple_orc.p_char SIMPLE [(vector_ptf_part_simple_text)vector_ptf_part_simple_text.FieldSchema(name:p_char, type:char(1), comment:null), ]
 POSTHOOK: Lineage: vector_ptf_part_simple_orc.p_date SIMPLE [(vector_ptf_part_simple_text)vector_ptf_part_simple_text.FieldSchema(name:p_date, type:date, comment:null), ]
 POSTHOOK: Lineage: vector_ptf_part_simple_orc.p_decimal EXPRESSION [(vector_ptf_part_simple_text)vector_ptf_part_simple_text.FieldSchema(name:p_retailprice, type:double, comment:null), ]
@@ -119,7 +122,7 @@ POSTHOOK: Lineage: vector_ptf_part_simple_orc.p_retailprice SIMPLE [(vector_ptf_
 POSTHOOK: Lineage: vector_ptf_part_simple_orc.p_timestamp EXPRESSION [(vector_ptf_part_simple_text)vector_ptf_part_simple_text.FieldSchema(name:p_date, type:date, comment:null), ]
 POSTHOOK: Lineage: vector_ptf_part_simple_orc.p_varchar SIMPLE [(vector_ptf_part_simple_text)vector_ptf_part_simple_text.FieldSchema(name:p_varchar, type:varchar(5), comment:null), ]
 POSTHOOK: Lineage: vector_ptf_part_simple_orc.rowindex SIMPLE [(vector_ptf_part_simple_text)vector_ptf_part_simple_text.FieldSchema(name:rowindex, type:int, comment:null), ]
-p_mfgr	p_name	p_date	_c3	_c4	p_retailprice	_c6	p_char	p_varchar	rowindex
+p_mfgr	p_name	p_date	_c3	_c4	p_retailprice	_c6	p_char	p_varchar	p_boolean	rowindex
 PREHOOK: query: SELECT * FROM vector_ptf_part_simple_orc
 PREHOOK: type: QUERY
 PREHOOK: Input: default@vector_ptf_part_simple_orc
@@ -128,47 +131,47 @@ POSTHOOK: query: SELECT * FROM vector_ptf_part_simple_orc
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@vector_ptf_part_simple_orc
 #### A masked pattern was here ####
-vector_ptf_part_simple_orc.p_mfgr	vector_ptf_part_simple_orc.p_name	vector_ptf_part_simple_orc.p_date	vector_ptf_part_simple_orc.p_timestamp	vector_ptf_part_simple_orc.p_int	vector_ptf_part_simple_orc.p_retailprice	vector_ptf_part_simple_orc.p_decimal	vector_ptf_part_simple_orc.p_char	vector_ptf_part_simple_orc.p_varchar	vector_ptf_part_simple_orc.rowindex
-Manufacturer#2	almond aquamarine rose maroon antique	NULL	NULL	NULL	900.66	900.6600	A	DA	1
-Manufacturer#1	almond aquamarine burnished black steel	1970-01-02	1970-01-02 00:00:00	115200	1414.42	1414.4200	B	AB	2
-Manufacturer#2	almond aquamarine rose maroon antique	1970-01-03	1970-01-03 00:00:00	201600	1698.66	1698.6600	C	CA	3
-Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-04	1970-01-04 00:00:00	288000	NULL	NULL	A	DE	4
-Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-05	1970-01-05 00:00:00	374400	1753.76	1753.7600	B	AC	5
-Manufacturer#5	almond antique medium spring khaki	1970-01-01	1970-01-01 00:00:00	28800	1611.66	1611.6600	C	AA	6
-Manufacturer#5	almond antique blue firebrick mint	NULL	NULL	NULL	1789.69	1789.6900	D	FD	7
-Manufacturer#1	almond antique burnished rose metallic	1970-01-03	1970-01-03 00:00:00	201600	1173.15	1173.1500	A	SM	8
-Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-04	1970-01-04 00:00:00	288000	1632.66	1632.6600	B	AK	9
-Manufacturer#3	almond antique forest lavender goldenrod	1970-01-05	1970-01-05 00:00:00	374400	1190.27	1190.2700	C	AY	10
-Manufacturer#4	almond aquamarine yellow dodger mint	1970-01-01	1970-01-01 00:00:00	28800	1844.92	1844.9200	D	FD	11
-Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-02	1970-01-02 00:00:00	115200	1753.76	1753.7600	D	DA	12
-Manufacturer#2	almond antique violet turquoise frosted	NULL	NULL	NULL	1800.7	1800.7000	B	AC	13
-Manufacturer#3	almond antique forest lavender goldenrod	1970-01-04	1970-01-04 00:00:00	288000	NULL	NULL	C	BB	14
-Manufacturer#2	almond antique violet chocolate turquoise	1970-01-05	1970-01-05 00:00:00	374400	1690.68	1690.6800	D	LM	15
-Manufacturer#4	almond antique violet mint lemon	1970-01-01	1970-01-01 00:00:00	28800	1375.42	1375.4200	B	OP	16
-Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-02	1970-01-02 00:00:00	115200	1632.66	1632.6600	D	RS	17
-Manufacturer#5	almond azure blanched chiffon midnight	1970-01-03	1970-01-03 00:00:00	201600	1464.48	1464.4800	C	AB	18
-Manufacturer#3	almond antique forest lavender goldenrod	NULL	NULL	NULL	590.27	590.2700	D	CD	19
-Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-05	1970-01-05 00:00:00	374400	1753.76	1753.7600	A	EF	20
-Manufacturer#2	almond antique violet turquoise frosted	1970-01-01	1970-01-01 00:00:00	28800	1800.7	1800.7000	B	AA	21
-Manufacturer#5	almond antique sky peru orange	1970-01-02	1970-01-02 00:00:00	115200	1788.73	1788.7300	A	BB	22
-Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-03	1970-01-03 00:00:00	201600	1632.66	1632.6600	D	CC	23
-Manufacturer#3	almond antique chartreuse khaki white	1970-01-04	1970-01-04 00:00:00	288000	99.68	99.6800	C	DD	24
-Manufacturer#4	almond antique gainsboro frosted violet	NULL	NULL	NULL	NULL	NULL	A	EE	25
-Manufacturer#1	almond antique chartreuse lavender yellow	NULL	NULL	NULL	1753.76	1753.7600	C	AD	26
-Manufacturer#2	almond antique violet turquoise frosted	1970-01-02	1970-01-02 00:00:00	115200	1800.7	1800.7000	D	AB	27
-Manufacturer#3	almond antique olive coral navajo	1970-01-03	1970-01-03 00:00:00	201600	1337.29	1337.2900	A	AC	28
-Manufacturer#5	almond antique medium spring khaki	1970-01-04	1970-01-04 00:00:00	288000	1611.66	1611.6600	B	AA	29
-Manufacturer#1	almond antique salmon chartreuse burlywood	1970-01-05	1970-01-05 00:00:00	374400	1602.59	1602.5900	C	BB	30
-Manufacturer#3	almond antique misty red olive	1970-01-01	1970-01-01 00:00:00	28800	1922.98	1922.9800	D	BC	31
-Manufacturer#2	almond aquamarine sandy cyan gainsboro	NULL	NULL	NULL	1000.6	1000.6000	A	BD	32
-Manufacturer#3	almond antique forest lavender goldenrod	1970-01-03	1970-01-03 00:00:00	201600	1190.27	1190.2700	B	CA	33
-Manufacturer#2	almond aquamarine midnight light salmon	1970-01-04	1970-01-04 00:00:00	288000	2031.98	2031.9800	C	CB	34
-Manufacturer#4	almond aquamarine floral ivory bisque	1970-01-05	1970-01-05 00:00:00	374400	NULL	NULL	A	CC	35
-Manufacturer#5	almond aquamarine dodger light gainsboro	1970-01-01	1970-01-01 00:00:00	28800	1018.1	1018.1000	B	CD	36
-Manufacturer#4	almond azure aquamarine papaya violet	1970-01-02	1970-01-02 00:00:00	115200	1290.35	1290.3500	C	DA	37
-Manufacturer#3	almond antique metallic orange dim	NULL	NULL	NULL	55.39	55.3900	D	DB	38
-Manufacturer#1	almond antique burnished rose metallic	1970-01-04	1970-01-04 00:00:00	288000	1173.15	1173.1500	D	DC	39
-Manufacturer#4	almond aquamarine floral ivory bisque	1970-01-05	1970-01-05 00:00:00	374400	1206.26	1206.2600	C	DD	40
+vector_ptf_part_simple_orc.p_mfgr	vector_ptf_part_simple_orc.p_name	vector_ptf_part_simple_orc.p_date	vector_ptf_part_simple_orc.p_timestamp	vector_ptf_part_simple_orc.p_int	vector_ptf_part_simple_orc.p_retailprice	vector_ptf_part_simple_orc.p_decimal	vector_ptf_part_simple_orc.p_char	vector_ptf_part_simple_orc.p_varchar	vector_ptf_part_simple_orc.p_boolean	vector_ptf_part_simple_orc.rowindex
+Manufacturer#2	almond aquamarine rose maroon antique	NULL	NULL	NULL	900.66	900.6600	A	DA	true	1
+Manufacturer#1	almond aquamarine burnished black steel	1970-01-02	1970-01-02 00:00:00	115200	1414.42	1414.4200	B	AB	true	2
+Manufacturer#2	almond aquamarine rose maroon antique	1970-01-03	1970-01-03 00:00:00	201600	1698.66	1698.6600	C	CA	true	3
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-04	1970-01-04 00:00:00	288000	NULL	NULL	A	DE	true	4
+Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-05	1970-01-05 00:00:00	374400	1753.76	1753.7600	B	AC	false	5
+Manufacturer#5	almond antique medium spring khaki	1970-01-01	1970-01-01 00:00:00	28800	1611.66	1611.6600	C	AA	false	6
+Manufacturer#5	almond antique blue firebrick mint	NULL	NULL	NULL	1789.69	1789.6900	D	FD	true	7
+Manufacturer#1	almond antique burnished rose metallic	1970-01-03	1970-01-03 00:00:00	201600	1173.15	1173.1500	A	SM	false	8
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-04	1970-01-04 00:00:00	288000	1632.66	1632.6600	B	AK	false	9
+Manufacturer#3	almond antique forest lavender goldenrod	1970-01-05	1970-01-05 00:00:00	374400	1190.27	1190.2700	C	AY	true	10
+Manufacturer#4	almond aquamarine yellow dodger mint	1970-01-01	1970-01-01 00:00:00	28800	1844.92	1844.9200	D	FD	false	11
+Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-02	1970-01-02 00:00:00	115200	1753.76	1753.7600	D	DA	true	12
+Manufacturer#2	almond antique violet turquoise frosted	NULL	NULL	NULL	1800.7	1800.7000	B	AC	false	13
+Manufacturer#3	almond antique forest lavender goldenrod	1970-01-04	1970-01-04 00:00:00	288000	NULL	NULL	C	BB	false	14
+Manufacturer#2	almond antique violet chocolate turquoise	1970-01-05	1970-01-05 00:00:00	374400	1690.68	1690.6800	D	LM	NULL	15
+Manufacturer#4	almond antique violet mint lemon	1970-01-01	1970-01-01 00:00:00	28800	1375.42	1375.4200	B	OP	true	16
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-02	1970-01-02 00:00:00	115200	1632.66	1632.6600	D	RS	true	17
+Manufacturer#5	almond azure blanched chiffon midnight	1970-01-03	1970-01-03 00:00:00	201600	1464.48	1464.4800	C	AB	true	18
+Manufacturer#3	almond antique forest lavender goldenrod	NULL	NULL	NULL	590.27	590.2700	D	CD	true	19
+Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-05	1970-01-05 00:00:00	374400	1753.76	1753.7600	A	EF	false	20
+Manufacturer#2	almond antique violet turquoise frosted	1970-01-01	1970-01-01 00:00:00	28800	1800.7	1800.7000	B	AA	false	21
+Manufacturer#5	almond antique sky peru orange	1970-01-02	1970-01-02 00:00:00	115200	1788.73	1788.7300	A	BB	false	22
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-03	1970-01-03 00:00:00	201600	1632.66	1632.6600	D	CC	true	23
+Manufacturer#3	almond antique chartreuse khaki white	1970-01-04	1970-01-04 00:00:00	288000	99.68	99.6800	C	DD	false	24
+Manufacturer#4	almond antique gainsboro frosted violet	NULL	NULL	NULL	NULL	NULL	A	EE	false	25
+Manufacturer#1	almond antique chartreuse lavender yellow	NULL	NULL	NULL	1753.76	1753.7600	C	AD	true	26
+Manufacturer#2	almond antique violet turquoise frosted	1970-01-02	1970-01-02 00:00:00	115200	1800.7	1800.7000	D	AB	true	27
+Manufacturer#3	almond antique olive coral navajo	1970-01-03	1970-01-03 00:00:00	201600	1337.29	1337.2900	A	AC	false	28
+Manufacturer#5	almond antique medium spring khaki	1970-01-04	1970-01-04 00:00:00	288000	1611.66	1611.6600	B	AA	false	29
+Manufacturer#1	almond antique salmon chartreuse burlywood	1970-01-05	1970-01-05 00:00:00	374400	1602.59	1602.5900	C	BB	true	30
+Manufacturer#3	almond antique misty red olive	1970-01-01	1970-01-01 00:00:00	28800	1922.98	1922.9800	D	BC	false	31
+Manufacturer#2	almond aquamarine sandy cyan gainsboro	NULL	NULL	NULL	1000.6	1000.6000	A	BD	NULL	32
+Manufacturer#3	almond antique forest lavender goldenrod	1970-01-03	1970-01-03 00:00:00	201600	1190.27	1190.2700	B	CA	false	33
+Manufacturer#2	almond aquamarine midnight light salmon	1970-01-04	1970-01-04 00:00:00	288000	2031.98	2031.9800	C	CB	true	34
+Manufacturer#4	almond aquamarine floral ivory bisque	1970-01-05	1970-01-05 00:00:00	374400	NULL	NULL	A	CC	false	35
+Manufacturer#5	almond aquamarine dodger light gainsboro	1970-01-01	1970-01-01 00:00:00	28800	1018.1	1018.1000	B	CD	true	36
+Manufacturer#4	almond azure aquamarine papaya violet	1970-01-02	1970-01-02 00:00:00	115200	1290.35	1290.3500	C	DA	NULL	37
+Manufacturer#3	almond antique metallic orange dim	NULL	NULL	NULL	55.39	55.3900	D	DB	true	38
+Manufacturer#1	almond antique burnished rose metallic	1970-01-04	1970-01-04 00:00:00	288000	1173.15	1173.1500	D	DC	false	39
+Manufacturer#4	almond aquamarine floral ivory bisque	1970-01-05	1970-01-05 00:00:00	374400	1206.26	1206.2600	C	DD	true	40
 PREHOOK: query: select "************ NON_VECTORIZED REFERENCE ************"
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
@@ -356,7 +359,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 11104 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_date (type: date)
                     null sort order: az
@@ -368,7 +371,7 @@ STAGE PLANS:
                         native: true
                         nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
                         partitionColumns: 0:string
-                        valueColumns: 1:string, 5:double, 9:int
+                        valueColumns: 1:string, 5:double, 10:int
                     Statistics: Num rows: 40 Data size: 11104 Basic stats: COMPLETE Column stats: COMPLETE
                     value expressions: p_name (type: string), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -383,9 +386,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 5, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 5, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
         Reducer 2 
@@ -400,13 +403,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 5
-                    dataColumns: KEY.reducesinkkey0:string, KEY.reducesinkkey1:date, VALUE._col0:string, VALUE._col3:double, VALUE._col7:int
+                    dataColumns: KEY.reducesinkkey0:string, KEY.reducesinkkey1:date, VALUE._col0:string, VALUE._col3:double, VALUE._col8:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, bigint, bigint, bigint, bigint, double, double, double, double, double, double, double, double, bigint, bigint]
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), KEY.reducesinkkey1 (type: date), VALUE._col3 (type: double), VALUE._col7 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col5, _col9
+                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), KEY.reducesinkkey1 (type: date), VALUE._col3 (type: double), VALUE._col8 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col5, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -416,7 +419,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col5: double, _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col5: double, _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -439,13 +442,13 @@ STAGE PLANS:
                               isStar: true
                             window function definition
                               alias: count_window_2
-                              arguments: _col9
+                              arguments: _col10
                               name: count
                               window function: GenericUDAFCountEvaluator
                               window frame: RANGE PRECEDING(1)~CURRENT
                             window function definition
                               alias: count_window_3
-                              arguments: _col9
+                              arguments: _col10
                               name: count
                               window function: GenericUDAFCountEvaluator
                               window frame: RANGE PRECEDING(3)~CURRENT
@@ -533,8 +536,8 @@ STAGE PLANS:
                       streamingColumns: [18, 19]
                   Statistics: Num rows: 40 Data size: 11104 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: count_window_0 (type: bigint), count_window_1 (type: bigint), count_window_2 (type: bigint), count_window_3 (type: bigint), count_window_4 (type: bigint), sum_window_5 (type: double), sum_window_6 (type: double), min_window_7 (type: double), min_window_8 (type: double), max_window_9 (type: double), max_window_10 (type: double), avg_window_11 (type: double), avg_window_12 (type: double), rank_window_16 (type: int), dense_rank_window_17 (type: int), _col0 ( [...]
-                    outputColumnNames: count_window_0, count_window_1, count_window_2, count_window_3, count_window_4, sum_window_5, sum_window_6, min_window_7, min_window_8, max_window_9, max_window_10, avg_window_11, avg_window_12, rank_window_16, dense_rank_window_17, _col0, _col1, _col2, _col5, _col9
+                    expressions: count_window_0 (type: bigint), count_window_1 (type: bigint), count_window_2 (type: bigint), count_window_3 (type: bigint), count_window_4 (type: bigint), sum_window_5 (type: double), sum_window_6 (type: double), min_window_7 (type: double), min_window_8 (type: double), max_window_9 (type: double), max_window_10 (type: double), avg_window_11 (type: double), avg_window_12 (type: double), rank_window_16 (type: int), dense_rank_window_17 (type: int), _col0 ( [...]
+                    outputColumnNames: count_window_0, count_window_1, count_window_2, count_window_3, count_window_4, sum_window_5, sum_window_6, min_window_7, min_window_8, max_window_9, max_window_10, avg_window_11, avg_window_12, rank_window_16, dense_rank_window_17, _col0, _col1, _col2, _col5, _col10
                     Select Vectorization:
                         className: VectorSelectOperator
                         native: true
@@ -552,7 +555,7 @@ STAGE PLANS:
                           nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
                           valueColumns: 5:bigint, 6:bigint, 7:bigint, 8:bigint, 9:bigint, 10:double, 11:double, 12:double, 13:double, 14:double, 15:double, 16:double, 17:double, 18:int, 19:int, 2:string, 1:date, 3:double, 4:int
                       Statistics: Num rows: 40 Data size: 11104 Basic stats: COMPLETE Column stats: COMPLETE
-                      value expressions: count_window_0 (type: bigint), count_window_1 (type: bigint), count_window_2 (type: bigint), count_window_3 (type: bigint), count_window_4 (type: bigint), sum_window_5 (type: double), sum_window_6 (type: double), min_window_7 (type: double), min_window_8 (type: double), max_window_9 (type: double), max_window_10 (type: double), avg_window_11 (type: double), avg_window_12 (type: double), rank_window_16 (type: int), dense_rank_window_17 (type: int), [...]
+                      value expressions: count_window_0 (type: bigint), count_window_1 (type: bigint), count_window_2 (type: bigint), count_window_3 (type: bigint), count_window_4 (type: bigint), sum_window_5 (type: double), sum_window_6 (type: double), min_window_7 (type: double), min_window_8 (type: double), max_window_9 (type: double), max_window_10 (type: double), avg_window_11 (type: double), avg_window_12 (type: double), rank_window_16 (type: int), dense_rank_window_17 (type: int), [...]
         Reducer 3 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -565,13 +568,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 20
-                    dataColumns: KEY.reducesinkkey0:string, VALUE._col0:bigint, VALUE._col1:bigint, VALUE._col2:bigint, VALUE._col3:bigint, VALUE._col4:bigint, VALUE._col5:double, VALUE._col6:double, VALUE._col7:double, VALUE._col8:double, VALUE._col9:double, VALUE._col10:double, VALUE._col11:double, VALUE._col12:double, VALUE._col13:int, VALUE._col14:int, VALUE._col15:string, VALUE._col16:date, VALUE._col19:double, VALUE._col23:int
+                    dataColumns: KEY.reducesinkkey0:string, VALUE._col0:bigint, VALUE._col1:bigint, VALUE._col2:bigint, VALUE._col3:bigint, VALUE._col4:bigint, VALUE._col5:double, VALUE._col6:double, VALUE._col7:double, VALUE._col8:double, VALUE._col9:double, VALUE._col10:double, VALUE._col11:double, VALUE._col12:double, VALUE._col13:int, VALUE._col14:int, VALUE._col15:string, VALUE._col16:date, VALUE._col19:double, VALUE._col24:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, bigint, bigint, double, double, double]
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: bigint), VALUE._col1 (type: bigint), VALUE._col2 (type: bigint), VALUE._col3 (type: bigint), VALUE._col4 (type: bigint), VALUE._col5 (type: double), VALUE._col6 (type: double), VALUE._col7 (type: double), VALUE._col8 (type: double), VALUE._col9 (type: double), VALUE._col10 (type: double), VALUE._col11 (type: double), VALUE._col12 (type: double), VALUE._col13 (type: int), VALUE._col14 (type: int), KEY.reducesinkkey0 (type: string), VALUE._co [...]
-                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col20, _col24
+                expressions: VALUE._col0 (type: bigint), VALUE._col1 (type: bigint), VALUE._col2 (type: bigint), VALUE._col3 (type: bigint), VALUE._col4 (type: bigint), VALUE._col5 (type: double), VALUE._col6 (type: double), VALUE._col7 (type: double), VALUE._col8 (type: double), VALUE._col9 (type: double), VALUE._col10 (type: double), VALUE._col11 (type: double), VALUE._col12 (type: double), VALUE._col13 (type: int), VALUE._col14 (type: int), KEY.reducesinkkey0 (type: string), VALUE._co [...]
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col20, _col25
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -581,7 +584,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: bigint, _col1: bigint, _col2: bigint, _col3: bigint, _col4: bigint, _col5: double, _col6: double, _col7: double, _col8: double, _col9: double, _col10: double, _col11: double, _col12: double, _col13: int, _col14: int, _col15: string, _col16: string, _col17: date, _col20: double, _col24: int
+                        output shape: _col0: bigint, _col1: bigint, _col2: bigint, _col3: bigint, _col4: bigint, _col5: double, _col6: double, _col7: double, _col8: double, _col9: double, _col10: double, _col11: double, _col12: double, _col13: int, _col14: int, _col15: string, _col16: string, _col17: date, _col20: double, _col25: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -646,8 +649,8 @@ STAGE PLANS:
                       streamingColumns: [20, 21, 22, 23]
                   Statistics: Num rows: 40 Data size: 15104 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: row_number_window_13 (type: int), rank_window_14 (type: int), dense_rank_window_15 (type: int), first_value_window_18 (type: double), lead_window_20 (type: double), lag_window_21 (type: double), _col0 (type: bigint), _col1 (type: bigint), _col2 (type: bigint), _col3 (type: bigint), _col4 (type: bigint), _col5 (type: double), _col6 (type: double), _col7 (type: double), _col8 (type: double), _col9 (type: double), _col10 (type: double), _col11 (type: double) [...]
-                    outputColumnNames: row_number_window_13, rank_window_14, dense_rank_window_15, first_value_window_18, lead_window_20, lag_window_21, _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col20, _col24
+                    expressions: row_number_window_13 (type: int), rank_window_14 (type: int), dense_rank_window_15 (type: int), first_value_window_18 (type: double), lead_window_20 (type: double), lag_window_21 (type: double), _col0 (type: bigint), _col1 (type: bigint), _col2 (type: bigint), _col3 (type: bigint), _col4 (type: bigint), _col5 (type: double), _col6 (type: double), _col7 (type: double), _col8 (type: double), _col9 (type: double), _col10 (type: double), _col11 (type: double) [...]
+                    outputColumnNames: row_number_window_13, rank_window_14, dense_rank_window_15, first_value_window_18, lead_window_20, lag_window_21, _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col20, _col25
                     Select Vectorization:
                         className: VectorSelectOperator
                         native: true
@@ -665,7 +668,7 @@ STAGE PLANS:
                           nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
                           valueColumns: 20:int, 21:int, 22:int, 23:double, 24:double, 25:double, 1:bigint, 2:bigint, 3:bigint, 4:bigint, 5:bigint, 6:double, 7:double, 8:double, 9:double, 10:double, 11:double, 12:double, 13:double, 14:int, 15:int, 16:string, 17:date, 18:double, 19:int
                       Statistics: Num rows: 40 Data size: 15104 Basic stats: COMPLETE Column stats: COMPLETE
-                      value expressions: row_number_window_13 (type: int), rank_window_14 (type: int), dense_rank_window_15 (type: int), first_value_window_18 (type: double), lead_window_20 (type: double), lag_window_21 (type: double), _col0 (type: bigint), _col1 (type: bigint), _col2 (type: bigint), _col3 (type: bigint), _col4 (type: bigint), _col5 (type: double), _col6 (type: double), _col7 (type: double), _col8 (type: double), _col9 (type: double), _col10 (type: double), _col11 (type: [...]
+                      value expressions: row_number_window_13 (type: int), rank_window_14 (type: int), dense_rank_window_15 (type: int), first_value_window_18 (type: double), lead_window_20 (type: double), lag_window_21 (type: double), _col0 (type: bigint), _col1 (type: bigint), _col2 (type: bigint), _col3 (type: bigint), _col4 (type: bigint), _col5 (type: double), _col6 (type: double), _col7 (type: double), _col8 (type: double), _col9 (type: double), _col10 (type: double), _col11 (type: [...]
         Reducer 4 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -678,13 +681,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 26
-                    dataColumns: KEY.reducesinkkey0:string, VALUE._col0:int, VALUE._col1:int, VALUE._col2:int, VALUE._col3:double, VALUE._col4:double, VALUE._col5:double, VALUE._col6:bigint, VALUE._col7:bigint, VALUE._col8:bigint, VALUE._col9:bigint, VALUE._col10:bigint, VALUE._col11:double, VALUE._col12:double, VALUE._col13:double, VALUE._col14:double, VALUE._col15:double, VALUE._col16:double, VALUE._col17:double, VALUE._col18:double, VALUE._col19:int, VALUE._col20:int, VALUE._col21:str [...]
+                    dataColumns: KEY.reducesinkkey0:string, VALUE._col0:int, VALUE._col1:int, VALUE._col2:int, VALUE._col3:double, VALUE._col4:double, VALUE._col5:double, VALUE._col6:bigint, VALUE._col7:bigint, VALUE._col8:bigint, VALUE._col9:bigint, VALUE._col10:bigint, VALUE._col11:double, VALUE._col12:double, VALUE._col13:double, VALUE._col14:double, VALUE._col15:double, VALUE._col16:double, VALUE._col17:double, VALUE._col18:double, VALUE._col19:int, VALUE._col20:int, VALUE._col21:str [...]
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [double]
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: int), VALUE._col3 (type: double), VALUE._col4 (type: double), VALUE._col5 (type: double), VALUE._col6 (type: bigint), VALUE._col7 (type: bigint), VALUE._col8 (type: bigint), VALUE._col9 (type: bigint), VALUE._col10 (type: bigint), VALUE._col11 (type: double), VALUE._col12 (type: double), VALUE._col13 (type: double), VALUE._col14 (type: double), VALUE._col15 (type: double), VALUE._col16 (type [...]
-                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23, _col26, _col30
+                expressions: VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: int), VALUE._col3 (type: double), VALUE._col4 (type: double), VALUE._col5 (type: double), VALUE._col6 (type: bigint), VALUE._col7 (type: bigint), VALUE._col8 (type: bigint), VALUE._col9 (type: bigint), VALUE._col10 (type: bigint), VALUE._col11 (type: double), VALUE._col12 (type: double), VALUE._col13 (type: double), VALUE._col14 (type: double), VALUE._col15 (type: double), VALUE._col16 (type [...]
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23, _col26, _col31
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -694,7 +697,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: int, _col1: int, _col2: int, _col3: double, _col4: double, _col5: double, _col6: bigint, _col7: bigint, _col8: bigint, _col9: bigint, _col10: bigint, _col11: double, _col12: double, _col13: double, _col14: double, _col15: double, _col16: double, _col17: double, _col18: double, _col19: int, _col20: int, _col21: string, _col22: string, _col23: date, _col26: double, _col30: int
+                        output shape: _col0: int, _col1: int, _col2: int, _col3: double, _col4: double, _col5: double, _col6: bigint, _col7: bigint, _col8: bigint, _col9: bigint, _col10: bigint, _col11: double, _col12: double, _col13: double, _col14: double, _col15: double, _col16: double, _col17: double, _col18: double, _col19: int, _col20: int, _col21: string, _col22: string, _col23: date, _col26: double, _col31: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -725,7 +728,7 @@ STAGE PLANS:
                       streamingColumns: [26]
                   Statistics: Num rows: 40 Data size: 15584 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col21 (type: string), _col22 (type: string), _col30 (type: int), _col23 (type: date), _col26 (type: double), _col6 (type: bigint), _col7 (type: bigint), _col8 (type: bigint), _col9 (type: bigint), _col10 (type: bigint), _col11 (type: double), _col12 (type: double), _col13 (type: double), _col14 (type: double), _col15 (type: double), _col16 (type: double), _col17 (type: double), _col18 (type: double), _col0 (type: int), _col1 (type: int), _col2 (type: int [...]
+                    expressions: _col21 (type: string), _col22 (type: string), _col31 (type: int), _col23 (type: date), _col26 (type: double), _col6 (type: bigint), _col7 (type: bigint), _col8 (type: bigint), _col9 (type: bigint), _col10 (type: bigint), _col11 (type: double), _col12 (type: double), _col13 (type: double), _col14 (type: double), _col15 (type: double), _col16 (type: double), _col17 (type: double), _col18 (type: double), _col0 (type: int), _col1 (type: int), _col2 (type: int [...]
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23, _col24, _col25, _col26
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -1679,7 +1682,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 11104 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_date (type: date)
                     null sort order: az
@@ -1691,7 +1694,7 @@ STAGE PLANS:
                         native: true
                         nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
                         partitionColumns: 0:string
-                        valueColumns: 1:string, 5:double, 9:int
+                        valueColumns: 1:string, 5:double, 10:int
                     Statistics: Num rows: 40 Data size: 11104 Basic stats: COMPLETE Column stats: COMPLETE
                     value expressions: p_name (type: string), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -1706,9 +1709,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 5, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 5, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
         Reducer 2 
@@ -1720,14 +1723,14 @@ STAGE PLANS:
                 vectorized: false
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), KEY.reducesinkkey1 (type: date), VALUE._col3 (type: double), VALUE._col7 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col5, _col9
+                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), KEY.reducesinkkey1 (type: date), VALUE._col3 (type: double), VALUE._col8 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col5, _col10
                 Statistics: Num rows: 40 Data size: 11104 Basic stats: COMPLETE Column stats: COMPLETE
                 PTF Operator
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col5: double, _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col5: double, _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -1750,13 +1753,13 @@ STAGE PLANS:
                               isStar: true
                             window function definition
                               alias: count_window_2
-                              arguments: _col9
+                              arguments: _col10
                               name: count
                               window function: GenericUDAFCountEvaluator
                               window frame: RANGE PRECEDING(1)~FOLLOWING(3)
                             window function definition
                               alias: count_window_3
-                              arguments: _col9
+                              arguments: _col10
                               name: count
                               window function: GenericUDAFCountEvaluator
                               window frame: RANGE PRECEDING(3)~FOLLOWING(1)
@@ -1830,8 +1833,8 @@ STAGE PLANS:
                               isPivotResult: true
                   Statistics: Num rows: 40 Data size: 11104 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: count_window_0 (type: bigint), count_window_1 (type: bigint), count_window_2 (type: bigint), count_window_3 (type: bigint), count_window_4 (type: bigint), sum_window_5 (type: double), sum_window_6 (type: double), min_window_7 (type: double), min_window_8 (type: double), max_window_9 (type: double), max_window_10 (type: double), avg_window_11 (type: double), avg_window_12 (type: double), rank_window_16 (type: int), dense_rank_window_17 (type: int), _col0 ( [...]
-                    outputColumnNames: count_window_0, count_window_1, count_window_2, count_window_3, count_window_4, sum_window_5, sum_window_6, min_window_7, min_window_8, max_window_9, max_window_10, avg_window_11, avg_window_12, rank_window_16, dense_rank_window_17, _col0, _col1, _col2, _col5, _col9
+                    expressions: count_window_0 (type: bigint), count_window_1 (type: bigint), count_window_2 (type: bigint), count_window_3 (type: bigint), count_window_4 (type: bigint), sum_window_5 (type: double), sum_window_6 (type: double), min_window_7 (type: double), min_window_8 (type: double), max_window_9 (type: double), max_window_10 (type: double), avg_window_11 (type: double), avg_window_12 (type: double), rank_window_16 (type: int), dense_rank_window_17 (type: int), _col0 ( [...]
+                    outputColumnNames: count_window_0, count_window_1, count_window_2, count_window_3, count_window_4, sum_window_5, sum_window_6, min_window_7, min_window_8, max_window_9, max_window_10, avg_window_11, avg_window_12, rank_window_16, dense_rank_window_17, _col0, _col1, _col2, _col5, _col10
                     Statistics: Num rows: 40 Data size: 11104 Basic stats: COMPLETE Column stats: COMPLETE
                     Reduce Output Operator
                       key expressions: _col0 (type: string)
@@ -1839,7 +1842,7 @@ STAGE PLANS:
                       sort order: +
                       Map-reduce partition columns: _col0 (type: string)
                       Statistics: Num rows: 40 Data size: 11104 Basic stats: COMPLETE Column stats: COMPLETE
-                      value expressions: count_window_0 (type: bigint), count_window_1 (type: bigint), count_window_2 (type: bigint), count_window_3 (type: bigint), count_window_4 (type: bigint), sum_window_5 (type: double), sum_window_6 (type: double), min_window_7 (type: double), min_window_8 (type: double), max_window_9 (type: double), max_window_10 (type: double), avg_window_11 (type: double), avg_window_12 (type: double), rank_window_16 (type: int), dense_rank_window_17 (type: int), [...]
+                      value expressions: count_window_0 (type: bigint), count_window_1 (type: bigint), count_window_2 (type: bigint), count_window_3 (type: bigint), count_window_4 (type: bigint), sum_window_5 (type: double), sum_window_6 (type: double), min_window_7 (type: double), min_window_8 (type: double), max_window_9 (type: double), max_window_10 (type: double), avg_window_11 (type: double), avg_window_12 (type: double), rank_window_16 (type: int), dense_rank_window_17 (type: int), [...]
         Reducer 3 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -1852,13 +1855,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 20
-                    dataColumns: KEY.reducesinkkey0:string, VALUE._col0:bigint, VALUE._col1:bigint, VALUE._col2:bigint, VALUE._col3:bigint, VALUE._col4:bigint, VALUE._col5:double, VALUE._col6:double, VALUE._col7:double, VALUE._col8:double, VALUE._col9:double, VALUE._col10:double, VALUE._col11:double, VALUE._col12:double, VALUE._col13:int, VALUE._col14:int, VALUE._col15:string, VALUE._col16:date, VALUE._col19:double, VALUE._col23:int
+                    dataColumns: KEY.reducesinkkey0:string, VALUE._col0:bigint, VALUE._col1:bigint, VALUE._col2:bigint, VALUE._col3:bigint, VALUE._col4:bigint, VALUE._col5:double, VALUE._col6:double, VALUE._col7:double, VALUE._col8:double, VALUE._col9:double, VALUE._col10:double, VALUE._col11:double, VALUE._col12:double, VALUE._col13:int, VALUE._col14:int, VALUE._col15:string, VALUE._col16:date, VALUE._col19:double, VALUE._col24:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, bigint, bigint, double, double, double]
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: bigint), VALUE._col1 (type: bigint), VALUE._col2 (type: bigint), VALUE._col3 (type: bigint), VALUE._col4 (type: bigint), VALUE._col5 (type: double), VALUE._col6 (type: double), VALUE._col7 (type: double), VALUE._col8 (type: double), VALUE._col9 (type: double), VALUE._col10 (type: double), VALUE._col11 (type: double), VALUE._col12 (type: double), VALUE._col13 (type: int), VALUE._col14 (type: int), KEY.reducesinkkey0 (type: string), VALUE._co [...]
-                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col20, _col24
+                expressions: VALUE._col0 (type: bigint), VALUE._col1 (type: bigint), VALUE._col2 (type: bigint), VALUE._col3 (type: bigint), VALUE._col4 (type: bigint), VALUE._col5 (type: double), VALUE._col6 (type: double), VALUE._col7 (type: double), VALUE._col8 (type: double), VALUE._col9 (type: double), VALUE._col10 (type: double), VALUE._col11 (type: double), VALUE._col12 (type: double), VALUE._col13 (type: int), VALUE._col14 (type: int), KEY.reducesinkkey0 (type: string), VALUE._co [...]
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col20, _col25
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -1868,7 +1871,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: bigint, _col1: bigint, _col2: bigint, _col3: bigint, _col4: bigint, _col5: double, _col6: double, _col7: double, _col8: double, _col9: double, _col10: double, _col11: double, _col12: double, _col13: int, _col14: int, _col15: string, _col16: string, _col17: date, _col20: double, _col24: int
+                        output shape: _col0: bigint, _col1: bigint, _col2: bigint, _col3: bigint, _col4: bigint, _col5: double, _col6: double, _col7: double, _col8: double, _col9: double, _col10: double, _col11: double, _col12: double, _col13: int, _col14: int, _col15: string, _col16: string, _col17: date, _col20: double, _col25: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -1933,8 +1936,8 @@ STAGE PLANS:
                       streamingColumns: [20, 21, 22, 23]
                   Statistics: Num rows: 40 Data size: 15104 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: row_number_window_13 (type: int), rank_window_14 (type: int), dense_rank_window_15 (type: int), first_value_window_18 (type: double), lead_window_20 (type: double), lag_window_21 (type: double), _col0 (type: bigint), _col1 (type: bigint), _col2 (type: bigint), _col3 (type: bigint), _col4 (type: bigint), _col5 (type: double), _col6 (type: double), _col7 (type: double), _col8 (type: double), _col9 (type: double), _col10 (type: double), _col11 (type: double) [...]
-                    outputColumnNames: row_number_window_13, rank_window_14, dense_rank_window_15, first_value_window_18, lead_window_20, lag_window_21, _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col20, _col24
+                    expressions: row_number_window_13 (type: int), rank_window_14 (type: int), dense_rank_window_15 (type: int), first_value_window_18 (type: double), lead_window_20 (type: double), lag_window_21 (type: double), _col0 (type: bigint), _col1 (type: bigint), _col2 (type: bigint), _col3 (type: bigint), _col4 (type: bigint), _col5 (type: double), _col6 (type: double), _col7 (type: double), _col8 (type: double), _col9 (type: double), _col10 (type: double), _col11 (type: double) [...]
+                    outputColumnNames: row_number_window_13, rank_window_14, dense_rank_window_15, first_value_window_18, lead_window_20, lag_window_21, _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col20, _col25
                     Select Vectorization:
                         className: VectorSelectOperator
                         native: true
@@ -1952,7 +1955,7 @@ STAGE PLANS:
                           nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
                           valueColumns: 20:int, 21:int, 22:int, 23:double, 24:double, 25:double, 1:bigint, 2:bigint, 3:bigint, 4:bigint, 5:bigint, 6:double, 7:double, 8:double, 9:double, 10:double, 11:double, 12:double, 13:double, 14:int, 15:int, 16:string, 17:date, 18:double, 19:int
                       Statistics: Num rows: 40 Data size: 15104 Basic stats: COMPLETE Column stats: COMPLETE
-                      value expressions: row_number_window_13 (type: int), rank_window_14 (type: int), dense_rank_window_15 (type: int), first_value_window_18 (type: double), lead_window_20 (type: double), lag_window_21 (type: double), _col0 (type: bigint), _col1 (type: bigint), _col2 (type: bigint), _col3 (type: bigint), _col4 (type: bigint), _col5 (type: double), _col6 (type: double), _col7 (type: double), _col8 (type: double), _col9 (type: double), _col10 (type: double), _col11 (type: [...]
+                      value expressions: row_number_window_13 (type: int), rank_window_14 (type: int), dense_rank_window_15 (type: int), first_value_window_18 (type: double), lead_window_20 (type: double), lag_window_21 (type: double), _col0 (type: bigint), _col1 (type: bigint), _col2 (type: bigint), _col3 (type: bigint), _col4 (type: bigint), _col5 (type: double), _col6 (type: double), _col7 (type: double), _col8 (type: double), _col9 (type: double), _col10 (type: double), _col11 (type: [...]
         Reducer 4 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -1965,13 +1968,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 26
-                    dataColumns: KEY.reducesinkkey0:string, VALUE._col0:int, VALUE._col1:int, VALUE._col2:int, VALUE._col3:double, VALUE._col4:double, VALUE._col5:double, VALUE._col6:bigint, VALUE._col7:bigint, VALUE._col8:bigint, VALUE._col9:bigint, VALUE._col10:bigint, VALUE._col11:double, VALUE._col12:double, VALUE._col13:double, VALUE._col14:double, VALUE._col15:double, VALUE._col16:double, VALUE._col17:double, VALUE._col18:double, VALUE._col19:int, VALUE._col20:int, VALUE._col21:str [...]
+                    dataColumns: KEY.reducesinkkey0:string, VALUE._col0:int, VALUE._col1:int, VALUE._col2:int, VALUE._col3:double, VALUE._col4:double, VALUE._col5:double, VALUE._col6:bigint, VALUE._col7:bigint, VALUE._col8:bigint, VALUE._col9:bigint, VALUE._col10:bigint, VALUE._col11:double, VALUE._col12:double, VALUE._col13:double, VALUE._col14:double, VALUE._col15:double, VALUE._col16:double, VALUE._col17:double, VALUE._col18:double, VALUE._col19:int, VALUE._col20:int, VALUE._col21:str [...]
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [double]
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: int), VALUE._col3 (type: double), VALUE._col4 (type: double), VALUE._col5 (type: double), VALUE._col6 (type: bigint), VALUE._col7 (type: bigint), VALUE._col8 (type: bigint), VALUE._col9 (type: bigint), VALUE._col10 (type: bigint), VALUE._col11 (type: double), VALUE._col12 (type: double), VALUE._col13 (type: double), VALUE._col14 (type: double), VALUE._col15 (type: double), VALUE._col16 (type [...]
-                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23, _col26, _col30
+                expressions: VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: int), VALUE._col3 (type: double), VALUE._col4 (type: double), VALUE._col5 (type: double), VALUE._col6 (type: bigint), VALUE._col7 (type: bigint), VALUE._col8 (type: bigint), VALUE._col9 (type: bigint), VALUE._col10 (type: bigint), VALUE._col11 (type: double), VALUE._col12 (type: double), VALUE._col13 (type: double), VALUE._col14 (type: double), VALUE._col15 (type: double), VALUE._col16 (type [...]
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23, _col26, _col31
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -1981,7 +1984,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: int, _col1: int, _col2: int, _col3: double, _col4: double, _col5: double, _col6: bigint, _col7: bigint, _col8: bigint, _col9: bigint, _col10: bigint, _col11: double, _col12: double, _col13: double, _col14: double, _col15: double, _col16: double, _col17: double, _col18: double, _col19: int, _col20: int, _col21: string, _col22: string, _col23: date, _col26: double, _col30: int
+                        output shape: _col0: int, _col1: int, _col2: int, _col3: double, _col4: double, _col5: double, _col6: bigint, _col7: bigint, _col8: bigint, _col9: bigint, _col10: bigint, _col11: double, _col12: double, _col13: double, _col14: double, _col15: double, _col16: double, _col17: double, _col18: double, _col19: int, _col20: int, _col21: string, _col22: string, _col23: date, _col26: double, _col31: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -2012,7 +2015,7 @@ STAGE PLANS:
                       streamingColumns: [26]
                   Statistics: Num rows: 40 Data size: 15584 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col21 (type: string), _col22 (type: string), _col30 (type: int), _col23 (type: date), _col26 (type: double), _col6 (type: bigint), _col7 (type: bigint), _col8 (type: bigint), _col9 (type: bigint), _col10 (type: bigint), _col11 (type: double), _col12 (type: double), _col13 (type: double), _col14 (type: double), _col15 (type: double), _col16 (type: double), _col17 (type: double), _col18 (type: double), _col0 (type: int), _col1 (type: int), _col2 (type: int [...]
+                    expressions: _col21 (type: string), _col22 (type: string), _col31 (type: int), _col23 (type: date), _col26 (type: double), _col6 (type: bigint), _col7 (type: bigint), _col8 (type: bigint), _col9 (type: bigint), _col10 (type: bigint), _col11 (type: double), _col12 (type: double), _col13 (type: double), _col14 (type: double), _col15 (type: double), _col16 (type: double), _col17 (type: double), _col18 (type: double), _col0 (type: int), _col1 (type: int), _col2 (type: int [...]
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23, _col24, _col25, _col26
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -2254,7 +2257,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_name (type: string)
                     null sort order: az
@@ -2266,7 +2269,7 @@ STAGE PLANS:
                         native: true
                         nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
                         partitionColumns: 0:string
-                        valueColumns: 2:date, 3:timestamp, 5:double, 9:int
+                        valueColumns: 2:date, 3:timestamp, 5:double, 10:int
                     Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                     value expressions: p_date (type: date), p_timestamp (type: timestamp), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -2281,9 +2284,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 5, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
         Reducer 2 
@@ -2298,13 +2301,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 6
-                    dataColumns: KEY.reducesinkkey0:string, KEY.reducesinkkey1:string, VALUE._col0:date, VALUE._col1:timestamp, VALUE._col3:double, VALUE._col7:int
+                    dataColumns: KEY.reducesinkkey0:string, KEY.reducesinkkey1:string, VALUE._col0:date, VALUE._col1:timestamp, VALUE._col3:double, VALUE._col8:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double]
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string), VALUE._col0 (type: date), VALUE._col1 (type: timestamp), VALUE._col3 (type: double), VALUE._col7 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col9
+                expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string), VALUE._col0 (type: date), VALUE._col1 (type: timestamp), VALUE._col3 (type: double), VALUE._col8 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -2314,7 +2317,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -2351,7 +2354,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col9 (type: int), _col2 (type: date), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -2478,7 +2481,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Reduce Output Operator
                     key expressions: p_name (type: string)
                     null sort order: a
@@ -2489,7 +2492,7 @@ STAGE PLANS:
                         keyColumns: 1:string
                         native: true
                         nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        valueColumns: 0:string, 2:date, 3:timestamp, 5:double, 9:int
+                        valueColumns: 0:string, 2:date, 3:timestamp, 5:double, 10:int
                     Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                     value expressions: p_mfgr (type: string), p_date (type: date), p_timestamp (type: timestamp), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -2504,9 +2507,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 5, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
         Reducer 2 
@@ -2521,13 +2524,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 6
-                    dataColumns: KEY.reducesinkkey0:string, VALUE._col0:string, VALUE._col1:date, VALUE._col2:timestamp, VALUE._col4:double, VALUE._col8:int
+                    dataColumns: KEY.reducesinkkey0:string, VALUE._col0:string, VALUE._col1:date, VALUE._col2:timestamp, VALUE._col4:double, VALUE._col9:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double]
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), KEY.reducesinkkey0 (type: string), VALUE._col1 (type: date), VALUE._col2 (type: timestamp), VALUE._col4 (type: double), VALUE._col8 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col9
+                expressions: VALUE._col0 (type: string), KEY.reducesinkkey0 (type: string), VALUE._col1 (type: date), VALUE._col2 (type: timestamp), VALUE._col4 (type: double), VALUE._col9 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -2537,7 +2540,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -2574,7 +2577,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col9 (type: int), _col2 (type: date), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -2725,7 +2728,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Filter Operator
                     Filter Vectorization:
                         className: VectorFilterOperator
@@ -2740,11 +2743,11 @@ STAGE PLANS:
                       Map-reduce partition columns: 'almond antique chartreuse lavender yellow' (type: string)
                       Reduce Sink Vectorization:
                           className: VectorReduceSinkStringOperator
-                          keyColumns: 12:string
-                          keyExpressions: ConstantVectorExpression(val almond antique chartreuse lavender yellow) -> 12:string
+                          keyColumns: 13:string
+                          keyExpressions: ConstantVectorExpression(val almond antique chartreuse lavender yellow) -> 13:string
                           native: true
                           nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                          valueColumns: 0:string, 2:date, 3:timestamp, 5:double, 9:int
+                          valueColumns: 0:string, 2:date, 3:timestamp, 5:double, 10:int
                       Statistics: Num rows: 2 Data size: 656 Basic stats: COMPLETE Column stats: COMPLETE
                       value expressions: p_mfgr (type: string), p_date (type: date), p_timestamp (type: timestamp), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -2759,9 +2762,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 5, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [string]
         Reducer 2 
@@ -2776,13 +2779,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 6
-                    dataColumns: KEY.reducesinkkey0:string, VALUE._col0:string, VALUE._col2:date, VALUE._col3:timestamp, VALUE._col5:double, VALUE._col9:int
+                    dataColumns: KEY.reducesinkkey0:string, VALUE._col0:string, VALUE._col2:date, VALUE._col3:timestamp, VALUE._col5:double, VALUE._col10:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double, string, string, string]
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col2 (type: date), VALUE._col3 (type: timestamp), VALUE._col5 (type: double), VALUE._col9 (type: int)
-                outputColumnNames: _col0, _col2, _col3, _col5, _col9
+                expressions: VALUE._col0 (type: string), VALUE._col2 (type: date), VALUE._col3 (type: timestamp), VALUE._col5 (type: double), VALUE._col10 (type: int)
+                outputColumnNames: _col0, _col2, _col3, _col5, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -2792,7 +2795,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col2: date, _col3: timestamp, _col5: double, _col9: int
+                        output shape: _col0: string, _col2: date, _col3: timestamp, _col5: double, _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -2829,7 +2832,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 2 Data size: 412 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), 'almond antique chartreuse lavender yellow' (type: string), _col3 (type: timestamp), _col9 (type: int), _col2 (type: date), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), 'almond antique chartreuse lavender yellow' (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -2977,7 +2980,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_timestamp (type: timestamp)
                     null sort order: az
@@ -2989,7 +2992,7 @@ STAGE PLANS:
                         native: true
                         nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
                         partitionColumns: 0:string
-                        valueColumns: 1:string, 2:date, 5:double, 9:int
+                        valueColumns: 1:string, 2:date, 5:double, 10:int
                     Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                     value expressions: p_name (type: string), p_date (type: date), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -3004,9 +3007,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 5, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
         Reducer 2 
@@ -3021,13 +3024,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 6
-                    dataColumns: KEY.reducesinkkey0:string, KEY.reducesinkkey1:timestamp, VALUE._col0:string, VALUE._col1:date, VALUE._col3:double, VALUE._col7:int
+                    dataColumns: KEY.reducesinkkey0:string, KEY.reducesinkkey1:timestamp, VALUE._col0:string, VALUE._col1:date, VALUE._col3:double, VALUE._col8:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double]
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), VALUE._col1 (type: date), KEY.reducesinkkey1 (type: timestamp), VALUE._col3 (type: double), VALUE._col7 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col9
+                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), VALUE._col1 (type: date), KEY.reducesinkkey1 (type: timestamp), VALUE._col3 (type: double), VALUE._col8 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -3037,7 +3040,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -3074,7 +3077,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col9 (type: int), _col2 (type: date), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -3201,7 +3204,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Reduce Output Operator
                     key expressions: p_timestamp (type: timestamp)
                     null sort order: a
@@ -3212,7 +3215,7 @@ STAGE PLANS:
                         keyColumns: 3:timestamp
                         native: true
                         nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        valueColumns: 0:string, 1:string, 2:date, 5:double, 9:int
+                        valueColumns: 0:string, 1:string, 2:date, 5:double, 10:int
                     Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                     value expressions: p_mfgr (type: string), p_name (type: string), p_date (type: date), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -3227,9 +3230,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 5, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
         Reducer 2 
@@ -3244,13 +3247,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 6
-                    dataColumns: KEY.reducesinkkey0:timestamp, VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col4:double, VALUE._col8:int
+                    dataColumns: KEY.reducesinkkey0:timestamp, VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col4:double, VALUE._col9:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double]
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), KEY.reducesinkkey0 (type: timestamp), VALUE._col4 (type: double), VALUE._col8 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col9
+                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), KEY.reducesinkkey0 (type: timestamp), VALUE._col4 (type: double), VALUE._col9 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -3260,7 +3263,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -3297,7 +3300,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col9 (type: int), _col2 (type: date), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -3427,7 +3430,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Filter Operator
                     Filter Vectorization:
                         className: VectorFilterOperator
@@ -3442,11 +3445,11 @@ STAGE PLANS:
                       Map-reduce partition columns: TIMESTAMP'1970-01-03 00:00:00' (type: timestamp)
                       Reduce Sink Vectorization:
                           className: VectorReduceSinkMultiKeyOperator
-                          keyColumns: 12:timestamp
-                          keyExpressions: ConstantVectorExpression(val 1970-01-03 00:00:00) -> 12:timestamp
+                          keyColumns: 13:timestamp
+                          keyExpressions: ConstantVectorExpression(val 1970-01-03 00:00:00) -> 13:timestamp
                           native: true
                           nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                          valueColumns: 0:string, 1:string, 2:date, 5:double, 9:int
+                          valueColumns: 0:string, 1:string, 2:date, 5:double, 10:int
                       Statistics: Num rows: 20 Data size: 6264 Basic stats: COMPLETE Column stats: COMPLETE
                       value expressions: p_mfgr (type: string), p_name (type: string), p_date (type: date), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -3461,9 +3464,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 5, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [timestamp]
         Reducer 2 
@@ -3478,13 +3481,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 6
-                    dataColumns: KEY.reducesinkkey0:timestamp, VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col5:double, VALUE._col9:int
+                    dataColumns: KEY.reducesinkkey0:timestamp, VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col5:double, VALUE._col10:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double, timestamp, timestamp, timestamp]
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), VALUE._col5 (type: double), VALUE._col9 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col5, _col9
+                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), VALUE._col5 (type: double), VALUE._col10 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col5, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -3494,7 +3497,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col5: double, _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col5: double, _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -3531,7 +3534,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 20 Data size: 5584 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), TIMESTAMP'1970-01-03 00:00:00' (type: timestamp), _col9 (type: int), _col2 (type: date), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), _col1 (type: string), TIMESTAMP'1970-01-03 00:00:00' (type: timestamp), _col10 (type: int), _col2 (type: date), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -3702,7 +3705,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_date (type: date)
                     null sort order: az
@@ -3714,7 +3717,7 @@ STAGE PLANS:
                         native: true
                         nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
                         partitionColumns: 0:string
-                        valueColumns: 1:string, 3:timestamp, 5:double, 9:int
+                        valueColumns: 1:string, 3:timestamp, 5:double, 10:int
                     Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                     value expressions: p_name (type: string), p_timestamp (type: timestamp), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -3729,9 +3732,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 5, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
         Reducer 2 
@@ -3746,13 +3749,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 6
-                    dataColumns: KEY.reducesinkkey0:string, KEY.reducesinkkey1:date, VALUE._col0:string, VALUE._col1:timestamp, VALUE._col3:double, VALUE._col7:int
+                    dataColumns: KEY.reducesinkkey0:string, KEY.reducesinkkey1:date, VALUE._col0:string, VALUE._col1:timestamp, VALUE._col3:double, VALUE._col8:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double]
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), KEY.reducesinkkey1 (type: date), VALUE._col1 (type: timestamp), VALUE._col3 (type: double), VALUE._col7 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col9
+                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), KEY.reducesinkkey1 (type: date), VALUE._col1 (type: timestamp), VALUE._col3 (type: double), VALUE._col8 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -3762,7 +3765,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -3799,7 +3802,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col9 (type: int), _col2 (type: date), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -3926,7 +3929,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Reduce Output Operator
                     key expressions: p_date (type: date)
                     null sort order: a
@@ -3937,7 +3940,7 @@ STAGE PLANS:
                         keyColumns: 2:date
                         native: true
                         nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        valueColumns: 0:string, 1:string, 3:timestamp, 5:double, 9:int
+                        valueColumns: 0:string, 1:string, 3:timestamp, 5:double, 10:int
                     Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                     value expressions: p_mfgr (type: string), p_name (type: string), p_timestamp (type: timestamp), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -3952,9 +3955,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 5, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
         Reducer 2 
@@ -3969,13 +3972,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 6
-                    dataColumns: KEY.reducesinkkey0:date, VALUE._col0:string, VALUE._col1:string, VALUE._col2:timestamp, VALUE._col4:double, VALUE._col8:int
+                    dataColumns: KEY.reducesinkkey0:date, VALUE._col0:string, VALUE._col1:string, VALUE._col2:timestamp, VALUE._col4:double, VALUE._col9:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double]
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), KEY.reducesinkkey0 (type: date), VALUE._col2 (type: timestamp), VALUE._col4 (type: double), VALUE._col8 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col9
+                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), KEY.reducesinkkey0 (type: date), VALUE._col2 (type: timestamp), VALUE._col4 (type: double), VALUE._col9 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -3985,7 +3988,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -4022,7 +4025,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col9 (type: int), _col2 (type: date), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -4152,7 +4155,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 12424 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Filter Operator
                     Filter Vectorization:
                         className: VectorFilterOperator
@@ -4167,11 +4170,11 @@ STAGE PLANS:
                       Map-reduce partition columns: DATE'1970-01-03' (type: date)
                       Reduce Sink Vectorization:
                           className: VectorReduceSinkLongOperator
-                          keyColumns: 12:date
-                          keyExpressions: ConstantVectorExpression(val 2) -> 12:date
+                          keyColumns: 13:date
+                          keyExpressions: ConstantVectorExpression(val 2) -> 13:date
                           native: true
                           nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                          valueColumns: 0:string, 1:string, 3:timestamp, 5:double, 9:int
+                          valueColumns: 0:string, 1:string, 3:timestamp, 5:double, 10:int
                       Statistics: Num rows: 20 Data size: 6264 Basic stats: COMPLETE Column stats: COMPLETE
                       value expressions: p_mfgr (type: string), p_name (type: string), p_timestamp (type: timestamp), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -4186,9 +4189,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 5, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint]
         Reducer 2 
@@ -4203,13 +4206,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 6
-                    dataColumns: KEY.reducesinkkey0:date, VALUE._col0:string, VALUE._col1:string, VALUE._col3:timestamp, VALUE._col5:double, VALUE._col9:int
+                    dataColumns: KEY.reducesinkkey0:date, VALUE._col0:string, VALUE._col1:string, VALUE._col3:timestamp, VALUE._col5:double, VALUE._col10:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double, bigint, bigint, bigint]
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col3 (type: timestamp), VALUE._col5 (type: double), VALUE._col9 (type: int)
-                outputColumnNames: _col0, _col1, _col3, _col5, _col9
+                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col3 (type: timestamp), VALUE._col5 (type: double), VALUE._col10 (type: int)
+                outputColumnNames: _col0, _col1, _col3, _col5, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -4219,7 +4222,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col3: timestamp, _col5: double, _col9: int
+                        output shape: _col0: string, _col1: string, _col3: timestamp, _col5: double, _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -4256,7 +4259,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 20 Data size: 5312 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col9 (type: int), DATE'1970-01-03' (type: date), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), DATE'1970-01-03' (type: date), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -4427,7 +4430,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 12556 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_int (type: int)
                     null sort order: az
@@ -4439,7 +4442,7 @@ STAGE PLANS:
                         native: true
                         nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
                         partitionColumns: 0:string
-                        valueColumns: 1:string, 2:date, 3:timestamp, 5:double, 9:int
+                        valueColumns: 1:string, 2:date, 3:timestamp, 5:double, 10:int
                     Statistics: Num rows: 40 Data size: 12556 Basic stats: COMPLETE Column stats: COMPLETE
                     value expressions: p_name (type: string), p_date (type: date), p_timestamp (type: timestamp), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -4454,9 +4457,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 4, 5, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 4, 5, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
         Reducer 2 
@@ -4471,13 +4474,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 7
-                    dataColumns: KEY.reducesinkkey0:string, KEY.reducesinkkey1:int, VALUE._col0:string, VALUE._col1:date, VALUE._col2:timestamp, VALUE._col3:double, VALUE._col7:int
+                    dataColumns: KEY.reducesinkkey0:string, KEY.reducesinkkey1:int, VALUE._col0:string, VALUE._col1:date, VALUE._col2:timestamp, VALUE._col3:double, VALUE._col8:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double]
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), VALUE._col1 (type: date), VALUE._col2 (type: timestamp), KEY.reducesinkkey1 (type: int), VALUE._col3 (type: double), VALUE._col7 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col9
+                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), VALUE._col1 (type: date), VALUE._col2 (type: timestamp), KEY.reducesinkkey1 (type: int), VALUE._col3 (type: double), VALUE._col8 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -4487,7 +4490,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col4: int, _col5: double, _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col4: int, _col5: double, _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -4524,7 +4527,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 40 Data size: 12556 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col9 (type: int), _col2 (type: date), _col5 (type: double), _col4 (type: int), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col5 (type: double), _col4 (type: int), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -4651,7 +4654,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 12556 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Reduce Output Operator
                     key expressions: p_int (type: int)
                     null sort order: a
@@ -4662,7 +4665,7 @@ STAGE PLANS:
                         keyColumns: 4:int
                         native: true
                         nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        valueColumns: 0:string, 1:string, 2:date, 3:timestamp, 5:double, 9:int
+                        valueColumns: 0:string, 1:string, 2:date, 3:timestamp, 5:double, 10:int
                     Statistics: Num rows: 40 Data size: 12556 Basic stats: COMPLETE Column stats: COMPLETE
                     value expressions: p_mfgr (type: string), p_name (type: string), p_date (type: date), p_timestamp (type: timestamp), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -4677,9 +4680,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 4, 5, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 4, 5, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
         Reducer 2 
@@ -4694,13 +4697,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 7
-                    dataColumns: KEY.reducesinkkey0:int, VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col3:timestamp, VALUE._col4:double, VALUE._col8:int
+                    dataColumns: KEY.reducesinkkey0:int, VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col3:timestamp, VALUE._col4:double, VALUE._col9:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double]
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), VALUE._col3 (type: timestamp), KEY.reducesinkkey0 (type: int), VALUE._col4 (type: double), VALUE._col8 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col9
+                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), VALUE._col3 (type: timestamp), KEY.reducesinkkey0 (type: int), VALUE._col4 (type: double), VALUE._col9 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -4710,7 +4713,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col4: int, _col5: double, _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col4: int, _col5: double, _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -4747,7 +4750,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 40 Data size: 12556 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col9 (type: int), _col2 (type: date), _col5 (type: double), _col4 (type: int), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col5 (type: double), _col4 (type: int), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -4877,12 +4880,12 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 12556 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Filter Operator
                     Filter Vectorization:
                         className: VectorFilterOperator
                         native: true
-                        predicateExpression: FilterStringGroupColEqualStringScalar(col 12:string, val 115200)(children: CastDateToString(col 2:date) -> 12:string)
+                        predicateExpression: FilterStringGroupColEqualStringScalar(col 13:string, val 115200)(children: CastDateToString(col 2:date) -> 13:string)
                     predicate: (CAST( p_date AS STRING) = '115200') (type: boolean)
                     Statistics: Num rows: 20 Data size: 6332 Basic stats: COMPLETE Column stats: COMPLETE
                     Reduce Output Operator
@@ -4895,7 +4898,7 @@ STAGE PLANS:
                           keyColumns: 4:int
                           native: true
                           nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                          valueColumns: 0:string, 1:string, 2:date, 3:timestamp, 5:double, 9:int
+                          valueColumns: 0:string, 1:string, 2:date, 3:timestamp, 5:double, 10:int
                       Statistics: Num rows: 20 Data size: 6332 Basic stats: COMPLETE Column stats: COMPLETE
                       value expressions: p_mfgr (type: string), p_name (type: string), p_date (type: date), p_timestamp (type: timestamp), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -4910,9 +4913,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 4, 5, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 4, 5, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [string]
         Reducer 2 
@@ -4927,13 +4930,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 7
-                    dataColumns: KEY.reducesinkkey0:int, VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col3:timestamp, VALUE._col4:double, VALUE._col8:int
+                    dataColumns: KEY.reducesinkkey0:int, VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col3:timestamp, VALUE._col4:double, VALUE._col9:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double]
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), VALUE._col3 (type: timestamp), KEY.reducesinkkey0 (type: int), VALUE._col4 (type: double), VALUE._col8 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col9
+                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), VALUE._col3 (type: timestamp), KEY.reducesinkkey0 (type: int), VALUE._col4 (type: double), VALUE._col9 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -4943,7 +4946,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col4: int, _col5: double, _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col4: int, _col5: double, _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -4980,7 +4983,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 20 Data size: 6332 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col9 (type: int), _col2 (type: date), _col5 (type: double), _col4 (type: int), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col5 (type: double), _col4 (type: int), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -5150,7 +5153,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 16568 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_decimal (type: decimal(10,4))
                     null sort order: az
@@ -5162,7 +5165,7 @@ STAGE PLANS:
                         native: true
                         nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
                         partitionColumns: 0:string
-                        valueColumns: 1:string, 2:date, 3:timestamp, 5:double, 9:int
+                        valueColumns: 1:string, 2:date, 3:timestamp, 5:double, 10:int
                     Statistics: Num rows: 40 Data size: 16568 Basic stats: COMPLETE Column stats: COMPLETE
                     value expressions: p_name (type: string), p_date (type: date), p_timestamp (type: timestamp), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -5177,9 +5180,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 5, 6, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 6, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
         Reducer 2 
@@ -5194,13 +5197,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 7
-                    dataColumns: KEY.reducesinkkey0:string, KEY.reducesinkkey1:decimal(10,4), VALUE._col0:string, VALUE._col1:date, VALUE._col2:timestamp, VALUE._col4:double, VALUE._col7:int
+                    dataColumns: KEY.reducesinkkey0:string, KEY.reducesinkkey1:decimal(10,4), VALUE._col0:string, VALUE._col1:date, VALUE._col2:timestamp, VALUE._col4:double, VALUE._col8:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double]
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), VALUE._col1 (type: date), VALUE._col2 (type: timestamp), VALUE._col4 (type: double), KEY.reducesinkkey1 (type: decimal(10,4)), VALUE._col7 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col6, _col9
+                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), VALUE._col1 (type: date), VALUE._col2 (type: timestamp), VALUE._col4 (type: double), KEY.reducesinkkey1 (type: decimal(10,4)), VALUE._col8 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col6, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -5210,7 +5213,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col6: decimal(10,4), _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col6: decimal(10,4), _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -5247,7 +5250,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 40 Data size: 16568 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col9 (type: int), _col2 (type: date), _col6 (type: decimal(10,4)), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col6 (type: decimal(10,4)), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -5374,7 +5377,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 16568 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Reduce Output Operator
                     key expressions: p_decimal (type: decimal(10,4))
                     null sort order: a
@@ -5385,7 +5388,7 @@ STAGE PLANS:
                         keyColumns: 6:decimal(10,4)
                         native: true
                         nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        valueColumns: 0:string, 1:string, 2:date, 3:timestamp, 5:double, 9:int
+                        valueColumns: 0:string, 1:string, 2:date, 3:timestamp, 5:double, 10:int
                     Statistics: Num rows: 40 Data size: 16568 Basic stats: COMPLETE Column stats: COMPLETE
                     value expressions: p_mfgr (type: string), p_name (type: string), p_date (type: date), p_timestamp (type: timestamp), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -5400,9 +5403,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 5, 6, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 6, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
         Reducer 2 
@@ -5417,13 +5420,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 7
-                    dataColumns: KEY.reducesinkkey0:decimal(10,4), VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col3:timestamp, VALUE._col5:double, VALUE._col8:int
+                    dataColumns: KEY.reducesinkkey0:decimal(10,4), VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col3:timestamp, VALUE._col5:double, VALUE._col9:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double]
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), VALUE._col3 (type: timestamp), VALUE._col5 (type: double), KEY.reducesinkkey0 (type: decimal(10,4)), VALUE._col8 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col6, _col9
+                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), VALUE._col3 (type: timestamp), VALUE._col5 (type: double), KEY.reducesinkkey0 (type: decimal(10,4)), VALUE._col9 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col6, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -5433,7 +5436,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col6: decimal(10,4), _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col6: decimal(10,4), _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -5470,7 +5473,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 40 Data size: 16568 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col9 (type: int), _col2 (type: date), _col6 (type: decimal(10,4)), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col6 (type: decimal(10,4)), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -5600,7 +5603,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 16568 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Filter Operator
                     Filter Vectorization:
                         className: VectorFilterOperator
@@ -5615,11 +5618,11 @@ STAGE PLANS:
                       Map-reduce partition columns: CAST( 1800.7 AS decimal(10,4)) (type: decimal(10,4))
                       Reduce Sink Vectorization:
                           className: VectorReduceSinkMultiKeyOperator
-                          keyColumns: 12:decimal(10,4)
-                          keyExpressions: ConstantVectorExpression(val 1800.7) -> 12:decimal(10,4)
+                          keyColumns: 13:decimal(10,4)
+                          keyExpressions: ConstantVectorExpression(val 1800.7) -> 13:decimal(10,4)
                           native: true
                           nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                          valueColumns: 0:string, 1:string, 2:date, 3:timestamp, 5:double, 9:int
+                          valueColumns: 0:string, 1:string, 2:date, 3:timestamp, 5:double, 10:int
                       Statistics: Num rows: 2 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE
                       value expressions: p_mfgr (type: string), p_name (type: string), p_date (type: date), p_timestamp (type: timestamp), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -5634,9 +5637,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 5, 6, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 6, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [decimal(10,4)]
         Reducer 2 
@@ -5651,13 +5654,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 7
-                    dataColumns: KEY.reducesinkkey0:decimal(10,4), VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col3:timestamp, VALUE._col5:double, VALUE._col9:int
+                    dataColumns: KEY.reducesinkkey0:decimal(10,4), VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col3:timestamp, VALUE._col5:double, VALUE._col10:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double, decimal(10,4), decimal(10,4), decimal(10,4)]
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), VALUE._col3 (type: timestamp), VALUE._col5 (type: double), VALUE._col9 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col9
+                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), VALUE._col3 (type: timestamp), VALUE._col5 (type: double), VALUE._col10 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -5667,7 +5670,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -5704,7 +5707,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 2 Data size: 656 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col9 (type: int), _col2 (type: date), 1800.7 (type: decimal(10,4)), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), 1800.7 (type: decimal(10,4)), _col5 (type: double), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -5874,7 +5877,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 15824 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_char (type: char(1))
                     null sort order: az
@@ -5886,7 +5889,7 @@ STAGE PLANS:
                         native: true
                         nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
                         partitionColumns: 0:string
-                        valueColumns: 1:string, 2:date, 3:timestamp, 5:double, 9:int
+                        valueColumns: 1:string, 2:date, 3:timestamp, 5:double, 10:int
                     Statistics: Num rows: 40 Data size: 15824 Basic stats: COMPLETE Column stats: COMPLETE
                     value expressions: p_name (type: string), p_date (type: date), p_timestamp (type: timestamp), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -5901,9 +5904,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 5, 7, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 7, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
         Reducer 2 
@@ -5918,13 +5921,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 7
-                    dataColumns: KEY.reducesinkkey0:string, KEY.reducesinkkey1:char(1), VALUE._col0:string, VALUE._col1:date, VALUE._col2:timestamp, VALUE._col4:double, VALUE._col7:int
+                    dataColumns: KEY.reducesinkkey0:string, KEY.reducesinkkey1:char(1), VALUE._col0:string, VALUE._col1:date, VALUE._col2:timestamp, VALUE._col4:double, VALUE._col8:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double]
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), VALUE._col1 (type: date), VALUE._col2 (type: timestamp), VALUE._col4 (type: double), KEY.reducesinkkey1 (type: char(1)), VALUE._col7 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col7, _col9
+                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), VALUE._col1 (type: date), VALUE._col2 (type: timestamp), VALUE._col4 (type: double), KEY.reducesinkkey1 (type: char(1)), VALUE._col8 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col7, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -5934,7 +5937,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col7: char(1), _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col7: char(1), _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -5971,7 +5974,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 40 Data size: 15824 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col9 (type: int), _col2 (type: date), _col5 (type: double), _col7 (type: char(1)), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col5 (type: double), _col7 (type: char(1)), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -6098,7 +6101,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 15824 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Reduce Output Operator
                     key expressions: p_char (type: char(1))
                     null sort order: a
@@ -6109,7 +6112,7 @@ STAGE PLANS:
                         keyColumns: 7:char(1)
                         native: true
                         nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        valueColumns: 0:string, 1:string, 2:date, 3:timestamp, 5:double, 9:int
+                        valueColumns: 0:string, 1:string, 2:date, 3:timestamp, 5:double, 10:int
                     Statistics: Num rows: 40 Data size: 15824 Basic stats: COMPLETE Column stats: COMPLETE
                     value expressions: p_mfgr (type: string), p_name (type: string), p_date (type: date), p_timestamp (type: timestamp), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -6124,9 +6127,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 5, 7, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 7, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
         Reducer 2 
@@ -6141,13 +6144,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 7
-                    dataColumns: KEY.reducesinkkey0:char(1), VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col3:timestamp, VALUE._col5:double, VALUE._col8:int
+                    dataColumns: KEY.reducesinkkey0:char(1), VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col3:timestamp, VALUE._col5:double, VALUE._col9:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double]
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), VALUE._col3 (type: timestamp), VALUE._col5 (type: double), KEY.reducesinkkey0 (type: char(1)), VALUE._col8 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col7, _col9
+                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), VALUE._col3 (type: timestamp), VALUE._col5 (type: double), KEY.reducesinkkey0 (type: char(1)), VALUE._col9 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col7, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -6157,7 +6160,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col7: char(1), _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col7: char(1), _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -6194,7 +6197,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 40 Data size: 15824 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col9 (type: int), _col2 (type: date), _col5 (type: double), _col7 (type: char(1)), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col5 (type: double), _col7 (type: char(1)), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -6324,7 +6327,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 15824 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Filter Operator
                     Filter Vectorization:
                         className: VectorFilterOperator
@@ -6339,11 +6342,11 @@ STAGE PLANS:
                       Map-reduce partition columns: CAST( 'D' AS CHAR(1)) (type: char(1))
                       Reduce Sink Vectorization:
                           className: VectorReduceSinkStringOperator
-                          keyColumns: 12:char(1)
-                          keyExpressions: VectorUDFAdaptor(CAST( 'D' AS CHAR(1))) -> 12:char(1)
+                          keyColumns: 13:char(1)
+                          keyExpressions: VectorUDFAdaptor(CAST( 'D' AS CHAR(1))) -> 13:char(1)
                           native: true
                           nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                          valueColumns: 0:string, 1:string, 2:date, 3:timestamp, 5:double, 9:int
+                          valueColumns: 0:string, 1:string, 2:date, 3:timestamp, 5:double, 10:int
                       Statistics: Num rows: 10 Data size: 4034 Basic stats: COMPLETE Column stats: COMPLETE
                       value expressions: p_mfgr (type: string), p_name (type: string), p_date (type: date), p_timestamp (type: timestamp), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -6358,9 +6361,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: true
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 5, 7, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 7, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [string]
         Reducer 2 
@@ -6375,13 +6378,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 7
-                    dataColumns: KEY.reducesinkkey0:char(1), VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col3:timestamp, VALUE._col5:double, VALUE._col9:int
+                    dataColumns: KEY.reducesinkkey0:char(1), VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col3:timestamp, VALUE._col5:double, VALUE._col10:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double, string, string, string]
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), VALUE._col3 (type: timestamp), VALUE._col5 (type: double), VALUE._col9 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col9
+                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), VALUE._col3 (type: timestamp), VALUE._col5 (type: double), VALUE._col10 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -6391,7 +6394,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -6428,7 +6431,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 10 Data size: 3184 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col9 (type: int), _col2 (type: date), _col5 (type: double), 'D' (type: char(1)), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col5 (type: double), 'D' (type: char(1)), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -6604,7 +6607,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 15864 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_varchar (type: varchar(5))
                     null sort order: az
@@ -6616,7 +6619,7 @@ STAGE PLANS:
                         native: true
                         nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
                         partitionColumns: 0:string
-                        valueColumns: 1:string, 2:date, 3:timestamp, 5:double, 9:int
+                        valueColumns: 1:string, 2:date, 3:timestamp, 5:double, 10:int
                     Statistics: Num rows: 40 Data size: 15864 Basic stats: COMPLETE Column stats: COMPLETE
                     value expressions: p_name (type: string), p_date (type: date), p_timestamp (type: timestamp), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -6631,9 +6634,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 5, 8, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 8, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
         Reducer 2 
@@ -6648,13 +6651,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 7
-                    dataColumns: KEY.reducesinkkey0:string, KEY.reducesinkkey1:varchar(5), VALUE._col0:string, VALUE._col1:date, VALUE._col2:timestamp, VALUE._col4:double, VALUE._col7:int
+                    dataColumns: KEY.reducesinkkey0:string, KEY.reducesinkkey1:varchar(5), VALUE._col0:string, VALUE._col1:date, VALUE._col2:timestamp, VALUE._col4:double, VALUE._col8:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double]
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), VALUE._col1 (type: date), VALUE._col2 (type: timestamp), VALUE._col4 (type: double), KEY.reducesinkkey1 (type: varchar(5)), VALUE._col7 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col8, _col9
+                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), VALUE._col1 (type: date), VALUE._col2 (type: timestamp), VALUE._col4 (type: double), KEY.reducesinkkey1 (type: varchar(5)), VALUE._col8 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col8, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -6664,7 +6667,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col8: varchar(5), _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col8: varchar(5), _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -6701,7 +6704,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 40 Data size: 15864 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col9 (type: int), _col2 (type: date), _col5 (type: double), _col8 (type: varchar(5)), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col5 (type: double), _col8 (type: varchar(5)), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -6828,7 +6831,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 15864 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Reduce Output Operator
                     key expressions: p_varchar (type: varchar(5))
                     null sort order: a
@@ -6839,7 +6842,7 @@ STAGE PLANS:
                         keyColumns: 8:varchar(5)
                         native: true
                         nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        valueColumns: 0:string, 1:string, 2:date, 3:timestamp, 5:double, 9:int
+                        valueColumns: 0:string, 1:string, 2:date, 3:timestamp, 5:double, 10:int
                     Statistics: Num rows: 40 Data size: 15864 Basic stats: COMPLETE Column stats: COMPLETE
                     value expressions: p_mfgr (type: string), p_name (type: string), p_date (type: date), p_timestamp (type: timestamp), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -6854,9 +6857,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: false
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 5, 8, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 8, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
         Reducer 2 
@@ -6871,13 +6874,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 7
-                    dataColumns: KEY.reducesinkkey0:varchar(5), VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col3:timestamp, VALUE._col5:double, VALUE._col8:int
+                    dataColumns: KEY.reducesinkkey0:varchar(5), VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col3:timestamp, VALUE._col5:double, VALUE._col9:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double]
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), VALUE._col3 (type: timestamp), VALUE._col5 (type: double), KEY.reducesinkkey0 (type: varchar(5)), VALUE._col8 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col8, _col9
+                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), VALUE._col3 (type: timestamp), VALUE._col5 (type: double), KEY.reducesinkkey0 (type: varchar(5)), VALUE._col9 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col8, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -6887,7 +6890,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col8: varchar(5), _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col8: varchar(5), _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -6924,7 +6927,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 40 Data size: 15864 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col9 (type: int), _col2 (type: date), _col5 (type: double), _col8 (type: varchar(5)), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col5 (type: double), _col8 (type: varchar(5)), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -7071,7 +7074,7 @@ STAGE PLANS:
                   Statistics: Num rows: 40 Data size: 15864 Basic stats: COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:rowindex:int, 10:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 11:ROW__IS__DELETED:boolean]
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
                   Filter Operator
                     Filter Vectorization:
                         className: VectorFilterOperator
@@ -7086,11 +7089,11 @@ STAGE PLANS:
                       Map-reduce partition columns: CAST( 'DA' AS varchar(5)) (type: varchar(5))
                       Reduce Sink Vectorization:
                           className: VectorReduceSinkStringOperator
-                          keyColumns: 12:varchar(5)
-                          keyExpressions: VectorUDFAdaptor(CAST( 'DA' AS varchar(5))) -> 12:varchar(5)
+                          keyColumns: 13:varchar(5)
+                          keyExpressions: VectorUDFAdaptor(CAST( 'DA' AS varchar(5))) -> 13:varchar(5)
                           native: true
                           nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                          valueColumns: 0:string, 1:string, 2:date, 3:timestamp, 5:double, 9:int
+                          valueColumns: 0:string, 1:string, 2:date, 3:timestamp, 5:double, 10:int
                       Statistics: Num rows: 2 Data size: 828 Basic stats: COMPLETE Column stats: COMPLETE
                       value expressions: p_mfgr (type: string), p_name (type: string), p_date (type: date), p_timestamp (type: timestamp), p_retailprice (type: double), rowindex (type: int)
             Execution mode: vectorized, llap
@@ -7105,9 +7108,9 @@ STAGE PLANS:
                 usesVectorUDFAdaptor: true
                 vectorized: true
                 rowBatchContext:
-                    dataColumnCount: 10
-                    includeColumns: [0, 1, 2, 3, 5, 8, 9]
-                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), rowindex:int
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 8, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [string]
         Reducer 2 
@@ -7122,13 +7125,13 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 7
-                    dataColumns: KEY.reducesinkkey0:varchar(5), VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col3:timestamp, VALUE._col5:double, VALUE._col9:int
+                    dataColumns: KEY.reducesinkkey0:varchar(5), VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col3:timestamp, VALUE._col5:double, VALUE._col10:int
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, double, string, string, string]
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), VALUE._col3 (type: timestamp), VALUE._col5 (type: double), VALUE._col9 (type: int)
-                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col9
+                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), VALUE._col3 (type: timestamp), VALUE._col5 (type: double), VALUE._col10 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col10
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
@@ -7138,7 +7141,7 @@ STAGE PLANS:
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col9: int
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col10: int
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -7175,7 +7178,7 @@ STAGE PLANS:
                       streamingColumns: []
                   Statistics: Num rows: 2 Data size: 656 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col9 (type: int), _col2 (type: date), _col5 (type: double), 'DA' (type: varchar(5)), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col5 (type: double), 'DA' (type: varchar(5)), count_window_0 (type: bigint), sum_window_1 (type: double)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -7200,3 +7203,739 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
+PREHOOK: query: select "************ BOOLEAN WINDOW RANGE TYPE ************"
+PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
+POSTHOOK: query: select "************ BOOLEAN WINDOW RANGE TYPE ************"
+POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
+_c0
+************ BOOLEAN WINDOW RANGE TYPE ************
+PREHOOK: query: select "************ BOOLEAN WINDOW RANGE TYPE (NON-VECTORIZED REFERENCE) ************"
+PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
+POSTHOOK: query: select "************ BOOLEAN WINDOW RANGE TYPE (NON-VECTORIZED REFERENCE) ************"
+POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
+_c0
+************ BOOLEAN WINDOW RANGE TYPE (NON-VECTORIZED REFERENCE) ************
+PREHOOK: query: select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice, p_char, p_boolean,
+       count(*) over(partition by p_mfgr order by p_boolean range between 3 preceding and current row) as cs,
+       sum(p_retailprice) over(partition by p_mfgr order by p_boolean range between 3 preceding and current row) as s
+from vector_ptf_part_simple_orc
+PREHOOK: type: QUERY
+PREHOOK: Input: default@vector_ptf_part_simple_orc
+#### A masked pattern was here ####
+POSTHOOK: query: select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice, p_char, p_boolean,
+       count(*) over(partition by p_mfgr order by p_boolean range between 3 preceding and current row) as cs,
+       sum(p_retailprice) over(partition by p_mfgr order by p_boolean range between 3 preceding and current row) as s
+from vector_ptf_part_simple_orc
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@vector_ptf_part_simple_orc
+#### A masked pattern was here ####
+p_mfgr	p_name	p_timestamp	rowindex	p_date	p_retailprice	p_char	p_boolean	cs	s
+Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-05 00:00:00	20	1970-01-05	1753.76	A	false	5	7486.48
+Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-05 00:00:00	5	1970-01-05	1753.76	B	false	5	7486.48
+Manufacturer#1	almond antique burnished rose metallic	1970-01-04 00:00:00	39	1970-01-04	1173.15	D	false	5	7486.48
+Manufacturer#1	almond antique burnished rose metallic	1970-01-03 00:00:00	8	1970-01-03	1173.15	A	false	5	7486.48
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-04 00:00:00	9	1970-01-04	1632.66	B	false	5	7486.48
+Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-02 00:00:00	12	1970-01-02	1753.76	D	true	7	9789.85
+Manufacturer#1	almond antique salmon chartreuse burlywood	1970-01-05 00:00:00	30	1970-01-05	1602.59	C	true	7	9789.85
+Manufacturer#1	almond antique chartreuse lavender yellow	NULL	26	NULL	1753.76	C	true	7	9789.85
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-02 00:00:00	17	1970-01-02	1632.66	D	true	7	9789.85
+Manufacturer#1	almond aquamarine burnished black steel	1970-01-02 00:00:00	2	1970-01-02	1414.42	B	true	7	9789.85
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-04 00:00:00	4	1970-01-04	NULL	A	true	7	9789.85
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-03 00:00:00	23	1970-01-03	1632.66	D	true	7	9789.85
+Manufacturer#2	almond antique violet turquoise frosted	NULL	13	NULL	1800.7	B	false	2	3601.4
+Manufacturer#2	almond antique violet turquoise frosted	1970-01-01 00:00:00	21	1970-01-01	1800.7	B	false	2	3601.4
+Manufacturer#2	almond aquamarine rose maroon antique	NULL	1	NULL	900.66	A	true	4	6432.0
+Manufacturer#2	almond aquamarine rose maroon antique	1970-01-03 00:00:00	3	1970-01-03	1698.66	C	true	4	6432.0
+Manufacturer#2	almond antique violet turquoise frosted	1970-01-02 00:00:00	27	1970-01-02	1800.7	D	true	4	6432.0
+Manufacturer#2	almond aquamarine midnight light salmon	1970-01-04 00:00:00	34	1970-01-04	2031.98	C	true	4	6432.0
+Manufacturer#2	almond antique violet chocolate turquoise	1970-01-05 00:00:00	15	1970-01-05	1690.68	D	NULL	2	2691.28
+Manufacturer#2	almond aquamarine sandy cyan gainsboro	NULL	32	NULL	1000.6	A	NULL	2	2691.28
+Manufacturer#3	almond antique olive coral navajo	1970-01-03 00:00:00	28	1970-01-03	1337.29	A	false	5	4550.219999999999
+Manufacturer#3	almond antique forest lavender goldenrod	1970-01-04 00:00:00	14	1970-01-04	NULL	C	false	5	4550.219999999999
+Manufacturer#3	almond antique forest lavender goldenrod	1970-01-03 00:00:00	33	1970-01-03	1190.27	B	false	5	4550.219999999999
+Manufacturer#3	almond antique chartreuse khaki white	1970-01-04 00:00:00	24	1970-01-04	99.68	C	false	5	4550.219999999999
+Manufacturer#3	almond antique misty red olive	1970-01-01 00:00:00	31	1970-01-01	1922.98	D	false	5	4550.219999999999
+Manufacturer#3	almond antique metallic orange dim	NULL	38	NULL	55.39	D	true	3	1835.93
+Manufacturer#3	almond antique forest lavender goldenrod	1970-01-05 00:00:00	10	1970-01-05	1190.27	C	true	3	1835.93
+Manufacturer#3	almond antique forest lavender goldenrod	NULL	19	NULL	590.27	D	true	3	1835.93
+Manufacturer#4	almond antique gainsboro frosted violet	NULL	25	NULL	NULL	A	false	3	1844.92
+Manufacturer#4	almond aquamarine yellow dodger mint	1970-01-01 00:00:00	11	1970-01-01	1844.92	D	false	3	1844.92
+Manufacturer#4	almond aquamarine floral ivory bisque	1970-01-05 00:00:00	35	1970-01-05	NULL	A	false	3	1844.92
+Manufacturer#4	almond aquamarine floral ivory bisque	1970-01-05 00:00:00	40	1970-01-05	1206.26	C	true	2	2581.6800000000003
+Manufacturer#4	almond antique violet mint lemon	1970-01-01 00:00:00	16	1970-01-01	1375.42	B	true	2	2581.6800000000003
+Manufacturer#4	almond azure aquamarine papaya violet	1970-01-02 00:00:00	37	1970-01-02	1290.35	C	NULL	1	1290.35
+Manufacturer#5	almond antique medium spring khaki	1970-01-04 00:00:00	29	1970-01-04	1611.66	B	false	3	5012.05
+Manufacturer#5	almond antique sky peru orange	1970-01-02 00:00:00	22	1970-01-02	1788.73	A	false	3	5012.05
+Manufacturer#5	almond antique medium spring khaki	1970-01-01 00:00:00	6	1970-01-01	1611.66	C	false	3	5012.05
+Manufacturer#5	almond antique blue firebrick mint	NULL	7	NULL	1789.69	D	true	3	4272.27
+Manufacturer#5	almond aquamarine dodger light gainsboro	1970-01-01 00:00:00	36	1970-01-01	1018.1	B	true	3	4272.27
+Manufacturer#5	almond azure blanched chiffon midnight	1970-01-03 00:00:00	18	1970-01-03	1464.48	C	true	3	4272.27
+PREHOOK: query: select "************ BOOLEAN WINDOW RANGE TYPE (VECTORIZED) ************"
+PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
+POSTHOOK: query: select "************ BOOLEAN WINDOW RANGE TYPE (VECTORIZED) ************"
+POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
+_c0
+************ BOOLEAN WINDOW RANGE TYPE (VECTORIZED) ************
+PREHOOK: query: EXPLAIN VECTORIZATION DETAIL select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice,p_char, p_boolean,
+                                    count(*) over(partition by p_mfgr order by p_boolean range between 3 preceding and
+                                    current row) as cs,
+                                    sum(p_retailprice) over(partition by p_mfgr order by p_boolean range between 3 preceding and current row) as s
+from vector_ptf_part_simple_orc
+PREHOOK: type: QUERY
+PREHOOK: Input: default@vector_ptf_part_simple_orc
+#### A masked pattern was here ####
+POSTHOOK: query: EXPLAIN VECTORIZATION DETAIL select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice,p_char, p_boolean,
+                                    count(*) over(partition by p_mfgr order by p_boolean range between 3 preceding and
+                                    current row) as cs,
+                                    sum(p_retailprice) over(partition by p_mfgr order by p_boolean range between 3 preceding and current row) as s
+from vector_ptf_part_simple_orc
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@vector_ptf_part_simple_orc
+#### A masked pattern was here ####
+Explain
+PLAN VECTORIZATION:
+  enabled: true
+  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
+
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Tez
+#### A masked pattern was here ####
+      Edges:
+        Reducer 2 <- Map 1 (SIMPLE_EDGE)
+#### A masked pattern was here ####
+      Vertices:
+        Map 1 
+            Map Operator Tree:
+                TableScan
+                  alias: vector_ptf_part_simple_orc
+                  Statistics: Num rows: 40 Data size: 15976 Basic stats: COMPLETE Column stats: COMPLETE
+                  TableScan Vectorization:
+                      native: true
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
+                  Reduce Output Operator
+                    key expressions: p_mfgr (type: string), p_boolean (type: boolean)
+                    null sort order: az
+                    sort order: ++
+                    Map-reduce partition columns: p_mfgr (type: string)
+                    Reduce Sink Vectorization:
+                        className: VectorReduceSinkObjectHashOperator
+                        keyColumns: 0:string, 9:boolean
+                        native: true
+                        nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
+                        partitionColumns: 0:string
+                        valueColumns: 1:string, 2:date, 3:timestamp, 5:double, 7:char(1), 10:int
+                    Statistics: Num rows: 40 Data size: 15976 Basic stats: COMPLETE Column stats: COMPLETE
+                    value expressions: p_name (type: string), p_date (type: date), p_timestamp (type: timestamp), p_retailprice (type: double), p_char (type: char(1)), rowindex (type: int)
+            Execution mode: vectorized, llap
+            LLAP IO: all inputs
+            Map Vectorization:
+                enabled: true
+                enabledConditionsMet: hive.vectorized.use.vectorized.input.format IS true
+                inputFormatFeatureSupport: [DECIMAL_64]
+                featureSupportInUse: [DECIMAL_64]
+                inputFileFormats: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
+                allNative: true
+                usesVectorUDFAdaptor: false
+                vectorized: true
+                rowBatchContext:
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 7, 9, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
+                    partitionColumnCount: 0
+                    scratchColumnTypeNames: []
+        Reducer 2 
+            Execution mode: vectorized, llap
+            Reduce Vectorization:
+                enabled: true
+                enableConditionsMet: hive.vectorized.execution.reduce.enabled IS true, hive.execution.engine tez IN [tez] IS true
+                reduceColumnNullOrder: az
+                reduceColumnSortOrder: ++
+                allNative: false
+                usesVectorUDFAdaptor: false
+                vectorized: true
+                rowBatchContext:
+                    dataColumnCount: 8
+                    dataColumns: KEY.reducesinkkey0:string, KEY.reducesinkkey1:boolean, VALUE._col0:string, VALUE._col1:date, VALUE._col2:timestamp, VALUE._col4:double, VALUE._col6:char(1), VALUE._col8:int
+                    partitionColumnCount: 0
+                    scratchColumnTypeNames: [bigint, double]
+            Reduce Operator Tree:
+              Select Operator
+                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), VALUE._col1 (type: date), VALUE._col2 (type: timestamp), VALUE._col4 (type: double), VALUE._col6 (type: char(1)), KEY.reducesinkkey1 (type: boolean), VALUE._col8 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col7, _col9, _col10
+                Select Vectorization:
+                    className: VectorSelectOperator
+                    native: true
+                    projectedOutputColumnNums: [0, 2, 3, 4, 5, 6, 1, 7]
+                Statistics: Num rows: 40 Data size: 15976 Basic stats: COMPLETE Column stats: COMPLETE
+                PTF Operator
+                  Function definitions:
+                      Input definition
+                        input alias: ptf_0
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col7: char(1), _col9: boolean, _col10: int
+                        type: WINDOWING
+                      Windowing table definition
+                        input alias: ptf_1
+                        name: windowingtablefunction
+                        order by: _col9 ASC NULLS LAST
+                        partition by: _col0
+                        raw input shape:
+                        window functions:
+                            window function definition
+                              alias: count_window_0
+                              name: count
+                              window function: GenericUDAFCountEvaluator
+                              window frame: RANGE PRECEDING(3)~CURRENT
+                              isStar: true
+                            window function definition
+                              alias: sum_window_1
+                              arguments: _col5
+                              name: sum
+                              window function: GenericUDAFSumDouble
+                              window frame: RANGE PRECEDING(3)~CURRENT
+                  PTF Vectorization:
+                      allEvaluatorsAreStreaming: false
+                      className: VectorPTFOperator
+                      evaluatorClasses: [VectorPTFEvaluatorCountStar, VectorPTFEvaluatorDoubleSum]
+                      functionInputExpressions: [null, col 5:double]
+                      functionNames: [count, sum]
+                      keyInputColumns: [0, 1]
+                      native: true
+                      nonKeyInputColumns: [2, 3, 4, 5, 6, 7]
+                      orderExpressions: [col 1:boolean]
+                      outputColumns: [8, 9, 0, 2, 3, 4, 5, 6, 1, 7]
+                      outputTypes: [bigint, double, string, string, date, timestamp, double, char(1), boolean, int]
+                      partitionExpressions: [col 0:string]
+                      streamingColumns: []
+                  Statistics: Num rows: 40 Data size: 15976 Basic stats: COMPLETE Column stats: COMPLETE
+                  Select Operator
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col5 (type: double), _col7 (type: char(1)), _col9 (type: boolean), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9
+                    Select Vectorization:
+                        className: VectorSelectOperator
+                        native: true
+                        projectedOutputColumnNums: [0, 2, 4, 7, 3, 5, 6, 1, 8, 9]
+                    Statistics: Num rows: 40 Data size: 15804 Basic stats: COMPLETE Column stats: COMPLETE
+                    File Output Operator
+                      compressed: false
+                      File Sink Vectorization:
+                          className: VectorFileSinkOperator
+                          native: false
+                      Statistics: Num rows: 40 Data size: 15804 Basic stats: COMPLETE Column stats: COMPLETE
+                      table:
+                          input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                          output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                          serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice, p_char, p_boolean,
+       count(*) over(partition by p_mfgr order by p_boolean range between 3 preceding and current row) as cs,
+       sum(p_retailprice) over(partition by p_mfgr order by p_boolean range between 3 preceding and current row) as s
+from vector_ptf_part_simple_orc
+PREHOOK: type: QUERY
+PREHOOK: Input: default@vector_ptf_part_simple_orc
+#### A masked pattern was here ####
+POSTHOOK: query: select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice, p_char, p_boolean,
+       count(*) over(partition by p_mfgr order by p_boolean range between 3 preceding and current row) as cs,
+       sum(p_retailprice) over(partition by p_mfgr order by p_boolean range between 3 preceding and current row) as s
+from vector_ptf_part_simple_orc
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@vector_ptf_part_simple_orc
+#### A masked pattern was here ####
+p_mfgr	p_name	p_timestamp	rowindex	p_date	p_retailprice	p_char	p_boolean	cs	s
+Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-05 00:00:00	20	1970-01-05	1753.76	A	false	5	7486.48
+Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-05 00:00:00	5	1970-01-05	1753.76	B	false	5	7486.48
+Manufacturer#1	almond antique burnished rose metallic	1970-01-04 00:00:00	39	1970-01-04	1173.15	D	false	5	7486.48
+Manufacturer#1	almond antique burnished rose metallic	1970-01-03 00:00:00	8	1970-01-03	1173.15	A	false	5	7486.48
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-04 00:00:00	9	1970-01-04	1632.66	B	false	5	7486.48
+Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-02 00:00:00	12	1970-01-02	1753.76	D	true	7	9789.85
+Manufacturer#1	almond antique salmon chartreuse burlywood	1970-01-05 00:00:00	30	1970-01-05	1602.59	C	true	7	9789.85
+Manufacturer#1	almond antique chartreuse lavender yellow	NULL	26	NULL	1753.76	C	true	7	9789.85
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-02 00:00:00	17	1970-01-02	1632.66	D	true	7	9789.85
+Manufacturer#1	almond aquamarine burnished black steel	1970-01-02 00:00:00	2	1970-01-02	1414.42	B	true	7	9789.85
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-04 00:00:00	4	1970-01-04	NULL	A	true	7	9789.85
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-03 00:00:00	23	1970-01-03	1632.66	D	true	7	9789.85
+Manufacturer#2	almond antique violet turquoise frosted	NULL	13	NULL	1800.7	B	false	2	3601.4
+Manufacturer#2	almond antique violet turquoise frosted	1970-01-01 00:00:00	21	1970-01-01	1800.7	B	false	2	3601.4
+Manufacturer#2	almond aquamarine rose maroon antique	NULL	1	NULL	900.66	A	true	4	6432.0
+Manufacturer#2	almond aquamarine rose maroon antique	1970-01-03 00:00:00	3	1970-01-03	1698.66	C	true	4	6432.0
+Manufacturer#2	almond antique violet turquoise frosted	1970-01-02 00:00:00	27	1970-01-02	1800.7	D	true	4	6432.0
+Manufacturer#2	almond aquamarine midnight light salmon	1970-01-04 00:00:00	34	1970-01-04	2031.98	C	true	4	6432.0
+Manufacturer#2	almond antique violet chocolate turquoise	1970-01-05 00:00:00	15	1970-01-05	1690.68	D	NULL	2	2691.28
+Manufacturer#2	almond aquamarine sandy cyan gainsboro	NULL	32	NULL	1000.6	A	NULL	2	2691.28
+Manufacturer#3	almond antique olive coral navajo	1970-01-03 00:00:00	28	1970-01-03	1337.29	A	false	5	4550.219999999999
+Manufacturer#3	almond antique forest lavender goldenrod	1970-01-04 00:00:00	14	1970-01-04	NULL	C	false	5	4550.219999999999
+Manufacturer#3	almond antique forest lavender goldenrod	1970-01-03 00:00:00	33	1970-01-03	1190.27	B	false	5	4550.219999999999
+Manufacturer#3	almond antique chartreuse khaki white	1970-01-04 00:00:00	24	1970-01-04	99.68	C	false	5	4550.219999999999
+Manufacturer#3	almond antique misty red olive	1970-01-01 00:00:00	31	1970-01-01	1922.98	D	false	5	4550.219999999999
+Manufacturer#3	almond antique metallic orange dim	NULL	38	NULL	55.39	D	true	3	1835.93
+Manufacturer#3	almond antique forest lavender goldenrod	1970-01-05 00:00:00	10	1970-01-05	1190.27	C	true	3	1835.93
+Manufacturer#3	almond antique forest lavender goldenrod	NULL	19	NULL	590.27	D	true	3	1835.93
+Manufacturer#4	almond antique gainsboro frosted violet	NULL	25	NULL	NULL	A	false	3	1844.92
+Manufacturer#4	almond aquamarine yellow dodger mint	1970-01-01 00:00:00	11	1970-01-01	1844.92	D	false	3	1844.92
+Manufacturer#4	almond aquamarine floral ivory bisque	1970-01-05 00:00:00	35	1970-01-05	NULL	A	false	3	1844.92
+Manufacturer#4	almond aquamarine floral ivory bisque	1970-01-05 00:00:00	40	1970-01-05	1206.26	C	true	2	2581.6800000000003
+Manufacturer#4	almond antique violet mint lemon	1970-01-01 00:00:00	16	1970-01-01	1375.42	B	true	2	2581.6800000000003
+Manufacturer#4	almond azure aquamarine papaya violet	1970-01-02 00:00:00	37	1970-01-02	1290.35	C	NULL	1	1290.35
+Manufacturer#5	almond antique medium spring khaki	1970-01-04 00:00:00	29	1970-01-04	1611.66	B	false	3	5012.05
+Manufacturer#5	almond antique sky peru orange	1970-01-02 00:00:00	22	1970-01-02	1788.73	A	false	3	5012.05
+Manufacturer#5	almond antique medium spring khaki	1970-01-01 00:00:00	6	1970-01-01	1611.66	C	false	3	5012.05
+Manufacturer#5	almond antique blue firebrick mint	NULL	7	NULL	1789.69	D	true	3	4272.27
+Manufacturer#5	almond aquamarine dodger light gainsboro	1970-01-01 00:00:00	36	1970-01-01	1018.1	B	true	3	4272.27
+Manufacturer#5	almond azure blanched chiffon midnight	1970-01-03 00:00:00	18	1970-01-03	1464.48	C	true	3	4272.27
+PREHOOK: query: select "************ BOOLEAN PARTITION ************"
+PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
+POSTHOOK: query: select "************ BOOLEAN PARTITION ************"
+POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
+_c0
+************ BOOLEAN PARTITION ************
+PREHOOK: query: EXPLAIN VECTORIZATION DETAIL select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice,p_char,p_boolean,
+                                    count(*) over(partition by p_boolean) as cs,
+                                    sum(p_retailprice) over(partition by p_boolean) as s
+from vector_ptf_part_simple_orc
+PREHOOK: type: QUERY
+PREHOOK: Input: default@vector_ptf_part_simple_orc
+#### A masked pattern was here ####
+POSTHOOK: query: EXPLAIN VECTORIZATION DETAIL select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice,p_char,p_boolean,
+                                    count(*) over(partition by p_boolean) as cs,
+                                    sum(p_retailprice) over(partition by p_boolean) as s
+from vector_ptf_part_simple_orc
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@vector_ptf_part_simple_orc
+#### A masked pattern was here ####
+Explain
+PLAN VECTORIZATION:
+  enabled: true
+  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
+
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Tez
+#### A masked pattern was here ####
+      Edges:
+        Reducer 2 <- Map 1 (SIMPLE_EDGE)
+#### A masked pattern was here ####
+      Vertices:
+        Map 1 
+            Map Operator Tree:
+                TableScan
+                  alias: vector_ptf_part_simple_orc
+                  Statistics: Num rows: 40 Data size: 15976 Basic stats: COMPLETE Column stats: COMPLETE
+                  TableScan Vectorization:
+                      native: true
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
+                  Reduce Output Operator
+                    key expressions: p_boolean (type: boolean)
+                    null sort order: a
+                    sort order: +
+                    Map-reduce partition columns: p_boolean (type: boolean)
+                    Reduce Sink Vectorization:
+                        className: VectorReduceSinkLongOperator
+                        keyColumns: 9:boolean
+                        native: true
+                        nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
+                        valueColumns: 0:string, 1:string, 2:date, 3:timestamp, 5:double, 7:char(1), 10:int
+                    Statistics: Num rows: 40 Data size: 15976 Basic stats: COMPLETE Column stats: COMPLETE
+                    value expressions: p_mfgr (type: string), p_name (type: string), p_date (type: date), p_timestamp (type: timestamp), p_retailprice (type: double), p_char (type: char(1)), rowindex (type: int)
+            Execution mode: vectorized, llap
+            LLAP IO: all inputs
+            Map Vectorization:
+                enabled: true
+                enabledConditionsMet: hive.vectorized.use.vectorized.input.format IS true
+                inputFormatFeatureSupport: [DECIMAL_64]
+                featureSupportInUse: [DECIMAL_64]
+                inputFileFormats: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
+                allNative: true
+                usesVectorUDFAdaptor: false
+                vectorized: true
+                rowBatchContext:
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 7, 9, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
+                    partitionColumnCount: 0
+                    scratchColumnTypeNames: []
+        Reducer 2 
+            Execution mode: vectorized, llap
+            Reduce Vectorization:
+                enabled: true
+                enableConditionsMet: hive.vectorized.execution.reduce.enabled IS true, hive.execution.engine tez IN [tez] IS true
+                reduceColumnNullOrder: a
+                reduceColumnSortOrder: +
+                allNative: false
+                usesVectorUDFAdaptor: false
+                vectorized: true
+                rowBatchContext:
+                    dataColumnCount: 8
+                    dataColumns: KEY.reducesinkkey0:boolean, VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col3:timestamp, VALUE._col5:double, VALUE._col7:char(1), VALUE._col9:int
+                    partitionColumnCount: 0
+                    scratchColumnTypeNames: [bigint, double]
+            Reduce Operator Tree:
+              Select Operator
+                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), VALUE._col3 (type: timestamp), VALUE._col5 (type: double), VALUE._col7 (type: char(1)), KEY.reducesinkkey0 (type: boolean), VALUE._col9 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col7, _col9, _col10
+                Select Vectorization:
+                    className: VectorSelectOperator
+                    native: true
+                    projectedOutputColumnNums: [1, 2, 3, 4, 5, 6, 0, 7]
+                Statistics: Num rows: 40 Data size: 15976 Basic stats: COMPLETE Column stats: COMPLETE
+                PTF Operator
+                  Function definitions:
+                      Input definition
+                        input alias: ptf_0
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col7: char(1), _col9: boolean, _col10: int
+                        type: WINDOWING
+                      Windowing table definition
+                        input alias: ptf_1
+                        name: windowingtablefunction
+                        order by: _col9 ASC NULLS FIRST
+                        partition by: _col9
+                        raw input shape:
+                        window functions:
+                            window function definition
+                              alias: count_window_0
+                              name: count
+                              window function: GenericUDAFCountEvaluator
+                              window frame: ROWS PRECEDING(MAX)~FOLLOWING(MAX)
+                              isStar: true
+                            window function definition
+                              alias: sum_window_1
+                              arguments: _col5
+                              name: sum
+                              window function: GenericUDAFSumDouble
+                              window frame: ROWS PRECEDING(MAX)~FOLLOWING(MAX)
+                  PTF Vectorization:
+                      allEvaluatorsAreStreaming: false
+                      className: VectorPTFOperator
+                      evaluatorClasses: [VectorPTFEvaluatorCountStar, VectorPTFEvaluatorDoubleSum]
+                      functionInputExpressions: [null, col 5:double]
+                      functionNames: [count, sum]
+                      keyInputColumns: [0]
+                      native: true
+                      nonKeyInputColumns: [1, 2, 3, 4, 5, 6, 7]
+                      orderExpressions: [col 0:boolean]
+                      outputColumns: [8, 9, 1, 2, 3, 4, 5, 6, 0, 7]
+                      outputTypes: [bigint, double, string, string, date, timestamp, double, char(1), boolean, int]
+                      partitionExpressions: [col 0:boolean]
+                      streamingColumns: []
+                  Statistics: Num rows: 40 Data size: 15976 Basic stats: COMPLETE Column stats: COMPLETE
+                  Select Operator
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col5 (type: double), _col7 (type: char(1)), _col9 (type: boolean), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9
+                    Select Vectorization:
+                        className: VectorSelectOperator
+                        native: true
+                        projectedOutputColumnNums: [1, 2, 4, 7, 3, 5, 6, 0, 8, 9]
+                    Statistics: Num rows: 40 Data size: 15804 Basic stats: COMPLETE Column stats: COMPLETE
+                    File Output Operator
+                      compressed: false
+                      File Sink Vectorization:
+                          className: VectorFileSinkOperator
+                          native: false
+                      Statistics: Num rows: 40 Data size: 15804 Basic stats: COMPLETE Column stats: COMPLETE
+                      table:
+                          input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                          output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                          serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice,p_char,p_boolean,
+       count(*) over(partition by p_boolean) as cs,
+       sum(p_retailprice) over(partition by p_boolean) as s
+from vector_ptf_part_simple_orc
+PREHOOK: type: QUERY
+PREHOOK: Input: default@vector_ptf_part_simple_orc
+#### A masked pattern was here ####
+POSTHOOK: query: select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice,p_char,p_boolean,
+       count(*) over(partition by p_boolean) as cs,
+       sum(p_retailprice) over(partition by p_boolean) as s
+from vector_ptf_part_simple_orc
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@vector_ptf_part_simple_orc
+#### A masked pattern was here ####
+p_mfgr	p_name	p_timestamp	rowindex	p_date	p_retailprice	p_char	p_boolean	cs	s
+Manufacturer#4	almond aquamarine floral ivory bisque	1970-01-05 00:00:00	40	1970-01-05	1206.26	C	true	19	24911.730000000003
+Manufacturer#1	almond aquamarine burnished black steel	1970-01-02 00:00:00	2	1970-01-02	1414.42	B	true	19	24911.730000000003
+Manufacturer#2	almond aquamarine rose maroon antique	1970-01-03 00:00:00	3	1970-01-03	1698.66	C	true	19	24911.730000000003
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-04 00:00:00	4	1970-01-04	NULL	A	true	19	24911.730000000003
+Manufacturer#5	almond antique blue firebrick mint	NULL	7	NULL	1789.69	D	true	19	24911.730000000003
+Manufacturer#3	almond antique forest lavender goldenrod	1970-01-05 00:00:00	10	1970-01-05	1190.27	C	true	19	24911.730000000003
+Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-02 00:00:00	12	1970-01-02	1753.76	D	true	19	24911.730000000003
+Manufacturer#4	almond antique violet mint lemon	1970-01-01 00:00:00	16	1970-01-01	1375.42	B	true	19	24911.730000000003
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-02 00:00:00	17	1970-01-02	1632.66	D	true	19	24911.730000000003
+Manufacturer#5	almond azure blanched chiffon midnight	1970-01-03 00:00:00	18	1970-01-03	1464.48	C	true	19	24911.730000000003
+Manufacturer#3	almond antique forest lavender goldenrod	NULL	19	NULL	590.27	D	true	19	24911.730000000003
+Manufacturer#2	almond aquamarine rose maroon antique	NULL	1	NULL	900.66	A	true	19	24911.730000000003
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-03 00:00:00	23	1970-01-03	1632.66	D	true	19	24911.730000000003
+Manufacturer#1	almond antique chartreuse lavender yellow	NULL	26	NULL	1753.76	C	true	19	24911.730000000003
+Manufacturer#2	almond antique violet turquoise frosted	1970-01-02 00:00:00	27	1970-01-02	1800.7	D	true	19	24911.730000000003
+Manufacturer#1	almond antique salmon chartreuse burlywood	1970-01-05 00:00:00	30	1970-01-05	1602.59	C	true	19	24911.730000000003
+Manufacturer#2	almond aquamarine midnight light salmon	1970-01-04 00:00:00	34	1970-01-04	2031.98	C	true	19	24911.730000000003
+Manufacturer#5	almond aquamarine dodger light gainsboro	1970-01-01 00:00:00	36	1970-01-01	1018.1	B	true	19	24911.730000000003
+Manufacturer#3	almond antique metallic orange dim	NULL	38	NULL	55.39	D	true	19	24911.730000000003
+Manufacturer#4	almond azure aquamarine papaya violet	1970-01-02 00:00:00	37	1970-01-02	1290.35	C	NULL	3	3981.6299999999997
+Manufacturer#2	almond antique violet chocolate turquoise	1970-01-05 00:00:00	15	1970-01-05	1690.68	D	NULL	3	3981.6299999999997
+Manufacturer#2	almond aquamarine sandy cyan gainsboro	NULL	32	NULL	1000.6	A	NULL	3	3981.6299999999997
+Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-05 00:00:00	20	1970-01-05	1753.76	A	false	18	22495.07
+Manufacturer#3	almond antique forest lavender goldenrod	1970-01-03 00:00:00	33	1970-01-03	1190.27	B	false	18	22495.07
+Manufacturer#5	almond antique sky peru orange	1970-01-02 00:00:00	22	1970-01-02	1788.73	A	false	18	22495.07
+Manufacturer#2	almond antique violet turquoise frosted	1970-01-01 00:00:00	21	1970-01-01	1800.7	B	false	18	22495.07
+Manufacturer#3	almond antique chartreuse khaki white	1970-01-04 00:00:00	24	1970-01-04	99.68	C	false	18	22495.07
+Manufacturer#4	almond antique gainsboro frosted violet	NULL	25	NULL	NULL	A	false	18	22495.07
+Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-05 00:00:00	5	1970-01-05	1753.76	B	false	18	22495.07
+Manufacturer#5	almond antique medium spring khaki	1970-01-01 00:00:00	6	1970-01-01	1611.66	C	false	18	22495.07
+Manufacturer#4	almond aquamarine floral ivory bisque	1970-01-05 00:00:00	35	1970-01-05	NULL	A	false	18	22495.07
+Manufacturer#1	almond antique burnished rose metallic	1970-01-03 00:00:00	8	1970-01-03	1173.15	A	false	18	22495.07
+Manufacturer#1	almond antique burnished rose metallic	1970-01-04 00:00:00	39	1970-01-04	1173.15	D	false	18	22495.07
+Manufacturer#4	almond aquamarine yellow dodger mint	1970-01-01 00:00:00	11	1970-01-01	1844.92	D	false	18	22495.07
+Manufacturer#3	almond antique olive coral navajo	1970-01-03 00:00:00	28	1970-01-03	1337.29	A	false	18	22495.07
+Manufacturer#2	almond antique violet turquoise frosted	NULL	13	NULL	1800.7	B	false	18	22495.07
+Manufacturer#3	almond antique forest lavender goldenrod	1970-01-04 00:00:00	14	1970-01-04	NULL	C	false	18	22495.07
+Manufacturer#5	almond antique medium spring khaki	1970-01-04 00:00:00	29	1970-01-04	1611.66	B	false	18	22495.07
+Manufacturer#3	almond antique misty red olive	1970-01-01 00:00:00	31	1970-01-01	1922.98	D	false	18	22495.07
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-04 00:00:00	9	1970-01-04	1632.66	B	false	18	22495.07
+PREHOOK: query: select "************ BOOLEAN PARTITION WITH CONSTANT PARTITION EXPRESSION ************"
+PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
+POSTHOOK: query: select "************ BOOLEAN PARTITION WITH CONSTANT PARTITION EXPRESSION ************"
+POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
+_c0
+************ BOOLEAN PARTITION WITH CONSTANT PARTITION EXPRESSION ************
+PREHOOK: query: EXPLAIN VECTORIZATION DETAIL select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice,p_char,p_boolean,
+                                    count(*) over(partition by p_boolean) as cs,
+                                    sum(p_retailprice) over(partition by p_boolean) as s
+from vector_ptf_part_simple_orc
+where p_boolean = true
+PREHOOK: type: QUERY
+PREHOOK: Input: default@vector_ptf_part_simple_orc
+#### A masked pattern was here ####
+POSTHOOK: query: EXPLAIN VECTORIZATION DETAIL select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice,p_char,p_boolean,
+                                    count(*) over(partition by p_boolean) as cs,
+                                    sum(p_retailprice) over(partition by p_boolean) as s
+from vector_ptf_part_simple_orc
+where p_boolean = true
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@vector_ptf_part_simple_orc
+#### A masked pattern was here ####
+Explain
+PLAN VECTORIZATION:
+  enabled: true
+  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
+
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Tez
+#### A masked pattern was here ####
+      Edges:
+        Reducer 2 <- Map 1 (SIMPLE_EDGE)
+#### A masked pattern was here ####
+      Vertices:
+        Map 1 
+            Map Operator Tree:
+                TableScan
+                  alias: vector_ptf_part_simple_orc
+                  Statistics: Num rows: 40 Data size: 15976 Basic stats: COMPLETE Column stats: COMPLETE
+                  TableScan Vectorization:
+                      native: true
+                      vectorizationSchemaColumns: [0:p_mfgr:string, 1:p_name:string, 2:p_date:date, 3:p_timestamp:timestamp, 4:p_int:int, 5:p_retailprice:double, 6:p_decimal:decimal(10,4)/DECIMAL_64, 7:p_char:char(1), 8:p_varchar:varchar(5), 9:p_boolean:boolean, 10:rowindex:int, 11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>, 12:ROW__IS__DELETED:boolean]
+                  Filter Operator
+                    Filter Vectorization:
+                        className: VectorFilterOperator
+                        native: true
+                        predicateExpression: SelectColumnIsTrue(col 9:boolean)
+                    predicate: p_boolean (type: boolean)
+                    Statistics: Num rows: 19 Data size: 7627 Basic stats: COMPLETE Column stats: COMPLETE
+                    Reduce Output Operator
+                      key expressions: p_boolean (type: boolean)
+                      null sort order: a
+                      sort order: +
+                      Map-reduce partition columns: p_boolean (type: boolean)
+                      Reduce Sink Vectorization:
+                          className: VectorReduceSinkLongOperator
+                          keyColumns: 9:boolean
+                          native: true
+                          nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
+                          valueColumns: 0:string, 1:string, 2:date, 3:timestamp, 5:double, 7:char(1), 10:int
+                      Statistics: Num rows: 19 Data size: 7627 Basic stats: COMPLETE Column stats: COMPLETE
+                      value expressions: p_mfgr (type: string), p_name (type: string), p_date (type: date), p_timestamp (type: timestamp), p_retailprice (type: double), p_char (type: char(1)), rowindex (type: int)
+            Execution mode: vectorized, llap
+            LLAP IO: all inputs
+            Map Vectorization:
+                enabled: true
+                enabledConditionsMet: hive.vectorized.use.vectorized.input.format IS true
+                inputFormatFeatureSupport: [DECIMAL_64]
+                featureSupportInUse: [DECIMAL_64]
+                inputFileFormats: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
+                allNative: true
+                usesVectorUDFAdaptor: false
+                vectorized: true
+                rowBatchContext:
+                    dataColumnCount: 11
+                    includeColumns: [0, 1, 2, 3, 5, 7, 9, 10]
+                    dataColumns: p_mfgr:string, p_name:string, p_date:date, p_timestamp:timestamp, p_int:int, p_retailprice:double, p_decimal:decimal(10,4)/DECIMAL_64, p_char:char(1), p_varchar:varchar(5), p_boolean:boolean, rowindex:int
+                    partitionColumnCount: 0
+                    scratchColumnTypeNames: []
+        Reducer 2 
+            Execution mode: vectorized, llap
+            Reduce Vectorization:
+                enabled: true
+                enableConditionsMet: hive.vectorized.execution.reduce.enabled IS true, hive.execution.engine tez IN [tez] IS true
+                reduceColumnNullOrder: a
+                reduceColumnSortOrder: +
+                allNative: false
+                usesVectorUDFAdaptor: false
+                vectorized: true
+                rowBatchContext:
+                    dataColumnCount: 8
+                    dataColumns: KEY.reducesinkkey0:boolean, VALUE._col0:string, VALUE._col1:string, VALUE._col2:date, VALUE._col3:timestamp, VALUE._col5:double, VALUE._col7:char(1), VALUE._col9:int
+                    partitionColumnCount: 0
+                    scratchColumnTypeNames: [bigint, double]
+            Reduce Operator Tree:
+              Select Operator
+                expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: date), VALUE._col3 (type: timestamp), VALUE._col5 (type: double), VALUE._col7 (type: char(1)), KEY.reducesinkkey0 (type: boolean), VALUE._col9 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col7, _col9, _col10
+                Select Vectorization:
+                    className: VectorSelectOperator
+                    native: true
+                    projectedOutputColumnNums: [1, 2, 3, 4, 5, 6, 0, 7]
+                Statistics: Num rows: 19 Data size: 7627 Basic stats: COMPLETE Column stats: COMPLETE
+                PTF Operator
+                  Function definitions:
+                      Input definition
+                        input alias: ptf_0
+                        output shape: _col0: string, _col1: string, _col2: date, _col3: timestamp, _col5: double, _col7: char(1), _col9: boolean, _col10: int
+                        type: WINDOWING
+                      Windowing table definition
+                        input alias: ptf_1
+                        name: windowingtablefunction
+                        order by: _col9 ASC NULLS FIRST
+                        partition by: _col9
+                        raw input shape:
+                        window functions:
+                            window function definition
+                              alias: count_window_0
+                              name: count
+                              window function: GenericUDAFCountEvaluator
+                              window frame: ROWS PRECEDING(MAX)~FOLLOWING(MAX)
+                              isStar: true
+                            window function definition
+                              alias: sum_window_1
+                              arguments: _col5
+                              name: sum
+                              window function: GenericUDAFSumDouble
+                              window frame: ROWS PRECEDING(MAX)~FOLLOWING(MAX)
+                  PTF Vectorization:
+                      allEvaluatorsAreStreaming: false
+                      className: VectorPTFOperator
+                      evaluatorClasses: [VectorPTFEvaluatorCountStar, VectorPTFEvaluatorDoubleSum]
+                      functionInputExpressions: [null, col 5:double]
+                      functionNames: [count, sum]
+                      keyInputColumns: [0]
+                      native: true
+                      nonKeyInputColumns: [1, 2, 3, 4, 5, 6, 7]
+                      orderExpressions: [col 0:boolean]
+                      outputColumns: [8, 9, 1, 2, 3, 4, 5, 6, 0, 7]
+                      outputTypes: [bigint, double, string, string, date, timestamp, double, char(1), boolean, int]
+                      partitionExpressions: [col 0:boolean]
+                      streamingColumns: []
+                  Statistics: Num rows: 19 Data size: 7627 Basic stats: COMPLETE Column stats: COMPLETE
+                  Select Operator
+                    expressions: _col0 (type: string), _col1 (type: string), _col3 (type: timestamp), _col10 (type: int), _col2 (type: date), _col5 (type: double), _col7 (type: char(1)), _col9 (type: boolean), count_window_0 (type: bigint), sum_window_1 (type: double)
+                    outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9
+                    Select Vectorization:
+                        className: VectorSelectOperator
+                        native: true
+                        projectedOutputColumnNums: [1, 2, 4, 7, 3, 5, 6, 0, 8, 9]
+                    Statistics: Num rows: 19 Data size: 7527 Basic stats: COMPLETE Column stats: COMPLETE
+                    File Output Operator
+                      compressed: false
+                      File Sink Vectorization:
+                          className: VectorFileSinkOperator
+                          native: false
+                      Statistics: Num rows: 19 Data size: 7527 Basic stats: COMPLETE Column stats: COMPLETE
+                      table:
+                          input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                          output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                          serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice, p_char,p_boolean,
+       count(*) over(partition by p_boolean) as cs,
+       sum(p_retailprice) over(partition by p_boolean) as s
+from vector_ptf_part_simple_orc
+where p_boolean = false
+PREHOOK: type: QUERY
+PREHOOK: Input: default@vector_ptf_part_simple_orc
+#### A masked pattern was here ####
+POSTHOOK: query: select p_mfgr, p_name, p_timestamp, rowindex, p_date, p_retailprice, p_char,p_boolean,
+       count(*) over(partition by p_boolean) as cs,
+       sum(p_retailprice) over(partition by p_boolean) as s
+from vector_ptf_part_simple_orc
+where p_boolean = false
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@vector_ptf_part_simple_orc
+#### A masked pattern was here ####
+p_mfgr	p_name	p_timestamp	rowindex	p_date	p_retailprice	p_char	p_boolean	cs	s
+Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-05 00:00:00	5	1970-01-05	1753.76	B	false	18	22495.070000000003
+Manufacturer#5	almond antique medium spring khaki	1970-01-01 00:00:00	6	1970-01-01	1611.66	C	false	18	22495.070000000003
+Manufacturer#1	almond antique burnished rose metallic	1970-01-03 00:00:00	8	1970-01-03	1173.15	A	false	18	22495.070000000003
+Manufacturer#1	almond aquamarine pink moccasin thistle	1970-01-04 00:00:00	9	1970-01-04	1632.66	B	false	18	22495.070000000003
+Manufacturer#4	almond aquamarine yellow dodger mint	1970-01-01 00:00:00	11	1970-01-01	1844.92	D	false	18	22495.070000000003
+Manufacturer#2	almond antique violet turquoise frosted	NULL	13	NULL	1800.7	B	false	18	22495.070000000003
+Manufacturer#3	almond antique forest lavender goldenrod	1970-01-04 00:00:00	14	1970-01-04	NULL	C	false	18	22495.070000000003
+Manufacturer#1	almond antique chartreuse lavender yellow	1970-01-05 00:00:00	20	1970-01-05	1753.76	A	false	18	22495.070000000003
+Manufacturer#2	almond antique violet turquoise frosted	1970-01-01 00:00:00	21	1970-01-01	1800.7	B	false	18	22495.070000000003
+Manufacturer#5	almond antique sky peru orange	1970-01-02 00:00:00	22	1970-01-02	1788.73	A	false	18	22495.070000000003
+Manufacturer#3	almond antique chartreuse khaki white	1970-01-04 00:00:00	24	1970-01-04	99.68	C	false	18	22495.070000000003
+Manufacturer#4	almond antique gainsboro frosted violet	NULL	25	NULL	NULL	A	false	18	22495.070000000003
+Manufacturer#3	almond antique olive coral navajo	1970-01-03 00:00:00	28	1970-01-03	1337.29	A	false	18	22495.070000000003
+Manufacturer#5	almond antique medium spring khaki	1970-01-04 00:00:00	29	1970-01-04	1611.66	B	false	18	22495.070000000003
+Manufacturer#3	almond antique misty red olive	1970-01-01 00:00:00	31	1970-01-01	1922.98	D	false	18	22495.070000000003
+Manufacturer#3	almond antique forest lavender goldenrod	1970-01-03 00:00:00	33	1970-01-03	1190.27	B	false	18	22495.070000000003
+Manufacturer#4	almond aquamarine floral ivory bisque	1970-01-05 00:00:00	35	1970-01-05	NULL	A	false	18	22495.070000000003
+Manufacturer#1	almond antique burnished rose metallic	1970-01-04 00:00:00	39	1970-01-04	1173.15	D	false	18	22495.070000000003