You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/01/02 02:04:02 UTC
[2/9] git commit: Response to Shivaram's review
Response to Shivaram's review
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/1cbef081
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/1cbef081
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/1cbef081
Branch: refs/heads/master
Commit: 1cbef081e3d1dcc647b49a2f2b5f13ceaa0f611d
Parents: cffe1c1
Author: Patrick Wendell <pw...@gmail.com>
Authored: Mon Dec 30 12:46:09 2013 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Mon Dec 30 12:46:09 2013 -0800
----------------------------------------------------------------------
.../main/scala/org/apache/spark/Logging.scala | 2 +-
spark-class | 31 +++++++++++---------
2 files changed, 18 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/1cbef081/core/src/main/scala/org/apache/spark/Logging.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/Logging.scala b/core/src/main/scala/org/apache/spark/Logging.scala
index a889273..b97697d 100644
--- a/core/src/main/scala/org/apache/spark/Logging.scala
+++ b/core/src/main/scala/org/apache/spark/Logging.scala
@@ -93,7 +93,7 @@ trait Logging {
// threads do it concurrently (as SLF4J initialization is not thread safe).
protected def initLogging() {
// If Log4j doesn't seem initialized, load a default properties file
- def log4jInitialized = LogManager.getRootLogger.getAllAppenders.hasMoreElements
+ val log4jInitialized = LogManager.getRootLogger.getAllAppenders.hasMoreElements
if (!log4jInitialized) {
val defaultLogProps = "org/apache/spark/default-log4j.properties"
val classLoader = this.getClass.getClassLoader
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/1cbef081/spark-class
----------------------------------------------------------------------
diff --git a/spark-class b/spark-class
index 1c4323e..1858ea6 100755
--- a/spark-class
+++ b/spark-class
@@ -115,27 +115,30 @@ if [ ! -f "$FWDIR/RELEASE" ]; then
fi
fi
-if [ "$1" == "org.apache.spark.tools.JavaAPICompletenessChecker" ]; then
- TOOLS_DIR="$FWDIR"/tools
- SPARK_TOOLS_JAR=""
- if [ -e "$TOOLS_DIR"/target/scala-$SCALA_VERSION/*assembly*[0-9Tg].jar ]; then
- # Use the JAR from the SBT build
- export SPARK_TOOLS_JAR=`ls "$TOOLS_DIR"/target/scala-$SCALA_VERSION/*assembly*[0-9Tg].jar`
- fi
- if [ -e "$TOOLS_DIR"/target/spark-tools*[0-9Tg].jar ]; then
- # Use the JAR from the Maven build
- # TODO: this also needs to become an assembly!
- export SPARK_TOOLS_JAR=`ls "$TOOLS_DIR"/target/spark-tools*[0-9Tg].jar`
- fi
+TOOLS_DIR="$FWDIR"/tools
+SPARK_TOOLS_JAR=""
+if [ -e "$TOOLS_DIR"/target/scala-$SCALA_VERSION/*assembly*[0-9Tg].jar ]; then
+ # Use the JAR from the SBT build
+ export SPARK_TOOLS_JAR=`ls "$TOOLS_DIR"/target/scala-$SCALA_VERSION/*assembly*[0-9Tg].jar`
+fi
+if [ -e "$TOOLS_DIR"/target/spark-tools*[0-9Tg].jar ]; then
+ # Use the JAR from the Maven build
+ # TODO: this also needs to become an assembly!
+ export SPARK_TOOLS_JAR=`ls "$TOOLS_DIR"/target/spark-tools*[0-9Tg].jar`
fi
# Compute classpath using external script
CLASSPATH=`$FWDIR/bin/compute-classpath.sh`
-CLASSPATH="$CLASSPATH:$SPARK_TOOLS_JAR"
+
+if [ "$1" == "org.apache.spark.tools.JavaAPICompletenessChecker" ]; then
+ CLASSPATH="$CLASSPATH:$SPARK_TOOLS_JAR"
+fi
if $cygwin; then
CLASSPATH=`cygpath -wp $CLASSPATH`
- export SPARK_TOOLS_JAR=`cygpath -w $SPARK_TOOLS_JAR`
+ if [ "$1" == "org.apache.spark.tools.JavaAPICompletenessChecker" ]; then
+ export SPARK_TOOLS_JAR=`cygpath -w $SPARK_TOOLS_JAR`
+ fi
fi
export CLASSPATH