Skip to content

Commit e2f432a

Browse files
committed
Fix the version check for LegacyGeoShapeFieldMapper (#38547)
Change version check from 7.0 to 6.6 in BaseGeoShapeFieldMapper to correctly use LegacyGeoShapeFieldMapper for indexes created prior to 6.6.
1 parent f8426d9 commit e2f432a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public Mapper.Builder parse(String name, Map<String, Object> node, ParserContext
190190
}
191191
}
192192
final Builder builder;
193-
if (parsedDeprecatedParams || parserContext.indexVersionCreated().before(Version.V_7_0_0)) {
193+
if (parsedDeprecatedParams || parserContext.indexVersionCreated().before(Version.V_6_6_0)) {
194194
// Legacy index-based shape
195195
builder = new LegacyGeoShapeFieldMapper.Builder(name, deprecatedParameters);
196196
} else {

server/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public ExternalMapper build(BuilderContext context) {
8787
BinaryFieldMapper binMapper = binBuilder.build(context);
8888
BooleanFieldMapper boolMapper = boolBuilder.build(context);
8989
GeoPointFieldMapper pointMapper = latLonPointBuilder.build(context);
90-
BaseGeoShapeFieldMapper shapeMapper = (context.indexCreatedVersion().before(Version.V_7_0_0))
90+
BaseGeoShapeFieldMapper shapeMapper = (context.indexCreatedVersion().before(Version.V_6_6_0))
9191
? legacyShapeBuilder.build(context)
9292
: shapeBuilder.build(context);
9393
FieldMapper stringMapper = (FieldMapper)stringBuilder.build(context);

0 commit comments

Comments
 (0)