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/13 06:31:36 UTC
[6/6] git commit: Merge pull request #395 from
hsaputra/remove_simpleredundantreturn_scala
Merge pull request #395 from hsaputra/remove_simpleredundantreturn_scala
Remove simple redundant return statements for Scala methods/functions
Remove simple redundant return statements for Scala methods/functions:
-) Only change simple return statements at the end of method
-) Ignore the complex if-else check
-) Ignore the ones inside synchronized
-) Add small changes to making var to val if possible and remove () for simple get
This hopefully makes the review simpler =)
Pass compile and tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/0ab505a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/0ab505a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/0ab505a2
Branch: refs/heads/master
Commit: 0ab505a29e21b5a03928e0bbd3950f6f8e08ae32
Parents: 405bfe8 5a8abfb
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sun Jan 12 21:31:04 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sun Jan 12 21:31:04 2014 -0800
----------------------------------------------------------------------
.../scala/org/apache/spark/Accumulators.scala | 2 +-
.../scala/org/apache/spark/CacheManager.scala | 4 +--
.../scala/org/apache/spark/HttpFileServer.scala | 6 ++--
.../main/scala/org/apache/spark/Logging.scala | 2 +-
.../org/apache/spark/MapOutputTracker.scala | 2 +-
.../scala/org/apache/spark/Partitioner.scala | 4 +--
.../scala/org/apache/spark/SparkContext.scala | 11 +++++---
.../org/apache/spark/SparkHadoopWriter.scala | 15 +++++-----
.../org/apache/spark/api/python/PythonRDD.scala | 3 +-
.../spark/broadcast/TorrentBroadcast.scala | 6 ++--
.../apache/spark/network/BufferMessage.scala | 2 +-
.../org/apache/spark/network/Connection.scala | 6 ++--
.../org/apache/spark/network/Message.scala | 6 ++--
.../spark/network/netty/ShuffleSender.scala | 2 +-
.../org/apache/spark/rdd/CoalescedRDD.scala | 10 +++----
.../scala/org/apache/spark/rdd/HadoopRDD.scala | 8 +++---
.../scala/org/apache/spark/rdd/PipedRDD.scala | 2 +-
.../main/scala/org/apache/spark/rdd/RDD.scala | 4 +--
.../spark/scheduler/InputFormatInfo.scala | 8 +++---
.../scala/org/apache/spark/scheduler/Pool.scala | 8 +++---
.../spark/scheduler/SchedulingAlgorithm.scala | 11 ++++----
.../spark/scheduler/SparkListenerBus.scala | 2 +-
.../org/apache/spark/scheduler/Stage.scala | 2 +-
.../org/apache/spark/scheduler/TaskResult.scala | 2 +-
.../spark/scheduler/TaskResultGetter.scala | 2 +-
.../apache/spark/scheduler/TaskSetManager.scala | 14 +++++-----
.../mesos/CoarseMesosSchedulerBackend.scala | 2 +-
.../cluster/mesos/MesosSchedulerBackend.scala | 6 ++--
.../org/apache/spark/storage/BlockManager.scala | 2 +-
.../spark/storage/BlockManagerWorker.scala | 20 +++++++-------
.../org/apache/spark/storage/BlockMessage.scala | 2 +-
.../spark/storage/BlockMessageArray.scala | 2 +-
.../org/apache/spark/storage/MemoryStore.scala | 2 +-
.../org/apache/spark/storage/StorageLevel.scala | 2 +-
.../org/apache/spark/util/ClosureCleaner.scala | 10 +++----
.../org/apache/spark/util/SizeEstimator.scala | 10 +++----
.../scala/org/apache/spark/util/Utils.scala | 19 ++++++-------
.../scala/org/apache/spark/util/Vector.scala | 12 ++++----
.../spark/util/collection/AppendOnlyMap.scala | 2 +-
.../spark/scheduler/ClusterSchedulerSuite.scala | 9 +++---
.../spark/scheduler/DAGSchedulerSuite.scala | 3 +-
.../apache/spark/scheduler/JobLoggerSuite.scala | 7 ++---
.../apache/spark/util/ClosureCleanerSuite.scala | 14 +++++-----
.../org/apache/spark/examples/LocalALS.scala | 8 +++---
.../org/apache/spark/examples/LocalFileLR.scala | 2 +-
.../org/apache/spark/examples/LocalKMeans.scala | 2 +-
.../org/apache/spark/examples/SparkALS.scala | 6 ++--
.../org/apache/spark/examples/SparkHdfsLR.scala | 2 +-
.../org/apache/spark/examples/SparkKMeans.scala | 12 ++++----
.../clickstream/PageViewGenerator.scala | 2 +-
.../spark/mllib/api/python/PythonMLLibAPI.scala | 29 ++++++++++----------
.../org/apache/spark/streaming/Checkpoint.scala | 2 +-
.../streaming/dstream/FileInputDStream.scala | 2 +-
.../spark/streaming/dstream/StateDStream.scala | 8 +++---
.../scheduler/StreamingListenerBus.scala | 2 +-
.../org/apache/spark/streaming/util/Clock.scala | 4 +--
.../spark/streaming/util/RawTextHelper.scala | 2 +-
.../org/apache/spark/deploy/yarn/Client.scala | 7 +++--
.../spark/deploy/yarn/WorkerLauncher.scala | 8 +++---
.../spark/deploy/yarn/WorkerRunnable.scala | 7 ++---
.../yarn/ClientDistributedCacheManager.scala | 10 +++----
.../ClientDistributedCacheManagerSuite.scala | 2 +-
.../org/apache/spark/deploy/yarn/Client.scala | 3 +-
63 files changed, 194 insertions(+), 194 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/0ab505a2/core/src/main/scala/org/apache/spark/scheduler/SparkListenerBus.scala
----------------------------------------------------------------------
diff --cc core/src/main/scala/org/apache/spark/scheduler/SparkListenerBus.scala
index fc63788,e551c11..17b1328
--- a/core/src/main/scala/org/apache/spark/scheduler/SparkListenerBus.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/SparkListenerBus.scala
@@@ -93,8 -88,6 +93,8 @@@ private[spark] class SparkListenerBus e
* add overhead in the general case. */
Thread.sleep(10)
}
- return true
+ true
}
+
+ def stop(): Unit = post(SparkListenerShutdown)
}
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/0ab505a2/streaming/src/main/scala/org/apache/spark/streaming/Checkpoint.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/0ab505a2/streaming/src/main/scala/org/apache/spark/streaming/scheduler/StreamingListenerBus.scala
----------------------------------------------------------------------
diff --cc streaming/src/main/scala/org/apache/spark/streaming/scheduler/StreamingListenerBus.scala
index 6e6e22e,73dc520..3063cf1
--- a/streaming/src/main/scala/org/apache/spark/streaming/scheduler/StreamingListenerBus.scala
+++ b/streaming/src/main/scala/org/apache/spark/streaming/scheduler/StreamingListenerBus.scala
@@@ -83,8 -76,6 +83,8 @@@ private[spark] class StreamingListenerB
* add overhead in the general case. */
Thread.sleep(10)
}
- return true
+ true
}
+
+ def stop(): Unit = post(StreamingListenerShutdown)
}