Whoops, getOrDefault is also new in Java 8.

JoshRosen · JoshRosen · commit 38e8a9935e3a · 2016-06-03T17:39:28.000-07:00
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/BoundAttribute.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/BoundAttribute.scala
@@ -98,7 +98,7 @@ object BindReferences extends Logging {
     }
     expression.transform { case a: AttributeReference =>
       attachTree(a, "Binding attribute") {
-        val ordinal = inputToOrdinal.getOrDefault(a.exprId, -1)
+        val ordinal = Option(inputToOrdinal.get(a.exprId)).getOrElse(-1)
         if (ordinal == -1) {
           if (allowFailures) {
             a

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ object BindReferences extends Logging {`
`98`	`98`	`}`
`99`	`99`	`expression.transform { case a: AttributeReference =>`
`100`	`100`	`attachTree(a, "Binding attribute") {`
`101`		`- val ordinal = inputToOrdinal.getOrDefault(a.exprId, -1)`
	`101`	`+ val ordinal = Option(inputToOrdinal.get(a.exprId)).getOrElse(-1)`
`102`	`102`	`if (ordinal == -1) {`
`103`	`103`	`if (allowFailures) {`
`104`	`104`	`a`