You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2018/10/18 18:35:47 UTC

[7/7] hive git commit: HIVE-20572 : Change default value of hive.tez.llap.min.reducer.per.executor

HIVE-20572 : Change default value of hive.tez.llap.min.reducer.per.executor


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

Branch: refs/heads/master
Commit: f89274ab42a94012074a7ec030c4fcc13c9577e8
Parents: dcaeeb4
Author: Ashutosh Chauhan <ha...@apache.org>
Authored: Sun Sep 16 23:24:12 2018 -0700
Committer: Ashutosh Chauhan <ha...@apache.org>
Committed: Thu Oct 18 11:15:38 2018 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hive/conf/HiveConf.java   |     2 +-
 .../clientpositive/llap/bucket_groupby.q.out    |   248 +-
 .../results/clientpositive/llap/cbo_limit.q.out |     4 +-
 .../clientpositive/llap/cbo_rp_limit.q.out      |     4 +-
 .../clientpositive/llap/cbo_rp_views.q.out      |     2 +-
 .../results/clientpositive/llap/cbo_views.q.out |     2 +-
 .../results/clientpositive/llap/cluster.q.out   |   378 +-
 .../llap/constraints_optimization.q.out         |     8 +-
 .../llap/correlationoptimizer1.q.out            |    24 +-
 .../results/clientpositive/llap/cte_1.q.out     | 24934 ++++++++---------
 .../clientpositive/llap/dp_counter_mm.q.out     |    16 +-
 .../clientpositive/llap/dp_counter_non_mm.q.out |    16 +-
 .../clientpositive/llap/except_distinct.q.out   |     2 +-
 .../llap/hybridgrace_hashjoin_2.q.out           |     4 +-
 .../clientpositive/llap/intersect_all.q.out     |  1034 +-
 .../llap/intersect_distinct.q.out               |   532 +-
 .../clientpositive/llap/lateral_view.q.out      |     6 +-
 .../results/clientpositive/llap/lineage2.q.out  |    26 +-
 .../llap/llap_decimal64_reader.q.out            |     4 +-
 .../results/clientpositive/llap/llap_smb.q.out  |    28 +-
 .../llap/materialized_view_create.q.out         |     2 +-
 .../materialized_view_create_rewrite_2.q.out    |    10 +-
 .../llap/materialized_view_describe.q.out       |     2 +-
 .../llap/multi_count_distinct_null.q.out        |    12 +-
 .../clientpositive/llap/parquet_types.q.out     |     2 +-
 .../llap/parquet_types_vectorization.q.out      |     2 +-
 .../llap/partition_multilevels.q.out            |   212 +-
 .../llap/reduce_deduplicate_extended.q.out      |    28 +-
 .../clientpositive/llap/results_cache_1.q.out   |     8 +-
 .../llap/results_cache_with_masking.q.out       |     4 +-
 .../clientpositive/llap/skiphf_aggr.q.out       |     6 +-
 .../clientpositive/llap/subquery_notin.q.out    |   100 +-
 .../llap/tez_input_counters.q.out               |     2 +-
 .../llap/tez_smb_reduce_side.q.out              |    14 +-
 .../clientpositive/llap/tez_union2.q.out        |   546 +-
 .../llap/udaf_collect_set_2.q.out               |    60 +-
 .../clientpositive/llap/unionDistinct_3.q.out   |   814 +-
 .../llap/vector_complex_all.q.out               |     4 +-
 .../llap/vector_grouping_sets.q.out             |     4 +-
 .../llap/vector_partitioned_date_time.q.out     |    72 +-
 .../llap/vector_ptf_part_simple.q.out           |   450 +-
 .../llap/vector_windowing_expressions.q.out     |    40 +-
 .../vector_windowing_multipartitioning.q.out    |    24 +-
 .../vector_windowing_range_multiorder.q.out     | 16434 +++++------
 .../llap/vectorized_distinct_gby.q.out          |     2 +-
 .../llap/vectorized_parquet.q.out               |   116 +-
 46 files changed, 23122 insertions(+), 23122 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/f89274ab/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index b600518..8a06cb5 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -3811,7 +3811,7 @@ public class HiveConf extends Configuration {
         "Turn on Tez' auto reducer parallelism feature. When enabled, Hive will still estimate data sizes\n" +
         "and set parallelism estimates. Tez will sample source vertices' output sizes and adjust the estimates at runtime as\n" +
         "necessary."),
