honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix hierarchy of Percentile/PercentileRank 

Original commit: elastic/x-pack-elasticsearch@b56e65a010
This commit is contained in:
Costin Leau 2017-08-17 17:29:32 +03:00
parent 8605263385
commit 4429defcb1
2 changed files with 3 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sql/server/src/main/java/org/elasticsearch/xpack/sql/expression/function/aggregate/Percentile.java
View File

@ -6,17 +6,14 @@
package org.elasticsearch.xpack.sql.expression.function.aggregate;
import org.elasticsearch.xpack.sql.expression.Expression;
import org.elasticsearch.xpack.sql.expression.Expressions;
import org.elasticsearch.xpack.sql.expression.Foldables;
import org.elasticsearch.xpack.sql.tree.Location;
import org.elasticsearch.xpack.sql.type.DataType;
import org.elasticsearch.xpack.sql.type.DataTypes;
import java.util.Objects;
import static java.util.Collections.singletonList;
public class Percentile extends AggregateFunction implements EnclosedAgg {
public class Percentile extends NumericAggregate implements EnclosedAgg {
private final Expression percent;
@ -27,9 +24,7 @@ public class Percentile extends AggregateFunction implements EnclosedAgg {
@Override
protected TypeResolution resolveType() {
TypeResolution resolution = field().dataType().isNumeric() ? TypeResolution.TYPE_RESOLVED :
new TypeResolution("Function '%s' cannot be applied on a non-numeric expression ('%s' of type '%s')",
functionName(), Expressions.name(field()), field().dataType().esName());
TypeResolution resolution = super.resolveType();
if (TypeResolution.TYPE_RESOLVED.equals(resolution)) {
resolution = percent().dataType().isNumeric() ? TypeResolution.TYPE_RESOLVED :
@ -51,19 +46,4 @@ public class Percentile extends AggregateFunction implements EnclosedAgg {
public String innerName() {
return "[" + Double.toString(Foldables.doubleValueOf(percent)) + "]";
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj == null || getClass() != obj.getClass()) {
return false;
}
Percentile other = (Percentile) obj;
return Objects.equals(field(), other.field())
&& Objects.equals(percent, other.percent);
}
}

22
sql/server/src/main/java/org/elasticsearch/xpack/sql/expression/function/aggregate/PercentileRank.java
View File

@ -6,14 +6,11 @@
package org.elasticsearch.xpack.sql.expression.function.aggregate;
import org.elasticsearch.xpack.sql.expression.Expression;
import org.elasticsearch.xpack.sql.expression.Expressions;
import org.elasticsearch.xpack.sql.expression.Foldables;
import org.elasticsearch.xpack.sql.tree.Location;
import org.elasticsearch.xpack.sql.type.DataType;
import org.elasticsearch.xpack.sql.type.DataTypes;
import java.util.Objects;
import static java.util.Collections.singletonList;
public class PercentileRank extends AggregateFunction implements EnclosedAgg {
@ -27,9 +24,7 @@ public class PercentileRank extends AggregateFunction implements EnclosedAgg {
@Override
protected TypeResolution resolveType() {
TypeResolution resolution = field().dataType().isNumeric() ? TypeResolution.TYPE_RESOLVED :
new TypeResolution("Function '%s' cannot be applied on a non-numeric expression ('%s' of type '%s')",
functionName(), Expressions.name(field()), field().dataType().esName());
TypeResolution resolution = super.resolveType();
if (TypeResolution.TYPE_RESOLVED.equals(resolution)) {
resolution = value.dataType().isNumeric() ? TypeResolution.TYPE_RESOLVED :
@ -51,19 +46,4 @@ public class PercentileRank extends AggregateFunction implements EnclosedAgg {
public String innerName() {
return "[" + Double.toString(Foldables.doubleValueOf(value)) + "]";
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj == null || getClass() != obj.getClass()) {
return false;
}
PercentileRank other = (PercentileRank) obj;
return Objects.equals(field(), other.field())
&& Objects.equals(value, other.value);
}
}