From 89c8ea2bb229a7599365b376b0d310fdc5daccea Mon Sep 17 00:00:00 2001
From: Ismael Juma <ismael@juma.me.uk>
Date: Thu, 26 May 2011 22:22:37 +0100
Subject: [PATCH] Replace deprecated `-` and `--` with suggested filterNot
(which is uglier).
---
core/src/main/scala/spark/CacheTracker.scala | 2 +-
core/src/main/scala/spark/Stage.scala | 2 +-
core/src/main/scala/spark/repl/SparkCompletion.scala | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/src/main/scala/spark/CacheTracker.scala b/core/src/main/scala/spark/CacheTracker.scala
index 0de829d7bc..6826c7897c 100644
--- a/core/src/main/scala/spark/CacheTracker.scala
+++ b/core/src/main/scala/spark/CacheTracker.scala
@@ -38,7 +38,7 @@ class CacheTrackerActor extends DaemonActor with Logging {
case DroppedFromCache(rddId, partition, host) =>
logInfo("Cache entry removed: (%s, %s) on %s".format(rddId, partition, host))
- locs(rddId)(partition) -= host
+ locs(rddId)(partition) = locs(rddId)(partition).filterNot(_ == host)
case MemoryCacheLost(host) =>
logInfo("Memory cache lost on " + host)
diff --git a/core/src/main/scala/spark/Stage.scala b/core/src/main/scala/spark/Stage.scala
index 82b70ce60d..401b33bd16 100644
--- a/core/src/main/scala/spark/Stage.scala
+++ b/core/src/main/scala/spark/Stage.scala
@@ -22,7 +22,7 @@ class Stage(val id: Int, val rdd: RDD[_], val shuffleDep: Option[ShuffleDependen
def removeOutputLoc(partition: Int, host: String) {
val prevList = outputLocs(partition)
- val newList = prevList - host
+ val newList = prevList.filterNot(_ == host)
outputLocs(partition) = newList
if (prevList != Nil && newList == Nil)
numAvailableOutputs -= 1
diff --git a/core/src/main/scala/spark/repl/SparkCompletion.scala b/core/src/main/scala/spark/repl/SparkCompletion.scala
index 9fa41736f3..c6ed1860f0 100644
--- a/core/src/main/scala/spark/repl/SparkCompletion.scala
+++ b/core/src/main/scala/spark/repl/SparkCompletion.scala
@@ -107,7 +107,7 @@ class SparkCompletion(val repl: SparkInterpreter) extends SparkCompletionOutput
class TypeMemberCompletion(val tp: Type) extends CompletionAware with CompilerCompletion {
def excludeEndsWith: List[String] = Nil
def excludeStartsWith: List[String] = List("<") // <byname>, <repeated>, etc.
- def excludeNames: List[String] = anyref.methodNames -- anyRefMethodsToShow ++ List("_root_")
+ def excludeNames: List[String] = anyref.methodNames.filterNot(anyRefMethodsToShow.contains) ++ List("_root_")
def methodSignatureString(sym: Symbol) = {
def asString = new MethodSymbolOutput(sym).methodString()
--
GitLab