[01/23] hive git commit: HIVE-14977:Flaky test: fix order_null.q and union_fast_stats.q (Prasanth Jayachandran reviewed by Siddharth Seth)

2016-10-20 Thread sershe
Repository: hive
Updated Branches:
  refs/heads/hive-14535 a057e12cf -> b60bbc28a


HIVE-14977:Flaky test: fix order_null.q and union_fast_stats.q (Prasanth 
Jayachandran reviewed by Siddharth Seth)


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

Branch: refs/heads/hive-14535
Commit: dedfaf909d33966ef3a430dec56f3e94e9f065b6
Parents: 044f1fa
Author: Prasanth Jayachandran 
Authored: Wed Oct 19 11:02:38 2016 -0700
Committer: Prasanth Jayachandran 
Committed: Wed Oct 19 11:02:38 2016 -0700

--
 .../test/resources/testconfiguration.properties | 13 +--
 .../queries/clientpositive/acid_globallimit.q   |  2 +-
 .../clientpositive/llap/acid_globallimit.q.out  | 24 ++--
 3 files changed, 19 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/dedfaf90/itests/src/test/resources/testconfiguration.properties
--
diff --git a/itests/src/test/resources/testconfiguration.properties 
b/itests/src/test/resources/testconfiguration.properties
index 73cc8a9..8868631 100644
--- a/itests/src/test/resources/testconfiguration.properties
+++ b/itests/src/test/resources/testconfiguration.properties
@@ -54,8 +54,7 @@ minitez.query.files=explainuser_3.q,\
   tez_union_with_udf.q
 
 
-minillap.shared.query.files=acid_globallimit.q,\
-  insert_into1.q,\
+minillap.shared.query.files=insert_into1.q,\
   insert_into2.q,\
   insert_values_orig_table.,\
   llapdecider.q,\
@@ -83,8 +82,7 @@ minillap.shared.query.files=acid_globallimit.q,\
   cte_4.q,\
   llap_nullscan.q,\
   dynamic_partition_pruning_2.q,\
-  tez_union_dynamic_partition.q,\
-  union_fast_stats.q
+  tez_union_dynamic_partition.q
 
 minillaplocal.shared.query.files=alter_merge_2_orc.q,\
   alter_merge_orc.q,\
@@ -214,7 +212,6 @@ minillaplocal.shared.query.files=alter_merge_2_orc.q,\
   orc_ppd_schema_evol_1b.q,\
   orc_ppd_schema_evol_2a.q,\
   orc_ppd_schema_evol_2b.q,\
-  order_null.q,\
   parallel.q,\
   ptf.q,\
   ptf_matchpath.q,\
@@ -434,11 +431,11 @@ minillap.query.files=acid_bucket_pruning.q,\
   orc_ppd_schema_evol_3a.q,\
   global_limit.q,\
   dynamic_partition_pruning_2.q,\
-  union_fast_stats.q,\
   tez_union_dynamic_partition.q,\
   load_fs2.q
 
-minillaplocal.query.files=acid_vectorization_missing_cols.q,\
+minillaplocal.query.files=acid_globallimit.q,\
+  acid_vectorization_missing_cols.q,\
   alter_merge_stats_orc.q,\
   auto_join30.q,\
   auto_join_filters.q,\
@@ -517,6 +514,7 @@ 
minillaplocal.query.files=acid_vectorization_missing_cols.q,\
   orc_ppd_date.q,\
   orc_ppd_decimal.q,\
   orc_ppd_timestamp.q,\
+  order_null.q,\
   partition_multilevels.q,\
   ptf.q,\
   ptf_streaming.q,\
@@ -583,6 +581,7 @@ 
minillaplocal.query.files=acid_vectorization_missing_cols.q,\
   tez_vector_dynpart_hashjoin_2.q,\
   uber_reduce.q,\
   udaf_collect_set_2.q,\
+  union_fast_stats.q,\
   union_remove_26.q,\
   union_top_level.q,\
   vector_auto_smb_mapjoin_14.q,\

http://git-wip-us.apache.org/repos/asf/hive/blob/dedfaf90/ql/src/test/queries/clientpositive/acid_globallimit.q
--
diff --git a/ql/src/test/queries/clientpositive/acid_globallimit.q 
b/ql/src/test/queries/clientpositive/acid_globallimit.q
index 7fa4c07..233b6b4 100644
--- a/ql/src/test/queries/clientpositive/acid_globallimit.q
+++ b/ql/src/test/queries/clientpositive/acid_globallimit.q
@@ -11,6 +11,6 @@ TBLPROPERTIES ("transactional"="true");
 
 insert into table acidtest1 select cint, cstring1 from alltypesorc where cint 
is not null order by cint;
 
-select cast (c1 as string) from acidtest1 limit 10;
+select cast (c1 as string) from acidtest1 order by c1 limit 10;
 
 drop table acidtest1;

http://git-wip-us.apache.org/repos/asf/hive/blob/dedfaf90/ql/src/test/results/clientpositive/llap/acid_globallimit.q.out
--
diff --git a/ql/src/test/results/clientpositive/llap/acid_globallimit.q.out 
b/ql/src/test/results/clientpositive/llap/acid_globallimit.q.out
index 6f0e46e..12545c7 100644
--- a/ql/src/test/results/clientpositive/llap/acid_globallimit.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_globallimit.q.out
@@ -24,24 +24,24 @@ POSTHOOK: Input: default@alltypesorc
 POSTHOOK: Output: default@acidtest1
 POSTHOOK: Lineage: acidtest1.c1 SIMPLE 
