hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prasan...@apache.org
Subject svn commit: r1665632 [2/2] - in /hive/branches/llap: ./ beeline/src/java/org/apache/hive/beeline/ beeline/src/main/resources/ beeline/src/test/org/apache/hive/beeline/ beeline/src/test/resources/ common/src/java/org/apache/hadoop/hive/conf/ dev-support...
Date Tue, 10 Mar 2015 17:40:32 GMT
Modified: hive/branches/llap/ql/src/test/results/clientpositive/auto_join12.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/auto_join12.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/auto_join12.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/auto_join12.q.out Tue Mar 10 17:40:31 2015
@@ -29,14 +29,14 @@ STAGE PLANS:
   Stage: Stage-7
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:src 
+        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:src 
           Fetch Operator
             limit: -1
-        $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:$hdt$_1:src 
+        $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:src 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:src 
+        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:src 
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
@@ -51,7 +51,7 @@ STAGE PLANS:
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
-        $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:$hdt$_1:src 
+        $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:src 
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/llap/ql/src/test/results/clientpositive/auto_join13.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/auto_join13.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/auto_join13.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/auto_join13.q.out Tue Mar 10 17:40:31 2015
@@ -29,14 +29,14 @@ STAGE PLANS:
   Stage: Stage-7
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:src 
+        $hdt$_0:$hdt$_0:$hdt$_0:src 
           Fetch Operator
             limit: -1
-        $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:src 
+        $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:src 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:src 
+        $hdt$_0:$hdt$_0:$hdt$_0:src 
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
@@ -51,7 +51,7 @@ STAGE PLANS:
                   keys:
                     0 UDFToDouble(_col0) (type: double)
                     1 (UDFToDouble(_col2) + UDFToDouble(_col0)) (type: double)
-        $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:src 
+        $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:src 
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/llap/ql/src/test/results/clientpositive/auto_join27.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/auto_join27.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/auto_join27.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/auto_join27.q.out Tue Mar 10 17:40:31 2015
@@ -73,11 +73,11 @@ STAGE PLANS:
   Stage: Stage-7
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_1:$hdt$_1:src 
+        $hdt$_0:$hdt$_1:src 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_1:$hdt$_1:src 
+        $hdt$_0:$hdt$_1:src 
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/llap/ql/src/test/results/clientpositive/auto_join4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/auto_join4.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/auto_join4.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/auto_join4.q.out Tue Mar 10 17:40:31 2015
@@ -46,11 +46,11 @@ STAGE PLANS:
   Stage: Stage-5
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_1:$hdt$_1:$hdt$_1:src1 
+        $hdt$_1:$hdt$_1:src1 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_1:$hdt$_1:$hdt$_1:src1 
+        $hdt$_1:$hdt$_1:src1 
           TableScan
             alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/llap/ql/src/test/results/clientpositive/auto_join5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/auto_join5.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/auto_join5.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/auto_join5.q.out Tue Mar 10 17:40:31 2015
@@ -46,11 +46,11 @@ STAGE PLANS:
   Stage: Stage-5
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_1:$hdt$_1:$hdt$_1:src1 
+        $hdt$_1:$hdt$_1:src1 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_1:$hdt$_1:$hdt$_1:src1 
+        $hdt$_1:$hdt$_1:src1 
           TableScan
             alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/llap/ql/src/test/results/clientpositive/auto_join8.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/auto_join8.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/auto_join8.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/auto_join8.q.out Tue Mar 10 17:40:31 2015
@@ -46,11 +46,11 @@ STAGE PLANS:
   Stage: Stage-5
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_1:$hdt$_1:$hdt$_1:src1 
+        $hdt$_1:$hdt$_1:src1 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_1:$hdt$_1:$hdt$_1:src1 
+        $hdt$_1:$hdt$_1:src1 
           TableScan
             alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/llap/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out Tue Mar 10 17:40:31 2015
@@ -203,8 +203,8 @@ STAGE PLANS:
               name: default.src1
             name: default.src1
       Truncated Path -> Alias:
-        /src [$hdt$_0:$hdt$_1:a]
-        /src1 [$hdt$_0:$hdt$_0:b]
+        /src [$hdt$_1:a]
+        /src1 [$hdt$_0:b]
       Needs Tagging: true
       Reduce Operator Tree:
         Join Operator

Modified: hive/branches/llap/ql/src/test/results/clientpositive/correlationoptimizer1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/correlationoptimizer1.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/correlationoptimizer1.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/correlationoptimizer1.q.out Tue Mar 10 17:40:31 2015
@@ -329,11 +329,11 @@ STAGE PLANS:
   Stage: Stage-6
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x 
+        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x 
+        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x 
           TableScan
             alias: x
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/llap/ql/src/test/results/clientpositive/correlationoptimizer6.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/correlationoptimizer6.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/correlationoptimizer6.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/correlationoptimizer6.q.out Tue Mar 10 17:40:31 2015
@@ -500,14 +500,14 @@ STAGE PLANS:
   Stage: Stage-8
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:x 
+        $hdt$_0:$hdt$_0:$hdt$_0:x 
           Fetch Operator
             limit: -1
-        $hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:x 
+        $hdt$_1:$hdt$_1:$hdt$_1:x 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:x 
+        $hdt$_0:$hdt$_0:$hdt$_0:x 
           TableScan
             alias: x
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
@@ -522,7 +522,7 @@ STAGE PLANS:
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
-        $hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:x 
+        $hdt$_1:$hdt$_1:$hdt$_1:x 
           TableScan
             alias: x
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
@@ -3822,11 +3822,11 @@ STAGE PLANS:
   Stage: Stage-10
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:x 
+        $hdt$_0:$hdt$_0:$hdt$_0:x 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:x 
+        $hdt$_0:$hdt$_0:$hdt$_0:x 
           TableScan
             alias: x
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
@@ -3894,11 +3894,11 @@ STAGE PLANS:
   Stage: Stage-9
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:x 
+        $hdt$_1:$hdt$_1:$hdt$_1:x 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:x 
+        $hdt$_1:$hdt$_1:$hdt$_1:x 
           TableScan
             alias: x
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/llap/ql/src/test/results/clientpositive/explain_logical.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/explain_logical.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/explain_logical.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/explain_logical.q.out Tue Mar 10 17:40:31 2015
@@ -804,20 +804,20 @@ $hdt$_0:$hdt$_0:src
   TableScan (TS_0)
     alias: src
     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-    Filter Operator (FIL_20)
