Skip to content

Commit aadfeab

Browse files
committed
Address comments.
1 parent 7228093 commit aadfeab

File tree

1 file changed

+5
-11
lines changed
  • sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen

1 file changed

+5
-11
lines changed

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

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -274,31 +274,25 @@ class CodeGenContext {
274274
val elementB = freshName("elementB")
275275
val isNullB = freshName("isNullB")
276276
val compareFunc = freshName("compareArray")
277-
val i = freshName("i")
278277
val minLength = freshName("minLength")
279278
val funcCode: String =
280279
s"""
281280
public int $compareFunc(ArrayData a, ArrayData b) {
282281
int lengthA = a.numElements();
283282
int lengthB = b.numElements();
284283
int $minLength = (lengthA > lengthB) ? lengthB : lengthA;
285-
boolean $isNullA;
286-
boolean $isNullB;
287-
${javaType(elementType)} $elementA;
288-
${javaType(elementType)} $elementB;
289-
for (int $i = 0; $i < $minLength; $i++) {
290-
$isNullA = a.isNullAt($i);
291-
$isNullB = b.isNullAt($i);
292-
284+
for (int i = 0; i < $minLength; i++) {
285+
boolean $isNullA = a.isNullAt(i);
286+
boolean $isNullB = b.isNullAt(i);
293287
if ($isNullA && $isNullB) {
294288
// Nothing
295289
} else if ($isNullA) {
296290
return -1;
297291
} else if ($isNullB) {
298292
return 1;
299293
} else {
300-
$elementA = ${getValue("a", elementType, i)};
301-
$elementB = ${getValue("b", elementType, i)};
294+
${javaType(elementType)} $elementA = ${getValue("a", elementType, "i")};
295+
${javaType(elementType)} $elementB = ${getValue("b", elementType, "i")};
302296
int comp = ${genComp(elementType, elementA, elementB)};
303297
if (comp != 0) {
304298
return comp;

0 commit comments

Comments
 (0)