more cleanup in mappings

Author: kimchy

src/main/java/org/elasticsearch/index/get/ShardGetService.java

@@ -197,18 +197,18 @@ public GetResult innerGet(String type, String id, String[] gFields, boolean real
  continue;
  }
  Object value = null;
- if (field.equals(RoutingFieldMapper.NAME) && docMapper.routingFieldMapper().stored()) {
+ if (field.equals(RoutingFieldMapper.NAME) && docMapper.routingFieldMapper().fieldType().stored()) {
  value = source.routing;
- } else if (field.equals(ParentFieldMapper.NAME) && docMapper.parentFieldMapper() != null && docMapper.parentFieldMapper().stored()) {
+ } else if (field.equals(ParentFieldMapper.NAME) && docMapper.parentFieldMapper() != null && docMapper.parentFieldMapper().fieldType().stored()) {
  value = source.parent;
- } else if (field.equals(TimestampFieldMapper.NAME) && docMapper.timestampFieldMapper().stored()) {
+ } else if (field.equals(TimestampFieldMapper.NAME) && docMapper.timestampFieldMapper().fieldType().stored()) {
  value = source.timestamp;
- } else if (field.equals(TTLFieldMapper.NAME) && docMapper.TTLFieldMapper().stored()) {
+ } else if (field.equals(TTLFieldMapper.NAME) && docMapper.TTLFieldMapper().fieldType().stored()) {
  // Call value for search with timestamp + ttl here to display the live remaining ttl value and be consistent with the search result display
  if (source.ttl > 0) {
  value = docMapper.TTLFieldMapper().valueForSearch(source.timestamp + source.ttl);
  }
- } else if (field.equals(SizeFieldMapper.NAME) && docMapper.rootMapper(SizeFieldMapper.class).stored()) {
+ } else if (field.equals(SizeFieldMapper.NAME) && docMapper.rootMapper(SizeFieldMapper.class).fieldType().stored()) {
  value = source.source.length();
  } else {
  if (field.contains("_source.")) {
@@ -242,7 +242,7 @@ public GetResult innerGet(String type, String id, String[] gFields, boolean real
 
  FieldMapper<?> x = docMapper.mappers().smartNameFieldMapper(field);
  // only if the field is stored or source is enabled we should add it..
- if (docMapper.sourceMapper().enabled() || x == null || x.stored()) {
+ if (docMapper.sourceMapper().enabled() || x == null || x.fieldType().stored()) {
  value = searchLookup.source().extractValue(field);
  }
  }
@@ -318,7 +318,7 @@ private GetResult innerGetLoadFromStoredFields(String type, String id, String[]
  }
  } else {
  FieldMappers x = docMapper.mappers().smartName(field);
- if (x == null || !x.mapper().stored()) {
+ if (x == null || !x.mapper().fieldType().stored()) {
  if (searchLookup == null) {
  searchLookup = new SearchLookup(mapperService, indexCache.fieldData(), new String[]{type});
  searchLookup.setNextReader(docIdAndVersion.reader);

src/main/java/org/elasticsearch/index/mapper/FieldMapper.java

@@ -20,7 +20,7 @@
 package org.elasticsearch.index.mapper;
 
 import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.index.FieldInfo.IndexOptions;
+import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.Filter;
 import org.apache.lucene.search.MultiTermQuery;
@@ -120,26 +120,10 @@ public Term createIndexNameTerm(BytesRef value) {
 
  // LUCENE 4 UPGRADE Consider replacing these all with fieldType() and letting consumer pick and choose
 
- boolean indexed();
-
- boolean tokenized();
-
- boolean stored();
-
- boolean storeTermVectors();
-
- boolean storeTermVectorOffsets();
-
- boolean storeTermVectorPositions();
-
- boolean storeTermVectorPayloads();
+ FieldType fieldType();
 
  float boost();
 
- boolean omitNorms();
-
- IndexOptions indexOptions();
-
  /**
  * The analyzer that will be used to index the field.
  */

src/main/java/org/elasticsearch/index/mapper/MapperService.java

@@ -442,7 +442,7 @@ public Filter searchFilter(String... types) {
  useTermsFilter = false;
  break;
  }
- if (!docMapper.typeMapper().indexed()) {
+ if (!docMapper.typeMapper().fieldType().indexed()) {
  useTermsFilter = false;
  break;
  }

src/main/java/org/elasticsearch/index/mapper/ParseContext.java

@@ -244,7 +244,7 @@ public void uid(UidField uid) {
  }
 
  public boolean includeInAll(Boolean includeInAll, FieldMapper mapper) {
- return includeInAll(includeInAll, mapper.indexed());
+ return includeInAll(includeInAll, mapper.fieldType().indexed());
  }
 
  /**

src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java

@@ -311,55 +311,15 @@ public Names names() {
  public abstract FieldType defaultFieldType();
 
  @Override
- public boolean stored() {
- return fieldType.stored();
- }
-
- @Override
- public boolean indexed() {
- return fieldType.indexed();
- }
-
- @Override
- public boolean tokenized() {
- return fieldType.tokenized();
- }
-
- @Override
- public boolean storeTermVectors() {
- return fieldType.storeTermVectors();
- }
-
- @Override
- public boolean storeTermVectorOffsets() {
- return fieldType.storeTermVectorOffsets();
- }
-
- @Override
- public boolean storeTermVectorPositions() {
- return fieldType.storeTermVectorPositions();
- }
-
- @Override
- public boolean storeTermVectorPayloads() {
- return fieldType.storeTermVectorPayloads();
+ public FieldType fieldType() {
+ return fieldType;
  }
 
  @Override
  public float boost() {
  return this.boost;
  }
 
- @Override
- public boolean omitNorms() {
- return fieldType.omitNorms();
- }
-
- @Override
- public IndexOptions indexOptions() {
- return fieldType.indexOptions();
- }
-
  @Override
  public Analyzer indexAnalyzer() {
  return this.indexAnalyzer;
@@ -526,25 +486,25 @@ public void merge(Mapper mergeWith, MergeContext mergeContext) throws MergeMappi
  return;
  }
  AbstractFieldMapper fieldMergeWith = (AbstractFieldMapper) mergeWith;
- if (this.indexed() != fieldMergeWith.indexed() || this.tokenized() != fieldMergeWith.tokenized()) {
+ if (this.fieldType().indexed() != fieldMergeWith.fieldType().indexed() || this.fieldType().tokenized() != fieldMergeWith.fieldType().tokenized()) {
  mergeContext.addConflict("mapper [" + names.fullName() + "] has different index values");
  }
- if (this.stored() != fieldMergeWith.stored()) {
+ if (this.fieldType().stored() != fieldMergeWith.fieldType().stored()) {
  mergeContext.addConflict("mapper [" + names.fullName() + "] has different store values");
  }
- if (this.tokenized() != fieldMergeWith.tokenized()) {
+ if (this.fieldType().tokenized() != fieldMergeWith.fieldType().tokenized()) {
  mergeContext.addConflict("mapper [" + names.fullName() + "] has different tokenize values");
  }
- if (this.storeTermVectors() != fieldMergeWith.storeTermVectors()) {
+ if (this.fieldType().storeTermVectors() != fieldMergeWith.fieldType().storeTermVectors()) {
  mergeContext.addConflict("mapper [" + names.fullName() + "] has different store_term_vector values");
  }
- if (this.storeTermVectorOffsets() != fieldMergeWith.storeTermVectorOffsets()) {
+ if (this.fieldType().storeTermVectorOffsets() != fieldMergeWith.fieldType().storeTermVectorOffsets()) {
  mergeContext.addConflict("mapper [" + names.fullName() + "] has different store_term_vector_offsets values");
  }
- if (this.storeTermVectorPositions() != fieldMergeWith.storeTermVectorPositions()) {
+ if (this.fieldType().storeTermVectorPositions() != fieldMergeWith.fieldType().storeTermVectorPositions()) {
  mergeContext.addConflict("mapper [" + names.fullName() + "] has different store_term_vector_positions values");
  }
- if (this.storeTermVectorPayloads() != fieldMergeWith.storeTermVectorPayloads()) {
+ if (this.fieldType().storeTermVectorPayloads() != fieldMergeWith.fieldType().storeTermVectorPayloads()) {
  mergeContext.addConflict("mapper [" + names.fullName() + "] has different store_term_vector_payloads values");
  }
  if (this.indexAnalyzer == null) {
@@ -614,30 +574,30 @@ protected void doXContentBody(XContentBuilder builder) throws IOException {
  }
 
  FieldType defaultFieldType = defaultFieldType();
- if (indexed() != defaultFieldType.indexed() ||
- tokenized() != defaultFieldType.tokenized()) {
- builder.field("index", indexTokenizeOptionToString(indexed(), tokenized()));
+ if (fieldType.indexed() != defaultFieldType.indexed() ||
+ fieldType.tokenized() != defaultFieldType.tokenized()) {
+ builder.field("index", indexTokenizeOptionToString(fieldType.indexed(), fieldType.tokenized()));
  }
- if (stored() != defaultFieldType.stored()) {
- builder.field("store", stored());
+ if (fieldType.stored() != defaultFieldType.stored()) {
+ builder.field("store", fieldType.stored());
  }
- if (storeTermVectors() != defaultFieldType.storeTermVectors()) {
- builder.field("store_term_vector", storeTermVectors());
+ if (fieldType.storeTermVectors() != defaultFieldType.storeTermVectors()) {
+ builder.field("store_term_vector", fieldType.storeTermVectors());
  }
- if (storeTermVectorOffsets() != defaultFieldType.storeTermVectorOffsets()) {
- builder.field("store_term_vector_offsets", storeTermVectorOffsets());
+ if (fieldType.storeTermVectorOffsets() != defaultFieldType.storeTermVectorOffsets()) {
+ builder.field("store_term_vector_offsets", fieldType.storeTermVectorOffsets());
  }
- if (storeTermVectorPositions() != defaultFieldType.storeTermVectorPositions()) {
- builder.field("store_term_vector_positions", storeTermVectorPositions());
+ if (fieldType.storeTermVectorPositions() != defaultFieldType.storeTermVectorPositions()) {
+ builder.field("store_term_vector_positions", fieldType.storeTermVectorPositions());
  }
- if (storeTermVectorPayloads() != defaultFieldType.storeTermVectorPayloads()) {
- builder.field("store_term_vector_payloads", storeTermVectorPayloads());
+ if (fieldType.storeTermVectorPayloads() != defaultFieldType.storeTermVectorPayloads()) {
+ builder.field("store_term_vector_payloads", fieldType.storeTermVectorPayloads());
  }
- if (omitNorms() != defaultFieldType.omitNorms()) {
- builder.field("omit_norms", omitNorms());
+ if (fieldType.omitNorms() != defaultFieldType.omitNorms()) {
+ builder.field("omit_norms", fieldType.omitNorms());
  }
- if (indexOptions() != defaultFieldType.indexOptions()) {
- builder.field("index_options", indexOptionToString(indexOptions()));
+ if (fieldType.indexOptions() != defaultFieldType.indexOptions()) {
+ builder.field("index_options", indexOptionToString(fieldType.indexOptions()));
  }
 
  if (indexAnalyzer != null && searchAnalyzer != null && indexAnalyzer.name().equals(searchAnalyzer.name()) && !indexAnalyzer.name().startsWith("_") && !indexAnalyzer.name().equals("default")) {

src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java

@@ -163,7 +163,7 @@ public String valueAsString(Object value) {
 
  @Override
  protected Field parseCreateField(ParseContext context) throws IOException {
- if (!stored()) {
+ if (!fieldType().stored()) {
  return null;
  }
  byte[] value;

src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java

@@ -203,7 +203,7 @@ public Filter nullValueFilter() {
 
  @Override
  protected Field parseCreateField(ParseContext context) throws IOException {
- if (!indexed() && !stored()) {
+ if (!fieldType().indexed() && !fieldType().stored()) {
  return null;
  }
  XContentParser.Token token = context.parser().currentToken();

src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java

@@ -354,7 +354,7 @@ public static class CustomByteNumericField extends CustomNumericField {
  private final NumberFieldMapper mapper;
 
  public CustomByteNumericField(NumberFieldMapper mapper, byte number, FieldType fieldType) {
- super(mapper, mapper.stored() ? new byte[]{number} : null, fieldType);
+ super(mapper, mapper.fieldType.stored() ? new byte[]{number} : null, fieldType);
  this.mapper = mapper;
  this.number = number;
  }

src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java

@@ -357,7 +357,7 @@ public static class CustomDoubleNumericField extends CustomNumericField {
  private final NumberFieldMapper mapper;
 
  public CustomDoubleNumericField(NumberFieldMapper mapper, double number, FieldType fieldType) {
- super(mapper, mapper.stored() ? Numbers.doubleToBytes(number) : null, fieldType);
+ super(mapper, mapper.fieldType().stored() ? Numbers.doubleToBytes(number) : null, fieldType);
  this.mapper = mapper;
  this.number = number;
  }

src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java

@@ -352,7 +352,7 @@ public static class CustomFloatNumericField extends CustomNumericField {
  private final NumberFieldMapper mapper;
 
  public CustomFloatNumericField(NumberFieldMapper mapper, float number, FieldType fieldType) {
- super(mapper, mapper.stored() ? Numbers.floatToBytes(number) : null, fieldType);
+ super(mapper, mapper.fieldType().stored() ? Numbers.floatToBytes(number) : null, fieldType);
  this.mapper = mapper;
  this.number = number;
  }