+    Filter Operator (FIL_19)
       predicate: key is not null (type: boolean)
       Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
       Select Operator (SEL_1)
         expressions: key (type: string), value (type: string)
         outputColumnNames: _col0, _col1
         Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
-        Reduce Output Operator (RS_11)
+        Reduce Output Operator (RS_10)
           key expressions: _col0 (type: string)
           sort order: +
           Map-reduce partition columns: _col0 (type: string)
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
           value expressions: _col1 (type: string)
-          Join Operator (JOIN_14)
+          Join Operator (JOIN_13)
             condition map:
                  Inner Join 0 to 1
             keys:
@@ -825,62 +825,62 @@ $hdt$_0:$hdt$_0:src
               1 _col0 (type: string)
             outputColumnNames: _col0, _col1, _col3
             Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
-            Select Operator (SEL_15)
+            Select Operator (SEL_14)
               expressions: _col0 (type: string), _col3 (type: bigint), _col1 (type: string)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
-              Reduce Output Operator (RS_17)
+              Reduce Output Operator (RS_16)
                 key expressions: _col0 (type: string)
                 sort order: +
                 Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
                 value expressions: _col1 (type: bigint), _col2 (type: string)
-                Select Operator (SEL_18)
+                Select Operator (SEL_17)
                   expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: bigint), VALUE._col1 (type: string)
                   outputColumnNames: _col0, _col1, _col2
                   Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
-                  File Output Operator (FS_19)
+                  File Output Operator (FS_18)
                     compressed: false
                     Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
                     table:
                         input format: org.apache.hadoop.mapred.TextInputFormat
                         output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                         serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:src 
+$hdt$_0:$hdt$_1:$hdt$_1:src 
   TableScan (TS_2)
     alias: src
     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-    Filter Operator (FIL_21)
+    Filter Operator (FIL_20)
       predicate: key is not null (type: boolean)
       Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
       Select Operator (SEL_3)
         expressions: key (type: string), value (type: string)
         outputColumnNames: _col0, _col1
         Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
-        Group By Operator (GBY_6)
+        Group By Operator (GBY_5)
           aggregations: count(_col1)
           keys: _col0 (type: string)
           mode: hash
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
-          Reduce Output Operator (RS_7)
+          Reduce Output Operator (RS_6)
             key expressions: _col0 (type: string)
             sort order: +
             Map-reduce partition columns: _col0 (type: string)
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
             value expressions: _col1 (type: bigint)
-            Group By Operator (GBY_8)
+            Group By Operator (GBY_7)
               aggregations: count(VALUE._col0)
               keys: KEY._col0 (type: string)
               mode: mergepartial
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE
-              Reduce Output Operator (RS_13)
+              Reduce Output Operator (RS_12)
                 key expressions: _col0 (type: string)
                 sort order: +
                 Map-reduce partition columns: _col0 (type: string)
                 Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE
                 value expressions: _col1 (type: bigint)
-                Join Operator (JOIN_14)
+                Join Operator (JOIN_13)
                   condition map:
                        Inner Join 0 to 1
                   keys:

Modified: hive/branches/llap/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out Tue Mar 10 17:40:31 2015
@@ -1192,7 +1192,7 @@ STAGE PLANS:
               name: default.t1
             name: default.t1
       Truncated Path -> Alias:
-        /t1 [$hdt$_0:$hdt$_0:$hdt$_0:t1]
+        /t1 [$hdt$_0:$hdt$_0:t1]
 
   Stage: Stage-7
     Conditional Operator
@@ -2278,7 +2278,7 @@ STAGE PLANS:
               name: default.t1
             name: default.t1
       Truncated Path -> Alias:
-        /t1 [$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:t1]
+        /t1 [$hdt$_0:$hdt$_0:$hdt$_0:t1]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -3247,7 +3247,7 @@ STAGE PLANS:
               name: default.t1
             name: default.t1
       Truncated Path -> Alias:
-        /t1 [null-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_0:$hdt$_0:t1]
+        /t1 [null-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_0:t1]
 #### A masked pattern was here ####
 
   Stage: Stage-8

Modified: hive/branches/llap/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out Tue Mar 10 17:40:31 2015
@@ -1257,7 +1257,7 @@ STAGE PLANS:
               name: default.t1
             name: default.t1
       Truncated Path -> Alias:
-        /t1 [$hdt$_0:$hdt$_0:$hdt$_0:t1]
+        /t1 [$hdt$_0:$hdt$_0:t1]
 
   Stage: Stage-7
     Conditional Operator
@@ -2539,7 +2539,7 @@ STAGE PLANS:
               name: default.t1
             name: default.t1
       Truncated Path -> Alias:
-        /t1 [$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:t1]
+        /t1 [$hdt$_0:$hdt$_0:$hdt$_0:t1]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -3637,7 +3637,7 @@ STAGE PLANS:
               name: default.t1
             name: default.t1
       Truncated Path -> Alias:
-        /t1 [null-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_0:$hdt$_0:t1]
+        /t1 [null-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_0:t1]
 #### A masked pattern was here ####
 
   Stage: Stage-8

Modified: hive/branches/llap/ql/src/test/results/clientpositive/metadataonly1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/metadataonly1.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/metadataonly1.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/metadataonly1.q.out Tue Mar 10 17:40:31 2015
@@ -138,7 +138,7 @@ STAGE PLANS:
                   value expressions: _col0 (type: string)
                   auto parallelism: false
       Path -> Alias:
-        -mr-10003default.test1{ds=1} [$hdt$_0:$hdt$_0:test1]
+        -mr-10003default.test1{ds=1} [$hdt$_0:test1]
       Path -> Partition:
         -mr-10003default.test1{ds=1} 
           Partition
@@ -180,7 +180,7 @@ STAGE PLANS:
               name: default.test1
             name: default.test1
       Truncated Path -> Alias:
-        -mr-10003default.test1{ds=1} [$hdt$_0:$hdt$_0:test1]
+        -mr-10003default.test1{ds=1} [$hdt$_0:test1]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -279,7 +279,7 @@ STAGE PLANS:
                   tag: -1
                   auto parallelism: false
       Path -> Alias:
-        -mr-10003default.test1{ds=1} [$hdt$_0:$hdt$_0:test1]
+        -mr-10003default.test1{ds=1} [$hdt$_0:test1]
       Path -> Partition:
         -mr-10003default.test1{ds=1} 
           Partition
@@ -321,7 +321,7 @@ STAGE PLANS:
               name: default.test1
             name: default.test1
       Truncated Path -> Alias:
