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

[1/4] hive git commit: HIVE-17746: Regenerate spark_explainuser_1.q.out (Peter Vary, reviewed by Vineet Garg)

Repository: hive
Updated Branches:
  refs/heads/hive-14535 ae4ac4b12 -> d7b6272ad


HIVE-17746: Regenerate spark_explainuser_1.q.out (Peter Vary, reviewed by Vineet Garg)


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

Branch: refs/heads/hive-14535
Commit: a974a9e6c4659f511e0b5edb97ce340a023a2e26
Parents: c254557
Author: Peter Vary <pv...@cloudera.com>
Authored: Tue Oct 10 10:10:15 2017 +0200
Committer: Peter Vary <pv...@cloudera.com>
Committed: Tue Oct 10 10:10:15 2017 +0200

----------------------------------------------------------------------
 .../spark/spark_explainuser_1.q.out             | 72 ++++++++++----------
 1 file changed, 37 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/a974a9e6/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out b/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out
index 7b36824..8ae9080 100644
--- a/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out
+++ b/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out
@@ -387,25 +387,25 @@ Stage-0
                               <-Map 5 [GROUP]
                                 GROUP [RS_7]
                                   PartitionCols:_col0, _col1, _col2
-                                  Group By Operator [GBY_6] (rows=2 width=101)
+                                  Group By Operator [GBY_6] (rows=1 width=101)
                                     Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, c_int, c_float
-                                    Filter Operator [FIL_35] (rows=5 width=93)
+                                    Filter Operator [FIL_35] (rows=4 width=93)
                                       predicate:(((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0)) and key is not null)
                                       TableScan [TS_3] (rows=20 width=88)
                                         default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
                         <-Reducer 8 [PARTITION-LEVEL SORT]
                           PARTITION-LEVEL SORT [RS_21]
                             PartitionCols:_col0
-                            Select Operator [SEL_17] (rows=2 width=89)
+                            Select Operator [SEL_17] (rows=1 width=89)
                               Output:["_col0","_col1"]
-                              Group By Operator [GBY_16] (rows=2 width=93)
+                              Group By Operator [GBY_16] (rows=1 width=93)
                                 Output:["_col0","_col1","_col2"],keys:KEY._col0, KEY._col1, KEY._col2
                               <-Map 7 [GROUP]
                                 GROUP [RS_15]
                                   PartitionCols:_col0, _col1, _col2
-                                  Group By Operator [GBY_14] (rows=2 width=93)
+                                  Group By Operator [GBY_14] (rows=1 width=93)
                                     Output:["_col0","_col1","_col2"],keys:key, c_int, c_float
-                                    Filter Operator [FIL_36] (rows=5 width=93)
+                                    Filter Operator [FIL_36] (rows=4 width=93)
                                       predicate:(((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0)) and key is not null)
                                       TableScan [TS_11] (rows=20 width=88)
                                         default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
@@ -1093,27 +1093,27 @@ Stage-0
     Stage-1
       Reducer 2
       File Output Operator [FS_16]
-        Select Operator [SEL_15] (rows=40 width=101)
+        Select Operator [SEL_15] (rows=48 width=101)
           Output:["_col0","_col1","_col2","_col3","_col4"]
-          Filter Operator [FIL_13] (rows=40 width=101)
+          Filter Operator [FIL_13] (rows=48 width=101)
             predicate:(((_col1 + _col4) = 2) and ((_col1 > 0) or (_col6 >= 0)))
-            Join Operator [JOIN_12] (rows=81 width=100)
+            Join Operator [JOIN_12] (rows=96 width=100)
               Output:["_col1","_col2","_col3","_col4","_col6"],condition map:[{"":"{\"type\":\"Inner\",\"left\":0,\"right\":1}"},{"":"{\"type\":\"Inner\",\"left\":0,\"right\":2}"}],keys:{"0":"_col0","1":"_col0","2":"_col0"}
             <-Map 1 [PARTITION-LEVEL SORT]
               PARTITION-LEVEL SORT [RS_9]
                 PartitionCols:_col0
-                Select Operator [SEL_2] (rows=9 width=93)
+                Select Operator [SEL_2] (rows=8 width=93)
                   Output:["_col0","_col1","_col2"]
-                  Filter Operator [FIL_17] (rows=9 width=93)
+                  Filter Operator [FIL_17] (rows=8 width=93)
                     predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0)) and key is not null)
                     TableScan [TS_0] (rows=20 width=88)
                       default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
             <-Map 3 [PARTITION-LEVEL SORT]
               PARTITION-LEVEL SORT [RS_10]
                 PartitionCols:_col0
