Skip to content

Commit 6e4b077

Browse files
committed
Make every parameter except value fixed avoiding recalculations
1 parent e4e9672 commit 6e4b077

File tree

3 files changed

+210
-166
lines changed
  • x-pack/plugin/esql
    • qa/testFixtures/src/main/resources
    • src
      • main/java/org/elasticsearch/xpack/esql/expression/function/scalar/score
      • test/java/org/elasticsearch/xpack/esql/expression/function/scalar/score

3 files changed

+210
-166
lines changed

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

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
intLinear
66
required_capability: decay_function
77

8-
ROW value = 5, origin = 10, scale = 10
9-
| EVAL decay_result = decay(value, origin, scale, {"offset": 0, "decay": 0.5, "type": "linear"})
8+
ROW value = 5
9+
| EVAL decay_result = decay(value, 10, 10, {"offset": 0, "decay": 0.5, "type": "linear"})
1010
| KEEP decay_result;
1111

1212
decay_result:double
@@ -16,8 +16,8 @@ decay_result:double
1616
intExp
1717
required_capability: decay_function
1818

19-
ROW value = 5, origin = 10, scale = 10
20-
| EVAL decay_result = decay(value, origin, scale, {"offset": 0, "decay": 0.5, "type": "exp"})
19+
ROW value = 5
20+
| EVAL decay_result = decay(value, 10, 10, {"offset": 0, "decay": 0.5, "type": "exp"})
2121
| KEEP decay_result;
2222

2323
decay_result:double
@@ -27,8 +27,8 @@ decay_result:double
2727
intGauss
2828
required_capability: decay_function
2929

30-
ROW value = 5, origin = 10, scale = 10
31-
| EVAL decay_result = decay(value, origin, scale, {"offset": 0, "decay": 0.5, "type": "gauss"})
30+
ROW value = 5
31+
| EVAL decay_result = decay(value, 10, 10, {"offset": 0, "decay": 0.5, "type": "gauss"})
3232
| KEEP decay_result;
3333

3434
decay_result:double
@@ -38,8 +38,8 @@ decay_result:double
3838
intLinearWithOffset
3939
required_capability: decay_function
4040

41-
ROW value = 95, origin = 100, scale = 50
42-
| EVAL decay_result = decay(value, origin, scale, {"offset": 10, "decay": 0.3, "type": "linear"})
41+
ROW value = 95
42+
| EVAL decay_result = decay(value, 100, 50, {"offset": 10, "decay": 0.3, "type": "linear"})
4343
| KEEP decay_result;
4444

4545
decay_result:double
@@ -49,8 +49,8 @@ decay_result:double
4949
intExpWithOffset
5050
required_capability: decay_function
5151

52-
ROW value = 120, origin = 100, scale = 50
53-
| EVAL decay_result = decay(value, origin, scale, {"offset": 5, "decay": 0.3, "type": "exp"})
52+
ROW value = 120
53+
| EVAL decay_result = decay(value, 100, 50, {"offset": 5, "decay": 0.3, "type": "exp"})
5454
| KEEP decay_result;
5555

5656
decay_result:double
@@ -60,8 +60,8 @@ decay_result:double
6060
intGaussWithOffset
6161
required_capability: decay_function
6262

63-
ROW value = 120, origin = 100, scale = 50
64-
| EVAL decay_result = decay(value, origin, scale, {"offset": 5, "decay": 0.3, "type": "gauss"})
63+
ROW value = 120
64+
| EVAL decay_result = decay(value, 100, 50, {"offset": 5, "decay": 0.3, "type": "gauss"})
6565
| KEEP decay_result;
6666

6767
decay_result:double
@@ -71,8 +71,8 @@ decay_result:double
7171
intWithoutOptions
7272
required_capability: decay_function
7373

74-
ROW value = 5, origin = 10, scale = 10
75-
| EVAL decay_result = decay(value, origin, scale)
74+
ROW value = 5
75+
| EVAL decay_result = decay(value, 10, 10)
7676
| KEEP decay_result;
7777

7878
decay_result:double
@@ -82,8 +82,8 @@ decay_result:double
8282
intOnlyWithOffset
8383
required_capability: decay_function
8484

85-
ROW value = 5, origin = 10, scale = 10
86-
| EVAL decay_result = decay(value, origin, scale, {"offset": 100})
85+
ROW value = 5
86+
| EVAL decay_result = decay(value, 10, 10, {"offset": 100})
8787
| KEEP decay_result;
8888