-    TEZ_LLAP_MIN_REDUCER_PER_EXECUTOR("hive.tez.llap.min.reducer.per.executor", 0.95f,
+    TEZ_LLAP_MIN_REDUCER_PER_EXECUTOR("hive.tez.llap.min.reducer.per.executor", 0.33f,
         "If above 0, the min number of reducers for auto-parallelism for LLAP scheduling will\n" +
         "be set to this fraction of the number of executors."),
     TEZ_MAX_PARTITION_FACTOR("hive.tez.max.partition.factor", 2f,

http://git-wip-us.apache.org/repos/asf/hive/blob/f89274ab/ql/src/test/results/clientpositive/llap/bucket_groupby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket_groupby.q.out b/ql/src/test/results/clientpositive/llap/bucket_groupby.q.out
index 433e033..4e6885d 100644
--- a/ql/src/test/results/clientpositive/llap/bucket_groupby.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket_groupby.q.out
@@ -383,8 +383,8 @@ POSTHOOK: Input: default@clustergroupby
 POSTHOOK: Input: default@clustergroupby@ds=101
 #### A masked pattern was here ####
 1	10
-3	416
 2	74
+3	416
 PREHOOK: query: explain
 select abs(length(key)), count(1) from clustergroupby  where ds='101'  group by abs(length(key)) limit 10
 PREHOOK: type: QUERY
@@ -476,8 +476,8 @@ POSTHOOK: Input: default@clustergroupby
 POSTHOOK: Input: default@clustergroupby@ds=101
 #### A masked pattern was here ####
 1	10
-3	416
 2	74
+3	416
 PREHOOK: query: explain
 select key, count(1) from clustergroupby  where ds='101'  group by key,'a' order by key,'a' limit 10
 PREHOOK: type: QUERY
@@ -796,93 +796,157 @@ POSTHOOK: Input: default@clustergroupby@ds=101
 104	4
 105	2
 11	2
+111	2
+12	4
+120	4
 126	2
 128	6
 129	4
+131	2
 133	2
 134	4
 136	2
 143	2
 149	4
+150	2
 152	4
 153	2
+156	2
 157	2
+160	2
 162	2
+163	2
 166	2
+167	6
+168	2
 169	8
+17	2
 170	2
 174	4
+175	4
 176	4
+180	2
 193	6
 196	2
+20	2
 201	2
+203	4
 205	4
 209	4
 213	4
 218	2
 221	4
 223	4
+226	2
 233	4
+237	4
 239	4
 24	4
 241	2
 242	4
 247	2
 248	2
+255	4
+256	4
 26	4
 263	2
 272	4
+274	2
 275	2
+277	8
+281	4
+282	4
 285	2
+286	2
+287	2
+289	2
+292	2
 296	2
 298	6
 302	2
 307	4
+308	2
+309	4
 310	2
+318	6
 323	2
 325	4
+327	6
+332	2
 333	4
 335	2
 338	2
+339	2
+34	2
+341	2
+348	10
+356	2
 360	2
 362	2
 367	4
+37	4
+374	2
 375	2
 377	2
+379	2
+382	4
 384	6
 392	2
 399	4
 401	10
 402	2
 403	6
+409	6
 413	4
 417	6
 419	2
 42	4
 427	2
+429	4
+43	2
+430	6
+431	6
+432	2
+435	2
+437	2
 438	6
+439	4
 44	2
+443	2
+457	2
 458	4
 459	4
+462	4
 466	6
+467	2
 469	10
+470	2
 472	2
 475	2
 478	4
 479	2
+481	2
 483	2
+487	2
 489	8
+494	2
 495	2
 496	2
 5	6
+51	4
 57	2
 58	4
 64	2
 66	2
 69	2
+70	6
 72	4
+74	2
 76	4
 77	2
+82	2
+83	4
+84	4
 9	2
 90	6
 0	6
@@ -890,214 +954,150 @@ POSTHOOK: Input: default@clustergroupby@ds=101
 114	2
 116	2
 118	4
+119	6
+125	4
 137	4
 138	8
 145	2
 146	4
+15	4
 155	2
 158	2
 164	4
 165	4
+172	4
+177	2
 178	2
+179	4
+18	4
 181	2
 183	2
 186	2
+187	6
 189	2
+19	2
 190	2
 191	4
+192	2
 194	2
 195	4
+197	4
 199	6
 2	2
+200	4
+202	2
 207	4
 208	6
 214	2
 216	4
+217	4
+219	4
 222	2
 224	4
+228	2
 229	4
 230	10
+235	2
 238	4
 244	2
+249	2
+252	2
+257	2
 258	2
 260	2
 262	2
+265	4
 266	2
 27	2
 273	6
-28	2
-284	2
-288	4
-30	2
-315	2
-321	4
-33	2
-342	4
-35	6
-364	2
-365	2
-366	2
-368	2
-386	2
-389	2
-394	2
-396	6
-397	4
-4	2
-41	2
-414	4
-421	2
-444	2
-446	2
-448	2
-452	2
-454	6
-455	2
-460	2
-463	4
-482	2
-492	4
-493	2
-65	2
-78	2
-80	2
-97	4
-111	2
-12	4
-120	4
-131	2
-150	2
-156	2
-160	2
-163	2
-167	6
-168	2
-17	2
-175	4
-180	2
-20	2
-203	4
-226	2
-237	4
-255	4
-256	4
-274	2
-277	8
-281	4
-282	4
-286	2
-287	2
-289	2
-292	2
-308	2
-309	4
-318	6
-327	6
-332	2
-339	2
-34	2
-341	2
-348	10
-356	2
-37	4
-374	2
-379	2
-382	4
-409	6
-429	4
-43	2
-430	6
-431	6
-432	2
-435	2
-437	2
-439	4
-443	2
-457	2
-462	4
-467	2
-470	2
-481	2
-487	2
-494	2
-51	4
-70	6
-74	2
-82	2
-83	4
-84	4
-119	6
-125	4
-15	4
-172	4
-177	2
-179	4
-18	4
-187	6
-19	2
-192	2
-197	4
-200	4
-202	2
-217	4
-219	4
-228	2
-235	2
-249	2
-252	2
-257	2
-265	4
 278	4
+28	2
 280	4
 283	2
+284	2
+288	4
 291	2
+30	2
 305	2
 306	2
 311	6
+315	2
 316	6
 317	4
+321	4
 322	4
+33	2
 331	4
 336	2
+342	4
 344	4
 345	2
+35	6
 351	2
 353	4
+364	2
+365	2
+366	2
+368	2
 369	6
 373	2
 378	2
+386	2
+389	2
 393	2
+394	2
 395	4
+396	6
+397	4
+4	2
 400	2
 404	4
 406	8
 407	2
+41	2
 411	2
+414	4
 418	2
+421	2
 424	4
 436	2
+444	2
+446	2
+448	2
 449	2
+452	2
 453	2
+454	6
+455	2
+460	2
+463	4
 468	8
 47	2
 477	2
 480	6
+482	2
 484	2
 485	2
 490	2
 491	2
+492	4
+493	2
 497	2
 498	6
 53	2
 54	2
+65	2
 67	4
+78	2
 8	2
+80	2
 85	2
 86	2
 87	2
 92	2
 95	4
 96	2
+97	4
 98	4
 PREHOOK: query: explain
 select key, count(1) from clustergroupby  group by key, 3

http://git-wip-us.apache.org/repos/asf/hive/blob/f89274ab/ql/src/test/results/clientpositive/llap/cbo_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cbo_limit.q.out b/ql/src/test/results/clientpositive/llap/cbo_limit.q.out
index 0d5c8f0..87a5770 100644
--- a/ql/src/test/results/clientpositive/llap/cbo_limit.q.out
+++ b/ql/src/test/results/clientpositive/llap/cbo_limit.q.out
@@ -8,7 +8,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cbo_t1
 POSTHOOK: Input: default@cbo_t1@dt=2014
 #### A masked pattern was here ####
-1	4	12
+ 1	4	2
 PREHOOK: query: select x, y, count(*) from (select key, (c_int+c_float+1+2) as x, sum(c_int) as y from cbo_t1 group by c_float, cbo_t1.c_int, key) R group by y, x order by x,y limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@cbo_t1
@@ -19,7 +19,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cbo_t1
 POSTHOOK: Input: default@cbo_t1@dt=2014
 #### A masked pattern was here ####
-5.0	2	2
+5.0	2	1
 PREHOOK: query: select key from(select key from (select key from cbo_t1 limit 5)cbo_t2  limit 5)cbo_t3  limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: default@cbo_t1

http://git-wip-us.apache.org/repos/asf/hive/blob/f89274ab/ql/src/test/results/clientpositive/llap/cbo_rp_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cbo_rp_limit.q.out b/ql/src/test/results/clientpositive/llap/cbo_rp_limit.q.out
index 0d5c8f0..87a5770 100644
--- a/ql/src/test/results/clientpositive/llap/cbo_rp_limit.q.out
+++ b/ql/src/test/results/clientpositive/llap/cbo_rp_limit.q.out
@@ -8,7 +8,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cbo_t1
 POSTHOOK: Input: default@cbo_t1@dt=2014
 #### A masked pattern was here ####
-1	4	12
+ 1	4	2
 PREHOOK: query: select x, y, count(*) from (select key, (c_int+c_float+1+2) as x, sum(c_int) as y from cbo_t1 group by c_float, cbo_t1.c_int, key) R group by y, x order by x,y limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@cbo_t1
@@ -19,7 +19,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cbo_t1
 POSTHOOK: Input: default@cbo_t1@dt=2014
 #### A masked pattern was here ####
-5.0	2	2
+5.0	2	1
 PREHOOK: query: select key from(select key from (select key from cbo_t1 limit 5)cbo_t2  limit 5)cbo_t3  limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: default@cbo_t1

http://git-wip-us.apache.org/repos/asf/hive/blob/f89274ab/ql/src/test/results/clientpositive/llap/cbo_rp_views.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cbo_rp_views.q.out b/ql/src/test/results/clientpositive/llap/cbo_rp_views.q.out
index 878a767..9c63ca4 100644
--- a/ql/src/test/results/clientpositive/llap/cbo_rp_views.q.out
+++ b/ql/src/test/results/clientpositive/llap/cbo_rp_views.q.out
@@ -50,8 +50,8 @@ POSTHOOK: Input: default@cbo_t1
 POSTHOOK: Input: default@cbo_t1@dt=2014
 POSTHOOK: Input: default@v1_n18
 #### A masked pattern was here ####
-NULL
 1
+NULL
 1
 PREHOOK: query: select count(v1_n18.c_int)  from v1_n18 join cbo_t2 on v1_n18.c_int = cbo_t2.c_int
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/f89274ab/ql/src/test/results/clientpositive/llap/cbo_views.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cbo_views.q.out b/ql/src/test/results/clientpositive/llap/cbo_views.q.out
index 214574e..2482f8a 100644
--- a/ql/src/test/results/clientpositive/llap/cbo_views.q.out
+++ b/ql/src/test/results/clientpositive/llap/cbo_views.q.out
@@ -50,8 +50,8 @@ POSTHOOK: Input: default@cbo_t1
 POSTHOOK: Input: default@cbo_t1@dt=2014
 POSTHOOK: Input: default@v1_n12
 #### A masked pattern was here ####
-NULL
 1
+NULL
 1
 PREHOOK: query: select count(v1_n12.c_int)  from v1_n12 join cbo_t2 on v1_n12.c_int = cbo_t2.c_int
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/f89274ab/ql/src/test/results/clientpositive/llap/cluster.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cluster.q.out b/ql/src/test/results/clientpositive/llap/cluster.q.out
index 056c4da..a3e4c7e 100644
--- a/ql/src/test/results/clientpositive/llap/cluster.q.out
+++ b/ql/src/test/results/clientpositive/llap/cluster.q.out
@@ -1140,12 +1140,18 @@ POSTHOOK: Input: default@src
 104	val_104
 105	val_105
 11	val_11
+111	val_111
+12	val_12
+12	val_12
+120	val_120
+120	val_120
 126	val_126
 128	val_128
 128	val_128
 128	val_128
 129	val_129
 129	val_129
+131	val_131
 133	val_133
 134	val_134
 134	val_134
@@ -1153,26 +1159,41 @@ POSTHOOK: Input: default@src
 143	val_143
 149	val_149
 149	val_149
+150	val_150
 152	val_152
 152	val_152
 153	val_153
+156	val_156
 157	val_157
+160	val_160
 162	val_162
+163	val_163
 166	val_166
+167	val_167
+167	val_167
+167	val_167
+168	val_168
 169	val_169
 169	val_169
 169	val_169
 169	val_169
+17	val_17
 170	val_170
 174	val_174
 174	val_174
+175	val_175
+175	val_175
 176	val_176
 176	val_176
+180	val_180
 193	val_193
 193	val_193
 193	val_193
 196	val_196
+20	val_20
 201	val_201
+203	val_203
+203	val_203
 205	val_205
 205	val_205
 209	val_209
@@ -1184,8 +1205,11 @@ POSTHOOK: Input: default@src
 221	val_221
 223	val_223
 223	val_223
+226	val_226
 233	val_233
 233	val_233
+237	val_237
+237	val_237
 239	val_239
 239	val_239
 24	val_24
@@ -1195,13 +1219,30 @@ POSTHOOK: Input: default@src
 242	val_242
 247	val_247
 248	val_248
+255	val_255
+255	val_255
+256	val_256
+256	val_256
 26	val_26
 26	val_26
 263	val_263
 272	val_272
 272	val_272
+274	val_274
 275	val_275
+277	val_277
+277	val_277
+277	val_277
+277	val_277
+281	val_281
+281	val_281
+282	val_282
+282	val_282
 285	val_285
+286	val_286
+287	val_287
+289	val_289
+292	val_292
 296	val_296
 298	val_298
 298	val_298
@@ -1209,20 +1250,45 @@ POSTHOOK: Input: default@src
 302	val_302
 307	val_307
 307	val_307
+308	val_308
+309	val_309
+309	val_309
 310	val_310
+318	val_318
+318	val_318
+318	val_318
 323	val_323
 325	val_325
 325	val_325
+327	val_327
+327	val_327
+327	val_327
+332	val_332
 333	val_333
 333	val_333
 335	val_335
 338	val_338
+339	val_339
+34	val_34
+341	val_341
+348	val_348
+348	val_348
+348	val_348
+348	val_348
+348	val_348
+356	val_356
 360	val_360
 362	val_362
 367	val_367
 367	val_367
+37	val_37
+37	val_37
+374	val_374
 375	val_375
 377	val_377
+379	val_379
+382	val_382
+382	val_382
 384	val_384
 384	val_384
 384	val_384
@@ -1238,6 +1304,9 @@ POSTHOOK: Input: default@src
 403	val_403
 403	val_403
 403	val_403
+409	val_409
+409	val_409
+409	val_409
 413	val_413
 413	val_413
 417	val_417
@@ -1247,48 +1316,82 @@ POSTHOOK: Input: default@src
 42	val_42
 42	val_42
 427	val_427
+429	val_429
+429	val_429
+43	val_43
+430	val_430
+430	val_430
+430	val_430
+431	val_431
+431	val_431
+431	val_431
+432	val_432
+435	val_435
+437	val_437
 438	val_438
 438	val_438
 438	val_438
+439	val_439
+439	val_439
 44	val_44
+443	val_443
+457	val_457
 458	val_458
 458	val_458
 459	val_459
 459	val_459
+462	val_462
+462	val_462
 466	val_466
 466	val_466
 466	val_466
+467	val_467
 469	val_469
 469	val_469
 469	val_469
 469	val_469
 469	val_469
+470	val_470
 472	val_472
 475	val_475
 478	val_478
 478	val_478
 479	val_479
+481	val_481
 483	val_483
+487	val_487
 489	val_489
 489	val_489
 489	val_489
 489	val_489
+494	val_494
 495	val_495
 496	val_496
 5	val_5
 5	val_5
 5	val_5
+51	val_51
+51	val_51
 57	val_57
 58	val_58
 58	val_58
 64	val_64
 66	val_66
 69	val_69
+70	val_70
+70	val_70
+70	val_70
 72	val_72
 72	val_72
+74	val_74
 76	val_76
 76	val_76
 77	val_77
+82	val_82
+83	val_83
+83	val_83
+84	val_84
+84	val_84
 9	val_9
 90	val_90
 90	val_90
@@ -1302,6 +1405,11 @@ POSTHOOK: Input: default@src
 116	val_116
 118	val_118
 118	val_118
+119	val_119
+119	val_119
+119	val_119
+125	val_125
+125	val_125
 137	val_137
 137	val_137
 138	val_138
@@ -1311,27 +1419,46 @@ POSTHOOK: Input: default@src
 145	val_145
 146	val_146
 146	val_146
+15	val_15
+15	val_15
 155	val_155
 158	val_158
 164	val_164
 164	val_164
 165	val_165
 165	val_165
+172	val_172
+172	val_172
+177	val_177
 178	val_178
+179	val_179
+179	val_179
+18	val_18
+18	val_18
 181	val_181
 183	val_183
 186	val_186
+187	val_187
+187	val_187
+187	val_187
 189	val_189
+19	val_19
 190	val_190
 191	val_191
 191	val_191
+192	val_192
 194	val_194
 195	val_195
 195	val_195
+197	val_197
+197	val_197
 199	val_199
 199	val_199
 199	val_199
 2	val_2
+200	val_200
+200	val_200
+202	val_202
 207	val_207
 207	val_207
 208	val_208
@@ -1340,9 +1467,14 @@ POSTHOOK: Input: default@src
 214	val_214
 216	val_216
 216	val_216
+217	val_217
+217	val_217
+219	val_219
+219	val_219
 222	val_222
 224	val_224
 224	val_224
+228	val_228
 229	val_229
 229	val_229
 230	val_230
@@ -1350,241 +1482,85 @@ POSTHOOK: Input: default@src
 230	val_230
 230	val_230
 230	val_230
+235	val_235
 238	val_238
 238	val_238
 244	val_244
+249	val_249
+252	val_252
+257	val_257
 258	val_258
 260	val_260
 262	val_262
+265	val_265
+265	val_265
 266	val_266
 27	val_27
 273	val_273
 273	val_273
 273	val_273
-28	val_28
-284	val_284
-288	val_288
-288	val_288
-30	val_30
-315	val_315
-321	val_321
-321	val_321
-33	val_33
-342	val_342
-342	val_342
-35	val_35
-35	val_35
-35	val_35
-364	val_364
-365	val_365
-366	val_366
-368	val_368
-386	val_386
-389	val_389
-394	val_394
-396	val_396
-396	val_396
-396	val_396
-397	val_397
-397	val_397
-4	val_4
-41	val_41
-414	val_414
-414	val_414
-421	val_421
-444	val_444
-446	val_446
-448	val_448
-452	val_452
-454	val_454
-454	val_454
-454	val_454
-455	val_455
-460	val_460
-463	val_463
-463	val_463
-482	val_482
-492	val_492
-492	val_492
-493	val_493
-65	val_65
-78	val_78
-80	val_80
-97	val_97
-97	val_97
-111	val_111
-12	val_12
-12	val_12
-120	val_120
-120	val_120
-131	val_131
-150	val_150
-156	val_156
-160	val_160
-163	val_163
-167	val_167
-167	val_167
-167	val_167
-168	val_168
-17	val_17
-175	val_175
-175	val_175
-180	val_180
-20	val_20
-203	val_203
-203	val_203
-226	val_226
-237	val_237
-237	val_237
-255	val_255
-255	val_255
-256	val_256
-256	val_256
-274	val_274
-277	val_277
-277	val_277
-277	val_277
-277	val_277
-281	val_281
-281	val_281
-282	val_282
-282	val_282
-286	val_286
-287	val_287
-289	val_289
-292	val_292
-308	val_308
-309	val_309
-309	val_309
-318	val_318
-318	val_318
-318	val_318
-327	val_327
-327	val_327
-327	val_327
-332	val_332
-339	val_339
-34	val_34
-341	val_341
-348	val_348
-348	val_348
-348	val_348
-348	val_348
-348	val_348
-356	val_356
-37	val_37
-37	val_37
-374	val_374
-379	val_379
-382	val_382
-382	val_382
-409	val_409
-409	val_409
-409	val_409
-429	val_429
-429	val_429
-43	val_43
-430	val_430
-430	val_430
-430	val_430
-431	val_431
-431	val_431
-431	val_431
-432	val_432
-435	val_435
-437	val_437
-439	val_439
-439	val_439
-443	val_443
-457	val_457
-462	val_462
-462	val_462
-467	val_467
-470	val_470
-481	val_481
-487	val_487
-494	val_494
-51	val_51
-51	val_51
-70	val_70
-70	val_70
-70	val_70
-74	val_74
-82	val_82
-83	val_83
-83	val_83
-84	val_84
-84	val_84
-119	val_119
-119	val_119
-119	val_119
-125	val_125
-125	val_125
-15	val_15
-15	val_15
-172	val_172
-172	val_172
-177	val_177
-179	val_179
-179	val_179
-18	val_18
-18	val_18
-187	val_187
-187	val_187
-187	val_187
-19	val_19
-192	val_192
-197	val_197
-197	val_197
-200	val_200
-200	val_200
-202	val_202
-217	val_217
-217	val_217
-219	val_219
-219	val_219
-228	val_228
-235	val_235
-249	val_249
-252	val_252
-257	val_257
-265	val_265
-265	val_265
 278	val_278
 278	val_278
+28	val_28
 280	val_280
 280	val_280
 283	val_283
+284	val_284
+288	val_288
+288	val_288
 291	val_291
+30	val_30
 305	val_305
 306	val_306
 311	val_311
 311	val_311
 311	val_311
+315	val_315
 316	val_316
 316	val_316
 316	val_316
 317	val_317
 317	val_317
+321	val_321
+321	val_321
 322	val_322
 322	val_322
+33	val_33
 331	val_331
 331	val_331
 336	val_336
+342	val_342
+342	val_342
 344	val_344
 344	val_344
 345	val_345
+35	val_35
+35	val_35
+35	val_35
 351	val_351
 353	val_353
 353	val_353
+364	val_364
+365	val_365
+366	val_366
+368	val_368
 369	val_369
 369	val_369
 369	val_369
 373	val_373
 378	val_378
+386	val_386
+389	val_389
 393	val_393
+394	val_394
 395	val_395
 395	val_395
+396	val_396
+396	val_396
+396	val_396
+397	val_397
+397	val_397
+4	val_4
 400	val_400
 404	val_404
 404	val_404
@@ -1593,13 +1569,28 @@ POSTHOOK: Input: default@src
 406	val_406
 406	val_406
 407	val_407
+41	val_41
 411	val_411
+414	val_414
+414	val_414
 418	val_418
+421	val_421
 424	val_424
 424	val_424
 436	val_436
+444	val_444
+446	val_446
+448	val_448
 449	val_449
+452	val_452
 453	val_453
+454	val_454
+454	val_454
+454	val_454
+455	val_455
+460	val_460
+463	val_463
+463	val_463
 468	val_468
 468	val_468
 468	val_468
@@ -1609,19 +1600,26 @@ POSTHOOK: Input: default@src
 480	val_480
 480	val_480
 480	val_480
+482	val_482
 484	val_484
 485	val_485
 490	val_490
 491	val_491
+492	val_492
+492	val_492
+493	val_493
 497	val_497
 498	val_498
 498	val_498
 498	val_498
 53	val_53
 54	val_54
+65	val_65
 67	val_67
 67	val_67
+78	val_78
 8	val_8
+80	val_80
 85	val_85
 86	val_86
 87	val_87
@@ -1629,5 +1627,7 @@ POSTHOOK: Input: default@src
 95	val_95
 95	val_95
 96	val_96
+97	val_97
+97	val_97
 98	val_98
 98	val_98

http://git-wip-us.apache.org/repos/asf/hive/blob/f89274ab/ql/src/test/results/clientpositive/llap/constraints_optimization.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/constraints_optimization.q.out b/ql/src/test/results/clientpositive/llap/constraints_optimization.q.out
index b45b7c4..96caa4d 100644
--- a/ql/src/test/results/clientpositive/llap/constraints_optimization.q.out
+++ b/ql/src/test/results/clientpositive/llap/constraints_optimization.q.out
@@ -1382,9 +1382,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest_g21
 #### A masked pattern was here ####
 1	1
+2	2
 3	3
 4	4
-2	2
 PREHOOK: query: DROP table dest_g21
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@dest_g21
@@ -1487,9 +1487,9 @@ POSTHOOK: query: select i, j from tconst where i is not null group by i,j, d_yea
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tconst
 #### A masked pattern was here ####
-3	3
 2	NULL
 1	1
+3	3
 PREHOOK: query: explain select i, j from tconst where i IS NOT NULL and j IS NOT NULL group by i,j, d_year
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tconst
@@ -1565,8 +1565,8 @@ POSTHOOK: query: select i, j from tconst where i IS NOT NULL and j IS NOT NULL g
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tconst
 #### A masked pattern was here ####
-3	3
 1	1
+3	3
 PREHOOK: query: explain select i,j from tconst where i is not null OR j IS NOT NULL group by i, j, d_year
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tconst
@@ -1642,9 +1642,9 @@ POSTHOOK: query: select i,j from tconst where i is not null OR j IS NOT NULL gro
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tconst
 #### A masked pattern was here ####
-3	3
 2	NULL
 1	1
+3	3
 PREHOOK: query: explain select sum(t1.i) from tconst t1 join tconst t2 on t1.i=t2.j group by t1.i, t1.d_year
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tconst

http://git-wip-us.apache.org/repos/asf/hive/blob/f89274ab/ql/src/test/results/clientpositive/llap/correlationoptimizer1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/correlationoptimizer1.q.out b/ql/src/test/results/clientpositive/llap/correlationoptimizer1.q.out
index 0d32c39..efa2dd8 100644
--- a/ql/src/test/results/clientpositive/llap/correlationoptimizer1.q.out
+++ b/ql/src/test/results/clientpositive/llap/correlationoptimizer1.q.out
@@ -1495,22 +1495,22 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
-273	val_273	3
-401	val_401	5
-146	val_146	2
-150	val_150	1
-311	val_311	3
-66	val_66	1
 	NULL	10
 128	NULL	1
 213	val_213	2
+273	val_273	3
+401	val_401	5
 406	val_406	4
 98	val_98	2
+146	val_146	2
+150	val_150	1
 224	NULL	1
 238	val_238	2
 255	val_255	2
 278	val_278	2
+311	val_311	3
 369	NULL	1
+66	val_66	1
 PREHOOK: query: EXPLAIN
 SELECT x.key, y.value, count(1) AS cnt
 FROM src1 x LEFT OUTER JOIN src y ON (x.key = y.key AND x.value = y.value)
@@ -1632,22 +1632,22 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
-273	val_273	3
-401	val_401	5
-146	val_146	2
-150	val_150	1
-311	val_311	3
-66	val_66	1
 	NULL	10
 128	NULL	1
 213	val_213	2
+273	val_273	3
+401	val_401	5
 406	val_406	4
 98	val_98	2
+146	val_146	2
+150	val_150	1
 224	NULL	1
 238	val_238	2
 255	val_255	2
 278	val_278	2
+311	val_311	3
 369	NULL	1
+66	val_66	1
 PREHOOK: query: EXPLAIN
 SELECT SUM(HASH(tmp.key)), SUM(HASH(tmp.cnt))
 FROM (SELECT y.key AS key, count(1) AS cnt