Skip to content

Commit b272364

Browse files
committed
Improve some styling
1 parent c6d4b5e commit b272364

File tree

2 files changed

+28
-13
lines changed

2 files changed

+28
-13
lines changed

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -176,20 +176,21 @@ class CodegenContext extends Logging {
176176
*/
177177
var currentLambdaVars: mutable.Map[Long, ExprCode] = mutable.HashMap.empty
178178

179-
def withLambdaVars(namedLambdas: Seq[NamedLambdaVariable],
179+
def withLambdaVars(
180+
namedLambdas: Seq[NamedLambdaVariable],
180181
f: Seq[ExprCode] => ExprCode): ExprCode = {
181-
val lambdaVars = namedLambdas.map { namedLambda =>
182-
val id = namedLambda.exprId.id
182+
val lambdaVars = namedLambdas.map { lambda =>
183+
val id = lambda.exprId.id
183184
if (currentLambdaVars.get(id).nonEmpty) {
184185
throw QueryExecutionErrors.lambdaVariableAlreadyDefinedError(id)
185186
}
186-
val isNull = if (namedLambda.nullable) {
187+
val isNull = if (lambda.nullable) {
187188
JavaCode.isNullGlobal(addMutableState(JAVA_BOOLEAN, "lambdaIsNull"))
188189
} else {
189190
FalseLiteral
190191
}
191-
val value = addMutableState(javaType(namedLambda.dataType), "lambdaValue")
192-
val lambdaVar = ExprCode(isNull, JavaCode.global(value, namedLambda.dataType))
192+
val value = addMutableState(javaType(lambda.dataType), "lambdaValue")
193+
val lambdaVar = ExprCode(isNull, JavaCode.global(value, lambda.dataType))
193194
currentLambdaVars.put(id, lambdaVar)
194195
lambdaVar
195196
}
@@ -200,7 +201,8 @@ class CodegenContext extends Logging {
200201
}
201202

202203
def getLambdaVar(id: Long): ExprCode = {
203-
currentLambdaVars.getOrElse(id,
204+
currentLambdaVars.getOrElse(
205+
id,
204206
throw QueryExecutionErrors.lambdaVariableNotDefinedError(id))
205207
}
206208

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/higherOrderFunctions.scala

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,10 @@ trait HigherOrderFunction extends Expression with ExpectsInputTypes {
245245
}
246246

247247

248-
protected def assignAtomic(atomicRef: String, value: String, isNull: String = FalseLiteral,
248+
protected def assignAtomic(
249+
atomicRef: String,
250+
value: String,
251+
isNull: String = FalseLiteral,
249252
nullable: Boolean = false) = {
250253
if (nullable) {
251254
s"""
@@ -260,8 +263,12 @@ trait HigherOrderFunction extends Expression with ExpectsInputTypes {
260263
}
261264
}
262265

263-
protected def assignArrayElement(ctx: CodegenContext, arrayName: String, elementCode: ExprCode,
264-
elementVar: NamedLambdaVariable, index: String): String = {
266+
protected def assignArrayElement(
267+
ctx: CodegenContext,
268+
arrayName: String,
269+
elementCode: ExprCode,
270+
elementVar: NamedLambdaVariable,
271+
index: String): String = {
265272
val elementType = elementVar.dataType
266273
val elementAtomic = ctx.addReferenceObj(elementVar.name, elementVar.value)
267274
val extractElement = CodeGenerator.getValue(arrayName, elementType, index)
@@ -282,8 +289,11 @@ trait HigherOrderFunction extends Expression with ExpectsInputTypes {
282289
}
283290
}
284291

285-
protected def assignIndex(ctx: CodegenContext, indexCode: ExprCode,
286-
indexVar: NamedLambdaVariable, index: String): String = {
292+
protected def assignIndex(
293+
ctx: CodegenContext,
294+
indexCode: ExprCode,
295+
indexVar: NamedLambdaVariable,
296+
index: String): String = {
287297
val indexAtomic = ctx.addReferenceObj(indexVar.name, indexVar.value)
288298
s"""
289299
${indexCode.value} = $index;
@@ -1175,7 +1185,10 @@ case class ArrayAggregate(
11751185
}
11761186
}
11771187

1178-
protected def assignVar(varCode: ExprCode, value: String, isNull: String,
1188+
protected def assignVar(
1189+
varCode: ExprCode,
1190+
value: String,
1191+
isNull: String,
11791192
nullable: Boolean): String = {
11801193
if (nullable) {
11811194
s"""

0 commit comments

Comments
 (0)