Skip to content

ES|QL: Add unsigned long and mixed numeric types support to Decay function #134440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

ES|QL: Add unsigned long and mixed numeric types support to Decay function #134440

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d57a8e9
Add unsigned long support to Decay function
timgrein Sep 10, 2025
58a230c
Separate unsigned long and long evaluators
timgrein Sep 16, 2025
408d4c9
Use actual unsigned long in unsigned long integration test case
timgrein Sep 16, 2025
c86e56c
spotlessApply
timgrein Sep 16, 2025
f43b505
Support mixed numeric types for numeric decay
timgrein Sep 17, 2025
1319903
Add mixed numeric types test cases
timgrein Sep 17, 2025
eee150f
Use EsqlDataTypeConverter for most cases
timgrein Sep 17, 2025
13f103a
Add Evaluator
timgrein Sep 22, 2025
e35b86f
Merge branch 'main' into esql-decay-function-unsigned-long-support
timgrein Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 34 additions & 5 deletions ...ql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/score/Decay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
import static org.elasticsearch.xpack.esql.core.type.DataType.isMillisOrNanos;
import static org.elasticsearch.xpack.esql.core.type.DataType.isSpatialPoint;
import static org.elasticsearch.xpack.esql.core.type.DataType.isTimeDuration;
import static org.elasticsearch.xpack.esql.core.type.DataType.isUnsignedLong;

/**
* Decay a numeric, spatial or date type value based on the distance of it to an origin.
Expand Down Expand Up @@ -237,8 +236,6 @@ private TypeResolution validateOriginAndScale(DataType valueType) {
);
} else if (isMillisOrNanos(valueType)) {
return validateOriginAndScale(DataType::isMillisOrNanos, "datetime or date_nanos", DataType::isTimeDuration, "time_duration");
} else if (isUnsignedLong(valueType)) {
return validateOriginAndScale(DataType::isUnsignedLong, "unsigned long", DataType::isUnsignedLong, "unsigned_long");
} else {
return validateOriginAndScale(DataType::isNumeric, "numeric", DataType::isNumeric, "numeric");
}
Expand Down Expand Up @@ -290,8 +287,8 @@ public EvalOperator.ExpressionEvaluator.Factory toEvaluator(ToEvaluator toEvalua
FoldContext foldCtx = toEvaluator.foldCtx();

// Constants
Object originFolded = origin.fold(foldCtx);
Object scaleFolded = getFoldedScale(foldCtx, valueDataType);
Object originFolded = convertToExpectedType(origin.fold(foldCtx), origin.dataType(), valueDataType);
Object scaleFolded = convertToExpectedType(getFoldedScale(foldCtx, valueDataType), scale.dataType(), valueDataType);
Object offsetFolded = getOffset(foldCtx, valueDataType, offsetExpr);
Double decayFolded = decayExpr != null ? (Double) decayExpr.fold(foldCtx) : DEFAULT_DECAY;
DecayFunction decayFunction = DecayFunction.fromBytesRef(typeExpr != null ? (BytesRef) typeExpr.fold(foldCtx) : DEFAULT_FUNCTION);
Expand Down Expand Up @@ -674,4 +671,36 @@ private Object getDefaultOffset(DataType valueDataType) {
};
}

private Object convertToExpectedType(Object value, DataType valueType, DataType targetType) {
if (targetType == INTEGER && value instanceof Integer) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can use EsqlDataTypeConverter.convert() here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right! Adjusted with Use EsqlDataTypeConverter for most cases.

return value;
}
if (targetType == LONG && value instanceof Long) {
return value;
}
if (targetType == UNSIGNED_LONG && value instanceof Long) {
return value;
}
if (targetType == DOUBLE && value instanceof Double) {
return value;
}

// Unsigned longs are represented using (Long.MIN_VALUE, Long.MAX_VALUE), therefore we need to convert
// if the targetType is not "unsigned_long"
if (valueType == UNSIGNED_LONG && targetType != UNSIGNED_LONG) {
value = NumericUtils.unsignedLongToDouble(((Number) value).longValue());
}

if (value instanceof Number num) {
return switch (targetType) {
case INTEGER -> num.intValue();
case LONG, UNSIGNED_LONG -> num.longValue();
case DOUBLE -> num.doubleValue();
default -> value;
};
}

return value;
}

}
Loading