hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xu...@apache.org
Subject [83/84] [abbrv] hive git commit: HIVE-10863: Merge branch 'master' into spark
Date Fri, 29 May 2015 04:48:02 GMT
http://git-wip-us.apache.org/repos/asf/hive/blob/aafd586d/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/aafd586d/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/aafd586d/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/HashTableLoader.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/aafd586d/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/HiveSparkClientFactory.java
----------------------------------------------------------------------
diff --cc ql/src/java/org/apache/hadoop/hive/ql/exec/spark/HiveSparkClientFactory.java
index 21398d8,058d91d..8998177
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/HiveSparkClientFactory.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/HiveSparkClientFactory.java
@@@ -112,11 -112,10 +112,14 @@@ public class HiveSparkClientFactory 
      String sparkMaster = hiveConf.get("spark.master");
      if (sparkMaster == null) {
        sparkMaster = sparkConf.get("spark.master");
 +      hiveConf.set("spark.master", sparkMaster);
 +    }
 +    if (sparkMaster.equals("yarn-cluster")) {
 +      sparkConf.put("spark.yarn.maxAppAttempts", "1");
      }
+     if (sparkMaster.equals("yarn-cluster")) {
+       sparkConf.put("spark.yarn.maxAppAttempts", "1");
+     }
      for (Map.Entry<String, String> entry : hiveConf) {
        String propertyName = entry.getKey();
        if (propertyName.startsWith("spark")) {

http://git-wip-us.apache.org/repos/asf/hive/blob/aafd586d/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java
----------------------------------------------------------------------
diff --cc ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java
index b4316ec,1891dff..4fed49e
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java
@@@ -448,4 -449,4 +448,5 @@@ public class ReduceSinkDesc extends Abs
    public void setHasOrderBy(boolean hasOrderBy) {
      this.hasOrderBy = hasOrderBy;
    }
++
  }


Mime
View raw message