-        -mr-10003default.test1{ds=1} [$hdt$_0:$hdt$_0:test1]
+        -mr-10003default.test1{ds=1} [$hdt$_0:test1]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -462,7 +462,7 @@ STAGE PLANS:
               name: default.test1
             name: default.test1
       Truncated Path -> Alias:
-        /test1/ds=1 [$hdt$_0:$hdt$_0:test1]
+        /test1/ds=1 [$hdt$_0:test1]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -598,8 +598,8 @@ STAGE PLANS:
                   value expressions: _col0 (type: string)
                   auto parallelism: false
       Path -> Alias:
-        -mr-10005default.test1{ds=1} [$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:a2]
-        -mr-10006default.test1{ds=2} [$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:a2]
+        -mr-10005default.test1{ds=1} [$hdt$_0:$hdt$_1:$hdt$_1:a2]
+        -mr-10006default.test1{ds=2} [$hdt$_0:$hdt$_1:$hdt$_1:a2]
       Path -> Partition:
         -mr-10005default.test1{ds=1} 
           Partition
@@ -680,8 +680,8 @@ STAGE PLANS:
               name: default.test1
             name: default.test1
       Truncated Path -> Alias:
-        -mr-10005default.test1{ds=1} [$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:a2]
-        -mr-10006default.test1{ds=2} [$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:a2]
+        -mr-10005default.test1{ds=1} [$hdt$_0:$hdt$_1:$hdt$_1:a2]
+        -mr-10006default.test1{ds=2} [$hdt$_0:$hdt$_1:$hdt$_1:a2]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -1049,9 +1049,9 @@ STAGE PLANS:
                   tag: -1
                   auto parallelism: false
       Path -> Alias:
-        -mr-10003default.test2{ds=1, hr=1} [$hdt$_0:$hdt$_0:test2]
-        -mr-10004default.test2{ds=1, hr=2} [$hdt$_0:$hdt$_0:test2]
-        -mr-10005default.test2{ds=1, hr=3} [$hdt$_0:$hdt$_0:test2]
+        -mr-10003default.test2{ds=1, hr=1} [$hdt$_0:test2]
+        -mr-10004default.test2{ds=1, hr=2} [$hdt$_0:test2]
+        -mr-10005default.test2{ds=1, hr=3} [$hdt$_0:test2]
       Path -> Partition:
         -mr-10003default.test2{ds=1, hr=1} 
           Partition
@@ -1174,9 +1174,9 @@ STAGE PLANS:
               name: default.test2
             name: default.test2
       Truncated Path -> Alias:
-        -mr-10003default.test2{ds=1, hr=1} [$hdt$_0:$hdt$_0:test2]
-        -mr-10004default.test2{ds=1, hr=2} [$hdt$_0:$hdt$_0:test2]
-        -mr-10005default.test2{ds=1, hr=3} [$hdt$_0:$hdt$_0:test2]
+        -mr-10003default.test2{ds=1, hr=1} [$hdt$_0:test2]
+        -mr-10004default.test2{ds=1, hr=2} [$hdt$_0:test2]
+        -mr-10005default.test2{ds=1, hr=3} [$hdt$_0:test2]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -1414,9 +1414,9 @@ STAGE PLANS:
               name: default.test2
             name: default.test2
       Truncated Path -> Alias:
-        /test2/ds=1/hr=1 [$hdt$_0:$hdt$_0:test2]
-        /test2/ds=1/hr=2 [$hdt$_0:$hdt$_0:test2]
-        /test2/ds=1/hr=3 [$hdt$_0:$hdt$_0:test2]
+        /test2/ds=1/hr=1 [$hdt$_0:test2]
+        /test2/ds=1/hr=2 [$hdt$_0:test2]
+        /test2/ds=1/hr=3 [$hdt$_0:test2]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -1518,8 +1518,8 @@ STAGE PLANS:
                   value expressions: _col0 (type: string)
                   auto parallelism: false
       Path -> Alias:
-        -mr-10003default.test1{ds=1} [$hdt$_0:$hdt$_0:test1]
-        -mr-10004default.test1{ds=2} [$hdt$_0:$hdt$_0:test1]
+        -mr-10003default.test1{ds=1} [$hdt$_0:test1]
+        -mr-10004default.test1{ds=2} [$hdt$_0:test1]
       Path -> Partition:
         -mr-10003default.test1{ds=1} 
           Partition
@@ -1600,8 +1600,8 @@ STAGE PLANS:
               name: default.test1
             name: default.test1
       Truncated Path -> Alias:
-        -mr-10003default.test1{ds=1} [$hdt$_0:$hdt$_0:test1]
-        -mr-10004default.test1{ds=2} [$hdt$_0:$hdt$_0:test1]
+        -mr-10003default.test1{ds=1} [$hdt$_0:test1]
+        -mr-10004default.test1{ds=2} [$hdt$_0:test1]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -1760,11 +1760,11 @@ STAGE PLANS:
                   tag: -1
                   auto parallelism: false
       Path -> Alias:
-        -mr-10003default.test2{ds=01_10_10, hr=01} [$hdt$_0:$hdt$_0:test2]
-        -mr-10004default.test2{ds=01_10_20, hr=02} [$hdt$_0:$hdt$_0:test2]
-        -mr-10005default.test2{ds=1, hr=1} [$hdt$_0:$hdt$_0:test2]
-        -mr-10006default.test2{ds=1, hr=2} [$hdt$_0:$hdt$_0:test2]
-        -mr-10007default.test2{ds=1, hr=3} [$hdt$_0:$hdt$_0:test2]
+        -mr-10003default.test2{ds=01_10_10, hr=01} [$hdt$_0:test2]
+        -mr-10004default.test2{ds=01_10_20, hr=02} [$hdt$_0:test2]
+        -mr-10005default.test2{ds=1, hr=1} [$hdt$_0:test2]
+        -mr-10006default.test2{ds=1, hr=2} [$hdt$_0:test2]
+        -mr-10007default.test2{ds=1, hr=3} [$hdt$_0:test2]
       Path -> Partition:
         -mr-10003default.test2{ds=01_10_10, hr=01} 
           Partition
@@ -1967,11 +1967,11 @@ STAGE PLANS:
               name: default.test2
             name: default.test2
       Truncated Path -> Alias:
