mappings: remove fly weight

Author: martijnvg

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

@@ -181,11 +181,6 @@ private FilterParseContext(ParseContext in) {
             this.in = in;
         }
 
-        @Override
-        public boolean flyweight() {
-            return in.flyweight();
-        }
-
         @Override
         public DocumentMapperParser docMapperParser() {
             return in.docMapperParser();
@@ -411,11 +406,6 @@ public void reset(XContentParser parser, Document document, SourceToParse source
             this.dynamicMappingsUpdate = null;
         }
 
-        @Override
-        public boolean flyweight() {
-            return sourceToParse.flyweight();
-        }
-
         @Override
         public DocumentMapperParser docMapperParser() {
             return this.docMapperParser;
@@ -580,8 +570,6 @@ public Mapper dynamicMappingsUpdate() {
         }
     }
 
-    public abstract boolean flyweight();
-
     public abstract DocumentMapperParser docMapperParser();
 
     /**
@@ -658,6 +646,7 @@ public boolean isWithinMultiFields() {
 
     public abstract SourceToParse sourceToParse();
 
+    @Nullable
     public abstract BytesReference source();
 
     // only should be used by SourceFieldMapper to update with a compressed source

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

@@ -46,8 +46,6 @@ public static SourceToParse source(Origin origin, BytesReference source) {
 
     private final XContentParser parser;
 
-    private boolean flyweight = false;
-
     private String index;
 
     private String type;
@@ -106,15 +104,6 @@ public SourceToParse type(String type) {
         return this;
     }
 
-    public SourceToParse flyweight(boolean flyweight) {
-        this.flyweight = flyweight;
-        return this;
-    }
-
-    public boolean flyweight() {
-        return this.flyweight;
-    }
-
     public String id() {
         return this.id;
     }

core/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java

@@ -220,7 +220,7 @@ public void preParse(ParseContext context) throws IOException {
 
     @Override
     public void postParse(ParseContext context) throws IOException {
-        if (context.id() == null && !context.sourceToParse().flyweight()) {
+        if (context.id() == null) {
             throw new MapperParsingException("No id found while parsing the content source");
         }
         // it either get built in the preParse phase, or get parsed...

core/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java

@@ -228,9 +228,7 @@ public void preParse(ParseContext context) throws IOException {
 
     @Override
     public void postParse(ParseContext context) throws IOException {
-        if (context.sourceToParse().flyweight() == false) {
-            parse(context);
-        }
+        parse(context);
     }
 
     @Override

core/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java

@@ -251,10 +251,11 @@ protected void parseCreateField(ParseContext context, List<Field> fields) throws
         if (!fieldType().stored()) {
             return;
         }
-        if (context.flyweight()) {
+        BytesReference source = context.source();
+        // Percolate and tv APIs may not set the source and that is ok, because these APIs will not index any data
+        if (source == null) {
             return;
         }
-        BytesReference source = context.source();
 
         boolean filtered = (includes != null && includes.length > 0) || (excludes != null && excludes.length > 0);
         if (filtered) {

core/src/main/java/org/elasticsearch/index/mapper/internal/TTLFieldMapper.java

@@ -212,7 +212,7 @@ public Mapper parse(ParseContext context) throws IOException, MapperParsingExcep
 
     @Override
     protected void parseCreateField(ParseContext context, List<Field> fields) throws IOException, AlreadyExpiredException {
-        if (enabledState.enabled && !context.sourceToParse().flyweight()) {
+        if (enabledState.enabled) {
             long ttl = context.sourceToParse().ttl();
             if (ttl <= 0 && defaultTTL > 0) { // no ttl provided so we use the default value
                 ttl = defaultTTL;

core/src/main/java/org/elasticsearch/index/mapper/internal/UidFieldMapper.java

@@ -149,7 +149,7 @@ public void preParse(ParseContext context) throws IOException {
 
     @Override
     public void postParse(ParseContext context) throws IOException {
-        if (context.id() == null && !context.sourceToParse().flyweight()) {
+        if (context.id() == null) {
             throw new MapperParsingException("No id found while parsing the content source");
         }
         // if we did not have the id as part of the sourceToParse, then we need to parse it here

core/src/main/java/org/elasticsearch/index/percolator/PercolatorFieldMapper.java

@@ -126,9 +126,7 @@ public PercolatorFieldMapper(String simpleName, MappedFieldType fieldType, Mappe
     public Mapper parse(ParseContext context) throws IOException {
         QueryShardContext queryShardContext = new QueryShardContext(this.queryShardContext);
         Query query = PercolatorQueriesRegistry.parseQuery(queryShardContext, mapUnmappedFieldAsString, context.parser());
-        if (context.flyweight() == false) {
-            ExtractQueryTermsService.extractQueryTerms(query, context.doc(), queryTermsField.name(), unknownQueryField.name(), queryTermsField.fieldType());
-        }
+        ExtractQueryTermsService.extractQueryTerms(query, context.doc(), queryTermsField.name(), unknownQueryField.name(), queryTermsField.fieldType());
         return null;
     }
 

core/src/main/java/org/elasticsearch/index/termvectors/TermVectorsService.java

@@ -292,7 +292,7 @@ private Fields generateTermVectorsFromDoc(IndexShard indexShard, TermVectorsRequ
     private ParsedDocument parseDocument(IndexShard indexShard, String index, String type, BytesReference doc) throws Throwable {
         MapperService mapperService = indexShard.mapperService();
         DocumentMapperForType docMapper = mapperService.documentMapperWithAutoCreate(type);
-        ParsedDocument parsedDocument = docMapper.getDocumentMapper().parse(source(doc).index(index).type(type).flyweight(true));
+        ParsedDocument parsedDocument = docMapper.getDocumentMapper().parse(source(doc).index(index).type(type).id("_id_for_tv_api"));
         if (docMapper.getMapping() != null) {
             parsedDocument.addDynamicMappingsUpdate(docMapper.getMapping());
         }

core/src/main/java/org/elasticsearch/percolator/PercolateDocumentParser.java

@@ -24,6 +24,7 @@
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.action.percolate.PercolateShardRequest;
 import org.elasticsearch.cluster.action.index.MappingUpdatedAction;
+import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
@@ -34,6 +35,7 @@
 import org.elasticsearch.index.mapper.DocumentMapperForType;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.ParsedDocument;
+import org.elasticsearch.index.mapper.SourceToParse;
 import org.elasticsearch.index.query.QueryShardContext;
 import org.elasticsearch.search.SearchParseElement;
 import org.elasticsearch.search.aggregations.AggregationPhase;
@@ -93,7 +95,7 @@ public ParsedDocument parse(PercolateShardRequest request, PercolateContext cont
 
                         DocumentMapperForType docMapper = mapperService.documentMapperWithAutoCreate(request.documentType());
                         String index = context.shardTarget().index();
-                        doc = docMapper.getDocumentMapper().parse(source(parser).index(index).type(request.documentType()).flyweight(true));
+                        doc = docMapper.getDocumentMapper().parse(source(parser).index(index).type(request.documentType()).id("_id_for_percolate_api"));
                         if (docMapper.getMapping() != null) {
                             doc.addDynamicMappingsUpdate(docMapper.getMapping());
                         }
@@ -202,19 +204,15 @@ private void parseSort(XContentParser parser, PercolateContext context) throws E
     }
 
     private ParsedDocument parseFetchedDoc(PercolateContext context, BytesReference fetchedDoc, MapperService mapperService, String index, String type) {
-        try (XContentParser parser = XContentFactory.xContent(fetchedDoc).createParser(fetchedDoc)) {
-            DocumentMapperForType docMapper = mapperService.documentMapperWithAutoCreate(type);
-            ParsedDocument doc = docMapper.getDocumentMapper().parse(source(parser).index(index).type(type).flyweight(true));
-            if (doc == null) {
-                throw new ElasticsearchParseException("No doc to percolate in the request");
-            }
-            if (context.highlight() != null) {
-                doc.setSource(fetchedDoc);
-            }
-            return doc;
-        } catch (Throwable e) {
-            throw new ElasticsearchParseException("failed to parse request", e);
+        DocumentMapperForType docMapper = mapperService.documentMapperWithAutoCreate(type);
+        ParsedDocument doc = docMapper.getDocumentMapper().parse(source(fetchedDoc).index(index).type(type).id("_id_for_percolate_api"));
+        if (doc == null) {
+            throw new ElasticsearchParseException("No doc to percolate in the request");
         }
+        if (context.highlight() != null) {
+            doc.setSource(fetchedDoc);
+        }
+        return doc;
     }
 
 }

plugins/mapper-size/src/main/java/org/elasticsearch/index/mapper/size/SizeFieldMapper.java

@@ -150,7 +150,7 @@ protected void parseCreateField(ParseContext context, List<Field> fields) throws
         if (!enabledState.enabled) {
             return;
         }
-        if (context.flyweight()) {
+        if (context.source() == null) {
             return;
         }
         fields.add(new IntegerFieldMapper.CustomIntegerNumericField(context.source().length(), fieldType()));