Index: ql/src/test/results/clientpositive/tez/vector_coalesce.q.out =================================================================== --- ql/src/test/results/clientpositive/tez/vector_coalesce.q.out (revision 1656253) +++ ql/src/test/results/clientpositive/tez/vector_coalesce.q.out (working copy) @@ -68,7 +68,7 @@ Filter Operator predicate: ctinyint is null (type: boolean) Select Operator - expressions: ctinyint (type: tinyint), cdouble (type: double), cint (type: int), COALESCE((UDFToInteger(ctinyint) + 10),(cdouble + log2(cint)),0) (type: double) + expressions: null (type: void), cdouble (type: double), cint (type: int), COALESCE((UDFToInteger(null) + 10),(cdouble + log2(cint)),0) (type: double) outputColumnNames: _col0, _col1, _col2, _col3 Limit Number of rows: 10 Index: ql/src/test/results/clientpositive/vector_coalesce.q.out =================================================================== --- ql/src/test/results/clientpositive/vector_coalesce.q.out (revision 1656253) +++ ql/src/test/results/clientpositive/vector_coalesce.q.out (working copy) @@ -87,7 +87,7 @@ predicate: ctinyint is null (type: boolean) Statistics: Num rows: 6144 Data size: 188618 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: ctinyint (type: tinyint), cdouble (type: double), cint (type: int), COALESCE((UDFToInteger(ctinyint) + 10),(cdouble + log2(cint)),0) (type: double) + expressions: null (type: void), cdouble (type: double), cint (type: int), COALESCE((UDFToInteger(null) + 10),(cdouble + log2(cint)),0) (type: double) outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 6144 Data size: 188618 Basic stats: COMPLETE Column stats: NONE Limit Index: ql/src/test/queries/clientpositive/vector_coalesce.q =================================================================== --- ql/src/test/queries/clientpositive/vector_coalesce.q (revision 1656253) +++ ql/src/test/queries/clientpositive/vector_coalesce.q (working copy) @@ -7,8 +7,6 @@ FROM alltypesorc WHERE (cdouble IS NULL) LIMIT 10; -SET hive.optimize.constant.propagation=false; - EXPLAIN SELECT ctinyint, cdouble, cint, coalesce(ctinyint+10, (cdouble+log2(cint)), 0) FROM alltypesorc WHERE (ctinyint IS NULL) LIMIT 10; @@ -17,8 +15,6 @@ FROM alltypesorc WHERE (ctinyint IS NULL) LIMIT 10; -SET hive.optimize.constant.propagation=true; - EXPLAIN SELECT cfloat, cbigint, coalesce(cfloat, cbigint, 0) FROM alltypesorc WHERE (cfloat IS NULL AND cbigint IS NULL) LIMIT 10; Index: ql/src/test/queries/clientpositive/orc_vectorization_ppd.q =================================================================== --- ql/src/test/queries/clientpositive/orc_vectorization_ppd.q (revision 1656253) +++ ql/src/test/queries/clientpositive/orc_vectorization_ppd.q (working copy) @@ -13,14 +13,12 @@ -- insert creates separate orc files insert overwrite table vectororc select "apple", "a", rand(1), "zoo" from srcorc; -set hive.optimize.constant.propagation=false; insert into table vectororc select null, "b", rand(2), "zoo" from srcorc; insert into table vectororc select null, "c", rand(3), "zoo" from srcorc; insert into table vectororc select "apple", "d", rand(4), "zoo" from srcorc; insert into table vectororc select null, "e", rand(5), "z" from srcorc; insert into table vectororc select "apple", "f", rand(6), "z" from srcorc; insert into table vectororc select null, "g", rand(7), "zoo" from srcorc; -set hive.optimize.constant.propagation=true; -- since vectororc table has multiple orc file we will load them into a single file using another table create table if not exists testorc