Skip to content

[SPARK-40633][BUILD] Upgrade janino to 3.1.9 #38075

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
LuciferYang wants to merge 9 commits into from
Closed

[SPARK-40633][BUILD] Upgrade janino to 3.1.9 #38075

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2354f10
upgrade
LuciferYang Oct 2, 2022
f4247ed
Merge branch 'apache:master' into SPARK-40633
LuciferYang Oct 16, 2022
cfebb25
Merge branch 'apache:master' into SPARK-40633
LuciferYang Nov 18, 2022
864aad0
init to null
LuciferYang Nov 18, 2022
c9b0ed9
Merge branch 'SPARK-40633' of github.com:LuciferYang/spark into SPARK…
LuciferYang Nov 18, 2022
8a0b656
fix
LuciferYang Nov 18, 2022
c00c4e6
upgrade to 3.1.9
LuciferYang Nov 21, 2022
2f35797
revert objects.scala for test
LuciferYang Nov 21, 2022
1074e69
Merge branch 'apache:master' into SPARK-40633
LuciferYang Nov 22, 2022
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
Prev Previous commit
Next Next commit
fix
  • Loading branch information
@LuciferYang
LuciferYang committed Nov 18, 2022
commit 8a0b6562561f8cdafe4f254fb2deabf7be7720be
7 changes: 2 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 @@ -1275,7 +1275,6 @@ case class CatalystToExternalMap private(
val genInputData = inputData.genCode(ctx)
val dataLength = ctx.freshName("dataLength")
val loopIndex = ctx.freshName("loopIndex")
val tupleLoopValue = ctx.freshName("tupleLoopValue")
val builderValue = ctx.freshName("builderValue")

val keyArray = ctx.freshName("keyArray")
Expand Down Expand Up @@ -1310,15 +1309,13 @@ case class CatalystToExternalMap private(

val tupleClass = classOf[(_, _)].getName
val appendToBuilder = s"""
$tupleClass $tupleLoopValue = null;

if (${genValueFunction.isNull}) {
$tupleLoopValue = new $tupleClass($genKeyFunctionValue, null);
$builderValue.$$plus$$eq(new $tupleClass($genKeyFunctionValue, null));
} else {
$tupleLoopValue = new $tupleClass($genKeyFunctionValue, $genValueFunctionValue);
$builderValue.$$plus$$eq(new $tupleClass($genKeyFunctionValue, $genValueFunctionValue));
}

$builderValue.$$plus$$eq($tupleLoopValue);
"""
val getBuilderResult = s"${ev.value} = (${collClass.getName}) $builderValue.result();"

Expand Down