|
16 | 16 | import org.elasticsearch.xpack.esql.action.AbstractEsqlIntegTestCase; |
17 | 17 | import org.junit.Before; |
18 | 18 |
|
| 19 | +import java.util.HashMap; |
19 | 20 | import java.util.List; |
| 21 | +import java.util.Map; |
20 | 22 |
|
21 | 23 | import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; |
22 | 24 | import static org.hamcrest.CoreMatchers.containsString; |
23 | 25 | import static org.hamcrest.Matchers.equalTo; |
| 26 | +import static org.hamcrest.Matchers.greaterThan; |
24 | 27 |
|
25 | 28 | //@TestLogging(value = "org.elasticsearch.xpack.esql:TRACE,org.elasticsearch.compute:TRACE", reason = "debug") |
26 | 29 | public class ScoringIT extends AbstractEsqlIntegTestCase { |
@@ -188,20 +191,127 @@ public void testMatchAllScoring() { |
188 | 191 | FROM test |
189 | 192 | METADATA _score |
190 | 193 | | KEEP id, _score |
| 194 | + """; |
| 195 | + |
| 196 | + assertZeroScore(query); |
| 197 | + } |
| 198 | + |
| 199 | + public void testNonPushableFunctionsScoring() { |
| 200 | + var query = """ |
| 201 | + FROM test |
| 202 | + METADATA _score |
| 203 | + | WHERE length(content) < 20 |
| 204 | + | KEEP id, _score |
| 205 | + """; |
| 206 | + |
| 207 | + assertZeroScore(query); |
| 208 | + |
| 209 | + query = """ |
| 210 | + FROM test |
| 211 | + METADATA _score |
| 212 | + | WHERE length(content) < 20 OR id > 4 |
| 213 | + | KEEP id, _score |
| 214 | + """; |
| 215 | + |
| 216 | + assertZeroScore(query); |
| 217 | + |
| 218 | + query = """ |
| 219 | + FROM test |
| 220 | + METADATA _score |
| 221 | + | WHERE length(content) < 20 AND id < 4 |
| 222 | + | KEEP id, _score |
| 223 | + """; |
| 224 | + |
| 225 | + assertZeroScore(query); |
| 226 | + } |
| 227 | + |
| 228 | + public void testPushableFunctionsScoring() { |
| 229 | + var query = """ |
| 230 | + FROM test |
| 231 | + METADATA _score |
| 232 | + | WHERE id > 4 |
| 233 | + | KEEP id, _score |
191 | 234 | | SORT id ASC |
192 | 235 | """; |
193 | 236 |
|
| 237 | + assertZeroScore(query); |
| 238 | + |
| 239 | + query = """ |
| 240 | + FROM test |
| 241 | + METADATA _score |
| 242 | + | WHERE id > 4 AND id < 7 |
| 243 | + | KEEP id, _score |
| 244 | + | SORT id ASC |
| 245 | + """; |
| 246 | + |
| 247 | + assertZeroScore(query); |
| 248 | + } |
| 249 | + |
| 250 | + private void assertZeroScore(String query) { |
194 | 251 | try (var resp = run(query)) { |
195 | 252 | assertColumnNames(resp.columns(), List.of("id", "_score")); |
196 | 253 | assertColumnTypes(resp.columns(), List.of("integer", "double")); |
197 | 254 | List<List<Object>> values = EsqlTestUtils.getValuesList(resp.values()); |
198 | | - assertThat(values.size(), equalTo(6)); |
199 | 255 | for (List<Object> value : values) { |
200 | 256 | assertThat((Double) value.get(1), equalTo(0.0)); |
201 | 257 | } |
202 | 258 | } |
203 | 259 | } |
204 | 260 |
|
| 261 | + public void testPushableAndFullTextFunctionsConjunctionScoring() { |
| 262 | + var queryWithoutFilter = """ |
| 263 | + FROM test |
| 264 | + METADATA _score |
| 265 | + | WHERE content:"fox" |
| 266 | + | KEEP id, _score |
| 267 | + | SORT id ASC |
| 268 | + """; |
| 269 | + var query = """ |
| 270 | + FROM test |
| 271 | + METADATA _score |
| 272 | + | WHERE content:"fox" AND id > 4 |
| 273 | + | KEEP id, _score |
| 274 | + | SORT id ASC |
| 275 | + """; |
| 276 | + checkSameScores(queryWithoutFilter, query); |
| 277 | + |
| 278 | + query= """ |
| 279 | + FROM test |
| 280 | + METADATA _score |
| 281 | + | WHERE content:"fox" AND (id > 4 or id < 2) |
| 282 | + | KEEP id, _score |
| 283 | + | SORT id ASC |
| 284 | + """; |
| 285 | + queryWithoutFilter = """ |
| 286 | + FROM test |
| 287 | + METADATA _score |
| 288 | + | WHERE content:"fox" |
| 289 | + | KEEP id, _score |
| 290 | + | SORT id ASC |
| 291 | + """; |
| 292 | + checkSameScores(queryWithoutFilter, query); |
| 293 | + } |
| 294 | + |
| 295 | + private void checkSameScores(String queryWithoutFilter, String query) { |
| 296 | + Map<Integer, Double> expectedScores = new HashMap<>(); |
| 297 | + try (var respWithoutFilter = run(queryWithoutFilter)) { |
| 298 | + List<List<Object>> valuesList = EsqlTestUtils.getValuesList(respWithoutFilter); |
| 299 | + for (List<Object> result : valuesList) { |
| 300 | + expectedScores.put((Integer) result.get(0), (Double) result.get(1)); |
| 301 | + } |
| 302 | + } |
| 303 | + try (var resp = run(query)) { |
| 304 | + assertColumnNames(resp.columns(), List.of("id", "_score")); |
| 305 | + assertColumnTypes(resp.columns(), List.of("integer", "double")); |
| 306 | + List<List<Object>> values = EsqlTestUtils.getValuesList(resp.values()); |
| 307 | + for (List<Object> value : values) { |
| 308 | + Double score = (Double) value.get(1); |
| 309 | + assertThat(score, greaterThan(0.0)); |
| 310 | + assertThat(expectedScores.get((Integer)value.get(0)), equalTo(score)); |
| 311 | + } |
| 312 | + } |
| 313 | + } |
| 314 | + |
205 | 315 | private void createAndPopulateIndex() { |
206 | 316 | var indexName = "test"; |
207 | 317 | var client = client().admin().indices(); |
|
0 commit comments