From 1f27d94c483b674a2076e6f420b85c323395eb86 Mon Sep 17 00:00:00 2001
From: Ismael Juma <ismael@juma.me.uk>
Date: Thu, 26 May 2011 22:04:42 +0100
Subject: [PATCH] Use Array.iterator instead of Iterator.fromArray as the
latter is deprecated.
---
core/src/main/scala/spark/CacheTracker.scala | 6 +++---
core/src/main/scala/spark/RDD.scala | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/src/main/scala/spark/CacheTracker.scala b/core/src/main/scala/spark/CacheTracker.scala
index 7040d4e147..0de829d7bc 100644
--- a/core/src/main/scala/spark/CacheTracker.scala
+++ b/core/src/main/scala/spark/CacheTracker.scala
@@ -111,7 +111,7 @@ class CacheTracker(isMaster: Boolean, theCache: Cache) extends Logging {
if (cachedVal != null) {
// Split is in cache, so just return its values
logInfo("Found partition in cache!")
- return Iterator.fromArray(cachedVal.asInstanceOf[Array[T]])
+ return cachedVal.asInstanceOf[Array[T]].iterator
} else {
// Mark the split as loading (unless someone else marks it first)
loading.synchronized {
@@ -119,7 +119,7 @@ class CacheTracker(isMaster: Boolean, theCache: Cache) extends Logging {
while (loading.contains(key)) {
try {loading.wait()} catch {case _ =>}
}
- return Iterator.fromArray(cache.get(key).asInstanceOf[Array[T]])
+ return cache.get(key).asInstanceOf[Array[T]].iterator
} else {
loading.add(key)
}
@@ -138,7 +138,7 @@ class CacheTracker(isMaster: Boolean, theCache: Cache) extends Logging {
loading.notifyAll()
}
future.apply() // Wait for the reply from the cache tracker
- return Iterator.fromArray(array)
+ return array.iterator
}
}
diff --git a/core/src/main/scala/spark/RDD.scala b/core/src/main/scala/spark/RDD.scala
index 6334896cb6..590106388a 100644
--- a/core/src/main/scala/spark/RDD.scala
+++ b/core/src/main/scala/spark/RDD.scala
@@ -178,7 +178,7 @@ class SplitRDD[T: ClassManifest](prev: RDD[T])
extends RDD[Array[T]](prev.context) {
override def splits = prev.splits
override val dependencies = List(new OneToOneDependency(prev))
- override def compute(split: Split) = Iterator.fromArray(Array(prev.iterator(split).toArray))
+ override def compute(split: Split) = Array(prev.iterator(split).toArray).iterator
}
--
GitLab