honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove explicit _all disabling from mappings (elastic/elasticsearch#719) 

The _all field is now deprecated and disabled by default in elasticsearch
6.0.0. We no longer need to disable it explicitly.

Original commit: elastic/x-pack-elasticsearch@c71465083a
This commit is contained in:
Dimitris Athanasiou 2017-01-13 12:39:59 +00:00 committed by GitHub
parent 3ce48bc7b9
commit 4128d635f4
1 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
elasticsearch/src/main/java/org/elasticsearch/xpack/ml/job/persistence/ElasticsearchMappings.java
View File

@ -56,7 +56,6 @@ public class ElasticsearchMappings {
/** /**
* String constants used in mappings * String constants used in mappings
*/ */
static final String ALL = "_all";
static final String ENABLED = "enabled"; static final String ENABLED = "enabled";
static final String ANALYZER = "analyzer"; static final String ANALYZER = "analyzer";
static final String WHITESPACE = "whitespace"; static final String WHITESPACE = "whitespace";
@ -125,9 +124,6 @@ public class ElasticsearchMappings {
XContentBuilder builder = jsonBuilder() XContentBuilder builder = jsonBuilder()
.startObject() .startObject()
.startObject(Result.TYPE.getPreferredName()) .startObject(Result.TYPE.getPreferredName())
.startObject(ALL)
.field(ENABLED, false)
.endObject()
.startObject(PROPERTIES) .startObject(PROPERTIES)
.startObject(ALL_FIELD_VALUES) .startObject(ALL_FIELD_VALUES)
.field(TYPE, TEXT) .field(TYPE, TEXT)
@ -400,9 +396,6 @@ public class ElasticsearchMappings {
.startObject() .startObject()
.startObject(DataCounts.TYPE.getPreferredName()) .startObject(DataCounts.TYPE.getPreferredName())
.field(ENABLED, false) .field(ENABLED, false)
.startObject(ALL)
.field(ENABLED, false)
.endObject()
.startObject(PROPERTIES) .startObject(PROPERTIES)
.startObject(Job.ID.getPreferredName()) .startObject(Job.ID.getPreferredName())
.field(TYPE, KEYWORD) .field(TYPE, KEYWORD)
@ -455,9 +448,6 @@ public class ElasticsearchMappings {
.startObject() .startObject()
.startObject(CategorizerState.TYPE) .startObject(CategorizerState.TYPE)
.field(ENABLED, false) .field(ENABLED, false)
.startObject(ALL)
.field(ENABLED, false)
.endObject()
.endObject() .endObject()
.endObject(); .endObject();
} }
@ -474,9 +464,6 @@ public class ElasticsearchMappings {
.startObject() .startObject()
.startObject(Quantiles.TYPE.getPreferredName()) .startObject(Quantiles.TYPE.getPreferredName())
.field(ENABLED, false) .field(ENABLED, false)
.startObject(ALL)
.field(ENABLED, false)
.endObject()
.endObject() .endObject()
.endObject(); .endObject();
} }
@ -492,9 +479,6 @@ public class ElasticsearchMappings {
return jsonBuilder() return jsonBuilder()
.startObject() .startObject()
.startObject(CategoryDefinition.TYPE.getPreferredName()) .startObject(CategoryDefinition.TYPE.getPreferredName())
.startObject(ALL)
.field(ENABLED, false)
.endObject()
.startObject(PROPERTIES) .startObject(PROPERTIES)
.startObject(CategoryDefinition.CATEGORY_ID.getPreferredName()) .startObject(CategoryDefinition.CATEGORY_ID.getPreferredName())
.field(TYPE, LONG) .field(TYPE, LONG)
@ -531,9 +515,6 @@ public class ElasticsearchMappings {
.startObject() .startObject()
.startObject(ModelState.TYPE.getPreferredName()) .startObject(ModelState.TYPE.getPreferredName())
.field(ENABLED, false) .field(ENABLED, false)
.startObject(ALL)
.field(ENABLED, false)
.endObject()
.endObject() .endObject()
.endObject(); .endObject();
} }
@ -546,9 +527,6 @@ public class ElasticsearchMappings {
XContentBuilder builder = jsonBuilder() XContentBuilder builder = jsonBuilder()
.startObject() .startObject()
.startObject(ModelSnapshot.TYPE.getPreferredName()) .startObject(ModelSnapshot.TYPE.getPreferredName())
.startObject(ALL)
.field(ENABLED, false)
.endObject()
.startObject(PROPERTIES) .startObject(PROPERTIES)
.startObject(Job.ID.getPreferredName()) .startObject(Job.ID.getPreferredName())
.field(TYPE, KEYWORD) .field(TYPE, KEYWORD)
@ -647,9 +625,6 @@ public class ElasticsearchMappings {
return jsonBuilder() return jsonBuilder()
.startObject() .startObject()
.startObject(Usage.TYPE) .startObject(Usage.TYPE)
.startObject(ALL)
.field(ENABLED, false)
.endObject()
.startObject(PROPERTIES) .startObject(PROPERTIES)
.startObject(Usage.TIMESTAMP) .startObject(Usage.TIMESTAMP)
.field(TYPE, DATE) .field(TYPE, DATE)
@ -672,9 +647,6 @@ public class ElasticsearchMappings {
return jsonBuilder() return jsonBuilder()
.startObject() .startObject()
.startObject(AuditMessage.TYPE.getPreferredName()) .startObject(AuditMessage.TYPE.getPreferredName())
.startObject(ALL)
.field(ENABLED, false)
.endObject()
.startObject(PROPERTIES) .startObject(PROPERTIES)
.startObject(AuditMessage.TIMESTAMP.getPreferredName()) .startObject(AuditMessage.TIMESTAMP.getPreferredName())
.field(TYPE, DATE) .field(TYPE, DATE)
@ -688,9 +660,6 @@ public class ElasticsearchMappings {
return jsonBuilder() return jsonBuilder()
.startObject() .startObject()
.startObject(AuditActivity.TYPE.getPreferredName()) .startObject(AuditActivity.TYPE.getPreferredName())
.startObject(ALL)
.field(ENABLED, false)
.endObject()
.startObject(PROPERTIES) .startObject(PROPERTIES)
.startObject(AuditActivity.TIMESTAMP.getPreferredName()) .startObject(AuditActivity.TIMESTAMP.getPreferredName())
.field(TYPE, DATE) .field(TYPE, DATE)