diff options
| author | Mosharaf Chowdhury <mosharaf@mosharaf-ubuntu.(none)> | 2010-12-07 10:17:47 -0800 |
|---|---|---|
| committer | Mosharaf Chowdhury <mosharaf@mosharaf-ubuntu.(none)> | 2010-12-07 10:17:47 -0800 |
| commit | 06dc4a5148ab235a524be296179cf864d4702a15 (patch) | |
| tree | 539cccac61a3b6786fce26d52410091c34df5850 | |
| parent | 1013a01469d08eaeb42e58e4bc442042387796fc (diff) | |
| download | spark-06dc4a5148ab235a524be296179cf864d4702a15.tar.gz spark-06dc4a5148ab235a524be296179cf864d4702a15.tar.bz2 spark-06dc4a5148ab235a524be296179cf864d4702a15.zip | |
- Removed config files from git's control.
- Changed DfsShuffle to default in RDD.scala.
| -rw-r--r-- | conf/java-opts | 1 | ||||
| -rw-r--r-- | conf/log4j.properties | 8 | ||||
| -rwxr-xr-x | conf/spark-env.sh | 13 | ||||
| -rw-r--r-- | src/scala/spark/RDD.scala | 2 |
4 files changed, 1 insertions, 23 deletions
diff --git a/conf/java-opts b/conf/java-opts deleted file mode 100644 index 11072b481e..0000000000 --- a/conf/java-opts +++ /dev/null @@ -1 +0,0 @@ --Dspark.broadcast.MasterHostAddress=127.0.0.1 -Dspark.broadcast.MasterTrackerPort=11111 -Dspark.broadcast.BlockSize=256 -Dspark.broadcast.MaxRetryCount=2 -Dspark.broadcast.TrackerSocketTimeout=50000 -Dspark.broadcast.ServerSocketTimeout=10000 -Dspark.broadcast.MaxChatTime=500 -Dspark.broadcast.EndGameFraction=0.95 -Dspark.broadcast.Factory=spark.ChainedBroadcastFactory diff --git a/conf/log4j.properties b/conf/log4j.properties deleted file mode 100644 index 33774b463d..0000000000 --- a/conf/log4j.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Set everything to be logged to the console -log4j.rootCategory=INFO, console -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss.SSS} %p %c{1}: %m%n - -# Ignore messages below warning level from Jetty, because it's a bit verbose -log4j.logger.org.eclipse.jetty=WARN diff --git a/conf/spark-env.sh b/conf/spark-env.sh deleted file mode 100755 index 77f9cb69b9..0000000000 --- a/conf/spark-env.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -# Set Spark environment variables for your site in this file. Some useful -# variables to set are: -# - MESOS_HOME, to point to your Mesos installation -# - SCALA_HOME, to point to your Scala installation -# - SPARK_CLASSPATH, to add elements to Spark's classpath -# - SPARK_JAVA_OPTS, to add JVM options -# - SPARK_MEM, to change the amount of memory used per node (this should -# be in the same format as the JVM's -Xmx option, e.g. 300m or 1g). -# - SPARK_LIBRARY_PATH, to add extra search paths for native libraries. - -MESOS_HOME=/home/mosharaf/Work/mesos diff --git a/src/scala/spark/RDD.scala b/src/scala/spark/RDD.scala index 39f2dc4458..bac59319a0 100644 --- a/src/scala/spark/RDD.scala +++ b/src/scala/spark/RDD.scala @@ -359,7 +359,7 @@ extends RDD[Pair[T, U]](sc) { : RDD[(K, C)] = { val shufClass = Class.forName(System.getProperty( - "spark.shuffle.class", "spark.LocalFileShuffle")) + "spark.shuffle.class", "spark.DfsShuffle")) val shuf = shufClass.newInstance().asInstanceOf[Shuffle[K, V, C]] shuf.compute(self, numSplits, createCombiner, mergeValue, mergeCombiners) } |