Skip to content

Commit 1b25a2f

Browse files
committed
Switch to capabilities
1 parent 3456bbd commit 1b25a2f

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/500_date_range.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,11 @@ setup:
127127
---
128128
"test bad dates in range - past":
129129
- requires:
130-
cluster_features: [ "mapper.range.invalid_date_fix" ]
130+
test_runner_features: [ capabilities ]
131+
capabilities:
132+
- method: GET
133+
path: /_search
134+
capabilities: [invalid_date_fix]
131135
reason: "Fix for invalid date required"
132136
- do:
133137
catch: /illegal_argument_exception/
@@ -145,7 +149,11 @@ setup:
145149
---
146150
"test bad dates in range - future":
147151
- requires:
148-
cluster_features: [ "mapper.range.invalid_date_fix" ]
152+
test_runner_features: [ capabilities ]
153+
capabilities:
154+
- method: GET
155+
path: /_search
156+
capabilities: [invalid_date_fix]
149157
reason: "Fix for invalid date required"
150158
- do:
151159
catch: /illegal_argument_exception/

server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.elasticsearch.common.util.LocaleUtils;
3737
import org.elasticsearch.core.Nullable;
3838
import org.elasticsearch.core.TimeValue;
39-
import org.elasticsearch.features.NodeFeature;
4039
import org.elasticsearch.index.IndexMode;
4140
import org.elasticsearch.index.IndexSettings;
4241
import org.elasticsearch.index.IndexSortConfig;
@@ -101,7 +100,6 @@ public final class DateFieldMapper extends FieldMapper {
101100
private static final DateMathParser EPOCH_MILLIS_PARSER = DateFormatter.forPattern("epoch_millis")
102101
.withLocale(DEFAULT_LOCALE)
103102
.toDateMathParser();
104-
public static final NodeFeature INVALID_DATE_FIX = new NodeFeature("mapper.range.invalid_date_fix");
105103

106104
public enum Resolution {
107105
MILLISECONDS(CONTENT_TYPE, NumericType.DATE, DateMillisDocValuesField::new) {

server/src/main/java/org/elasticsearch/index/mapper/MapperFeatures.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ public Set<NodeFeature> getTestFeatures() {
5858
SourceFieldMapper.SYNTHETIC_RECOVERY_SOURCE,
5959
ObjectMapper.SUBOBJECTS_FALSE_MAPPING_UPDATE_FIX,
6060
UKNOWN_FIELD_MAPPING_UPDATE_ERROR_MESSAGE,
61-
DOC_VALUES_SKIPPER,
62-
DateFieldMapper.INVALID_DATE_FIX
61+
DOC_VALUES_SKIPPER
6362
);
6463
}
6564
}

server/src/main/java/org/elasticsearch/rest/action/search/SearchCapabilities.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ private SearchCapabilities() {}
4545
private static final String KNN_QUANTIZED_VECTOR_RESCORE_OVERSAMPLE = "knn_quantized_vector_rescore_oversample";
4646

4747
private static final String HIGHLIGHT_MAX_ANALYZED_OFFSET_DEFAULT = "highlight_max_analyzed_offset_default";
48+
private static final String INVALID_DATE_FIX = "invalid_date_fix";
4849

4950
public static final Set<String> CAPABILITIES;
5051
static {
@@ -63,6 +64,7 @@ private SearchCapabilities() {}
6364
capabilities.add(K_DEFAULT_TO_SIZE);
6465
capabilities.add(KQL_QUERY_SUPPORTED);
6566
capabilities.add(HIGHLIGHT_MAX_ANALYZED_OFFSET_DEFAULT);
67+
capabilities.add(INVALID_DATE_FIX);
6668
CAPABILITIES = Set.copyOf(capabilities);
6769
}
6870
}

0 commit comments

Comments
 (0)