Skip to content

Commit eb59b94

Browse files
Davies Liudavies
authored andcommitted
[SPARK-11417] [SQL] no @OverRide in codegen
Older version of Janino (>2.7) does not support Override, we should not use that in codegen. Author: Davies Liu <[email protected]> Closes #9372 from davies/no_override.
1 parent 56419cf commit eb59b94

File tree

3 files changed

+0
-9
lines changed

3 files changed

+0
-9
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ object GenerateOrdering extends CodeGenerator[Seq[SortOrder], Ordering[InternalR
126126
${initMutableStates(ctx)}
127127
}
128128

129-
@Override
130129
public int compare(InternalRow a, InternalRow b) {
131130
InternalRow ${ctx.INPUT_ROW} = null; // Holds current row being evaluated.
132131
$comparisons

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ object GeneratePredicate extends CodeGenerator[Expression, (InternalRow) => Bool
5555
${initMutableStates(ctx)}
5656
}
5757

58-
@Override
5958
public boolean eval(InternalRow ${ctx.INPUT_ROW}) {
6059
${eval.code}
6160
return !${eval.isNull} && ${eval.value};

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
8282
if (cases.length > 0) {
8383
val getter = "get" + ctx.primitiveTypeName(jt)
8484
s"""
85-
@Override
8685
public $jt $getter(int i) {
8786
if (isNullAt(i)) {
8887
return ${ctx.defaultValue(jt)};
@@ -107,7 +106,6 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
107106
if (cases.length > 0) {
108107
val setter = "set" + ctx.primitiveTypeName(jt)
109108
s"""
110-
@Override
111109
public void $setter(int i, $jt value) {
112110
nullBits[i] = false;
113111
switch (i) {
@@ -169,7 +167,6 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
169167
${initMutableStates(ctx)}
170168
}
171169

172-
@Override
173170
public Object apply(Object r) {
174171
// GenerateProjection does not work with UnsafeRows.
175172
assert(!(r instanceof ${classOf[UnsafeRow].getName}));
@@ -189,7 +186,6 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
189186
public void setNullAt(int i) { nullBits[i] = true; }
190187
public boolean isNullAt(int i) { return nullBits[i]; }
191188

192-
@Override
193189
public Object genericGet(int i) {
194190
if (isNullAt(i)) return null;
195191
switch (i) {
@@ -210,14 +206,12 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
210206
$specificAccessorFunctions
211207
$specificMutatorFunctions
212208

213-
@Override
214209
public int hashCode() {
215210
int result = 37;
216211
$hashUpdates
217212
return result;
218213
}
219214

220-
@Override
221215
public boolean equals(Object other) {
222216
if (other instanceof SpecificRow) {
223217
SpecificRow row = (SpecificRow) other;
@@ -227,7 +221,6 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
227221
return super.equals(other);
228222
}
229223

230-
@Override
231224
public InternalRow copy() {
232225
Object[] arr = new Object[${expressions.length}];
233226
${copyColumns}

0 commit comments

Comments
 (0)