Remove version argument in RangeFieldType (#30411)

The argument `indexVersionCreated` is not needed any more and can be removed.
elastic · May 16, 2018 · d2b9a76 · d2b9a76
1 parent 41887e8
commit d2b9a76
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java b/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java
@@ -161,7 +161,7 @@ static BinaryFieldMapper createQueryBuilderFieldBuilder(BuilderContext context)
  }
 
  static RangeFieldMapper createExtractedRangeFieldBuilder(String name, RangeType rangeType, BuilderContext context) {
- RangeFieldMapper.Builder builder = new RangeFieldMapper.Builder(name, rangeType, context.indexCreatedVersion());
+ RangeFieldMapper.Builder builder = new RangeFieldMapper.Builder(name, rangeType);
  // For now no doc values, because in processQuery(...) only the Lucene range fields get added:
  builder.docValues(false);
  return builder.build(context);

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java
@@ -40,7 +40,6 @@
 import org.apache.lucene.store.ByteArrayDataOutput;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.Version;
 import org.elasticsearch.common.Explicit;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.collect.Tuple;
@@ -93,8 +92,8 @@ public static class Builder extends FieldMapper.Builder<Builder, RangeFieldMappe
  private Boolean coerce;
  private Locale locale;
 
- public Builder(String name, RangeType type, Version indexVersionCreated) {
- super(name, new RangeFieldType(type, indexVersionCreated), new RangeFieldType(type, indexVersionCreated));
+ public Builder(String name, RangeType type) {
+ super(name, new RangeFieldType(type), new RangeFieldType(type));
  builder = this;
  locale = Locale.ROOT;
  }
@@ -174,7 +173,7 @@ public TypeParser(RangeType type) {
  @Override
  public Mapper.Builder<?,?> parse(String name, Map<String, Object> node,
  ParserContext parserContext) throws MapperParsingException {
- Builder builder = new Builder(name, type, parserContext.indexVersionCreated());
+ Builder builder = new Builder(name, type);
  TypeParsers.parseField(builder, name, node, parserContext);
  for (Iterator<Map.Entry<String, Object>> iterator = node.entrySet().iterator(); iterator.hasNext();) {
  Map.Entry<String, Object> entry = iterator.next();
@@ -205,7 +204,7 @@ public static final class RangeFieldType extends MappedFieldType {
  protected FormatDateTimeFormatter dateTimeFormatter;
  protected DateMathParser dateMathParser;
 
- RangeFieldType(RangeType type, Version indexVersionCreated) {
+ RangeFieldType(RangeType type) {
  super();
  this.rangeType = Objects.requireNonNull(type);
  setTokenized(false);

diff --git a/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java
@@ -77,12 +77,12 @@ public void modify(MappedFieldType ft) {
 
  @Override
  protected RangeFieldType createDefaultFieldType() {
- return new RangeFieldType(type, Version.CURRENT);
+ return new RangeFieldType(type);
  }
 
  public void testRangeQuery() throws Exception {
  QueryShardContext context = createContext();
- RangeFieldType ft = new RangeFieldType(type, Version.CURRENT);
+ RangeFieldType ft = new RangeFieldType(type);
  ft.setName(FIELDNAME);
  ft.setIndexOptions(IndexOptions.DOCS);
 
@@ -106,7 +106,7 @@ private QueryShardContext createContext() {
 
  public void testDateRangeQueryUsingMappingFormat() {
  QueryShardContext context = createContext();
- RangeFieldType fieldType = new RangeFieldType(RangeType.DATE, Version.CURRENT);
+ RangeFieldType fieldType = new RangeFieldType(RangeType.DATE);
  fieldType.setName(FIELDNAME);
  fieldType.setIndexOptions(IndexOptions.DOCS);
  fieldType.setHasDocValues(false);
@@ -313,7 +313,7 @@ public void testParseIp() {
  public void testTermQuery() throws Exception {
  // See https:/elastic/elasticsearch/issues/25950
  QueryShardContext context = createContext();
- RangeFieldType ft = new RangeFieldType(type, Version.CURRENT);
+ RangeFieldType ft = new RangeFieldType(type);
  ft.setName(FIELDNAME);
  ft.setIndexOptions(IndexOptions.DOCS);