-                Select Operator [SEL_5] (rows=9 width=89)
+                Select Operator [SEL_5] (rows=8 width=89)
                   Output:["_col0","_col1"]
-                  Filter Operator [FIL_18] (rows=9 width=93)
+                  Filter Operator [FIL_18] (rows=8 width=93)
                     predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0)) and key is not null)
                     TableScan [TS_3] (rows=20 width=88)
                       default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
@@ -1142,27 +1142,27 @@ Stage-0
     Stage-1
       Reducer 2
       File Output Operator [FS_16]
-        Select Operator [SEL_15] (rows=40 width=101)
+        Select Operator [SEL_15] (rows=48 width=101)
           Output:["_col0","_col1","_col2","_col3","_col4"]
-          Filter Operator [FIL_13] (rows=40 width=101)
+          Filter Operator [FIL_13] (rows=48 width=101)
             predicate:(((_col1 + _col4) = 2) and ((_col1 > 0) or (_col6 >= 0)))
-            Join Operator [JOIN_12] (rows=81 width=100)
+            Join Operator [JOIN_12] (rows=96 width=100)
               Output:["_col1","_col2","_col3","_col4","_col6"],condition map:[{"":"{\"type\":\"Inner\",\"left\":0,\"right\":1}"},{"":"{\"type\":\"Inner\",\"left\":0,\"right\":2}"}],keys:{"0":"_col0","1":"_col0","2":"_col0"}
             <-Map 1 [PARTITION-LEVEL SORT]
               PARTITION-LEVEL SORT [RS_9]
                 PartitionCols:_col0
-                Select Operator [SEL_2] (rows=9 width=93)
+                Select Operator [SEL_2] (rows=8 width=93)
                   Output:["_col0","_col1","_col2"]
-                  Filter Operator [FIL_17] (rows=9 width=93)
+                  Filter Operator [FIL_17] (rows=8 width=93)
                     predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0)) and key is not null)
                     TableScan [TS_0] (rows=20 width=88)
                       default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
             <-Map 3 [PARTITION-LEVEL SORT]
               PARTITION-LEVEL SORT [RS_10]
                 PartitionCols:_col0
-                Select Operator [SEL_5] (rows=9 width=89)
+                Select Operator [SEL_5] (rows=8 width=89)
                   Output:["_col0","_col1"]
-                  Filter Operator [FIL_18] (rows=9 width=93)
+                  Filter Operator [FIL_18] (rows=8 width=93)
                     predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0)) and key is not null)
                     TableScan [TS_3] (rows=20 width=88)
                       default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
@@ -1427,16 +1427,16 @@ Stage-0
     Stage-1
       Reducer 2
       File Output Operator [FS_12]
-        Select Operator [SEL_11] (rows=9 width=4)
+        Select Operator [SEL_11] (rows=8 width=4)
           Output:["_col0"]
-          Join Operator [JOIN_10] (rows=9 width=4)
+          Join Operator [JOIN_10] (rows=8 width=4)
             Output:["_col1"],condition map:[{"":"{\"type\":\"Left Semi\",\"left\":0,\"right\":1}"}],keys:{"0":"_col0","1":"_col0"}
           <-Map 1 [PARTITION-LEVEL SORT]
             PARTITION-LEVEL SORT [RS_8]
               PartitionCols:_col0
-              Select Operator [SEL_2] (rows=9 width=93)
+              Select Operator [SEL_2] (rows=8 width=93)
                 Output:["_col0","_col1"]
-                Filter Operator [FIL_13] (rows=9 width=93)
+                Filter Operator [FIL_13] (rows=8 width=93)
                   predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0)) and key is not null)
                   TableScan [TS_0] (rows=20 width=88)
                     default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
@@ -1474,20 +1474,20 @@ Stage-0
           <-Map 1 [PARTITION-LEVEL SORT]
             PARTITION-LEVEL SORT [RS_13]
               PartitionCols:_col0
-              Select Operator [SEL_2] (rows=9 width=93)
+              Select Operator [SEL_2] (rows=8 width=93)
                 Output:["_col0","_col1","_col2"]
-                Filter Operator [FIL_19] (rows=9 width=93)
+                Filter Operator [FIL_19] (rows=8 width=93)
                   predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0)) and key is not null)
                   TableScan [TS_0] (rows=20 width=88)
                     default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
           <-Map 3 [PARTITION-LEVEL SORT]
             PARTITION-LEVEL SORT [RS_14]
               PartitionCols:_col0
