You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mrql.apache.org by fe...@apache.org on 2014/01/27 01:09:44 UTC
git commit: MRQL-26: Support for Spark 0.8.1
Updated Branches:
refs/heads/master 4b096c01b -> e1ab10697
MRQL-26: Support for Spark 0.8.1
Project: http://git-wip-us.apache.org/repos/asf/incubator-mrql/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mrql/commit/e1ab1069
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mrql/tree/e1ab1069
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mrql/diff/e1ab1069
Branch: refs/heads/master
Commit: e1ab10697badd9048f55f14aa3ebd2358b6f02d7
Parents: 4b096c0
Author: fegaras <fe...@cse.uta.edu>
Authored: Sun Jan 26 18:09:21 2014 -0600
Committer: fegaras <fe...@cse.uta.edu>
Committed: Sun Jan 26 18:09:21 2014 -0600
----------------------------------------------------------------------
conf/mrql-env.sh | 2 +-
pom.xml | 2 +-
src/main/java/core/Inv.java | 2 +-
src/main/java/spark/SparkEvaluator.gen | 3 ++-
4 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/e1ab1069/conf/mrql-env.sh
----------------------------------------------------------------------
diff --git a/conf/mrql-env.sh b/conf/mrql-env.sh
index 66d9da5..982f1fd 100644
--- a/conf/mrql-env.sh
+++ b/conf/mrql-env.sh
@@ -57,7 +57,7 @@ HAMA_ZOOKEEPER_QUORUM=localhost
# Optional: Spark configuration
-SPARK_HOME=${HOME}/spark-0.8.0-incubating-bin-hadoop1
+SPARK_HOME=${HOME}/spark-0.8.1-incubating-bin-hadoop1
# URI of the Spark master node
SPARK_MASTER=spark://crete:7077
# Spark memory per node
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/e1ab1069/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4757784..20b8de1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
<properties>
<hadoop.version>1.0.3</hadoop.version>
<hama.version>0.6.3</hama.version>
- <spark.version>0.8.0-incubating</spark.version>
+ <spark.version>0.8.1-incubating</spark.version>
</properties>
<modules>
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/e1ab1069/src/main/java/core/Inv.java
----------------------------------------------------------------------
diff --git a/src/main/java/core/Inv.java b/src/main/java/core/Inv.java
index fade0db..3faa7fe 100644
--- a/src/main/java/core/Inv.java
+++ b/src/main/java/core/Inv.java
@@ -56,7 +56,7 @@ final public class Inv extends MRData {
}
public boolean equals ( Object x ) {
- return value.equals(((Inv)x).value);
+ return x instanceof Inv && value.equals(((Inv)x).value);
}
public int hashCode () { return value.hashCode(); }
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/e1ab1069/src/main/java/spark/SparkEvaluator.gen
----------------------------------------------------------------------
diff --git a/src/main/java/spark/SparkEvaluator.gen b/src/main/java/spark/SparkEvaluator.gen
index fbc08ff..867b926 100644
--- a/src/main/java/spark/SparkEvaluator.gen
+++ b/src/main/java/spark/SparkEvaluator.gen
@@ -273,7 +273,8 @@ final public class SparkEvaluator extends Evaluator implements Serializable {
});
}
- final static TaskContext context = new TaskContext(0,0,(long)0,Config.local_mode,null);
+ // changed since Spark 0.8.1
+ final static TaskContext context = new TaskContext(0,0,(long)0,Config.local_mode,false,null);
/** Convert a Spark RDD into a lazy bag
* @param rdd the Spark RDD