8989
decay_result:double
@@ -93,8 +93,8 @@ decay_result:double
9393
doubleLinear
9494
required_capability: decay_function
9595

96-
ROW value = 5.0, origin = 10.0, scale = 10.0
97-
| EVAL decay_result = decay(value, origin, scale, {"offset": 0.0, "decay": 0.5, "type": "linear"})
96+
ROW value = 5.0
97+
| EVAL decay_result = decay(value, 10.0, 10.0, {"offset": 0.0, "decay": 0.5, "type": "linear"})
9898
| KEEP decay_result;
9999

100100
decay_result:double
@@ -104,8 +104,8 @@ decay_result:double
104104
doubleExp
105105
required_capability: decay_function
106106

107-
ROW value = 5.0, origin = 10.0, scale = 10.0
108-
| EVAL decay_result = decay(value, origin, scale, {"offset": 0.0, "decay": 0.5, "type": "exp"})
107+
ROW value = 5.0
108+
| EVAL decay_result = decay(value, 10.0, 10.0, {"offset": 0.0, "decay": 0.5, "type": "exp"})
109109
| KEEP decay_result;
110110

111111
decay_result:double
@@ -115,8 +115,8 @@ decay_result:double
115115
doubleGauss
116116
required_capability: decay_function
117117

118-
ROW value = 5.0, origin = 10.0, scale = 10.0
119-
| EVAL decay_result = decay(value, origin, scale, {"offset": 0.0, "decay": 0.5, "type": "gauss"})
118+
ROW value = 5.0
119+
| EVAL decay_result = decay(value, 10.0, 10.0, {"offset": 0.0, "decay": 0.5, "type": "gauss"})
120120
| KEEP decay_result;
121121

122122
decay_result:double
@@ -126,8 +126,8 @@ decay_result:double
126126
longLinear
127127
required_capability: decay_function
128128

129-
ROW value = 15::long, origin = 10::long, scale = 10::long
130-
| EVAL decay_result = decay(value, origin, scale, {"offset": 10000000000, "decay": 0.5, "type": "linear"})
129+
ROW value = 15::long
130+
| EVAL decay_result = decay(value, 10::long, 10::long, {"offset": 10000000000, "decay": 0.5, "type": "linear"})
131131
| KEEP decay_result;
132132

133133
decay_result:double
@@ -137,8 +137,8 @@ decay_result:double
137137
cartesianPointLinear1
138138
required_capability: decay_function
139139

140-
ROW value = TO_CARTESIANPOINT("POINT(5 5)"), origin = TO_CARTESIANPOINT("POINT(0 0)"), scale = 10.0
141-
| EVAL decay_result = decay(value, origin, scale, {"offset": 0.0, "decay": 0.25, "type": "linear"})
140+
ROW value = TO_CARTESIANPOINT("POINT(5 5)")
141+
| EVAL decay_result = decay(value, TO_CARTESIANPOINT("POINT(0 0)"), 10.0, {"offset": 0.0, "decay": 0.25, "type": "linear"})
142142
| KEEP decay_result;
143143

144144
decay_result:double
@@ -148,8 +148,8 @@ decay_result:double
148148
cartesianPointLinear2
149149
required_capability: decay_function
150150

151-
ROW value = TO_CARTESIANPOINT("POINT(10 0)"), origin = TO_CARTESIANPOINT("POINT(0 0)"), scale = 10.0
152-
| EVAL decay_result = ROUND(decay(value, origin, scale, {"offset": 0.0, "decay": 0.25, "type": "linear"}), 10)
151+
ROW value = TO_CARTESIANPOINT("POINT(10 0)")
152+
| EVAL decay_result = ROUND(decay(value, TO_CARTESIANPOINT("POINT(0 0)"), 10.0, {"offset": 0.0, "decay": 0.25, "type": "linear"}), 10)
153153
| KEEP decay_result;
154154

155155
decay_result:double
@@ -159,8 +159,8 @@ decay_result:double
159159
cartesianPointLinearWithOffset
160160
required_capability: decay_function
161161

