Skip to content

Commit 4c7549a

Browse files
Merge offset encoding index versions (#125610)
Since we haven't yet had an 8.x release, there's no need for separate index versions for the individual offset encoding implementations on the 8.x branch.
1 parent 36afa61 commit 4c7549a

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

server/src/main/java/org/elasticsearch/index/IndexVersions.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,7 @@ private static IndexVersion def(int id, Version luceneVersion) {
125125
public static final IndexVersion INFERENCE_METADATA_FIELDS_BACKPORT = def(8_524_0_00, Version.LUCENE_9_12_1);
126126
public static final IndexVersion LOGSB_OPTIONAL_SORTING_ON_HOST_NAME_BACKPORT = def(8_525_0_00, Version.LUCENE_9_12_1);
127127
public static final IndexVersion USE_SYNTHETIC_SOURCE_FOR_RECOVERY_BY_DEFAULT_BACKPORT = def(8_526_0_00, Version.LUCENE_9_12_1);
128-
public static final IndexVersion SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_KEYWORD = def(8_527_0_00, Version.LUCENE_9_12_1);
129-
public static final IndexVersion SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_NUMBER = def(8_528_0_00, Version.LUCENE_9_12_1);
128+
public static final IndexVersion SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY = def(8_527_0_00, Version.LUCENE_9_12_1);
130129
/*
131130
* STOP! READ THIS FIRST! No, really,
132131
* ____ _____ ___ ____ _ ____ _____ _ ____ _____ _ _ ___ ____ _____ ___ ____ ____ _____ _

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public IpFieldMapper build(MapperBuilderContext context) {
201201
stored.getValue(),
202202
this,
203203
indexCreatedVersion,
204-
IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_KEYWORD
204+
IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY
205205
);
206206
return new IpFieldMapper(
207207
leafName(),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ public KeywordFieldMapper build(MapperBuilderContext context) {
391391
stored.getValue(),
392392
this,
393393
indexCreatedVersion,
394-
IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_KEYWORD
394+
IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY
395395
);
396396
return new KeywordFieldMapper(
397397
leafName(),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ public NumberFieldMapper build(MapperBuilderContext context) {
298298
stored.getValue(),
299299
this,
300300
indexCreatedVersion,
301-
IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_NUMBER
301+
IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY
302302
);
303303
return new NumberFieldMapper(leafName(), ft, builderParams(this, context), context.isSourceSynthetic(), this, offsetsFieldName);
304304
}

0 commit comments

Comments
 (0)