diff --git a/core/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java index 717f0361552..2e5a62de584 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java @@ -496,7 +496,10 @@ public class DateFieldMapper extends FieldMapper { } @Override - protected void parseCreateField(ParseContext context, List fields) throws IOException { + protected void parseCreateField(ParseContext originalContext, List fields) throws IOException { + // Date fields, by default, will not be included in _all + final ParseContext context = originalContext.setIncludeInAllDefault(false); + String dateAsString; if (context.externalValueSet()) { Object dateAsObject = context.externalValue(); diff --git a/core/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java index c27ddc1811b..ee7a9fa07f9 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java @@ -110,7 +110,10 @@ public class GeoPointFieldMapper extends BaseGeoPointFieldMapper { } @Override - protected void parse(ParseContext context, GeoPoint point, String geoHash) throws IOException { + protected void parse(ParseContext originalContext, GeoPoint point, String geoHash) throws IOException { + // Geopoint fields, by default, will not be included in _all + final ParseContext context = originalContext.setIncludeInAllDefault(false); + if (ignoreMalformed.value() == false) { if (point.lat() > 90.0 || point.lat() < -90.0) { throw new IllegalArgumentException("illegal latitude value [" + point.lat() + "] for " + name()); diff --git a/core/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java index 9c90dd44dbc..d38e98a843d 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java @@ -430,7 +430,10 @@ public class GeoShapeFieldMapper extends FieldMapper { } @Override - public Mapper parse(ParseContext context) throws IOException { + public Mapper parse(ParseContext originalContext) throws IOException { + // Numeric fields, by default, will not be included in _all + final ParseContext context = originalContext.setIncludeInAllDefault(false); + try { Shape shape = context.parseExternalValue(Shape.class); if (shape == null) { diff --git a/core/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java index 69a8e06f859..7ba23c073a6 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java @@ -285,7 +285,10 @@ public class IpFieldMapper extends FieldMapper { } @Override - protected void parseCreateField(ParseContext context, List fields) throws IOException { + protected void parseCreateField(ParseContext originalContext, List fields) throws IOException { + // IP fields, by default, will not be included in _all + final ParseContext context = originalContext.setIncludeInAllDefault(false); + Object addressAsObject; if (context.externalValueSet()) { addressAsObject = context.externalValue(); diff --git a/core/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java index 886b93fcf0e..bb1b38b99e2 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java @@ -895,7 +895,9 @@ public class NumberFieldMapper extends FieldMapper { } @Override - protected void parseCreateField(ParseContext context, List fields) throws IOException { + protected void parseCreateField(ParseContext originalContext, List fields) throws IOException { + // Numeric fields, by default, will not be included in _all + final ParseContext context = originalContext.setIncludeInAllDefault(false); final boolean includeInAll = context.includeInAll(this.includeInAll, this); XContentParser parser = context.parser(); diff --git a/core/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java index 3608da30f76..e30a5b61c78 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java @@ -364,7 +364,9 @@ public class ScaledFloatFieldMapper extends FieldMapper { } @Override - protected void parseCreateField(ParseContext context, List fields) throws IOException { + protected void parseCreateField(ParseContext originalContext, List fields) throws IOException { + // Numeric fields, by default, will not be included in _all + final ParseContext context = originalContext.setIncludeInAllDefault(false); final boolean includeInAll = context.includeInAll(this.includeInAll, this); XContentParser parser = context.parser(); diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java index a80f94845d1..ff8fad47a0d 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java @@ -194,7 +194,8 @@ public class DateFieldMapperTests extends ESSingleNodeTestCase { public void testIncludeInAll() throws Exception { String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") - .startObject("properties").startObject("field").field("type", "date").endObject().endObject() + .startObject("properties").startObject("field").field("type", "date") + .field("include_in_all", true).endObject().endObject() .endObject().endObject().string(); DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping)); @@ -212,8 +213,7 @@ public class DateFieldMapperTests extends ESSingleNodeTestCase { assertEquals("2016-03-11", fields[0].stringValue()); mapping = XContentFactory.jsonBuilder().startObject().startObject("type") - .startObject("properties").startObject("field").field("type", "date") - .field("include_in_all", false).endObject().endObject() + .startObject("properties").startObject("field").field("type", "date").endObject().endObject() .endObject().endObject().string(); mapper = parser.parse("type", new CompressedXContent(mapping)); diff --git a/core/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java index 3d3a69ea800..306cdb77ace 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java @@ -199,7 +199,8 @@ public class IpFieldMapperTests extends ESSingleNodeTestCase { public void testIncludeInAll() throws Exception { String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") - .startObject("properties").startObject("field").field("type", "ip").endObject().endObject() + .startObject("properties").startObject("field").field("type", "ip") + .field("include_in_all", true).endObject().endObject() .endObject().endObject().string(); DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping)); @@ -217,8 +218,7 @@ public class IpFieldMapperTests extends ESSingleNodeTestCase { assertEquals("::1", fields[0].stringValue()); mapping = XContentFactory.jsonBuilder().startObject().startObject("type") - .startObject("properties").startObject("field").field("type", "ip") - .field("include_in_all", false).endObject().endObject() + .startObject("properties").startObject("field").field("type", "ip").endObject().endObject() .endObject().endObject().string(); mapper = parser.parse("type", new CompressedXContent(mapping)); diff --git a/core/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java index 875cec3ebca..96dfbfe62be 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java @@ -280,7 +280,8 @@ public class NumberFieldMapperTests extends ESSingleNodeTestCase { public void doTestIncludeInAll(String type) throws Exception { String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") - .startObject("properties").startObject("field").field("type", type).endObject().endObject() + .startObject("properties").startObject("field").field("type", type) + .field("include_in_all", true).endObject().endObject() .endObject().endObject().string(); DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping)); @@ -298,8 +299,7 @@ public class NumberFieldMapperTests extends ESSingleNodeTestCase { assertEquals("123", fields[0].stringValue()); mapping = XContentFactory.jsonBuilder().startObject().startObject("type") - .startObject("properties").startObject("field").field("type", type) - .field("include_in_all", false).endObject().endObject() + .startObject("properties").startObject("field").field("type", type).endObject().endObject() .endObject().endObject().string(); mapper = parser.parse("type", new CompressedXContent(mapping)); diff --git a/core/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapperTests.java index 3556cea23ad..c7984912b9c 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapperTests.java @@ -265,7 +265,8 @@ public class ScaledFloatFieldMapperTests extends ESSingleNodeTestCase { public void testIncludeInAll() throws Exception { String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") .startObject("properties").startObject("field").field("type", "scaled_float") - .field("scaling_factor", 10.0).endObject().endObject() + .field("scaling_factor", 10.0) + .field("include_in_all", true).endObject().endObject() .endObject().endObject().string(); DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping)); @@ -284,8 +285,7 @@ public class ScaledFloatFieldMapperTests extends ESSingleNodeTestCase { mapping = XContentFactory.jsonBuilder().startObject().startObject("type") .startObject("properties").startObject("field") - .field("type", "scaled_float").field("scaling_factor", 10.0) - .field("include_in_all", false).endObject().endObject() + .field("type", "scaled_float").field("scaling_factor", 10.0).endObject().endObject() .endObject().endObject().string(); mapper = parser.parse("type", new CompressedXContent(mapping)); diff --git a/docs/plugins/mapper-attachments.asciidoc b/docs/plugins/mapper-attachments.asciidoc index 0e21c6ab705..75902653a9c 100644 --- a/docs/plugins/mapper-attachments.asciidoc +++ b/docs/plugins/mapper-attachments.asciidoc @@ -88,10 +88,10 @@ If you get a hit for your indexed document, the plugin should be installed and w "took": 53, "hits": { "total": 1, - "max_score": 0.25811607, + "max_score": 0.28582606, "hits": [ { - "_score": 0.25811607, + "_score": 0.28582606, "_index": "trying-out-mapper-attachments", "_type": "person", "_id": "1", diff --git a/docs/reference/mapping/fields/all-field.asciidoc b/docs/reference/mapping/fields/all-field.asciidoc index 70fac4ed068..3ecb8a27454 100644 --- a/docs/reference/mapping/fields/all-field.asciidoc +++ b/docs/reference/mapping/fields/all-field.asciidoc @@ -1,14 +1,14 @@ [[mapping-all-field]] === `_all` field -The `_all` field is a special _catch-all_ field which concatenates the values -of all of the other fields into one big string, using space as a delimiter, which is then -<> and indexed, but not stored. This means that it can be -searched, but not retrieved. +The `_all` field is a special _catch-all_ field which concatenates the values of +all of the other string fields into one big string, using space as a delimiter, +which is then <> and indexed, but not stored. This means that +it can be searched, but not retrieved. -The `_all` field allows you to search for values in documents without knowing -which field contains the value. This makes it a useful option when getting -started with a new dataset. For instance: +The `_all` field allows you to search for string values in documents without +knowing which field contains the value. This makes it a useful option when +getting started with a new dataset. For instance: [source,js] -------------------------------- @@ -16,7 +16,7 @@ PUT my_index/user/1 <1> { "first_name": "John", "last_name": "Smith", - "date_of_birth": "1970-10-24" + "date_of_birth": "Born 1970-10-24" } GET my_index/_search @@ -29,16 +29,17 @@ GET my_index/_search } -------------------------------- // CONSOLE -<1> The `_all` field will contain the terms: [ `"john"`, `"smith"`, `"1970"`, `"10"`, `"24"` ] +<1> The `_all` field will contain the terms: [ `"john"`, `"smith"`, `"born"`, `"1970"`, `"10"`, `"24"` ] [NOTE] -.All values treated as strings +.Only string values are added to _all ============================================================================= -The `date_of_birth` field in the above example is recognised as a `date` field -and so will index a single term representing `1970-10-24 00:00:00 UTC`. The -`_all` field, however, treats all values as strings, so the date value is -indexed as the three string terms: `"1970"`, `"24"`, `"10"`. +The `date_of_birth` field in the above example is recognised as a `string` field +and thus will be analyzed as a string, resulting in the terms `"born"`, +`"1970"`, `"24"`, and `"10"`. If the `date_of_birth` field were an actual date +type field, it would not be included in the `_all` field, since `_all` only +contains content from string fields. It is important to note that the `_all` field combines the original values from each field as a string. It does not combine the _terms_ from each field. diff --git a/docs/reference/migration/migrate_6_0/mapping.asciidoc b/docs/reference/migration/migrate_6_0/mapping.asciidoc new file mode 100644 index 00000000000..f2d6107e527 --- /dev/null +++ b/docs/reference/migration/migrate_6_0/mapping.asciidoc @@ -0,0 +1,14 @@ +[[breaking_60_mapping_changes]] +=== Mapping changes + +==== `include_in_all` default changed to false for numeric/date/ip/geo types + +The default unset value for numeric types for the `include_in_all` mapping +option has been changed from true to false. + +This includes: + +- All regular numeric types such as int, long, float, scaled-float, double +- IP addresses +- Dates +- Geopoints and Geoshapes