Remove the unnecessary null checking

chenghao-intel · chenghao-intel · commit 50444cc04eda · 2014-04-30T14:57:22.000+08:00
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypes.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypes.scala
@@ -52,21 +52,15 @@ case class GetItem(child: Expression, ordinal: Expression) extends Expression {
         if (child.dataType.isInstanceOf[ArrayType]) {
           val baseValue = value.asInstanceOf[Seq[_]]
           val o = key.asInstanceOf[Int]
-          if (baseValue == null) {
-            null
-          } else if (o >= baseValue.size || o < 0) {
+          if (o >= baseValue.size || o < 0) {
             null
           } else {
             baseValue(o)
           }
         } else {
           val baseValue = value.asInstanceOf[Map[Any, _]]
           val key = ordinal.eval(input)
-          if (baseValue == null) {
-            null
-          } else {
-            baseValue.get(key).orNull
-          }
+          baseValue.get(key).orNull
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -52,21 +52,15 @@ case class GetItem(child: Expression, ordinal: Expression) extends Expression {`
`52`	`52`	`if (child.dataType.isInstanceOf[ArrayType]) {`
`53`	`53`	`val baseValue = value.asInstanceOf[Seq[_]]`
`54`	`54`	`val o = key.asInstanceOf[Int]`
`55`		`- if (baseValue == null) {`
`56`		`- null`
`57`		`- } else if (o >= baseValue.size \|\| o < 0) {`
	`55`	`+ if (o >= baseValue.size \|\| o < 0) {`
`58`	`56`	`null`
`59`	`57`	`} else {`
`60`	`58`	`baseValue(o)`
`61`	`59`	`}`
`62`	`60`	`} else {`
`63`	`61`	`val baseValue = value.asInstanceOf[Map[Any, _]]`
`64`	`62`	`val key = ordinal.eval(input)`
`65`		`- if (baseValue == null) {`
`66`		`- null`
`67`		`- } else {`
`68`		`- baseValue.get(key).orNull`
`69`		`- }`
	`63`	`+ baseValue.get(key).orNull`
`70`	`64`	`}`
`71`	`65`	`}`
`72`	`66`	`}`