-        -mr-10003default.test2{ds=01_10_10, hr=01} [$hdt$_0:$hdt$_0:test2]
-        -mr-10004default.test2{ds=01_10_20, hr=02} [$hdt$_0:$hdt$_0:test2]
-        -mr-10005default.test2{ds=1, hr=1} [$hdt$_0:$hdt$_0:test2]
-        -mr-10006default.test2{ds=1, hr=2} [$hdt$_0:$hdt$_0:test2]
-        -mr-10007default.test2{ds=1, hr=3} [$hdt$_0:$hdt$_0:test2]
+        -mr-10003default.test2{ds=01_10_10, hr=01} [$hdt$_0:test2]
+        -mr-10004default.test2{ds=01_10_20, hr=02} [$hdt$_0:test2]
+        -mr-10005default.test2{ds=1, hr=1} [$hdt$_0:test2]
+        -mr-10006default.test2{ds=1, hr=2} [$hdt$_0:test2]
+        -mr-10007default.test2{ds=1, hr=3} [$hdt$_0:test2]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator

Modified: hive/branches/llap/ql/src/test/results/clientpositive/ppd_join_filter.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/ppd_join_filter.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/ppd_join_filter.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/ppd_join_filter.q.out Tue Mar 10 17:40:31 2015
@@ -202,7 +202,7 @@ STAGE PLANS:
               name: default.src
             name: default.src
       Truncated Path -> Alias:
-        /src [$hdt$_1:$hdt$_1:$hdt$_1:a]
+        /src [$hdt$_1:$hdt$_1:a]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -627,7 +627,7 @@ STAGE PLANS:
               name: default.src
             name: default.src
       Truncated Path -> Alias:
-        /src [$hdt$_1:$hdt$_1:$hdt$_1:a]
+        /src [$hdt$_1:$hdt$_1:a]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -1040,7 +1040,7 @@ STAGE PLANS:
               name: default.src
             name: default.src
       Truncated Path -> Alias:
-        /src [$hdt$_1:$hdt$_1:$hdt$_1:a]
+        /src [$hdt$_1:$hdt$_1:a]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -1461,7 +1461,7 @@ STAGE PLANS:
               name: default.src
             name: default.src
       Truncated Path -> Alias:
-        /src [$hdt$_1:$hdt$_1:$hdt$_1:a]
+        /src [$hdt$_1:$hdt$_1:a]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator

Modified: hive/branches/llap/ql/src/test/results/clientpositive/ppd_vc.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/ppd_vc.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/ppd_vc.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/ppd_vc.q.out Tue Mar 10 17:40:31 2015
@@ -680,10 +680,10 @@ STAGE PLANS:
             name: default.srcpart
       Truncated Path -> Alias:
         /src [$hdt$_0:a]
-        /srcpart/ds=2008-04-08/hr=11 [$hdt$_1:$hdt$_1:srcpart]
-        /srcpart/ds=2008-04-08/hr=12 [$hdt$_1:$hdt$_1:srcpart]
-        /srcpart/ds=2008-04-09/hr=11 [$hdt$_1:$hdt$_1:srcpart]
-        /srcpart/ds=2008-04-09/hr=12 [$hdt$_1:$hdt$_1:srcpart]
+        /srcpart/ds=2008-04-08/hr=11 [$hdt$_1:srcpart]
+        /srcpart/ds=2008-04-08/hr=12 [$hdt$_1:srcpart]
+        /srcpart/ds=2008-04-09/hr=11 [$hdt$_1:srcpart]
+        /srcpart/ds=2008-04-09/hr=12 [$hdt$_1:srcpart]
       Needs Tagging: true
       Reduce Operator Tree:
         Join Operator

Modified: hive/branches/llap/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_1.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_1.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_1.q.out Tue Mar 10 17:40:31 2015
@@ -253,7 +253,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: $hdt$_0:$hdt$_0:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__
+            alias: $hdt$_0:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__
             Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: l_shipdate (type: string), _count_of_l_shipdate (type: bigint)
@@ -900,7 +900,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: null-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_0:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__
+            alias: null-subquery1:$hdt$_0-subquery1:$hdt$_0:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__
             Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: l_shipdate (type: string), _count_of_l_shipdate (type: bigint)
@@ -1063,7 +1063,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: $hdt$_0:$hdt$_0:default.default__tbl_tbl_key_idx__
+            alias: $hdt$_0:default.default__tbl_tbl_key_idx__
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Select Operator
               expressions: key (type: int), _count_of_key (type: bigint)
@@ -1161,7 +1161,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: $hdt$_0:$hdt$_0:default.default__tbl_tbl_key_idx__
+            alias: $hdt$_0:default.default__tbl_tbl_key_idx__
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Select Operator
               expressions: key (type: int), _count_of_key (type: bigint)
@@ -2453,7 +2453,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: $hdt$_0:$hdt$_0:default.default__tbl_tbl_key_idx__
+            alias: $hdt$_0:default.default__tbl_tbl_key_idx__
             Statistics: Num rows: 6 Data size: 430 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: key (type: int), _count_of_key (type: bigint)

Modified: hive/branches/llap/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_2.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_2.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_2.q.out Tue Mar 10 17:40:31 2015
@@ -176,7 +176,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: $hdt$_0:$hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__
+            alias: $hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__
             Statistics: Num rows: 26 Data size: 2604 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: l_orderkey (type: int), _count_of_l_orderkey (type: bigint)
@@ -1223,7 +1223,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: $hdt$_0:$hdt$_0:$hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__
+            alias: $hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__
             Statistics: Num rows: 26 Data size: 2604 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: l_orderkey (type: int), _count_of_l_orderkey (type: bigint)
@@ -1907,7 +1907,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__
+            alias: $hdt$_0:$hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__
             Statistics: Num rows: 26 Data size: 2604 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: (l_orderkey < 7) (type: boolean)
@@ -3404,7 +3404,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: $hdt$_0-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__
+            alias: $hdt$_0-subquery1:$hdt$_0-subquery1:$hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__
             Statistics: Num rows: 26 Data size: 2604 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: (l_orderkey < 7) (type: boolean)
@@ -3495,7 +3495,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: $hdt$_0-subquery2:$hdt$_0-subquery2:$hdt$_0:$hdt$_0:default.default__lineitem_ix_lineitem_ix_l_partkey_idx__
+            alias: $hdt$_0-subquery2:$hdt$_0-subquery2:$hdt$_0:default.default__lineitem_ix_lineitem_ix_l_partkey_idx__
             Statistics: Num rows: 100 Data size: 8937 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: (l_partkey < 10) (type: boolean)

