Mappings: Remove _analyzer

closes elastic#9279

docs/reference/mapping/fields.asciidoc

@@ -15,8 +15,6 @@ include::fields/source-field.asciidoc[]
 
 include::fields/all-field.asciidoc[]
 
-include::fields/analyzer-field.asciidoc[]
-
 include::fields/parent-field.asciidoc[]
 
 include::fields/field-names-field.asciidoc[]

src/main/java/org/elasticsearch/index/engine/Engine.java

@@ -374,7 +374,7 @@ public List<Document> docs() {
         }
 
         public Analyzer analyzer() {
-            return this.doc.analyzer();
+            return docMapper.mappers().indexAnalyzer();
         }
 
         public BytesReference source() {

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

@@ -22,7 +22,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.FieldType;
@@ -45,19 +44,43 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.text.StringAndBytesText;
 import org.elasticsearch.common.text.Text;
-import org.elasticsearch.common.xcontent.*;
-import org.elasticsearch.common.xcontent.smile.SmileXContent;
+import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.cache.bitset.BitsetFilterCache;
-import org.elasticsearch.index.mapper.internal.*;
+import org.elasticsearch.index.mapper.internal.AllFieldMapper;
+import org.elasticsearch.index.mapper.internal.BoostFieldMapper;
+import org.elasticsearch.index.mapper.internal.FieldNamesFieldMapper;
+import org.elasticsearch.index.mapper.internal.IdFieldMapper;
+import org.elasticsearch.index.mapper.internal.IndexFieldMapper;
+import org.elasticsearch.index.mapper.internal.ParentFieldMapper;
+import org.elasticsearch.index.mapper.internal.RoutingFieldMapper;
+import org.elasticsearch.index.mapper.internal.SizeFieldMapper;
+import org.elasticsearch.index.mapper.internal.SourceFieldMapper;
+import org.elasticsearch.index.mapper.internal.TTLFieldMapper;
+import org.elasticsearch.index.mapper.internal.TimestampFieldMapper;
+import org.elasticsearch.index.mapper.internal.TypeFieldMapper;
+import org.elasticsearch.index.mapper.internal.UidFieldMapper;
+import org.elasticsearch.index.mapper.internal.VersionFieldMapper;
 import org.elasticsearch.index.mapper.object.ObjectMapper;
 import org.elasticsearch.index.mapper.object.RootObjectMapper;
 import org.elasticsearch.script.ExecutableScript;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.script.ScriptService.ScriptType;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import static com.google.common.collect.Lists.newArrayList;
@@ -184,7 +207,6 @@ public Builder(String index, Settings indexSettings, RootObjectMapper.Builder bu
             this.rootMappers.put(IndexFieldMapper.class, new IndexFieldMapper());
             this.rootMappers.put(SourceFieldMapper.class, new SourceFieldMapper(indexSettings));
             this.rootMappers.put(TypeFieldMapper.class, new TypeFieldMapper());
-            this.rootMappers.put(AnalyzerMapper.class, new AnalyzerMapper());
             this.rootMappers.put(AllFieldMapper.class, new AllFieldMapper());
             this.rootMappers.put(BoostFieldMapper.class, new BoostFieldMapper(indexSettings));
             this.rootMappers.put(TimestampFieldMapper.class, new TimestampFieldMapper(indexSettings));
@@ -408,10 +430,6 @@ public SourceFieldMapper sourceMapper() {
         return rootMapper(SourceFieldMapper.class);
     }
 
-    public AnalyzerMapper analyzerMapper() {
-        return rootMapper(AnalyzerMapper.class);
-    }
-
     public AllFieldMapper allFieldMapper() {
         return rootMapper(AllFieldMapper.class);
     }
@@ -578,7 +596,7 @@ public ParsedDocument parse(SourceToParse source, @Nullable ParseListener listen
             }
         }
 
-        ParsedDocument doc = new ParsedDocument(context.uid(), context.version(), context.id(), context.type(), source.routing(), source.timestamp(), source.ttl(), context.docs(), context.analyzer(),
+        ParsedDocument doc = new ParsedDocument(context.uid(), context.version(), context.id(), context.type(), source.routing(), source.timestamp(), source.ttl(), context.docs(),
                 context.source(), context.mappingsModified()).parent(source.parent());
         // reset the context to free up memory
         context.reset(null, null, null, null);

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

@@ -56,7 +56,6 @@
 import org.elasticsearch.index.mapper.geo.GeoPointFieldMapper;
 import org.elasticsearch.index.mapper.geo.GeoShapeFieldMapper;
 import org.elasticsearch.index.mapper.internal.AllFieldMapper;
-import org.elasticsearch.index.mapper.internal.AnalyzerMapper;
 import org.elasticsearch.index.mapper.internal.BoostFieldMapper;
 import org.elasticsearch.index.mapper.internal.FieldNamesFieldMapper;
 import org.elasticsearch.index.mapper.internal.IdFieldMapper;
@@ -147,7 +146,6 @@ public DocumentMapperParser(Index index, @IndexSettings Settings indexSettings,
                 .put(SourceFieldMapper.NAME, new SourceFieldMapper.TypeParser())
                 .put(TypeFieldMapper.NAME, new TypeFieldMapper.TypeParser())
                 .put(AllFieldMapper.NAME, new AllFieldMapper.TypeParser())
-                .put(AnalyzerMapper.NAME, new AnalyzerMapper.TypeParser())
                 .put(BoostFieldMapper.NAME, new BoostFieldMapper.TypeParser())
                 .put(ParentFieldMapper.NAME, new ParentFieldMapper.TypeParser())
                 .put(RoutingFieldMapper.NAME, new RoutingFieldMapper.TypeParser())

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

@@ -97,10 +97,6 @@ public static AllFieldMapper.Builder all() {
         return new AllFieldMapper.Builder();
     }
 
-    public static AnalyzerMapper.Builder analyzer() {
-        return new AnalyzerMapper.Builder();
-    }
-
     public static RootObjectMapper.Builder rootObject(String name) {
         return new RootObjectMapper.Builder(name);
     }

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

@@ -354,16 +354,6 @@ public AllEntries allEntries() {
             return in.allEntries();
         }
 
-        @Override
-        public Analyzer analyzer() {
-            return in.analyzer();
-        }
-
-        @Override
-        public void analyzer(Analyzer analyzer) {
-            in.analyzer(analyzer);
-        }
-
         @Override
         public boolean externalValueSet() {
             return in.externalValueSet();
@@ -405,8 +395,6 @@ public static class InternalParseContext extends ParseContext {
 
         private List<Document> documents = Lists.newArrayList();
 
-        private Analyzer analyzer;
-
         private final String index;
 
         @Nullable
@@ -449,7 +437,6 @@ public void reset(XContentParser parser, Document document, SourceToParse source
             } else {
                 this.documents = null;
             }
-            this.analyzer = null;
             this.uid = null;
             this.version = null;
             this.id = null;
@@ -600,14 +587,6 @@ public AllEntries allEntries() {
             return this.allEntries;
         }
 
-        public Analyzer analyzer() {
-            return this.analyzer;
-        }
-
-        public void analyzer(Analyzer analyzer) {
-            this.analyzer = analyzer;
-        }
-
         public float docBoost() {
             return this.docBoost;
         }
@@ -789,10 +768,6 @@ private boolean includeInAll(Boolean specificIncludeInAll, boolean indexed) {
 
     public abstract AllEntries allEntries();
 
-    public abstract Analyzer analyzer();
-
-    public abstract void analyzer(Analyzer analyzer);
-
     /**
      * Return a new context that will have the external value set.
      */

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

@@ -46,15 +46,13 @@ public class ParsedDocument {
 
     private final List<Document> documents;
 
-    private final Analyzer analyzer;
-
     private BytesReference source;
 
     private boolean mappingsModified;
 
     private String parent;
 
-    public ParsedDocument(Field uid, Field version, String id, String type, String routing, long timestamp, long ttl, List<Document> documents, Analyzer analyzer, BytesReference source, boolean mappingsModified) {
+    public ParsedDocument(Field uid, Field version, String id, String type, String routing, long timestamp, long ttl, List<Document> documents, BytesReference source, boolean mappingsModified) {
         this.uid = uid;
         this.version = version;
         this.id = id;
@@ -64,7 +62,6 @@ public ParsedDocument(Field uid, Field version, String id, String type, String r
         this.ttl = ttl;
         this.documents = documents;
         this.source = source;
-        this.analyzer = analyzer;
         this.mappingsModified = mappingsModified;
     }
 
@@ -104,10 +101,6 @@ public List<Document> docs() {
         return this.documents;
     }
 
-    public Analyzer analyzer() {
-        return this.analyzer;
-    }
-
     public BytesReference source() {
         return this.source;
     }

src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java

@@ -236,13 +236,10 @@ protected void parseCreateField(ParseContext context, List<Field> fields) throws
     private Analyzer findAnalyzer(ParseContext context) {
         Analyzer analyzer = indexAnalyzer;
         if (analyzer == null) {
-            analyzer = context.analyzer();
+            analyzer = context.docMapper().mappers().indexAnalyzer();
             if (analyzer == null) {
-                analyzer = context.docMapper().indexAnalyzer();
-                if (analyzer == null) {
-                    // This should not happen, should we log warn it?
-                    analyzer = Lucene.STANDARD_ANALYZER;
-                }
+                // This should not happen, should we log warn it?
+                analyzer = Lucene.STANDARD_ANALYZER;
             }
         }
         return analyzer;