Merge pull request #351 from twitter/feature/add_default_option_setting

ADd a means to set defaults outside the planner
twitter · Nov 9, 2013 · 67d4cdd · 67d4cdd
2 parents c7f45cf + deafca3
commit 67d4cdd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/ScaldingPlatform.scala b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/ScaldingPlatform.scala
@@ -232,10 +232,10 @@ object Scalding {
 
   private def getOrElse[T: Manifest](options: Map[String, Options], idOpt: Option[String], default: T): T =
     (for {
-      id <- idOpt
+      id <- idOpt.map(List(_, "DEFAULT")).getOrElse(List("DEFAULT"))
       innerOpts <- options.get(id)
       option <- innerOpts.get[T]
-    } yield option).getOrElse(default)
+    } yield option).headOption.getOrElse(default)
 
   @annotation.tailrec
   private def getFirst[T: Manifest](options: Map[String, Options], names: List[String]): Option[T] =