Skip to content
Snippets Groups Projects
Commit bc36ee4f authored by Matei Zaharia's avatar Matei Zaharia
Browse files

Merge pull request #543 from holdenk/master

Re-enable deprecation warnings and fix deprecated warning.
parents 6c181314 1f538111
No related branches found
No related tags found
No related merge requests found
...@@ -27,7 +27,7 @@ private[spark] class CacheManager(blockManager: BlockManager) extends Logging { ...@@ -27,7 +27,7 @@ private[spark] class CacheManager(blockManager: BlockManager) extends Logging {
if (loading.contains(key)) { if (loading.contains(key)) {
logInfo("Loading contains " + key + ", waiting...") logInfo("Loading contains " + key + ", waiting...")
while (loading.contains(key)) { while (loading.contains(key)) {
try {loading.wait()} catch {case _ =>} try {loading.wait()} catch {case _ : Throwable =>}
} }
logInfo("Loading no longer contains " + key + ", so returning cached result") logInfo("Loading no longer contains " + key + ", so returning cached result")
// See whether someone else has successfully loaded it. The main way this would fail // See whether someone else has successfully loaded it. The main way this would fail
......
...@@ -37,7 +37,7 @@ object SparkBuild extends Build { ...@@ -37,7 +37,7 @@ object SparkBuild extends Build {
organization := "org.spark-project", organization := "org.spark-project",
version := "0.7.1-SNAPSHOT", version := "0.7.1-SNAPSHOT",
scalaVersion := "2.9.2", scalaVersion := "2.9.2",
scalacOptions := Seq(/*"-deprecation",*/ "-unchecked", "-optimize"), // -deprecation is too noisy due to usage of old Hadoop API, enable it once that's no longer an issue scalacOptions := Seq("-unchecked", "-optimize", "-deprecation"),
unmanagedJars in Compile <<= baseDirectory map { base => (base / "lib" ** "*.jar").classpath }, unmanagedJars in Compile <<= baseDirectory map { base => (base / "lib" ** "*.jar").classpath },
retrieveManaged := true, retrieveManaged := true,
retrievePattern := "[type]s/[artifact](-[revision])(-[classifier]).[ext]", retrievePattern := "[type]s/[artifact](-[revision])(-[classifier]).[ext]",
......
...@@ -28,7 +28,7 @@ class QueueInputDStream[T: ClassManifest]( ...@@ -28,7 +28,7 @@ class QueueInputDStream[T: ClassManifest](
} }
if (buffer.size > 0) { if (buffer.size > 0) {
if (oneAtATime) { if (oneAtATime) {
Some(buffer.first) Some(buffer.head)
} else { } else {
Some(new UnionRDD(ssc.sc, buffer.toSeq)) Some(new UnionRDD(ssc.sc, buffer.toSeq))
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment