Skip to content

[SPARK-24806][SQL] Brush up generated code so that JDK compilers can handle it #21770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

[SPARK-24806][SQL] Brush up generated code so that JDK compilers can handle it #21770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a53803d
Fix
maropu Jun 18, 2018
dad96eb
Fix
maropu Jul 15, 2018
074cbf9
Fix
maropu Jul 16, 2018
5a70a7c
Fix
maropu Jul 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...atalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/codegen/BufferHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* for each incoming record, we should call `reset` of BufferHolder instance before write the record
* and reuse the data buffer.
*/
final class BufferHolder {
public final class BufferHolder {

private static final int ARRAY_MAX = ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH;

Expand Down
4 changes: 2 additions & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Cast.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,7 @@ case class Cast(child: Expression, dataType: DataType, timeZoneId: Option[String
case StringType =>
val intOpt = ctx.freshVariable("intOpt", classOf[Option[Integer]])
(c, evPrim, evNull) => code"""
scala.Option<Integer> $intOpt =
scala.Option<Object> $intOpt =
org.apache.spark.sql.catalyst.util.DateTimeUtils.stringToDate($c);
if ($intOpt.isDefined()) {
$evPrim = ((Integer) $intOpt.get()).intValue();
Expand Down Expand Up @@ -991,7 +991,7 @@ case class Cast(child: Expression, dataType: DataType, timeZoneId: Option[String
val longOpt = ctx.freshVariable("longOpt", classOf[Option[Long]])
(c, evPrim, evNull) =>
code"""
scala.Option<Long> $longOpt =
scala.Option<Object> $longOpt =
org.apache.spark.sql.catalyst.util.DateTimeUtils.stringToTimestamp($c, $tz);
if ($longOpt.isDefined()) {
$evPrim = ((Long) $longOpt.get()).longValue();
Expand Down
6 changes: 3 additions & 3 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/SortOrder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,9 @@ case class SortPrefix(child: SortOrder) extends UnaryExpression {
override def doGenCode(ctx: CodegenContext, ev: ExprCode): ExprCode = {
val childCode = child.child.genCode(ctx)
val input = childCode.value
val BinaryPrefixCmp = classOf[BinaryPrefixComparator].getName
val DoublePrefixCmp = classOf[DoublePrefixComparator].getName
val StringPrefixCmp = classOf[StringPrefixComparator].getName
val BinaryPrefixCmp = classOf[BinaryPrefixComparator].getCanonicalName
val DoublePrefixCmp = classOf[DoublePrefixComparator].getCanonicalName
val StringPrefixCmp = classOf[StringPrefixComparator].getCanonicalName
val prefixCode = child.child.dataType match {
case BooleanType =>
s"$input ? 1L : 0L"
Expand Down
30 changes: 28 additions & 2 deletions ...lyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class CodegenContext {
def addReferenceObj(objName: String, obj: Any, className: String = null): String = {
val idx = references.length
references += obj
val clsName = Option(className).getOrElse(obj.getClass.getName)
val clsName = Option(className).getOrElse(getClassName(obj.getClass))
s"(($clsName) references[$idx] /* $objName */)"
}

Expand Down Expand Up @@ -1604,6 +1604,32 @@ object CodeGenerator extends Logging {

def primitiveTypeName(dt: DataType): String = primitiveTypeName(javaType(dt))

def getClassName(cls: Class[_]): String = {
val getNameValue = cls.getName
// `getName` and `getCanonicalName` return different names for inner classes, e.g.,
//
// scala> classOf[PrefixComparators.BinaryPrefixComparator].getName
// o.a.s.util.collection.unsafe.sort.PrefixComparators$BinaryPrefixComparator
// scala> classOf[PrefixComparators.BinaryPrefixComparator].getCanonicalName
// o.a.s.util.collection.unsafe.sort.PrefixComparators.BinaryPrefixComparator
//
// Janino can handle both forms for casts and imports though, JDK Java compilers cannot handle
// the former one. So, this method basically uses `getCanonicalName`. If `getCanonicalName`
// returns null or throws an exception (See SPARK-24216), it uses `getName`.
//
// Note that there is only one exception; Janino cannot handle the `getCanonicalName` form
// for package objects, so we need to use `getName` for the case.
if (getNameValue.matches(""".*\.package\$.*""")) {
getNameValue
} else {
try {
Option(cls.getCanonicalName).getOrElse(getNameValue)
} catch {
case err: InternalError => cls.getName
}
}
}

/**
* Returns the Java type for a DataType.
*/
Expand All @@ -1624,7 +1650,7 @@ object CodeGenerator extends Logging {
case _: MapType => "MapData"
case udt: UserDefinedType[_] => javaType(udt.sqlType)
case ObjectType(cls) if cls.isArray => s"${javaType(ObjectType(cls.getComponentType))}[]"
case ObjectType(cls) => cls.getName
case ObjectType(cls) => getClassName(cls)
case _ => "Object"
}

Expand Down
2 changes: 1 addition & 1 deletion ...alyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collectionOperations.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2826,7 +2826,7 @@ case class Sequence(
val arr = ctx.freshName("arr")
val arrElemType = CodeGenerator.javaType(dataType.elementType)
s"""
|final $arrElemType[] $arr = null;
|$arrElemType[] $arr = null;
|${impl.genCode(ctx, startGen.value, stopGen.value, stepGen.value, arr, arrElemType)}
|${ev.value} = UnsafeArrayData.fromPrimitiveArray($arr);
""".stripMargin
Expand Down
2 changes: 1 addition & 1 deletion ...talyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,7 @@ case class StringToTimestampWithoutTimezone(child: Expression, timeZoneId: Optio
|${CodeGenerator.JAVA_BOOLEAN} ${ev.isNull} = true;
|${CodeGenerator.JAVA_LONG} ${ev.value} = ${CodeGenerator.defaultValue(TimestampType)};
|if (!${eval.isNull}) {
| scala.Option<Long> $longOpt = $dtu.stringToTimestamp(${eval.value}, $tz, true);
| scala.Option<Object> $longOpt = $dtu.stringToTimestamp(${eval.value}, $tz, true);
| if ($longOpt.isDefined()) {
| ${ev.value} = ((Long) $longOpt.get()).longValue();
| ${ev.isNull} = false;
Expand Down
12 changes: 7 additions & 5 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/objects/objects.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import org.apache.spark.sql.catalyst.expressions.codegen._
import org.apache.spark.sql.catalyst.expressions.codegen.Block._
import org.apache.spark.sql.catalyst.util.{ArrayBasedMapData, ArrayData, GenericArrayData, MapData}
import org.apache.spark.sql.types._
import org.apache.spark.unsafe.types.{CalendarInterval, UTF8String}
import org.apache.spark.util.Utils

/**
Expand Down Expand Up @@ -219,8 +218,8 @@ case class StaticInvoke(
propagateNull: Boolean = true,
returnNullable: Boolean = true) extends InvokeLike {

val objectName = staticObject.getName.stripSuffix("$")
val cls = if (staticObject.getName == objectName) {
val objectName = staticObject.getCanonicalName.stripSuffix("$")
val cls = if (staticObject.getCanonicalName == objectName) {
staticObject
} else {
Utils.classForName(objectName)
Expand Down Expand Up @@ -434,7 +433,7 @@ case class NewInstance(
propagateNull: Boolean,
dataType: DataType,
outerPointer: Option[() => AnyRef]) extends InvokeLike {
private val className = cls.getName
private val className = CodeGenerator.getClassName(cls)

override def nullable: Boolean = needNullCheck

Expand Down Expand Up @@ -1335,7 +1334,7 @@ case class ExternalMapToCatalyst private(
val (defineEntries, defineKeyValue) = child.dataType match {
case ObjectType(cls) if classOf[java.util.Map[_, _]].isAssignableFrom(cls) =>
val javaIteratorCls = classOf[java.util.Iterator[_]].getName
val javaMapEntryCls = classOf[java.util.Map.Entry[_, _]].getName
val javaMapEntryCls = classOf[java.util.Map.Entry[_, _]].getCanonicalName

val defineEntries =
s"final $javaIteratorCls $entries = ${inputMap.value}.entrySet().iterator();"
Expand Down Expand Up @@ -1585,6 +1584,9 @@ case class InitializeJavaBean(beanInstance: Expression, setters: Map[String, Exp
}

override def doGenCode(ctx: CodegenContext, ev: ExprCode): ExprCode = {
// Resolves setters before compilation
require(setters.isEmpty || resolvedSetters.nonEmpty)

val instanceGen = beanInstance.genCode(ctx)

val javaBeanInstance = ctx.freshName("javaBean")
Expand Down
3 changes: 2 additions & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/basicPhysicalOperators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,8 @@ case class SampleExec(
v => s"""
| $v = new $samplerClass<UnsafeRow>($lowerBound, $upperBound, false);
| $v.setSeed(${seed}L + partitionIndex);
""".stripMargin.trim)
""".stripMargin.trim,
forceInline = true)
Copy link
Contributor

Choose a reason for hiding this comment

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

why do we need this?

Copy link
Member Author

Choose a reason for hiding this comment

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

Generic arrays not allowed;

/* 019 */   private org.apache.spark.util.random.BernoulliCellSampler<UnsafeRow>[] sample_mutableStateArray_0 = new org.apache.spark.util.random.BernoulliCellSampler<UnsafeRow>[1];
--- 
 Cause: java.util.concurrent.ExecutionException: org.codehaus.commons.compiler.CompileException: failed to compile:
(Line 40, Column 101) generic array creation

Copy link
Contributor

Choose a reason for hiding this comment

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

Though this may cause problems leading to the 64KB limit issue. So if we are not including the jdk support I'd be against this change...

Copy link
Member Author

Choose a reason for hiding this comment

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

aha, ok. let's us wait for the other developer's comments.


s"""
| if ($sampler.sample() != 0) {
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/limit.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ case class LocalLimitExec(limit: Int, child: SparkPlan) extends UnaryExecNode wi

ctx.addNewFunction("stopEarly", s"""
@Override
protected boolean stopEarly() {
public boolean stopEarly() {
return $stopEarly;
}
""", inlineToOuterClass = true)
Expand Down