-              Group By Operator [GBY_10] (rows=4 width=85)
+              Group By Operator [GBY_10] (rows=3 width=85)
                 Output:["_col0"],keys:_col0
-                Select Operator [SEL_5] (rows=9 width=85)
+                Select Operator [SEL_5] (rows=8 width=85)
                   Output:["_col0"]
-                  Filter Operator [FIL_20] (rows=9 width=93)
+                  Filter Operator [FIL_20] (rows=8 width=93)
                     predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0)) and key is not null)
                     TableScan [TS_3] (rows=20 width=88)
                       default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
@@ -5124,16 +5124,18 @@ PREHOOK: query: explain select explode(array('a', 'b'))
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select explode(array('a', 'b'))
 POSTHOOK: type: QUERY
-Plan not optimized by CBO.
+Plan optimized by CBO.
 
 Stage-0
   Fetch Operator
     limit:-1
-    UDTF Operator [UDTF_2]
-      function name:explode
-      Select Operator [SEL_1]
-        Output:["_col0"]
-        TableScan [TS_0]
+    Select Operator [SEL_3]
+      Output:["_col0"]
+      UDTF Operator [UDTF_2]
+        function name:explode
+        Select Operator [SEL_1]
+          Output:["_col0"]
+          TableScan [TS_0]
 
 PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE


[3/4] hive git commit: HIVE-15212 : merge branch into master - fix some tests (Sergey Shelukhin)

Posted by se...@apache.org.
HIVE-15212 : merge branch into master - fix some tests (Sergey Shelukhin)


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

Branch: refs/heads/hive-14535
Commit: 98c5b637df2df2ee8ada89a2862ce928ee074ebc
Parents: ae4ac4b
Author: sergey <se...@apache.org>
Authored: Tue Oct 10 15:21:27 2017 -0700
Committer: sergey <se...@apache.org>
Committed: Tue Oct 10 15:21:27 2017 -0700

----------------------------------------------------------------------
 .../test/resources/testconfiguration.properties |  3 +-
 .../queries/clientnegative/mm_bucket_convert.q  | 18 ---------
 ql/src/test/queries/clientnegative/mm_convert.q | 10 +++++
 .../clientnegative/mm_bucket_convert.q.out      | 41 --------------------
 .../results/clientnegative/mm_convert.q.out     | 17 ++++++++
 ql/src/test/results/clientpositive/mm_all.q.out | 13 +------
 6 files changed, 31 insertions(+), 71 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/98c5b637/itests/src/test/resources/testconfiguration.properties
----------------------------------------------------------------------
diff --git a/itests/src/test/resources/testconfiguration.properties b/itests/src/test/resources/testconfiguration.properties
index a72f66d..2fa5abd 100644
--- a/itests/src/test/resources/testconfiguration.properties
+++ b/itests/src/test/resources/testconfiguration.properties
@@ -34,7 +34,8 @@ disabled.query.files=ql_rewrite_gbtoidx.q,\
   ql_rewrite_gbtoidx_cbo_2.q,\
   rcfile_merge1.q,\
   smb_mapjoin_8.q,\
-  stats_filemetadata.q
+  stats_filemetadata.q,\
+  mm_exim.q
 
 # NOTE: Add tests to minitez only if it is very
 # specific to tez and cannot be added to minillap.

http://git-wip-us.apache.org/repos/asf/hive/blob/98c5b637/ql/src/test/queries/clientnegative/mm_bucket_convert.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/mm_bucket_convert.q b/ql/src/test/queries/clientnegative/mm_bucket_convert.q
deleted file mode 100644
index 2ded047..0000000
--- a/ql/src/test/queries/clientnegative/mm_bucket_convert.q
+++ /dev/null
@@ -1,18 +0,0 @@
-set hive.mapred.mode=nonstrict;
-set hive.explain.user=false;
-set hive.fetch.task.conversion=none;
-set hive.exec.dynamic.partition.mode=nonstrict;
-
-drop table bucket0_mm;
-drop table bucket1_mm;
-create table bucket0_mm(key int, id int) clustered by (key) into 2 buckets
-  tblproperties("transactional"="true", "transactional_properties"="insert_only");
-create table bucket1_mm(key int, id int) clustered by (key) into 2 buckets
-  tblproperties("transactional"="true", "transactional_properties"="insert_only");
-
-set hive.strict.checks.bucketing=false;
-alter table bucket0_mm unset tblproperties('transactional_properties', 'transactional');
-set hive.strict.checks.bucketing=true;
-alter table bucket1_mm unset tblproperties('transactional_properties', 'transactional');
-
-

