Skip to content
Snippets Groups Projects
Commit eb59b94c authored by Davies Liu's avatar Davies Liu Committed by Davies Liu
Browse files

[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 <davies@databricks.com>

Closes #9372 from davies/no_override.
parent 56419cf1
No related branches found
No related tags found
No related merge requests found
...@@ -126,7 +126,6 @@ object GenerateOrdering extends CodeGenerator[Seq[SortOrder], Ordering[InternalR ...@@ -126,7 +126,6 @@ object GenerateOrdering extends CodeGenerator[Seq[SortOrder], Ordering[InternalR
${initMutableStates(ctx)} ${initMutableStates(ctx)}
} }
@Override
public int compare(InternalRow a, InternalRow b) { public int compare(InternalRow a, InternalRow b) {
InternalRow ${ctx.INPUT_ROW} = null; // Holds current row being evaluated. InternalRow ${ctx.INPUT_ROW} = null; // Holds current row being evaluated.
$comparisons $comparisons
......
...@@ -55,7 +55,6 @@ object GeneratePredicate extends CodeGenerator[Expression, (InternalRow) => Bool ...@@ -55,7 +55,6 @@ object GeneratePredicate extends CodeGenerator[Expression, (InternalRow) => Bool
${initMutableStates(ctx)} ${initMutableStates(ctx)}
} }
@Override
public boolean eval(InternalRow ${ctx.INPUT_ROW}) { public boolean eval(InternalRow ${ctx.INPUT_ROW}) {
${eval.code} ${eval.code}
return !${eval.isNull} && ${eval.value}; return !${eval.isNull} && ${eval.value};
......
...@@ -82,7 +82,6 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] { ...@@ -82,7 +82,6 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
if (cases.length > 0) { if (cases.length > 0) {
val getter = "get" + ctx.primitiveTypeName(jt) val getter = "get" + ctx.primitiveTypeName(jt)
s""" s"""
@Override
public $jt $getter(int i) { public $jt $getter(int i) {
if (isNullAt(i)) { if (isNullAt(i)) {
return ${ctx.defaultValue(jt)}; return ${ctx.defaultValue(jt)};
...@@ -107,7 +106,6 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] { ...@@ -107,7 +106,6 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
if (cases.length > 0) { if (cases.length > 0) {
val setter = "set" + ctx.primitiveTypeName(jt) val setter = "set" + ctx.primitiveTypeName(jt)
s""" s"""
@Override
public void $setter(int i, $jt value) { public void $setter(int i, $jt value) {
nullBits[i] = false; nullBits[i] = false;
switch (i) { switch (i) {
...@@ -169,7 +167,6 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] { ...@@ -169,7 +167,6 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
${initMutableStates(ctx)} ${initMutableStates(ctx)}
} }
@Override
public Object apply(Object r) { public Object apply(Object r) {
// GenerateProjection does not work with UnsafeRows. // GenerateProjection does not work with UnsafeRows.
assert(!(r instanceof ${classOf[UnsafeRow].getName})); assert(!(r instanceof ${classOf[UnsafeRow].getName}));
...@@ -189,7 +186,6 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] { ...@@ -189,7 +186,6 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
public void setNullAt(int i) { nullBits[i] = true; } public void setNullAt(int i) { nullBits[i] = true; }
public boolean isNullAt(int i) { return nullBits[i]; } public boolean isNullAt(int i) { return nullBits[i]; }
@Override
public Object genericGet(int i) { public Object genericGet(int i) {
if (isNullAt(i)) return null; if (isNullAt(i)) return null;
switch (i) { switch (i) {
...@@ -210,14 +206,12 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] { ...@@ -210,14 +206,12 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
$specificAccessorFunctions $specificAccessorFunctions
$specificMutatorFunctions $specificMutatorFunctions
@Override
public int hashCode() { public int hashCode() {
int result = 37; int result = 37;
$hashUpdates $hashUpdates
return result; return result;
} }
@Override
public boolean equals(Object other) { public boolean equals(Object other) {
if (other instanceof SpecificRow) { if (other instanceof SpecificRow) {
SpecificRow row = (SpecificRow) other; SpecificRow row = (SpecificRow) other;
...@@ -227,7 +221,6 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] { ...@@ -227,7 +221,6 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
return super.equals(other); return super.equals(other);
} }
@Override
public InternalRow copy() { public InternalRow copy() {
Object[] arr = new Object[${expressions.length}]; Object[] arr = new Object[${expressions.length}];
${copyColumns} ${copyColumns}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment