hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xu...@apache.org
Subject svn commit: r1654104 [1/3] - in /hive/branches/spark: itests/util/src/main/java/org/apache/hadoop/hive/ql/ ql/src/java/org/apache/hadoop/hive/ql/exec/spark/session/ ql/src/java/org/apache/hadoop/hive/ql/optimizer/spark/ ql/src/test/results/clientpositi...
Date Fri, 23 Jan 2015 01:12:56 GMT
Author: xuefu
Date: Fri Jan 23 01:12:54 2015
New Revision: 1654104

URL: http://svn.apache.org/r1654104
Log:
HIVE-9378: Spark qfile tests should reuse RSC [Spark Branch] (Jimmy via Xuefu)

Modified:
    hive/branches/spark/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/session/SparkSession.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/session/SparkSessionImpl.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/spark/SetSparkReducerParallelism.java
    hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join0.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join15.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join18.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join18_multi_distinct.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join20.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join21.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join23.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join26.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join27.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join28.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join29.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join30.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join31.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join32.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join6.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join7.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join_without_localtask.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/count.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/cross_join.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/ctas.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/escape_clusterby1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/escape_distributeby1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/escape_sortby1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby10.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby11.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby4.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby8.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby9.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_complex_types.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_complex_types_multi_single_reducer.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_cube1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_insert_common_distinct.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_position.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/having.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/identity_project_remove_skip.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/index_auto_self_join.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/innerjoin.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/input14.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/input17.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/input18.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join0.q.java1.7.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join10.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join11.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join12.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join13.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join14.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join15.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join16.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join17.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join18.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join18_multi_distinct.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join19.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join20.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join21.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join22.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join23.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join29.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join30.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join31.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join34.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join35.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join4.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join40.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join5.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join6.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join7.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join8.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join9.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_alt_syntax.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_cond_pushdown_1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_cond_pushdown_2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_cond_pushdown_3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_cond_pushdown_4.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_cond_pushdown_unqual1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_cond_pushdown_unqual2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_cond_pushdown_unqual3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_cond_pushdown_unqual4.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_hive_626.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_merge_multi_expressions.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_merging.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_nullsafe.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_reorder.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_reorder2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_reorder3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_thrift.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_vc.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_view.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/limit_partition_metadataonly.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_distinct.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/mapreduce1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/mapreduce2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/merge1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/merge2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/mergejoins.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/mergejoins_mixed.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_gby.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_gby3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_mixed.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/multigroupby_singlemr.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/orc_analyze.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.java1.7.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/parallel.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_gby_join.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_join.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_join2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_join3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_multi_insert.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_outer_join1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_outer_join2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_outer_join3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_outer_join4.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_outer_join5.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_transform.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/reduce_deduplicate_exclude_join.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/sample8.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoin.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoin_noskew.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt11.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt12.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt13.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt14.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt16.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt17.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt19.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt20.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt4.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt5.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt6.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt7.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt8.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt9.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_25.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/sort.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/subquery_exists.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/subquery_in.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/subquery_multiinsert.q.java1.7.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/tez_join_tests.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/tez_joins_explain.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union11.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union14.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union15.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union19.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union28.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union30.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union33.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union5.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union7.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union_ppr.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union_remove_1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union_remove_10.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union_remove_15.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union_remove_16.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union_remove_18.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union_remove_19.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union_remove_2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union_remove_20.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union_remove_21.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union_remove_24.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union_remove_25.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union_remove_4.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union_remove_5.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union_remove_6.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union_remove_7.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union_remove_8.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union_remove_9.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/vector_mapjoin_reduce.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/vectorization_13.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/vectorization_14.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/vectorization_15.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/vectorization_16.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/vectorization_9.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/vectorized_shufflejoin.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out

Modified: hive/branches/spark/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java (original)
+++ hive/branches/spark/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java Fri Jan 23 01:12:54 2015
@@ -78,6 +78,8 @@ import org.apache.hadoop.hive.metastore.
 import org.apache.hadoop.hive.ql.exec.FunctionRegistry;
 import org.apache.hadoop.hive.ql.exec.Task;
 import org.apache.hadoop.hive.ql.exec.Utilities;