http://git-wip-us.apache.org/repos/asf/hive/blob/98c5b637/ql/src/test/queries/clientnegative/mm_convert.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/mm_convert.q b/ql/src/test/queries/clientnegative/mm_convert.q
new file mode 100644
index 0000000..acbf4bb
--- /dev/null
+++ b/ql/src/test/queries/clientnegative/mm_convert.q
@@ -0,0 +1,10 @@
+set hive.mapred.mode=nonstrict;
+set hive.explain.user=false;
+set hive.fetch.task.conversion=none;
+set hive.exec.dynamic.partition.mode=nonstrict;
+
+drop table convert_mm;
+create table convert_mm(key int, id int) tblproperties("transactional"="true", "transactional_properties"="insert_only");
+alter table convert_mm unset tblproperties('transactional_properties', 'transactional');
+
+

http://git-wip-us.apache.org/repos/asf/hive/blob/98c5b637/ql/src/test/results/clientnegative/mm_bucket_convert.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/mm_bucket_convert.q.out b/ql/src/test/results/clientnegative/mm_bucket_convert.q.out
deleted file mode 100644
index b732d3e..0000000
--- a/ql/src/test/results/clientnegative/mm_bucket_convert.q.out
+++ /dev/null
@@ -1,41 +0,0 @@
-PREHOOK: query: drop table bucket0_mm
-PREHOOK: type: DROPTABLE
-POSTHOOK: query: drop table bucket0_mm
-POSTHOOK: type: DROPTABLE
-PREHOOK: query: drop table bucket1_mm
-PREHOOK: type: DROPTABLE
-POSTHOOK: query: drop table bucket1_mm
-POSTHOOK: type: DROPTABLE
-PREHOOK: query: create table bucket0_mm(key int, id int) clustered by (key) into 2 buckets
-  tblproperties("transactional"="true", "transactional_properties"="insert_only")
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@bucket0_mm
-POSTHOOK: query: create table bucket0_mm(key int, id int) clustered by (key) into 2 buckets
-  tblproperties("transactional"="true", "transactional_properties"="insert_only")
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@bucket0_mm
-PREHOOK: query: create table bucket1_mm(key int, id int) clustered by (key) into 2 buckets
-  tblproperties("transactional"="true", "transactional_properties"="insert_only")
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@bucket1_mm
-POSTHOOK: query: create table bucket1_mm(key int, id int) clustered by (key) into 2 buckets
-  tblproperties("transactional"="true", "transactional_properties"="insert_only")
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@bucket1_mm
-PREHOOK: query: alter table bucket0_mm unset tblproperties('transactional_properties', 'transactional')
-PREHOOK: type: ALTERTABLE_PROPERTIES
-PREHOOK: Input: default@bucket0_mm
-PREHOOK: Output: default@bucket0_mm
-POSTHOOK: query: alter table bucket0_mm unset tblproperties('transactional_properties', 'transactional')
-POSTHOOK: type: ALTERTABLE_PROPERTIES
-POSTHOOK: Input: default@bucket0_mm
-POSTHOOK: Output: default@bucket0_mm
-PREHOOK: query: alter table bucket1_mm unset tblproperties('transactional_properties', 'transactional')
-PREHOOK: type: ALTERTABLE_PROPERTIES
-PREHOOK: Input: default@bucket1_mm
-PREHOOK: Output: default@bucket1_mm
-FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Converting bucketed tables from MM is not supported by default; copying files from multiple MM directories may potentially break the buckets. You can set hive.strict.checks.bucketing to false for this query if you want to force the conversion.

http://git-wip-us.apache.org/repos/asf/hive/blob/98c5b637/ql/src/test/results/clientnegative/mm_convert.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/mm_convert.q.out b/ql/src/test/results/clientnegative/mm_convert.q.out
new file mode 100644
index 0000000..496f8b5
--- /dev/null
+++ b/ql/src/test/results/clientnegative/mm_convert.q.out
@@ -0,0 +1,17 @@
+PREHOOK: query: drop table convert_mm
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table convert_mm
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: create table convert_mm(key int, id int) tblproperties("transactional"="true", "transactional_properties"="insert_only")
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@convert_mm
+POSTHOOK: query: create table convert_mm(key int, id int) tblproperties("transactional"="true", "transactional_properties"="insert_only")
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@convert_mm
+PREHOOK: query: alter table convert_mm unset tblproperties('transactional_properties', 'transactional')
+PREHOOK: type: ALTERTABLE_PROPERTIES
+PREHOOK: Input: default@convert_mm
+PREHOOK: Output: default@convert_mm
+FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Cannot convert an ACID table to non-ACID

