Skip to content
Prev Previous commit
Next Next commit
Merge branch 'master' of github.com:apache/spark into SPARK-23916
  • Loading branch information
mgaido91 committed Apr 10, 2018
commit b9cea24be83db0d47c6e993c80e45f8ee7d800ba
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import java.util.Comparator

import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.catalyst.analysis.TypeCheckResult
import org.apache.spark.sql.catalyst.expressions.codegen.{CodegenContext, CodeGenerator, CodegenFallback, ExprCode, UTF8StringBuilder}
import org.apache.spark.sql.catalyst.expressions.codegen._
import org.apache.spark.sql.catalyst.util.{ArrayData, GenericArrayData, MapData}
import org.apache.spark.sql.types._
import org.apache.spark.unsafe.types.UTF8String
Expand Down Expand Up @@ -408,7 +408,7 @@ case class ArrayJoin(
|boolean ${ev.isNull} = false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I guess we can remove this?

|UTF8String ${ev.value} = null;
|$code
""".stripMargin, isNull = "false")
""".stripMargin, FalseLiteral)
}
}

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.