Modified: hive/branches/llap/ql/src/test/results/clientpositive/spark/bucket_map_join_tez1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/spark/bucket_map_join_tez1.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/spark/bucket_map_join_tez1.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/spark/bucket_map_join_tez1.q.out Tue Mar 10 17:40:31 2015
@@ -1218,3 +1218,78 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
+PREHOOK: query: explain
+select a.key, a.value, b.value
+from tab a join tab_part b on a.key = b.key and a.ds = b.ds
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select a.key, a.value, b.value
+from tab a join tab_part b on a.key = b.key and a.ds = b.ds
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-2 is a root stage
+  Stage-1 depends on stages: Stage-2
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-2
+    Spark
+#### A masked pattern was here ####
+      Vertices:
+        Map 1 
+            Map Operator Tree:
+                TableScan
+                  alias: a
+                  Statistics: Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
+                  Filter Operator
+                    predicate: key is not null (type: boolean)
+                    Statistics: Num rows: 121 Data size: 1283 Basic stats: COMPLETE Column stats: NONE
+                    Spark HashTable Sink Operator
+                      keys:
+                        0 key (type: int), ds (type: string)
+                        1 key (type: int), ds (type: string)
+            Local Work:
+              Map Reduce Local Work
+
+  Stage: Stage-1
+    Spark
+#### A masked pattern was here ####
+      Vertices:
+        Map 2 
+            Map Operator Tree:
+                TableScan
+                  alias: b
+                  Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+                  Filter Operator
+                    predicate: key is not null (type: boolean)
+                    Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+                    Map Join Operator
+                      condition map:
+                           Inner Join 0 to 1
+                      keys:
+                        0 key (type: int), ds (type: string)
+                        1 key (type: int), ds (type: string)
+                      outputColumnNames: _col0, _col1, _col7
+                      input vertices:
+                        0 Map 1
+                      Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
+                      Select Operator
+                        expressions: _col0 (type: int), _col1 (type: string), _col7 (type: string)
+                        outputColumnNames: _col0, _col1, _col2
+                        Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
+                        File Output Operator
+                          compressed: false
+                          Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
+                          table:
+                              input format: org.apache.hadoop.mapred.TextInputFormat
+                              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+            Local Work:
+              Map Reduce Local Work
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Processor Tree:
+        ListSink
+

Modified: hive/branches/llap/ql/src/test/results/clientpositive/subquery_in_having.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/subquery_in_having.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/subquery_in_having.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/subquery_in_having.q.out Tue Mar 10 17:40:31 2015
@@ -1108,11 +1108,11 @@ STAGE PLANS:
   Stage: Stage-10
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:$hdt$_1:b 
+        $hdt$_0:$hdt$_1:b 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:$hdt$_1:b 
+        $hdt$_0:$hdt$_1:b 
           TableScan
             alias: b
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/llap/ql/src/test/results/clientpositive/subquery_notin.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/subquery_notin.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/subquery_notin.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/subquery_notin.q.out Tue Mar 10 17:40:31 2015
@@ -575,7 +575,7 @@ Manufacturer#4	almond azure aquamarine p
 Manufacturer#5	almond antique blue firebrick mint	31
 Manufacturer#5	almond aquamarine dodger light gainsboro	46
 Manufacturer#5	almond azure blanched chiffon midnight	23
