Remove _boost field

dev-tools/create-bwc-index.py

@@ -181,7 +181,10 @@ def generate_index(client, version):
       },
       '_routing': {
         'path': 'myrouting'
-      } 
+      },
+      '_boost': {
+        'null_value': 2.0
+      }     
     }
     mappings['custom_formats'] = {
       'properties': {
@@ -196,7 +199,6 @@ def generate_index(client, version):
       }
     }
 
-
   client.indices.create(index='test', body={
       'settings': {
           'number_of_shards': 1,

docs/reference/migration/migrate_2_0.asciidoc

@@ -247,14 +247,15 @@ curl -XGET 'localhost:9200/index/type/_search'
 }
 ---------------
 
-==== Meta fields have limited confiugration
+==== Meta fields have limited configuration
 Meta fields (those beginning with underscore) are fields used by elasticsearch
 to provide special features.  They now have limited configuration options.
 
 * `_id` configuration can no longer be changed.  If you need to sort, use `_uid` instead.
 * `_type` configuration can no longer be changed.
 * `_index` configuration is limited to enabling the field.
 * `_routing` configuration is limited to requiring the field.
+* `_boost` has been removed.
 
 === Codecs
 

src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java

@@ -53,7 +53,7 @@
 public class PutMappingRequest extends AcknowledgedRequest<PutMappingRequest> implements IndicesRequest.Replaceable {
 
     private static ObjectOpenHashSet<String> RESERVED_FIELDS = ObjectOpenHashSet.from(
-            "_uid", "_id", "_type", "_source",  "_all", "_analyzer", "_boost", "_parent", "_routing", "_index",
+            "_uid", "_id", "_type", "_source",  "_all", "_analyzer", "_parent", "_routing", "_index",
             "_size", "_timestamp", "_ttl"
     );
 

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

@@ -22,9 +22,7 @@
 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;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.index.LeafReaderContext;
@@ -33,7 +31,6 @@
 import org.apache.lucene.util.CloseableThreadLocal;
 import org.elasticsearch.ElasticsearchGenerationException;
 import org.elasticsearch.ElasticsearchIllegalArgumentException;
-import org.elasticsearch.common.Booleans;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Preconditions;
 import org.elasticsearch.common.bytes.BytesReference;
@@ -50,10 +47,8 @@
 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.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;
@@ -194,7 +189,6 @@ public Builder(String index, Settings indexSettings, RootObjectMapper.Builder bu
             this.rootMappers.put(SourceFieldMapper.class, new SourceFieldMapper(indexSettings));
             this.rootMappers.put(TypeFieldMapper.class, new TypeFieldMapper(indexSettings));
             this.rootMappers.put(AllFieldMapper.class, new AllFieldMapper(indexSettings));
-            this.rootMappers.put(BoostFieldMapper.class, new BoostFieldMapper(indexSettings));
             this.rootMappers.put(TimestampFieldMapper.class, new TimestampFieldMapper(indexSettings));
             this.rootMappers.put(TTLFieldMapper.class, new TTLFieldMapper(indexSettings));
             this.rootMappers.put(VersionFieldMapper.class, new VersionFieldMapper(indexSettings));
@@ -411,10 +405,6 @@ public SizeFieldMapper SizeFieldMapper() {
         return rootMapper(SizeFieldMapper.class);
     }
 
-    public BoostFieldMapper boostFieldMapper() {
-        return rootMapper(BoostFieldMapper.class);
-    }
-
     public Filter typeFilter() {
         return this.typeFilter;
     }

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

@@ -54,7 +54,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.BoostFieldMapper;
 import org.elasticsearch.index.mapper.internal.FieldNamesFieldMapper;
 import org.elasticsearch.index.mapper.internal.IdFieldMapper;
 import org.elasticsearch.index.mapper.internal.IndexFieldMapper;
@@ -139,7 +138,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(BoostFieldMapper.NAME, new BoostFieldMapper.TypeParser())
                 .put(ParentFieldMapper.NAME, new ParentFieldMapper.TypeParser())
                 .put(RoutingFieldMapper.NAME, new RoutingFieldMapper.TypeParser())
                 .put(TimestampFieldMapper.NAME, new TimestampFieldMapper.TypeParser())

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

@@ -89,10 +89,6 @@ public static ParentFieldMapper.Builder parent() {
         return new ParentFieldMapper.Builder();
     }
 
-    public static BoostFieldMapper.Builder boost(String name) {
-        return new BoostFieldMapper.Builder(name);
-    }
-
     public static AllFieldMapper.Builder all() {
         return new AllFieldMapper.Builder();
     }

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

@@ -90,7 +90,7 @@ public class MapperService extends AbstractIndexComponent  {
 
     public static final String DEFAULT_MAPPING = "_default_";
     private static ObjectOpenHashSet<String> META_FIELDS = ObjectOpenHashSet.from(
-            "_uid", "_id", "_type", "_all", "_analyzer", "_boost", "_parent", "_routing", "_index",
+            "_uid", "_id", "_type", "_all", "_analyzer", "_parent", "_routing", "_index",
             "_size", "_timestamp", "_ttl"
     );
     private final AnalysisService analysisService;