Skip to content

Commit cb8a8b5

Browse files
committed
Add cluster feature for patterned text to handl bwc test
1 parent f045910 commit cb8a8b5

File tree

4 files changed

+69
-2
lines changed

4 files changed

+69
-2
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public class MapperFeatures implements FeatureSpecification {
4545
static final NodeFeature IVF_FORMAT_CLUSTER_FEATURE = new NodeFeature("mapper.ivf_format_cluster_feature");
4646
static final NodeFeature IVF_NESTED_SUPPORT = new NodeFeature("mapper.ivf_nested_support");
4747
static final NodeFeature SEARCH_LOAD_PER_SHARD = new NodeFeature("mapper.search_load_per_shard");
48+
static final NodeFeature PATTERNED_TEXT = new NodeFeature("mapper.patterned_text");
4849

4950
@Override
5051
public Set<NodeFeature> getTestFeatures() {
@@ -76,7 +77,8 @@ public Set<NodeFeature> getTestFeatures() {
7677
IVF_FORMAT_CLUSTER_FEATURE,
7778
IVF_NESTED_SUPPORT,
7879
SEARCH_LOAD_PER_SHARD,
79-
SPARSE_VECTOR_INDEX_OPTIONS_FEATURE
80+
SPARSE_VECTOR_INDEX_OPTIONS_FEATURE,
81+
PATTERNED_TEXT
8082
);
8183
}
8284
}