-Warning: Shuffle Join JOIN[47][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-2:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[45][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: -- agg, non corr
 explain
 select p_name, p_size 
@@ -859,7 +859,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[47][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-2:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[45][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: select p_name, p_size 
 from 
 part where part.p_size not in 
@@ -906,7 +906,7 @@ almond aquamarine sandy cyan gainsboro	1
 almond aquamarine yellow dodger mint	7
 almond azure aquamarine papaya violet	12
 almond azure blanched chiffon midnight	23
-Warning: Shuffle Join JOIN[44][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[42][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
 PREHOOK: query: -- agg, corr
 explain
 select p_mfgr, p_name, p_size 
@@ -1226,7 +1226,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[44][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[42][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
 PREHOOK: query: select p_mfgr, p_name, p_size 
 from part b where b.p_size not in 
   (select min(p_size) 

Modified: hive/branches/llap/ql/src/test/results/clientpositive/subquery_notin_having.q.java1.7.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/subquery_notin_having.q.java1.7.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/subquery_notin_having.q.java1.7.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/subquery_notin_having.q.java1.7.out Tue Mar 10 17:40:31 2015
@@ -1,4 +1,4 @@
-Warning: Shuffle Join JOIN[25][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[24][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: -- non agg, non corr
 -- JAVA_VERSION_SPECIFIC_OUTPUT
 
@@ -188,7 +188,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[38][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[34][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: -- non agg, corr
 explain
 select b.p_mfgr, min(p_retailprice) 
@@ -445,7 +445,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[38][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[34][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: select b.p_mfgr, min(p_retailprice) 
 from part b 
 group by b.p_mfgr
@@ -470,7 +470,7 @@ POSTHOOK: Input: default@part
 #### A masked pattern was here ####
 Manufacturer#1	1173.15
 Manufacturer#2	1690.68
-Warning: Shuffle Join JOIN[41][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-3:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[38][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-3:MAPRED' is a cross product
 PREHOOK: query: -- agg, non corr
 explain
 select b.p_mfgr, min(p_retailprice) 
@@ -729,7 +729,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[41][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-3:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[38][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-3:MAPRED' is a cross product
 PREHOOK: query: select b.p_mfgr, min(p_retailprice) 
 from part b 
 group by b.p_mfgr

Modified: hive/branches/llap/ql/src/test/results/clientpositive/table_access_keys_stats.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/table_access_keys_stats.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/table_access_keys_stats.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/table_access_keys_stats.q.out Tue Mar 10 17:40:31 2015
@@ -63,7 +63,7 @@ PREHOOK: query: SELECT k, count(1) FROM
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 #### A masked pattern was here ####
-Operator:GBY_5
+Operator:GBY_4
 Table:default@t1
 Keys:key
 

Modified: hive/branches/llap/ql/src/test/results/clientpositive/tez/bucket_map_join_tez1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/tez/bucket_map_join_tez1.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/tez/bucket_map_join_tez1.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/tez/bucket_map_join_tez1.q.out Tue Mar 10 17:40:31 2015
@@ -1127,3 +1127,87 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
+PREHOOK: query: explain
+select a.key, a.value, b.value
+from tab a join tab_part b on a.key = b.key and a.ds = b.ds
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select a.key, a.value, b.value
+from tab a join tab_part b on a.key = b.key and a.ds = b.ds
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Tez
+      Edges:
+        Map 2 <- Map 1 (BROADCAST_EDGE)
+#### A masked pattern was here ####
+      Vertices:
+        Map 1 
+            Map Operator Tree:
+                TableScan
+                  alias: a
+                  Statistics: Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
+                  Filter Operator
+                    predicate: key is not null (type: boolean)
+                    Statistics: Num rows: 121 Data size: 1283 Basic stats: COMPLETE Column stats: NONE
+                    Reduce Output Operator
+                      key expressions: key (type: int), ds (type: string)
+                      sort order: ++
+                      Map-reduce partition columns: key (type: int), ds (type: string)
+                      Statistics: Num rows: 121 Data size: 1283 Basic stats: COMPLETE Column stats: NONE
+                      value expressions: value (type: string)
+                    Select Operator
+                      expressions: ds (type: string)
+                      outputColumnNames: _col0
+                      Statistics: Num rows: 121 Data size: 1283 Basic stats: COMPLETE Column stats: NONE
+                      Group By Operator
+                        keys: _col0 (type: string)
+                        mode: hash
+                        outputColumnNames: _col0
+                        Statistics: Num rows: 121 Data size: 1283 Basic stats: COMPLETE Column stats: NONE
+                        Dynamic Partitioning Event Operator
+                          Target Input: b
+                          Partition key expr: ds
+                          Statistics: Num rows: 121 Data size: 1283 Basic stats: COMPLETE Column stats: NONE
+                          Target column: ds
+                          Target Vertex: Map 2
+        Map 2 
+            Map Operator Tree:
+                TableScan
+                  alias: b
+                  Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+                  Filter Operator
+                    predicate: key is not null (type: boolean)
+                    Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+                    Map Join Operator
+                      condition map:
+                           Inner Join 0 to 1
+                      keys:
+                        0 key (type: int), ds (type: string)
+                        1 key (type: int), ds (type: string)
+                      outputColumnNames: _col0, _col1, _col7
+                      input vertices:
+                        0 Map 1
+                      Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
+                      Select Operator
+                        expressions: _col0 (type: int), _col1 (type: string), _col7 (type: string)
+                        outputColumnNames: _col0, _col1, _col2
+                        Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
+                        File Output Operator
+                          compressed: false
+                          Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
+                          table:
+                              input format: org.apache.hadoop.mapred.TextInputFormat
+                              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Processor Tree:
+        ListSink
+

Modified: hive/branches/llap/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out Tue Mar 10 17:40:31 2015
@@ -1773,7 +1773,7 @@ POSTHOOK: Input: default@srcpart@ds=2008
 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 #### A masked pattern was here ####
 1000
-Warning: Shuffle Join MERGEJOIN[24][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[23][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
 PREHOOK: query: -- parent is reduce tasks
 EXPLAIN select count(*) from srcpart join (select ds as ds, ds as date from srcpart group by ds) s on (srcpart.ds = s.ds) where s.date = '2008-04-08'
 PREHOOK: type: QUERY
@@ -1875,7 +1875,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[24][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[23][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
 PREHOOK: query: select count(*) from srcpart join (select ds as ds, ds as date from srcpart group by ds) s on (srcpart.ds = s.ds) where s.date = '2008-04-08'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
@@ -4061,7 +4061,7 @@ POSTHOOK: Input: default@srcpart@ds=2008
 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 #### A masked pattern was here ####
 1000
-Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[23][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: -- parent is reduce tasks
 EXPLAIN select count(*) from srcpart join (select ds as ds, ds as date from srcpart group by ds) s on (srcpart.ds = s.ds) where s.date = '2008-04-08'
 PREHOOK: type: QUERY
@@ -4160,7 +4160,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[23][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: select count(*) from srcpart join (select ds as ds, ds as date from srcpart group by ds) s on (srcpart.ds = s.ds) where s.date = '2008-04-08'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart

Modified: hive/branches/llap/ql/src/test/results/clientpositive/tez/mrr.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/tez/mrr.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/tez/mrr.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/tez/mrr.q.out Tue Mar 10 17:40:31 2015
@@ -1418,18 +1418,18 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col3, _col4, _col5
                 Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: string), _col3 (type: bigint), _col0 (type: string), _col1 (type: bigint), _col4 (type: string), _col5 (type: bigint)
-                  outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
+                  expressions: _col0 (type: string), _col3 (type: bigint), _col1 (type: bigint), _col4 (type: string), _col5 (type: bigint)
+                  outputColumnNames: _col0, _col1, _col3, _col4, _col5
                   Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
                     sort order: +
                     Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col1 (type: bigint), _col2 (type: string), _col3 (type: bigint), _col4 (type: string), _col5 (type: bigint)
+                    value expressions: _col1 (type: bigint), _col3 (type: bigint), _col4 (type: string), _col5 (type: bigint)
         Reducer 5 
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: bigint), VALUE._col1 (type: string), VALUE._col2 (type: bigint), VALUE._col3 (type: string), VALUE._col4 (type: bigint)
+                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: bigint), KEY.reducesinkkey0 (type: string), VALUE._col1 (type: bigint), VALUE._col2 (type: string), VALUE._col3 (type: bigint)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                 Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
@@ -1694,14 +1694,14 @@ STAGE PLANS:
                           1 Reducer 4
                         Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
                         Select Operator
-                          expressions: _col0 (type: string), _col3 (type: bigint), _col0 (type: string), _col1 (type: string)
-                          outputColumnNames: _col0, _col1, _col2, _col3
+                          expressions: _col0 (type: string), _col3 (type: bigint), _col1 (type: string)
+                          outputColumnNames: _col0, _col1, _col3
                           Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
                           Reduce Output Operator
                             key expressions: _col0 (type: string)
                             sort order: +
                             Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
-                            value expressions: _col1 (type: bigint), _col2 (type: string), _col3 (type: string)
+                            value expressions: _col1 (type: bigint), _col3 (type: string)
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -1729,7 +1729,7 @@ STAGE PLANS:
         Reducer 2 
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: bigint), VALUE._col1 (type: string), VALUE._col2 (type: string)
+                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: bigint), KEY.reducesinkkey0 (type: string), VALUE._col1 (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator

Modified: hive/branches/llap/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out Tue Mar 10 17:40:31 2015
@@ -1793,7 +1793,7 @@ POSTHOOK: Input: default@srcpart@ds=2008
 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 #### A masked pattern was here ####
 1000
-Warning: Shuffle Join MERGEJOIN[24][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[23][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
 PREHOOK: query: -- parent is reduce tasks
 EXPLAIN select count(*) from srcpart join (select ds as ds, ds as date from srcpart group by ds) s on (srcpart.ds = s.ds) where s.date = '2008-04-08'
 PREHOOK: type: QUERY
@@ -1897,7 +1897,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[24][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[23][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
 PREHOOK: query: select count(*) from srcpart join (select ds as ds, ds as date from srcpart group by ds) s on (srcpart.ds = s.ds) where s.date = '2008-04-08'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
@@ -4108,7 +4108,7 @@ POSTHOOK: Input: default@srcpart@ds=2008
 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 #### A masked pattern was here ####
 1000
-Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[23][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: -- parent is reduce tasks
 EXPLAIN select count(*) from srcpart join (select ds as ds, ds as date from srcpart group by ds) s on (srcpart.ds = s.ds) where s.date = '2008-04-08'
 PREHOOK: type: QUERY
@@ -4209,7 +4209,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[23][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: select count(*) from srcpart join (select ds as ds, ds as date from srcpart group by ds) s on (srcpart.ds = s.ds) where s.date = '2008-04-08'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart

Modified: hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerializer.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerializer.java?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerializer.java (original)
+++ hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerializer.java Tue Mar 10 17:40:31 2015
@@ -28,6 +28,7 @@ import java.util.Set;
 import org.apache.avro.Schema;
 import org.apache.avro.Schema.Field;
 import org.apache.avro.Schema.Type;
+import org.apache.avro.generic.GenericArray;
 import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.GenericData.Fixed;
 import org.apache.avro.generic.GenericEnumSymbol;
@@ -237,7 +238,7 @@ class AvroSerializer {
 
   private Object serializeList(ListTypeInfo typeInfo, ListObjectInspector fieldOI, Object structFieldData, Schema schema) throws AvroSerdeException {
     List<?> list = fieldOI.getList(structFieldData);
-    List<Object> deserialized = new ArrayList<Object>(list.size());
+    List<Object> deserialized = new GenericData.Array<Object>(list.size(), schema);
 
     TypeInfo listElementTypeInfo = typeInfo.getListElementTypeInfo();
     ObjectInspector listElementObjectInspector = fieldOI.getListElementObjectInspector();

Modified: hive/branches/llap/serde/src/test/org/apache/hadoop/hive/serde2/avro/TestAvroSerializer.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/serde/src/test/org/apache/hadoop/hive/serde2/avro/TestAvroSerializer.java?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/serde/src/test/org/apache/hadoop/hive/serde2/avro/TestAvroSerializer.java (original)
+++ hive/branches/llap/serde/src/test/org/apache/hadoop/hive/serde2/avro/TestAvroSerializer.java Tue Mar 10 17:40:31 2015
@@ -17,6 +17,7 @@
  */
 package org.apache.hadoop.hive.serde2.avro;
 
+import org.apache.avro.generic.GenericArray;
 import org.apache.avro.reflect.ReflectData;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericData;
@@ -27,6 +28,7 @@ import org.apache.hadoop.hive.serde2.Ser
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
 import org.apache.hadoop.io.Writable;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -130,7 +132,10 @@ public class TestAvroSerializer {
     Collections.addAll(intList, 1,2, 3);
     String field = "{ \"name\":\"list1\", \"type\":{\"type\":\"array\", \"items\":\"int\"} }";
     GenericRecord r = serializeAndDeserialize(field, "list1", intList);
-    assertEquals(intList, r.get("list1"));
+    final Object list1 = r.get("list1");
+    Assert.assertTrue(list1 instanceof GenericArray);
+    Assert.assertTrue(list1 instanceof List);
+    assertEquals(intList, list1);
   }
 
   @Test

Modified: hive/branches/llap/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java?rev=1665632&r1=1665631&r2=1665632&view=diff
==============================================================================
--- hive/branches/llap/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java (original)
+++ hive/branches/llap/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java Tue Mar 10 17:40:31 2015
@@ -18,13 +18,12 @@
  */
 package org.apache.hive.ptest.execution;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URL;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedSet;
+import java.util.*;
 
+import org.apache.commons.cli.*;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.hive.ptest.api.server.TestLogger;
 import org.apache.hive.ptest.execution.conf.Context;
@@ -50,13 +49,15 @@ import org.apache.http.protocol.BasicHtt
 import org.apache.http.protocol.ExecutionContext;
 import org.apache.http.protocol.HttpContext;
 import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.JsonFactory;
+import org.codehaus.jackson.JsonParser;
+import org.codehaus.jackson.JsonToken;
 import org.slf4j.Logger;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
 
 class JIRAService {
   static final int MAX_MESSAGES = 200;
@@ -71,6 +72,15 @@ class JIRAService {
   private final String mJenkinsURL;
   private final String mLogsURL;
 
+  private static final String OPT_HELP_SHORT = "h";
+  private static final String OPT_HELP_LONG = "help";
+  private static final String OPT_USER_SHORT = "u";
+  private static final String OPT_USER_LONG = "user";
+  private static final String OPT_PASS_SHORT = "p";
+  private static final String OPT_PASS_LONG = "password";
+  private static final String OPT_FILE_SHORT = "f";
+  private static final String OPT_FILE_LONG = "file";
+
   public JIRAService(Logger logger, TestConfiguration configuration, String buildTag) {
     mLogger = logger;
     mName = configuration.getJiraName();
@@ -277,22 +287,148 @@ class JIRAService {
     }
     return result.trim();
   }
+
+  private static void assertRequired(CommandLine commandLine, String[] requiredOptions) throws IllegalArgumentException {
+    for(String requiredOption : requiredOptions) {
+      if(!commandLine.hasOption(requiredOption)) {
+        throw new IllegalArgumentException("--" + requiredOption + " is required");
+      }
+    }
+  }
+
+  private static final String FIELD_BUILD_STATUS = "buildStatus";
+  private static final String FIELD_BUILD_TAG = "buildTag";
+  private static final String FIELD_LOGS_URL = "logsURL";
+  private static final String FIELD_JENKINS_URL = "jenkinsURL";
+  private static final String FIELD_PATCH_URL = "patchUrl";
+  private static final String FIELD_JIRA_NAME = "jiraName";
+  private static final String FIELD_JIRA_URL = "jiraUrl";
+  private static final String FIELD_REPO = "repository";
+  private static final String FIELD_REPO_NAME = "repositoryName";
+  private static final String FIELD_REPO_BRANCH = "branch";
+  private static final String FIELD_NUM_TESTS_EXECUTED = "numTestsExecuted";
+  private static final String FIELD_FAILED_TESTS = "failedTests";
+  private static final String FIELD_MESSAGES = "messages";
+  private static final String FIELD_JIRA_USER = "jiraUser";
+  private static final String FIELD_JIRA_PASS= "jiraPassword";
+
+  private static Map<String, Class> supportedJsonFields = new HashMap<String, Class>() {
+    {
+      put(FIELD_BUILD_STATUS, Integer.class);
+      put(FIELD_BUILD_TAG, String.class);
+      put(FIELD_LOGS_URL, String.class);
+      put(FIELD_JENKINS_URL, String.class);
+      put(FIELD_PATCH_URL, String.class);
+      put(FIELD_JIRA_NAME, String.class);
+      put(FIELD_JIRA_URL, String.class);
+      put(FIELD_REPO, String.class);
+      put(FIELD_REPO_NAME, String.class);
+      put(FIELD_REPO_BRANCH, String.class);
+      put(FIELD_NUM_TESTS_EXECUTED, Integer.class);
+      put(FIELD_FAILED_TESTS, SortedSet.class);
+      put(FIELD_MESSAGES, List.class);
+    }
+  };
+
+  private static Map<String, Object> parseJsonFile(String jsonFile) throws IOException {
+    JsonFactory jsonFactory = new JsonFactory();
+    JsonParser jsonParser = jsonFactory.createJsonParser(new File(jsonFile));
+    Map<String, Object> values = new HashMap<String, Object>();
+
+    while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+      String fieldName = jsonParser.getCurrentName();
+      if (supportedJsonFields.containsKey(fieldName)) {
+        jsonParser.nextToken();
+
+        Class clazz = supportedJsonFields.get(fieldName);
+        if (clazz == String.class) {
+          values.put(fieldName, jsonParser.getText());
+        } else if (clazz == Integer.class) {
+          values.put(fieldName, Integer.valueOf(jsonParser.getText()));
+        } else if (clazz == SortedSet.class) {
+          SortedSet<String> failedTests = new TreeSet<String>();
+          while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+            failedTests.add(jsonParser.getText());
+          }
+
+          values.put(fieldName, failedTests);
+        } else if (clazz == List.class) {
+          List<String> messages = new ArrayList<String>();
+          while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+            messages.add(jsonParser.getText());
+          }
+
+          values.put(fieldName, messages);
+        }
+      }
+    }
+
+    jsonParser.close();
+    return values;
+  }
+
+  private static CommandLine parseCommandLine(String[] args) throws ParseException {
+    CommandLineParser parser = new GnuParser();
+
+    Options options = new Options();
+    options.addOption(OPT_HELP_SHORT, OPT_HELP_LONG, false, "Display help text and exit");
+    options.addOption(OPT_USER_SHORT, OPT_USER_LONG, true, "Jira username.");
+    options.addOption(OPT_PASS_SHORT, OPT_PASS_LONG, true, "Jira password.");
+    options.addOption(OPT_FILE_SHORT, OPT_FILE_LONG, true, "Pathname to file (JSON format) that will be post as Jira comment.");
+
+    CommandLine cmd = parser.parse(options, args);
+
+    // If help option is requested, then display help and exit
+    if (cmd.hasOption(OPT_HELP_LONG)) {
+      new HelpFormatter().printHelp(JIRAService.class.getName(), options, true);
+      return null;
+    }
+
+    assertRequired(cmd, new String[]{
+        OPT_USER_LONG,
+        OPT_PASS_LONG,
+        OPT_FILE_LONG
+    });
+
+    return cmd;
+  }
+
   public static void main(String[] args) throws Exception {
-    TestLogger logger = new TestLogger(System.err, TestLogger.LEVEL.TRACE);
+    CommandLine cmd = null;
+
+    try {
+      cmd = parseCommandLine(args);
+    } catch(ParseException e) {
+      System.out.println("Error parsing command arguments: " + e.getMessage());
+      System.exit(1);
+    }
+
+    // If null is returned, then help message was displayed in parseCommandLine method
+    if (cmd == null) {
+      System.exit(0);
+    }
+
+    Map<String, Object> jsonValues = parseJsonFile(cmd.getOptionValue(OPT_FILE_LONG));
+
     Map<String, String> context = Maps.newHashMap();
-    context.put("jiraUrl", "https://issues.apache.org/jira");
-    context.put("jiraUser", "hiveqa");
-    context.put("jiraPassword", "password goes here");
-    context.put("branch", "trunk");
-    context.put("repository", "repo");
-    context.put("repositoryName", "repoName");
-    context.put("antArgs", "-Dsome=thing");
-    context.put("logsURL", "http://ec2-174-129-184-35.compute-1.amazonaws.com/logs");
+    context.put(FIELD_JIRA_URL, (String)jsonValues.get(FIELD_JIRA_URL));
+    context.put(FIELD_JIRA_USER, cmd.getOptionValue(OPT_USER_LONG));
+    context.put(FIELD_JIRA_PASS, cmd.getOptionValue(OPT_PASS_LONG));
+    context.put(FIELD_LOGS_URL, (String)jsonValues.get(FIELD_LOGS_URL));
+    context.put(FIELD_REPO, (String)jsonValues.get(FIELD_REPO));
+    context.put(FIELD_REPO_NAME, (String)jsonValues.get(FIELD_REPO_NAME));
+    context.put(FIELD_REPO_BRANCH, (String)jsonValues.get(FIELD_REPO_BRANCH));
+    context.put(FIELD_JENKINS_URL, (String)jsonValues.get(FIELD_JENKINS_URL));
+
+    TestLogger logger = new TestLogger(System.err, TestLogger.LEVEL.TRACE);
     TestConfiguration configuration = new TestConfiguration(new Context(context), logger);
-    configuration.setJiraName("HIVE-4892");
-    JIRAService service = new JIRAService(logger, configuration, "test-123");
-    List<String> messages = Lists.newArrayList("msg1", "msg2");
-    SortedSet<String> failedTests = Sets.newTreeSet(Collections.singleton("failed"));
-    service.postComment(false, 5, failedTests, messages);
+    configuration.setJiraName((String)jsonValues.get(FIELD_JIRA_NAME));
+    configuration.setPatch((String)jsonValues.get(FIELD_PATCH_URL));
+
+    JIRAService service = new JIRAService(logger, configuration, (String)jsonValues.get(FIELD_BUILD_TAG));
+    List<String> messages = (List)jsonValues.get(FIELD_MESSAGES);
+    SortedSet<String> failedTests = (SortedSet)jsonValues.get(FIELD_FAILED_TESTS);
+    boolean error = (Integer)jsonValues.get(FIELD_BUILD_STATUS) == 0 ? false : true;
+    service.postComment(error, (Integer)jsonValues.get(FIELD_NUM_TESTS_EXECUTED), failedTests, messages);
   }
 }
\ No newline at end of file



Mime
View raw message