[(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ]
 POSTHOOK: Lineage: acidtest1.c2 SIMPLE 
[(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, 
comment:null), ]
-PREHOOK: query: select cast 

hive git commit: HIVE-14977:Flaky test: fix order_null.q and union_fast_stats.q (Prasanth Jayachandran reviewed by Siddharth Seth)

2016-10-19 Thread prasanthj
Repository: hive
Updated Branches:
  refs/heads/master 044f1fa3c -> dedfaf909


HIVE-14977:Flaky test: fix order_null.q and union_fast_stats.q (Prasanth 
Jayachandran reviewed by Siddharth Seth)


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

Branch: refs/heads/master
Commit: dedfaf909d33966ef3a430dec56f3e94e9f065b6
Parents: 044f1fa
Author: Prasanth Jayachandran 
Authored: Wed Oct 19 11:02:38 2016 -0700
Committer: Prasanth Jayachandran 
Committed: Wed Oct 19 11:02:38 2016 -0700

--
 .../test/resources/testconfiguration.properties | 13 +--
 .../queries/clientpositive/acid_globallimit.q   |  2 +-
 .../clientpositive/llap/acid_globallimit.q.out  | 24 ++--
 3 files changed, 19 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/dedfaf90/itests/src/test/resources/testconfiguration.properties
--
diff --git a/itests/src/test/resources/testconfiguration.properties 
b/itests/src/test/resources/testconfiguration.properties
index 73cc8a9..8868631 100644
--- a/itests/src/test/resources/testconfiguration.properties
+++ b/itests/src/test/resources/testconfiguration.properties
@@ -54,8 +54,7 @@ minitez.query.files=explainuser_3.q,\
   tez_union_with_udf.q
 
 
-minillap.shared.query.files=acid_globallimit.q,\
-  insert_into1.q,\
+minillap.shared.query.files=insert_into1.q,\
   insert_into2.q,\
   insert_values_orig_table.,\
   llapdecider.q,\
@@ -83,8 +82,7 @@ minillap.shared.query.files=acid_globallimit.q,\
   cte_4.q,\
   llap_nullscan.q,\
   dynamic_partition_pruning_2.q,\
-  tez_union_dynamic_partition.q,\
-  union_fast_stats.q
+  tez_union_dynamic_partition.q
 
 minillaplocal.shared.query.files=alter_merge_2_orc.q,\
   alter_merge_orc.q,\
@@ -214,7 +212,6 @@ minillaplocal.shared.query.files=alter_merge_2_orc.q,\
   orc_ppd_schema_evol_1b.q,\
   orc_ppd_schema_evol_2a.q,\
   orc_ppd_schema_evol_2b.q,\
-  order_null.q,\
   parallel.q,\
   ptf.q,\
   ptf_matchpath.q,\
@@ -434,11 +431,11 @@ minillap.query.files=acid_bucket_pruning.q,\
   orc_ppd_schema_evol_3a.q,\
   global_limit.q,\
   dynamic_partition_pruning_2.q,\
-  union_fast_stats.q,\
   tez_union_dynamic_partition.q,\
   load_fs2.q
 
-minillaplocal.query.files=acid_vectorization_missing_cols.q,\
+minillaplocal.query.files=acid_globallimit.q,\
+  acid_vectorization_missing_cols.q,\
   alter_merge_stats_orc.q,\
   auto_join30.q,\
   auto_join_filters.q,\
@@ -517,6 +514,7 @@ 
minillaplocal.query.files=acid_vectorization_missing_cols.q,\
   orc_ppd_date.q,\
   orc_ppd_decimal.q,\
   orc_ppd_timestamp.q,\
+  order_null.q,\
   partition_multilevels.q,\
   ptf.q,\
   ptf_streaming.q,\
@@ -583,6 +581,7 @@ 
minillaplocal.query.files=acid_vectorization_missing_cols.q,\
   tez_vector_dynpart_hashjoin_2.q,\
   uber_reduce.q,\
   udaf_collect_set_2.q,\
+  union_fast_stats.q,\
   union_remove_26.q,\
   union_top_level.q,\
   vector_auto_smb_mapjoin_14.q,\

http://git-wip-us.apache.org/repos/asf/hive/blob/dedfaf90/ql/src/test/queries/clientpositive/acid_globallimit.q
--
diff --git a/ql/src/test/queries/clientpositive/acid_globallimit.q 
b/ql/src/test/queries/clientpositive/acid_globallimit.q
index 7fa4c07..233b6b4 100644
--- a/ql/src/test/queries/clientpositive/acid_globallimit.q
+++ b/ql/src/test/queries/clientpositive/acid_globallimit.q
@@ -11,6 +11,6 @@ TBLPROPERTIES ("transactional"="true");
 
 insert into table acidtest1 select cint, cstring1 from alltypesorc where cint 
is not null order by cint;
 
-select cast (c1 as string) from acidtest1 limit 10;
+select cast (c1 as string) from acidtest1 order by c1 limit 10;
 
 drop table acidtest1;

http://git-wip-us.apache.org/repos/asf/hive/blob/dedfaf90/ql/src/test/results/clientpositive/llap/acid_globallimit.q.out
--
diff --git a/ql/src/test/results/clientpositive/llap/acid_globallimit.q.out 
b/ql/src/test/results/clientpositive/llap/acid_globallimit.q.out
index 6f0e46e..12545c7 100644
--- a/ql/src/test/results/clientpositive/llap/acid_globallimit.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_globallimit.q.out
@@ -24,24 +24,24 @@ POSTHOOK: Input: default@alltypesorc
 POSTHOOK: Output: default@acidtest1
 POSTHOOK: Lineage: acidtest1.c1 SIMPLE 
[(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ]
 POSTHOOK: Lineage: acidtest1.c2 SIMPLE 
[(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, 
comment:null), ]
-PREHOOK: query: select cast (c1 as