test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public enum FeatureFlag {
2222
USE_LUCENE101_POSTINGS_FORMAT("es.use_lucene101_postings_format_feature_flag_enabled=true", Version.fromString("9.1.0"), null),
2323
IVF_FORMAT("es.ivf_format_feature_flag_enabled=true", Version.fromString("9.1.0"), null),
2424
LOGS_STREAM("es.logs_stream_feature_flag_enabled=true", Version.fromString("9.1.0"), null),
25-
PATTERNED_TEXT("es.patterned_text_feature_flag_enabled=true", Version.fromString("9.1.1"), null);
25+
PATTERNED_TEXT("es.patterned_text_feature_flag_enabled=true", Version.fromString("9.2.0"), null);
2626

2727
public final String systemProperty;
2828
public final Version from;

x-pack/plugin/logsdb/src/yamlRestTest/resources/rest-api-spec/test/patternedtext/10_basic.yml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
setup:
2+
- requires:
3+
cluster_features: [ "mapper.patterned_text" ]
4+
reason: "patterned_text mappings are used in this test"
25

36
- do:
47
indices.create:
@@ -38,6 +41,9 @@ setup:
3841

3942
---
4043
Field caps:
44+
- requires:
45+
cluster_features: [ "mapper.patterned_text" ]
46+
reason: "patterned_text mappings are used in this test"
4147

4248
- do:
4349
field_caps:
@@ -49,6 +55,9 @@ Field caps:
4955

5056
---
5157
Exist query:
58+
- requires:
59+
cluster_features: [ "mapper.patterned_text" ]
60+
reason: "patterned_text mappings are used in this test"
5261

5362
- do:
5463
search:
@@ -63,6 +72,9 @@ Exist query:
6372

6473
---
6574
Match query:
75+
- requires:
76+
cluster_features: [ "mapper.patterned_text" ]
77+
reason: "patterned_text mappings are used in this test"
6678

6779
- do:
6880
search:
@@ -77,6 +89,9 @@ Match query:
7789

7890
---
7991
Match Phrase query:
92+
- requires:
93+
cluster_features: [ "mapper.patterned_text" ]
94+
reason: "patterned_text mappings are used in this test"
8095

8196
- do:
8297
search:
@@ -91,6 +106,9 @@ Match Phrase query:
91106

92107
---
93108
Match Phrase Prefix query:
109+
- requires:
110+
cluster_features: [ "mapper.patterned_text" ]
111+
reason: "patterned_text mappings are used in this test"
94112

95113
- do:
96114
search:
@@ -106,6 +124,9 @@ Match Phrase Prefix query:
106124

107125
---
108126
Query String query with phrase:
127+
- requires:
128+
cluster_features: [ "mapper.patterned_text" ]
129+
reason: "patterned_text mappings are used in this test"
109130

110131
- do:
111132
search:
@@ -122,6 +143,9 @@ Query String query with phrase:
122143

123144
---
124145
Regexp query:
146+
- requires:
147+
cluster_features: [ "mapper.patterned_text" ]
148+
reason: "patterned_text mappings are used in this test"
125149

126150
- do:
127151
search:
@@ -136,6 +160,9 @@ Regexp query:
136160

137161
---
138162
Wildcard query:
163+
- requires:
164+
cluster_features: [ "mapper.patterned_text" ]
165+
reason: "patterned_text mappings are used in this test"
139166

140167
- do:
141168
search:
@@ -150,6 +177,9 @@ Wildcard query:
150177

151178
---
152179
Prefix query:
180+
- requires:
181+
cluster_features: [ "mapper.patterned_text" ]
182+
reason: "patterned_text mappings are used in this test"
153183

154184
- do:
155185
search:
@@ -164,6 +194,9 @@ Prefix query:
164194

165195
---
166196
Fuzzy query:
197+
- requires:
198+
cluster_features: [ "mapper.patterned_text" ]
199+
reason: "patterned_text mappings are used in this test"
167200

168201
- do:
169202
search:
@@ -178,6 +211,9 @@ Fuzzy query:
178211

179212
---
180213
Span query:
214+
- requires:
215+
cluster_features: [ "mapper.patterned_text" ]
216+
reason: "patterned_text mappings are used in this test"
181217

182218
- do:
183219
catch: bad_request
@@ -190,6 +226,9 @@ Span query:
190226

191227
---
192228
Term intervals query:
229+
- requires:
230+
cluster_features: [ "mapper.patterned_text" ]
231+
reason: "patterned_text mappings are used in this test"
193232

194233
- do:
195234
search:
@@ -206,6 +245,9 @@ Term intervals query:
206245

207246
---
208247
Prefix intervals query:
248+
- requires:
249+
cluster_features: [ "mapper.patterned_text" ]
250+
reason: "patterned_text mappings are used in this test"
209251

210252
- do:
211253
search:
@@ -221,6 +263,9 @@ Prefix intervals query:
221263

222264
---
223265
Wildcard intervals query:
266+
- requires:
267+
cluster_features: [ "mapper.patterned_text" ]
268+
reason: "patterned_text mappings are used in this test"
224269

225270
- do:
226271
search:
@@ -236,6 +281,9 @@ Wildcard intervals query:
236281

237282
---
238283
Fuzzy intervals query:
284+
- requires:
285+
cluster_features: [ "mapper.patterned_text" ]
286+
reason: "patterned_text mappings are used in this test"
239287

240288
- do:
241289
search:
@@ -251,6 +299,9 @@ Fuzzy intervals query:
251299

252300
---
253301
Wildcard highlighting:
302+
- requires:
303+
cluster_features: [ "mapper.patterned_text" ]
304+
reason: "patterned_text mappings are used in this test"
254305

255306
- do:
256307
search:
@@ -269,6 +320,9 @@ Wildcard highlighting:
269320

270321
---
271322
tsdb:
323+
- requires:
324+
cluster_features: [ "mapper.patterned_text" ]
325+
reason: "patterned_text mappings are used in this test"
272326

273327
- do:
274328
indices.create:
@@ -310,6 +364,10 @@ tsdb:
310364

311365
---
312366
Multiple values:
367+
- requires:
368+
cluster_features: [ "mapper.patterned_text" ]
369+
reason: "patterned_text mappings are used in this test"
370+
313371
- do:
314372
indices.create:
315373
index: test1

x-pack/plugin/logsdb/src/yamlRestTest/resources/rest-api-spec/test/patternedtext/20_synthetic_source.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
simple:
2+
- requires:
3+
cluster_features: [ "mapper.patterned_text" ]
4+
reason: "patterned_text mappings are used in this test"
5+
26
- do:
37
indices.create:
48
index: test
@@ -39,6 +43,9 @@ simple:
3943

4044
---
4145
synthetic_source with copy_to:
46+
- requires:
47+
cluster_features: [ "mapper.patterned_text" ]
48+
reason: "patterned_text mappings are used in this test"
4249

4350
- do:
4451
indices.create:

0 commit comments

Comments
 (0)