+import org.apache.hadoop.hive.ql.exec.spark.session.SparkSession;
+import org.apache.hadoop.hive.ql.exec.spark.session.SparkSessionManagerImpl;
 import org.apache.hadoop.hive.ql.lockmgr.zookeeper.CuratorFrameworkSingleton;
 import org.apache.hadoop.hive.ql.lockmgr.zookeeper.ZooKeeperHiveLockManager;
 import org.apache.hadoop.hive.ql.metadata.Hive;
@@ -149,6 +151,7 @@ public class QTestUtil {
   private boolean miniMr = false;
   private String hadoopVer = null;
   private QTestSetup setup = null;
+  private SparkSession sparkSession = null;
   private boolean isSessionStateStarted = false;
   private static final String javaVersion = getJavaVersion();
 
@@ -418,6 +421,15 @@ public class QTestUtil {
     }
 
     setup.tearDown();
+    if (sparkSession != null) {
+      try {
+        SparkSessionManagerImpl.getInstance().closeSession(sparkSession);
+      } catch (Exception ex) {
+        LOG.error("Error closing spark session.", ex);
+      } finally {
+        sparkSession = null;
+      }
+    }
     if (mr != null) {
       mr.shutdown();
       mr = null;
@@ -834,7 +846,7 @@ public class QTestUtil {
     HiveConf.setVar(conf, HiveConf.ConfVars.HIVE_AUTHENTICATOR_MANAGER,
     "org.apache.hadoop.hive.ql.security.DummyAuthenticator");
     Utilities.clearWorkMap();
-    CliSessionState ss = new CliSessionState(conf);
+    CliSessionState ss = createSessionState();
     assert ss != null;
     ss.in = System.in;
 
@@ -864,6 +876,9 @@ public class QTestUtil {
     SessionState oldSs = SessionState.get();
 
     if (oldSs != null && (clusterType == MiniClusterType.tez || clusterType == MiniClusterType.spark)) {
+      sparkSession = oldSs.getSparkSession();
+      ss.setSparkSession(sparkSession);
+      oldSs.setSparkSession(null);
       oldSs.close();
     }
 
@@ -882,6 +897,29 @@ public class QTestUtil {
     return outf.getAbsolutePath();
   }
 
+  private CliSessionState createSessionState() {
+   return new CliSessionState(conf) {
+      public void setSparkSession(SparkSession sparkSession) {
+        super.setSparkSession(sparkSession);
+        if (sparkSession != null) {
+          try {
+            // Wait a little for cluster to init, at most 4 minutes
+            long endTime = System.currentTimeMillis() + 240000;
+            while (sparkSession.getMemoryAndCores().getSecond() <= 1) {
+              if (System.currentTimeMillis() >= endTime) {
+                LOG.error("Timed out waiting for Spark cluster to init");
+                break;
+              }
+              Thread.sleep(100);
+            }
+          } catch (Exception e) {
+            LOG.error(e);
+          }
+        }
+      }
+    };
+  }
+
   private CliSessionState startSessionState()
       throws IOException {
 
@@ -890,7 +928,7 @@ public class QTestUtil {
 
     String execEngine = conf.get("hive.execution.engine");
     conf.set("hive.execution.engine", "mr");
-    CliSessionState ss = new CliSessionState(conf);
+    CliSessionState ss = createSessionState();
     assert ss != null;
     ss.in = System.in;
     ss.out = System.out;
@@ -898,6 +936,9 @@ public class QTestUtil {
 
     SessionState oldSs = SessionState.get();
     if (oldSs != null && (clusterType == MiniClusterType.tez || clusterType == MiniClusterType.spark)) {
+      sparkSession = oldSs.getSparkSession();
+      ss.setSparkSession(sparkSession);
+      oldSs.setSparkSession(null);
       oldSs.close();
     }
     if (oldSs != null && oldSs.out != null && oldSs.out != System.out) {

Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/session/SparkSession.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/session/SparkSession.java?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/session/SparkSession.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/session/SparkSession.java Fri Jan 23 01:12:54 2015
@@ -17,14 +17,13 @@
  */
 package org.apache.hadoop.hive.ql.exec.spark.session;
 
+import org.apache.hadoop.hive.common.ObjectPair;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.ql.DriverContext;
 import org.apache.hadoop.hive.ql.exec.spark.status.SparkJobRef;
 import org.apache.hadoop.hive.ql.metadata.HiveException;
 import org.apache.hadoop.hive.ql.plan.SparkWork;
 
-import scala.Tuple2;
-
 public interface SparkSession {
   /**
    * Initializes a Spark session for DAG execution.
@@ -44,10 +43,10 @@ public interface SparkSession {
    * Get Spark shuffle memory per task, and total number of cores. This
    * information can be used to estimate how many reducers a task can have.
    *
-   * @return a tuple, the first element is the shuffle memory per task in bytes,
+   * @return an object pair, the first element is the shuffle memory per task in bytes,
    *  the second element is the number of total cores usable by the client
    */
-  Tuple2<Long, Integer> getMemoryAndCores() throws Exception;
+  ObjectPair<Long, Integer> getMemoryAndCores() throws Exception;
 
   /**
    * @return true if the session is open and ready to submit jobs.

Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/session/SparkSessionImpl.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/session/SparkSessionImpl.java?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/session/SparkSessionImpl.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/session/SparkSessionImpl.java Fri Jan 23 01:12:54 2015
@@ -22,6 +22,7 @@ import java.util.UUID;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.common.ObjectPair;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.ql.DriverContext;
 import org.apache.hadoop.hive.ql.exec.spark.HiveSparkClient;
@@ -32,8 +33,6 @@ import org.apache.hadoop.hive.ql.plan.Sp
 import org.apache.spark.SparkConf;
 import org.apache.spark.util.Utils;
 
-import scala.Tuple2;
-
 import com.google.common.base.Preconditions;
 
 public class SparkSessionImpl implements SparkSession {
@@ -66,12 +65,12 @@ public class SparkSessionImpl implements
   }
 
   @Override
-  public Tuple2<Long, Integer> getMemoryAndCores() throws Exception {
+  public ObjectPair<Long, Integer> getMemoryAndCores() throws Exception {
     SparkConf sparkConf = hiveSparkClient.getSparkConf();
     int numExecutors = hiveSparkClient.getExecutorCount();
     // at start-up, we may be unable to get number of executors
     if (numExecutors <= 0) {
-      return new Tuple2<Long, Integer>(-1L, -1);
+      return new ObjectPair<Long, Integer>(-1L, -1);
     }
     int executorMemoryInMB = Utils.memoryStringToMb(
         sparkConf.get("spark.executor.memory", "512m"));
@@ -94,7 +93,7 @@ public class SparkSessionImpl implements
     LOG.info("Spark cluster current has executors: " + numExecutors
         + ", total cores: " + totalCores + ", memory per executor: "
         + executorMemoryInMB + "M, memoryFraction: " + memoryFraction);
-    return new Tuple2<Long, Integer>(Long.valueOf(memoryPerTaskInBytes),
+    return new ObjectPair<Long, Integer>(Long.valueOf(memoryPerTaskInBytes),
         Integer.valueOf(totalCores));
   }
 

Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/spark/SetSparkReducerParallelism.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/spark/SetSparkReducerParallelism.java?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/spark/SetSparkReducerParallelism.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/spark/SetSparkReducerParallelism.java Fri Jan 23 01:12:54 2015
@@ -22,6 +22,7 @@ import java.util.Stack;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.common.ObjectPair;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants;
 import org.apache.hadoop.hive.ql.exec.FileSinkOperator;
@@ -42,8 +43,6 @@ import org.apache.hadoop.hive.ql.parse.s
 import org.apache.hadoop.hive.ql.plan.OperatorDesc;
 import org.apache.hadoop.hive.ql.plan.ReduceSinkDesc;
 
-import scala.Tuple2;
-
 /**
  * SetSparkReducerParallelism determines how many reducers should
  * be run for a given reduce sink, clone from SetReducerParallelism.
@@ -53,7 +52,7 @@ public class SetSparkReducerParallelism
   private static final Log LOG = LogFactory.getLog(SetSparkReducerParallelism.class.getName());
 
   // Spark memory per task, and total number of cores
-  private Tuple2<Long, Integer> sparkMemoryAndCores;
+  private ObjectPair<Long, Integer> sparkMemoryAndCores;
 
   @Override
   public Object process(Node nd, Stack<Node> stack,
@@ -135,15 +134,15 @@ public class SetSparkReducerParallelism
             maxReducers, false);
 
         if (sparkMemoryAndCores != null &&
-            sparkMemoryAndCores._1() > 0 && sparkMemoryAndCores._2() > 0) {
+            sparkMemoryAndCores.getFirst() > 0 && sparkMemoryAndCores.getSecond() > 0) {
           // warn the user if bytes per reducer is much larger than memory per task
-          if ((double) sparkMemoryAndCores._1() / bytesPerReducer < 0.5) {
+          if ((double) sparkMemoryAndCores.getFirst() / bytesPerReducer < 0.5) {
             LOG.warn("Average load of a reducer is much larger than its available memory. " +
                 "Consider decreasing hive.exec.reducers.bytes.per.reducer");
           }
 
           // If there are more cores, use the number of cores
-          numReducers = Math.max(numReducers, sparkMemoryAndCores._2());
+          numReducers = Math.max(numReducers, sparkMemoryAndCores.getSecond());
         }
         numReducers = Math.min(numReducers, maxReducers);
         LOG.info("Set parallelism for reduce sink " + sink + " to: " + numReducers +

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join0.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join0.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join0.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join0.q.out Fri Jan 23 01:12:54 2015
@@ -53,7 +53,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 2)
         Reducer 3 <- Reducer 2 (GROUP, 1)
 #### A masked pattern was here ####
       Vertices:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join15.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join15.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join15.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join15.q.out Fri Jan 23 01:12:54 2015
@@ -42,7 +42,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 2)
         Reducer 3 <- Reducer 2 (GROUP, 1)
 #### A masked pattern was here ####
       Vertices:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join18.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join18.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join18.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join18.q.out Fri Jan 23 01:12:54 2015
@@ -32,9 +32,9 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
-        Reducer 6 <- Map 5 (GROUP PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 1), Reducer 6 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (GROUP, 2)
+        Reducer 6 <- Map 5 (GROUP PARTITION-LEVEL SORT, 2)
+        Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2), Reducer 6 (PARTITION-LEVEL SORT, 2)
         Reducer 4 <- Reducer 3 (GROUP, 1)
 #### A masked pattern was here ####
       Vertices:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join18_multi_distinct.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join18_multi_distinct.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join18_multi_distinct.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join18_multi_distinct.q.out Fri Jan 23 01:12:54 2015
@@ -34,9 +34,9 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
-        Reducer 6 <- Map 5 (GROUP PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 1), Reducer 6 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (GROUP, 2)
+        Reducer 6 <- Map 5 (GROUP PARTITION-LEVEL SORT, 2)
+        Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2), Reducer 6 (PARTITION-LEVEL SORT, 2)
         Reducer 4 <- Reducer 3 (GROUP, 1)
 #### A masked pattern was here ####
       Vertices:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join20.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join20.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join20.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join20.q.out Fri Jan 23 01:12:54 2015
@@ -66,7 +66,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 4 <- Map 3 (SORT, 1)
+        Reducer 4 <- Map 3 (SORT, 2)
         Reducer 5 <- Reducer 4 (GROUP, 1)
 #### A masked pattern was here ####
       Vertices:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join21.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join21.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join21.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join21.q.out Fri Jan 23 01:12:54 2015
@@ -57,7 +57,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 4 <- Map 3 (SORT, 1)
+        Reducer 4 <- Map 3 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 3 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join23.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join23.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join23.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join23.q.out Fri Jan 23 01:12:54 2015
@@ -37,7 +37,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join26.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join26.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join26.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join26.q.out Fri Jan 23 01:12:54 2015
@@ -47,7 +47,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (GROUP, 1)
+        Reducer 3 <- Map 2 (GROUP, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 2 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join27.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join27.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join27.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join27.q.out Fri Jan 23 01:12:54 2015
@@ -30,8 +30,8 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 6 (PARTITION-LEVEL SORT, 1), Reducer 5 (PARTITION-LEVEL SORT, 1)
-        Reducer 5 <- Map 4 (GROUP, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2), Reducer 5 (PARTITION-LEVEL SORT, 2)
+        Reducer 5 <- Map 4 (GROUP, 2)
         Reducer 3 <- Reducer 2 (GROUP, 1)
 #### A masked pattern was here ####
       Vertices:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join28.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join28.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join28.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join28.q.out Fri Jan 23 01:12:54 2015
@@ -53,7 +53,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 4 <- Map 3 (SORT, 1)
+        Reducer 4 <- Map 3 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 3 
@@ -166,7 +166,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -279,7 +279,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (SORT, 1)
+        Reducer 3 <- Map 2 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 2 
@@ -389,7 +389,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 4 <- Map 3 (SORT, 1)
+        Reducer 4 <- Map 3 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 3 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join29.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join29.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join29.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join29.q.out Fri Jan 23 01:12:54 2015
@@ -57,7 +57,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 4 <- Map 3 (SORT, 1)
+        Reducer 4 <- Map 3 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 3 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join30.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join30.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join30.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join30.q.out Fri Jan 23 01:12:54 2015
@@ -23,7 +23,7 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 5 <- Map 4 (SORT, 1)
+        Reducer 5 <- Map 4 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 4 
@@ -59,7 +59,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 2)
         Reducer 3 <- Reducer 2 (GROUP, 1)
 #### A masked pattern was here ####
       Vertices:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join31.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join31.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join31.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join31.q.out Fri Jan 23 01:12:54 2015
@@ -29,8 +29,8 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
-        Reducer 7 <- Map 6 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 2)
+        Reducer 7 <- Map 6 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -90,7 +90,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 4 <- Map 3 (SORT, 1)
+        Reducer 4 <- Map 3 (SORT, 2)
         Reducer 5 <- Reducer 4 (GROUP, 1)
 #### A masked pattern was here ####
       Vertices:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join32.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join32.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join32.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join32.q.out Fri Jan 23 01:12:54 2015
@@ -54,7 +54,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join6.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join6.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join6.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join6.q.out Fri Jan 23 01:12:54 2015
@@ -45,7 +45,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join7.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join7.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join7.q.out Fri Jan 23 01:12:54 2015
@@ -55,7 +55,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join_without_localtask.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join_without_localtask.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join_without_localtask.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join_without_localtask.q.out Fri Jan 23 01:12:54 2015
@@ -12,7 +12,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2)
         Reducer 3 <- Reducer 2 (SORT, 1)
 #### A masked pattern was here ####
       Vertices:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/count.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/count.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/count.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/count.q.out Fri Jan 23 01:12:54 2015
@@ -43,7 +43,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/cross_join.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/cross_join.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/cross_join.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/cross_join.q.out Fri Jan 23 01:12:54 2015
@@ -138,7 +138,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/ctas.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/ctas.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/ctas.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/ctas.q.out Fri Jan 23 01:12:54 2015
@@ -32,7 +32,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 2)
         Reducer 3 <- Reducer 2 (SORT, 1)
 #### A masked pattern was here ####
       Vertices:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/escape_clusterby1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/escape_clusterby1.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/escape_clusterby1.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/escape_clusterby1.q.out Fri Jan 23 01:12:54 2015
@@ -14,7 +14,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -65,7 +65,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/escape_distributeby1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/escape_distributeby1.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/escape_distributeby1.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/escape_distributeby1.q.out Fri Jan 23 01:12:54 2015
@@ -14,7 +14,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -65,7 +65,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/escape_sortby1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/escape_sortby1.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/escape_sortby1.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/escape_sortby1.q.out Fri Jan 23 01:12:54 2015
@@ -14,7 +14,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -64,7 +64,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby1.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby1.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby1.q.out Fri Jan 23 01:12:54 2015
@@ -25,8 +25,8 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Reducer 2 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 2)
+        Reducer 3 <- Reducer 2 (GROUP, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby10.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby10.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby10.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby10.q.out Fri Jan 23 01:12:54 2015
@@ -55,10 +55,10 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 5 <- Map 1 (SORT, 1)
-        Reducer 6 <- Map 1 (SORT, 1)
-        Reducer 3 <- Reducer 5 (GROUP, 1)
-        Reducer 4 <- Reducer 6 (GROUP, 1)
+        Reducer 5 <- Map 1 (SORT, 2)
+        Reducer 6 <- Map 1 (SORT, 2)
+        Reducer 3 <- Reducer 5 (GROUP, 2)
+        Reducer 4 <- Reducer 6 (GROUP, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby11.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby11.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby11.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby11.q.out Fri Jan 23 01:12:54 2015
@@ -43,10 +43,10 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 5 <- Map 1 (SORT, 1)
-        Reducer 6 <- Map 1 (SORT, 1)
-        Reducer 3 <- Reducer 5 (GROUP, 1)
-        Reducer 4 <- Reducer 6 (GROUP, 1)
+        Reducer 5 <- Map 1 (SORT, 2)
+        Reducer 6 <- Map 1 (SORT, 2)
+        Reducer 3 <- Reducer 5 (GROUP, 2)
+        Reducer 4 <- Reducer 6 (GROUP, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby2.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby2.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby2.q.out Fri Jan 23 01:12:54 2015
@@ -23,7 +23,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby3.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby3.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby3.q.out Fri Jan 23 01:12:54 2015
@@ -41,7 +41,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 2)
         Reducer 3 <- Reducer 2 (GROUP, 1)
 #### A masked pattern was here ####
       Vertices:
@@ -148,4 +148,4 @@ POSTHOOK: query: SELECT dest1.* FROM des
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
-130091.0	260.182	256.10355987055016	98.0	0.0	142.92680950752379	143.06995106518903	20428.07287599999	20469.010897795582
+130091.0	260.182	256.10355987055016	98.0	0.0	142.9268095075238	143.06995106518906	20428.072876000002	20469.010897795593

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby4.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby4.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby4.q.out Fri Jan 23 01:12:54 2015
@@ -27,8 +27,8 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Reducer 2 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 2)
+        Reducer 3 <- Reducer 2 (GROUP, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby8.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby8.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby8.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby8.q.out Fri Jan 23 01:12:54 2015
@@ -39,10 +39,10 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 5 <- Map 1 (SORT, 1)
-        Reducer 6 <- Map 1 (SORT, 1)
-        Reducer 3 <- Reducer 5 (GROUP, 1)
-        Reducer 4 <- Reducer 6 (GROUP, 1)
+        Reducer 5 <- Map 1 (SORT, 2)
+        Reducer 6 <- Map 1 (SORT, 2)
+        Reducer 3 <- Reducer 5 (GROUP, 2)
+        Reducer 4 <- Reducer 6 (GROUP, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby9.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby9.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby9.q.out Fri Jan 23 01:12:54 2015
@@ -39,10 +39,10 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 5 <- Map 1 (SORT, 1)
-        Reducer 6 <- Map 1 (SORT, 1)
-        Reducer 3 <- Reducer 5 (GROUP, 1)
-        Reducer 4 <- Reducer 6 (GROUP, 1)
+        Reducer 5 <- Map 1 (SORT, 2)
+        Reducer 6 <- Map 1 (SORT, 2)
+        Reducer 3 <- Reducer 5 (GROUP, 2)
+        Reducer 4 <- Reducer 6 (GROUP, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_complex_types.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_complex_types.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_complex_types.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_complex_types.q.out Fri Jan 23 01:12:54 2015
@@ -51,9 +51,9 @@ STAGE PLANS:
   Stage: Stage-3
     Spark
       Edges:
-        Reducer 2 <- Map 5 (GROUP, 1)
-        Reducer 3 <- Map 6 (GROUP, 1)
-        Reducer 4 <- Map 7 (GROUP, 1)
+        Reducer 2 <- Map 5 (GROUP, 2)
+        Reducer 3 <- Map 6 (GROUP, 2)
+        Reducer 4 <- Map 7 (GROUP, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 5 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_complex_types_multi_single_reducer.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_complex_types_multi_single_reducer.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_complex_types_multi_single_reducer.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_complex_types_multi_single_reducer.q.out Fri Jan 23 01:12:54 2015
@@ -39,8 +39,8 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 6 (GROUP, 1)
-        Reducer 4 <- Map 7 (GROUP, 1)
+        Reducer 2 <- Map 6 (GROUP, 2)
+        Reducer 4 <- Map 7 (GROUP, 2)
         Reducer 3 <- Reducer 2 (GROUP, 1)
         Reducer 5 <- Reducer 4 (GROUP, 1)
 #### A masked pattern was here ####
@@ -204,16 +204,16 @@ POSTHOOK: query: SELECT DEST1.* FROM DES
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
-["229"]	2
-["242"]	2
-["30"]	1
-["302"]	1
-["315"]	1
-["333"]	2
-["378"]	1
-["41"]	1
+["166"]	1
+["169"]	4
+["238"]	2
+["258"]	1
+["306"]	1
+["384"]	3
+["392"]	1
+["435"]	1
+["455"]	1
 ["468"]	4
-["8"]	1
 PREHOOK: query: SELECT DEST2.* FROM DEST2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest2

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_cube1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_cube1.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_cube1.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_cube1.q.out Fri Jan 23 01:12:54 2015
@@ -32,7 +32,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_insert_common_distinct.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_insert_common_distinct.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_insert_common_distinct.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_insert_common_distinct.q.out Fri Jan 23 01:12:54 2015
@@ -39,10 +39,10 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 5 <- Map 1 (SORT, 1)
-        Reducer 6 <- Map 1 (SORT, 1)
-        Reducer 3 <- Reducer 5 (GROUP, 1)
-        Reducer 4 <- Reducer 6 (GROUP, 1)
+        Reducer 5 <- Map 1 (SORT, 2)
+        Reducer 6 <- Map 1 (SORT, 2)
+        Reducer 3 <- Reducer 5 (GROUP, 2)
+        Reducer 4 <- Reducer 6 (GROUP, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer.q.out Fri Jan 23 01:12:54 2015
@@ -67,7 +67,7 @@ STAGE PLANS:
   Stage: Stage-3
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer2.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer2.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer2.q.out Fri Jan 23 01:12:54 2015
@@ -39,7 +39,7 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out Fri Jan 23 01:12:54 2015
@@ -49,7 +49,7 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_position.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_position.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_position.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_position.q.out Fri Jan 23 01:12:54 2015
@@ -39,8 +39,8 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 4 (GROUP PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Map 5 (GROUP PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 4 (GROUP PARTITION-LEVEL SORT, 2)
+        Reducer 3 <- Map 5 (GROUP PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 4 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out Fri Jan 23 01:12:54 2015
@@ -104,7 +104,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out Fri Jan 23 01:12:54 2015
@@ -32,7 +32,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/having.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/having.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/having.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/having.q.out Fri Jan 23 01:12:54 2015
@@ -12,7 +12,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/identity_project_remove_skip.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/identity_project_remove_skip.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/identity_project_remove_skip.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/identity_project_remove_skip.q.out Fri Jan 23 01:12:54 2015
@@ -25,7 +25,7 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -56,7 +56,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 4 <- Map 3 (SORT, 1)
+        Reducer 4 <- Map 3 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 3 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/index_auto_self_join.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/index_auto_self_join.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/index_auto_self_join.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/index_auto_self_join.q.out Fri Jan 23 01:12:54 2015
@@ -16,7 +16,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/innerjoin.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/innerjoin.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/innerjoin.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/innerjoin.q.out Fri Jan 23 01:12:54 2015
@@ -27,7 +27,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/input14.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/input14.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/input14.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/input14.q.out Fri Jan 23 01:12:54 2015
@@ -33,7 +33,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/input17.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/input17.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/input17.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/input17.q.out Fri Jan 23 01:12:54 2015
@@ -33,7 +33,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/input18.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/input18.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/input18.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/input18.q.out Fri Jan 23 01:12:54 2015
@@ -33,7 +33,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join0.q.java1.7.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join0.q.java1.7.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join0.q.java1.7.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join0.q.java1.7.out Fri Jan 23 01:12:54 2015
@@ -30,7 +30,7 @@ STAGE PLANS:
     Spark
       Edges:
         Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Reducer 2 (SORT, 1)
+        Reducer 3 <- Reducer 2 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join1.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join1.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join1.q.out Fri Jan 23 01:12:54 2015
@@ -27,7 +27,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join10.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join10.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join10.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join10.q.out Fri Jan 23 01:12:54 2015
@@ -24,7 +24,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join11.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join11.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join11.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join11.q.out Fri Jan 23 01:12:54 2015
@@ -26,7 +26,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join12.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join12.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join12.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join12.q.out Fri Jan 23 01:12:54 2015
@@ -32,8 +32,8 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 1), Map 5 (PARTITION-LEVEL SORT, 1)
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Reducer 4 (PARTITION-LEVEL SORT, 1)
+        Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Reducer 4 (PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join13.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join13.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join13.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join13.q.out Fri Jan 23 01:12:54 2015
@@ -32,8 +32,8 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 1), Map 5 (PARTITION-LEVEL SORT, 1)
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Reducer 4 (PARTITION-LEVEL SORT, 1)
+        Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Reducer 4 (PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join14.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join14.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join14.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join14.q.out Fri Jan 23 01:12:54 2015
@@ -29,7 +29,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join15.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join15.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join15.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join15.q.out Fri Jan 23 01:12:54 2015
@@ -16,8 +16,8 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Reducer 2 (SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2)
+        Reducer 3 <- Reducer 2 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join16.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join16.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join16.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join16.q.out Fri Jan 23 01:12:54 2015
@@ -10,7 +10,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join17.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join17.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join17.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join17.q.out Fri Jan 23 01:12:54 2015
@@ -65,7 +65,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join18.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join18.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join18.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join18.q.out Fri Jan 23 01:12:54 2015
@@ -36,9 +36,9 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
-        Reducer 5 <- Map 4 (GROUP PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 1), Reducer 5 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (GROUP, 2)
+        Reducer 5 <- Map 4 (GROUP PARTITION-LEVEL SORT, 2)
+        Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2), Reducer 5 (PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join18_multi_distinct.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join18_multi_distinct.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join18_multi_distinct.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join18_multi_distinct.q.out Fri Jan 23 01:12:54 2015
@@ -38,9 +38,9 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
-        Reducer 5 <- Map 4 (GROUP PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 1), Reducer 5 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (GROUP, 2)
+        Reducer 5 <- Map 4 (GROUP PARTITION-LEVEL SORT, 2)
+        Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2), Reducer 5 (PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join19.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join19.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join19.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join19.q.out Fri Jan 23 01:12:54 2015
@@ -130,9 +130,9 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 5 (PARTITION-LEVEL SORT, 1), Map 6 (PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Map 7 (PARTITION-LEVEL SORT, 1), Map 8 (PARTITION-LEVEL SORT, 1), Reducer 2 (PARTITION-LEVEL SORT, 1)
-        Reducer 4 <- Map 9 (PARTITION-LEVEL SORT, 1), Reducer 3 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2)
+        Reducer 3 <- Map 7 (PARTITION-LEVEL SORT, 2), Map 8 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2)
+        Reducer 4 <- Map 9 (PARTITION-LEVEL SORT, 2), Reducer 3 (PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join2.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join2.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join2.q.out Fri Jan 23 01:12:54 2015
@@ -27,8 +27,8 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 1), Reducer 2 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2)
+        Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join20.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join20.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join20.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join20.q.out Fri Jan 23 01:12:54 2015
@@ -18,8 +18,8 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1), Map 5 (PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Reducer 2 (SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2)
+        Reducer 3 <- Reducer 2 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join21.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join21.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join21.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join21.q.out Fri Jan 23 01:12:54 2015
@@ -16,8 +16,8 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1), Map 5 (PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Reducer 2 (SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2)
+        Reducer 3 <- Reducer 2 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join22.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join22.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join22.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join22.q.out Fri Jan 23 01:12:54 2015
@@ -12,8 +12,8 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 1), Reducer 2 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2)
+        Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join23.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join23.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join23.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join23.q.out Fri Jan 23 01:12:54 2015
@@ -18,7 +18,7 @@ STAGE PLANS:
     Spark
       Edges:
         Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Reducer 2 (SORT, 1)
+        Reducer 3 <- Reducer 2 (SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join29.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join29.q.out?rev=1654104&r1=1654103&r2=1654104&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join29.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join29.q.out Fri Jan 23 01:12:54 2015
@@ -36,7 +36,7 @@ STAGE PLANS:
   Stage: Stage-3
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -77,7 +77,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 4 <- Map 3 (GROUP, 1)
+        Reducer 4 <- Map 3 (GROUP, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 3 



Mime
View raw message