http://git-wip-us.apache.org/repos/asf/hive/blob/98c5b637/ql/src/test/results/clientpositive/mm_all.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/mm_all.q.out b/ql/src/test/results/clientpositive/mm_all.q.out
index fa9e4a7..c943f01 100644
--- a/ql/src/test/results/clientpositive/mm_all.q.out
+++ b/ql/src/test/results/clientpositive/mm_all.q.out
@@ -88,10 +88,7 @@ STAGE PLANS:
     Conditional Operator
 
   Stage: Stage-4
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
+    Dependency Collection
 
   Stage: Stage-0
     Move Operator
@@ -125,10 +122,7 @@ STAGE PLANS:
       input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
 
   Stage: Stage-6
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
+    Dependency Collection
 
 PREHOOK: query: insert into table part_mm partition(key_mm=455) select key from intermediate
 PREHOOK: type: QUERY
@@ -1792,7 +1786,6 @@ POSTHOOK: query: desc formatted stats_mm
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@stats_mm
 # col_name            	data_type           	comment             
-	 	 
 key                 	int                 	                    
 	 	 
 # Detailed Table Information	 	 
@@ -1843,7 +1836,6 @@ POSTHOOK: query: desc formatted stats_mm
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@stats_mm
 # col_name            	data_type           	comment             
-	 	 
 key                 	int                 	                    
 	 	 
 # Detailed Table Information	 	 
@@ -1902,7 +1894,6 @@ POSTHOOK: query: desc formatted stats2_mm
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@stats2_mm
 # col_name            	data_type           	comment             
-	 	 
 _c0                 	array<string>       	                    
 	 	 
 # Detailed Table Information	 	 


[2/4] hive git commit: HIVE-17111: Add TestLocalSparkCliDriver (Sahil Takiar, reviewed by Aihua Xu, Peter Vary, Xuefu Zhang) (addendum)

Posted by se...@apache.org.
HIVE-17111: Add TestLocalSparkCliDriver (Sahil Takiar, reviewed by Aihua Xu, Peter Vary, Xuefu Zhang) (addendum)


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

Branch: refs/heads/hive-14535
Commit: 857347f7fde23d9fb2a0026ca8f1ab6faa28b91c
Parents: a974a9e
Author: Sahil Takiar <ta...@gmail.com>
Authored: Tue Oct 10 13:04:11 2017 -0700
Committer: Sahil Takiar <st...@cloudera.com>
Committed: Tue Oct 10 13:04:11 2017 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java    | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/857347f7/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
----------------------------------------------------------------------
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
index c9e1543..438d296 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
@@ -54,6 +54,7 @@ public class CliConfigs {
         excludesFrom(testConfigProps, "spark.only.query.files");
         excludesFrom(testConfigProps, "miniSparkOnYarn.only.query.files");
         excludesFrom(testConfigProps, "disabled.query.files");
+        excludesFrom(testConfigProps, "localSpark.only.query.files");
 
         setResultsDir("ql/src/test/results/clientpositive");
         setLogDir("itests/qtest/target/qfile-results/clientpositive");


[4/4] hive git commit: HIVE-14671 : merge master into hive-14535 (Sergey Shelukhin)

Posted by se...@apache.org.
HIVE-14671 : merge master into hive-14535 (Sergey Shelukhin)


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

Branch: refs/heads/hive-14535
Commit: d7b6272ad4b59619f5bfa7698c2823efdc938273
Parents: 98c5b63 857347f
Author: sergey <se...@apache.org>
Authored: Tue Oct 10 15:23:31 2017 -0700
Committer: sergey <se...@apache.org>
Committed: Tue Oct 10 15:23:31 2017 -0700

----------------------------------------------------------------------
 .../hadoop/hive/cli/control/CliConfigs.java     |  1 +
 .../spark/spark_explainuser_1.q.out             | 72 ++++++++++----------
 2 files changed, 38 insertions(+), 35 deletions(-)
----------------------------------------------------------------------