aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorDavies Liu <davies@databricks.com>2015-10-30 00:36:20 -0700
committerDavies Liu <davies.liu@gmail.com>2015-10-30 00:36:20 -0700
commiteb59b94c450fe6391d24d44ff7ea9bd4c6893af8 (patch)
tree6d58ba077c82871965751217514ed3bc69432187 /sql
parent56419cf11f769c80f391b45dc41b3c7101cc5ff4 (diff)
downloadspark-eb59b94c450fe6391d24d44ff7ea9bd4c6893af8.tar.gz
spark-eb59b94c450fe6391d24d44ff7ea9bd4c6893af8.tar.bz2
spark-eb59b94c450fe6391d24d44ff7ea9bd4c6893af8.zip
[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.
Diffstat (limited to 'sql')
-rw-r--r--sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala1
-rw-r--r--sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GeneratePredicate.scala1
-rw-r--r--sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateProjection.scala7
3 files changed, 0 insertions, 9 deletions
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala
index c2b420286f..1af7c73cd4 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala
@@ -126,7 +126,6 @@ object GenerateOrdering extends CodeGenerator[Seq[SortOrder], Ordering[InternalR
${initMutableStates(ctx)}
}
- @Override
public int compare(InternalRow a, InternalRow b) {
InternalRow ${ctx.INPUT_ROW} = null; // Holds current row being evaluated.
$comparisons
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GeneratePredicate.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GeneratePredicate.scala
index ae6ffe6293..457b4f0842 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GeneratePredicate.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GeneratePredicate.scala
@@ -55,7 +55,6 @@ object GeneratePredicate extends CodeGenerator[Expression, (InternalRow) => Bool
${initMutableStates(ctx)}
}
- @Override
public boolean eval(InternalRow ${ctx.INPUT_ROW}) {
${eval.code}
return !${eval.isNull} && ${eval.value};
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateProjection.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateProjection.scala
index dbcc9dc084..c0d313b2e1 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateProjection.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateProjection.scala
@@ -82,7 +82,6 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
if (cases.length > 0) {
val getter = "get" + ctx.primitiveTypeName(jt)
s"""
- @Override
public $jt $getter(int i) {
if (isNullAt(i)) {
return ${ctx.defaultValue(jt)};
@@ -107,7 +106,6 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
if (cases.length > 0) {
val setter = "set" + ctx.primitiveTypeName(jt)
s"""
- @Override
public void $setter(int i, $jt value) {
nullBits[i] = false;
switch (i) {
@@ -169,7 +167,6 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
${initMutableStates(ctx)}
}
- @Override
public Object apply(Object r) {
// GenerateProjection does not work with UnsafeRows.
assert(!(r instanceof ${classOf[UnsafeRow].getName}));
@@ -189,7 +186,6 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
public void setNullAt(int i) { nullBits[i] = true; }
public boolean isNullAt(int i) { return nullBits[i]; }
- @Override
public Object genericGet(int i) {
if (isNullAt(i)) return null;
switch (i) {
@@ -210,14 +206,12 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
$specificAccessorFunctions
$specificMutatorFunctions
- @Override
public int hashCode() {
int result = 37;
$hashUpdates
return result;
}
- @Override
public boolean equals(Object other) {
if (other instanceof SpecificRow) {
SpecificRow row = (SpecificRow) other;
@@ -227,7 +221,6 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
return super.equals(other);
}
- @Override
public InternalRow copy() {
Object[] arr = new Object[${expressions.length}];
${copyColumns}