Skip to content

Commit f5a63a0

Browse files
missinglinkorangejulius
authored andcommitted
feat(es7): remove _all mapping
The `_all` field was deprecated in Elasticsearch 6 and completely removed in [Elasticsearch 7](https://www.elastic.co/guide/en/elasticsearch/reference/current/breaking-changes-7.0.html#all-meta-field-removed). Pelias has disabled this field for quite some time, however now that we have dropped support for ES5, we can remove this configuration option. This also moves us towards supporting ES7! Connects pelias/pelias#831
1 parent 00cd0dd commit f5a63a0

File tree

3 files changed

+1
-7
lines changed

3 files changed

+1
-7
lines changed

Diff for: mappings/document.js

-3
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,6 @@ var schema = {
186186
_source: {
187187
excludes : ['shape','phrase']
188188
},
189-
_all: {
190-
enabled: false
191-
},
192189
dynamic: 'strict'
193190
};
194191

Diff for: test/document.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ module.exports.tests.dynamic_templates = function(test, common) {
185185
// _all should be disabled
186186
module.exports.tests.all_disabled = function(test, common) {
187187
test('_all disabled', function(t) {
188-
t.equal(schema._all.enabled, false, '_all disabled');
188+
t.false(schema._all, '_all undefined');
189189
t.end();
190190
});
191191
};

Diff for: test/fixtures/expected.json

-3
Original file line numberDiff line numberDiff line change
@@ -1149,9 +1149,6 @@
11491149
"phrase"
11501150
]
11511151
},
1152-
"_all": {
1153-
"enabled": false
1154-
},
11551152
"dynamic": "strict"
11561153
}
11571154
}

0 commit comments

Comments
 (0)