Skip to content

Commit bb845d6

Browse files
committed
Fix offset types and tests
1 parent 23eef67 commit bb845d6

File tree

5 files changed

+21
-23
lines changed

5 files changed

+21
-23
lines changed

x-pack/plugin/esql/qa/testFixtures/src/main/resources/decay.csv-spec

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
intLinear
66

77
ROW value = 5, origin = 10, scale = 10
8-
| EVAL decay_result = decay(value, origin, scale, 0.0, 0.5, "linear")
8+
| EVAL decay_result = decay(value, origin, scale, 0, 0.5, "linear")
99
| KEEP decay_result;
1010

1111
decay_result:double
@@ -15,7 +15,7 @@ decay_result:double
1515
intExp
1616

1717
ROW value = 5, origin = 10, scale = 10
18-
| EVAL decay_result = decay(value, origin, scale, 0.0, 0.5, "exp")
18+
| EVAL decay_result = decay(value, origin, scale, 0, 0.5, "exp")
1919
| KEEP decay_result;
2020

2121
decay_result:double
@@ -25,7 +25,7 @@ decay_result:double
2525
intGauss
2626

2727
ROW value = 5, origin = 10, scale = 10
28-
| EVAL decay_result = decay(value, origin, scale, 0.0, 0.5, "gauss")
28+
| EVAL decay_result = decay(value, origin, scale, 0, 0.5, "gauss")
2929
| KEEP decay_result;
3030

3131
decay_result:double
@@ -35,7 +35,7 @@ decay_result:double
3535
intLinearWithOffset
3636

3737
ROW value = 95, origin = 100, scale = 50
38-
| EVAL decay_result = decay(value, origin, scale, 10.0, 0.3, "linear")
38+
| EVAL decay_result = decay(value, origin, scale, 10, 0.3, "linear")
3939
| KEEP decay_result;
4040

4141
decay_result:double
@@ -45,7 +45,7 @@ decay_result:double
4545
intExpWithOffset
4646

4747
ROW value = 120, origin = 100, scale = 50
48-
| EVAL decay_result = decay(value, origin, scale, 5.0, 0.3, "exp")
48+
| EVAL decay_result = decay(value, origin, scale, 5, 0.3, "exp")
4949
| KEEP decay_result;
5050

5151
decay_result:double
@@ -55,7 +55,7 @@ decay_result:double
5555
intGaussWithOffset
5656

5757
ROW value = 120, origin = 100, scale = 50
58-
| EVAL decay_result = decay(value, origin, scale, 5.0, 0.3, "gauss")
58+
| EVAL decay_result = decay(value, origin, scale, 5, 0.3, "gauss")
5959
| KEEP decay_result;
6060

6161
decay_result:double
@@ -95,7 +95,7 @@ decay_result:double
9595
longLinear
9696

9797
ROW value = 15::long, origin = 10::long, scale = 10::long
98-
| EVAL decay_result = decay(value, origin, scale, 0.0, 0.5, "linear")
98+
| EVAL decay_result = decay(value, origin, scale, 0::long, 0.5, "linear")
9999
| KEEP decay_result;
100100

101101
decay_result:double

x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/fulltext/DecayIntEvaluator.java

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/fulltext/DecayLongEvaluator.java

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/Decay.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ public EvalOperator.ExpressionEvaluator.Factory toEvaluator(ToEvaluator toEvalua
372372
}
373373

374374
@Evaluator(extraName = "Int")
375-
static double process(int value, int origin, int scale, double offset, double decay, BytesRef functionType) {
375+
static double process(int value, int origin, int scale, int offset, double decay, BytesRef functionType) {
376376
return switch (functionType.utf8ToString()) {
377377
case "exp" -> new ScoreScriptUtils.DecayNumericExp(origin, scale, offset, decay).decayNumericExp(value);
378378
case "gauss" -> new ScoreScriptUtils.DecayNumericGauss(origin, scale, offset, decay).decayNumericGauss(value);
@@ -390,7 +390,7 @@ static double process(double value, double origin, double scale, double offset,
390390
}
391391

392392
@Evaluator(extraName = "Long")
393-
static double process(long value, long origin, long scale, double offset, double decay, BytesRef functionType) {
393+
static double process(long value, long origin, long scale, long offset, double decay, BytesRef functionType) {
394394
return switch (functionType.utf8ToString()) {
395395
case "exp" -> new ScoreScriptUtils.DecayNumericExp(origin, scale, offset, decay).decayNumericExp(value);
396396
case "gauss" -> new ScoreScriptUtils.DecayNumericGauss(origin, scale, offset, decay).decayNumericGauss(value);

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/fulltext/DecayTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,9 @@ public static Iterable<Object[]> parameters() {
4141
List<TestCaseSupplier> testCaseSuppliers = new ArrayList<>();
4242

4343
// Int
44-
testCaseSuppliers.addAll(intTestCase(5, 10, 10, 0.0, 0.5, "linear", 0.75));
4544
testCaseSuppliers.addAll(intTestCase(5, 10, 10, 0, 0.5, "linear", 0.75));
4645

4746
// Long
48-
testCaseSuppliers.addAll(longTestCase(5L, 10L, 10L, 0.0, 0.5, "linear", 0.75));
4947
testCaseSuppliers.addAll(longTestCase(5L, 10L, 10L, 0L, 0.5, "linear", 0.75));
5048

5149
// Double

0 commit comments

Comments
 (0)