|
15 | 15 | import org.apache.lucene.search.TermQuery;
|
16 | 16 | import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource;
|
17 | 17 | import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
|
18 |
| -import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource; |
19 |
| -import org.elasticsearch.index.fielddata.fieldcomparator.DoubleValuesComparatorSource; |
| 18 | +import org.elasticsearch.index.fielddata.fieldcomparator.ScriptDoubleValuesComparatorSource; |
| 19 | +import org.elasticsearch.index.fielddata.fieldcomparator.ScriptStringFieldComparatorSource; |
| 20 | +import org.elasticsearch.index.fielddata.fieldcomparator.ScriptVersionFieldComparatorSource; |
20 | 21 | import org.elasticsearch.index.mapper.NestedPathFieldMapper;
|
21 | 22 | import org.elasticsearch.index.query.MatchNoneQueryBuilder;
|
22 | 23 | import org.elasticsearch.index.query.QueryBuilder;
|
@@ -301,15 +302,15 @@ public void testMultiValueMode() throws IOException {
|
301 | 302 | public void testBuildCorrectComparatorType() throws IOException {
|
302 | 303 | ScriptSortBuilder sortBuilder = new ScriptSortBuilder(mockScript(MOCK_SCRIPT_NAME), ScriptSortType.STRING);
|
303 | 304 | SortField sortField = sortBuilder.build(createMockSearchExecutionContext()).field();
|
304 |
| - assertThat(sortField.getComparatorSource(), instanceOf(BytesRefFieldComparatorSource.class)); |
| 305 | + assertThat(sortField.getComparatorSource(), instanceOf(ScriptStringFieldComparatorSource.class)); |
305 | 306 |
|
306 | 307 | sortBuilder = new ScriptSortBuilder(mockScript(MOCK_SCRIPT_NAME), ScriptSortType.NUMBER);
|
307 | 308 | sortField = sortBuilder.build(createMockSearchExecutionContext()).field();
|
308 |
| - assertThat(sortField.getComparatorSource(), instanceOf(DoubleValuesComparatorSource.class)); |
| 309 | + assertThat(sortField.getComparatorSource(), instanceOf(ScriptDoubleValuesComparatorSource.class)); |
309 | 310 |
|
310 | 311 | sortBuilder = new ScriptSortBuilder(mockScript(MOCK_SCRIPT_NAME), ScriptSortType.VERSION);
|
311 | 312 | sortField = sortBuilder.build(createMockSearchExecutionContext()).field();
|
312 |
| - assertThat(sortField.getComparatorSource(), instanceOf(BytesRefFieldComparatorSource.class)); |
| 313 | + assertThat(sortField.getComparatorSource(), instanceOf(ScriptVersionFieldComparatorSource.class)); |
313 | 314 | }
|
314 | 315 |
|
315 | 316 | /**
|
|
0 commit comments