162-
ROW value = TO_CARTESIANPOINT("POINT(10 0)"), origin = TO_CARTESIANPOINT("POINT(0 0)"), scale = 10.0
163-
| EVAL decay_result = ROUND(decay(value, origin, scale, {"offset": 5.0, "decay": 0.25, "type": "linear"}), 10)
162+
ROW value = TO_CARTESIANPOINT("POINT(10 0)")
163+
| EVAL decay_result = ROUND(decay(value, TO_CARTESIANPOINT("POINT(0 0)"), 10.0, {"offset": 5.0, "decay": 0.25, "type": "linear"}), 10)
164164
| KEEP decay_result;
165165

166166
decay_result:double
@@ -171,8 +171,8 @@ decay_result:double
171171
geoPointLinear
172172
required_capability: decay_function
173173

174-
ROW value = TO_GEOPOINT("POINT(0 0)"), origin = TO_GEOPOINT("POINT(1 1)"), scale = "200km"
175-
| EVAL decay_result = decay(value, origin, scale, {"offset": "0km", "decay": 0.5, "type": "linear"})
174+
ROW value = TO_GEOPOINT("POINT(0 0)")
175+
| EVAL decay_result = decay(value, TO_GEOPOINT("POINT(1 1)"), "200km", {"offset": "0km", "decay": 0.5, "type": "linear"})
176176
| KEEP decay_result;
177177

178178
decay_result:double
@@ -182,8 +182,8 @@ decay_result:double
182182
datetimeLinear1
183183
required_capability: decay_function
184184

185-
ROW value = TO_DATETIME("2023-01-01T00:00:00Z"), origin = TO_DATETIME("2023-01-01T00:00:00Z")
186-
| EVAL decay_result = decay(value, origin, 24 hours, {"offset": 0 seconds, "decay": 0.5, "type": "linear"})
185+
ROW value = TO_DATETIME("2023-01-01T00:00:00Z")
186+
| EVAL decay_result = decay(value, TO_DATETIME("2023-01-01T00:00:00Z"), 24 hours, {"offset": 0 seconds, "decay": 0.5, "type": "linear"})
187187
| KEEP decay_result;
188188

189189
decay_result:double
@@ -193,8 +193,8 @@ decay_result:double
193193
datetimeLinear2
194194
required_capability: decay_function
195195

196-
ROW value = TO_DATETIME("2023-01-01T12:00:00Z"), origin = TO_DATETIME("2023-01-01T00:00:00Z")
197-
| EVAL decay_result = decay(value, origin, 24 hours, {"offset": 0 seconds, "decay": 0.5, "type": "linear"})
196+
ROW value = TO_DATETIME("2023-01-01T12:00:00Z")
197+
| EVAL decay_result = decay(value, TO_DATETIME("2023-01-01T00:00:00Z"), 24 hours, {"offset": 0 seconds, "decay": 0.5, "type": "linear"})
198198
| KEEP decay_result;
199199

200200
decay_result:double
@@ -204,8 +204,8 @@ decay_result:double
204204
dateNanosLinear1
205205
required_capability: decay_function
206206

207-
ROW value = TO_DATE_NANOS("2023-01-01T00:00:00Z"), origin = TO_DATE_NANOS("2023-01-01T00:00:00Z")
208-
| EVAL decay_result = decay(value, origin, 24 hours, {"offset": 0 seconds, "decay": 0.5, "type": "linear"})
207+
ROW value = TO_DATE_NANOS("2023-01-01T00:00:00Z")
208+
| EVAL decay_result = decay(value, TO_DATE_NANOS("2023-01-01T00:00:00Z"), 24 hours, {"offset": 0 seconds, "decay": 0.5, "type": "linear"})
209209
| KEEP decay_result;
210210

211211
decay_result:double
@@ -215,8 +215,8 @@ decay_result:double
215215
dateNanosLinear2
216216
required_capability: decay_function
217217

218-
ROW value = TO_DATE_NANOS("2023-01-01T12:00:00Z"), origin = TO_DATE_NANOS("2023-01-01T00:00:00Z")
219-
| EVAL decay_result = decay(value, origin, 24 hours, {"offset": 0 seconds, "decay": 0.5, "type": "linear"})
218+
ROW value = TO_DATE_NANOS("2023-01-01T12:00:00Z")
219+
| EVAL decay_result = decay(value, TO_DATE_NANOS("2023-01-01T00:00:00Z"), 24 hours, {"offset": 0 seconds, "decay": 0.5, "type": "linear"})
220220
| KEEP decay_result;
221221

222222
decay_result:double

0 commit comments

Comments
 (0)