From 3298a4ed38fe9ef6984c0b63ce04231fd3ad3c90 Mon Sep 17 00:00:00 2001 From: Lee Hinman Date: Tue, 23 Aug 2016 09:24:33 -0600 Subject: [PATCH] Revert "Merge remote-tracking branch 'dakrone/exclude-numerics-from-all'" This reverts commit 514585290c04293485a494758a52bc3a876abb33, reversing changes made to 8563c8d8970f27420f5a4c39f95643d5f0191232. --- .../index/mapper/DateFieldMapper.java | 5 +-- .../index/mapper/GeoPointFieldMapper.java | 5 +-- .../index/mapper/GeoShapeFieldMapper.java | 5 +-- .../index/mapper/IpFieldMapper.java | 5 +-- .../index/mapper/NumberFieldMapper.java | 5 +-- .../index/mapper/ScaledFloatFieldMapper.java | 5 +-- .../index/mapper/DateFieldMapperTests.java | 6 ++-- .../index/mapper/IpFieldMapperTests.java | 6 ++-- .../index/mapper/NumberFieldMapperTests.java | 6 ++-- .../mapper/ScaledFloatFieldMapperTests.java | 6 ++-- docs/plugins/mapper-attachments.asciidoc | 4 +-- .../mapping/fields/all-field.asciidoc | 33 ++++++++++--------- .../migration/migrate_5_0/mapping.asciidoc | 12 ------- 13 files changed, 37 insertions(+), 66 deletions(-) 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 2e5a62de584..717f0361552 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java @@ -496,10 +496,7 @@ public class DateFieldMapper extends FieldMapper { } @Override - 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); - + protected void parseCreateField(ParseContext context, List fields) throws IOException { 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 b757fc90f29..590679cb989 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java @@ -110,10 +110,7 @@ public class GeoPointFieldMapper extends BaseGeoPointFieldMapper { } @Override - 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); - + protected void parse(ParseContext context, GeoPoint point, String geoHash) throws IOException { 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 d38e98a843d..9c90dd44dbc 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java @@ -430,10 +430,7 @@ public class GeoShapeFieldMapper extends FieldMapper { } @Override - public Mapper parse(ParseContext originalContext) throws IOException { - // Numeric fields, by default, will not be included in _all - final ParseContext context = originalContext.setIncludeInAllDefault(false); - + public Mapper parse(ParseContext context) throws IOException { 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 7ba23c073a6..69a8e06f859 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java @@ -285,10 +285,7 @@ public class IpFieldMapper extends FieldMapper { } @Override - 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); - + protected void parseCreateField(ParseContext context, List fields) throws IOException { 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 b5c53ece1ff..be6ed23c508 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java @@ -895,10 +895,7 @@ public class NumberFieldMapper extends FieldMapper { } @Override - 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); - + protected void parseCreateField(ParseContext context, List fields) throws IOException { XContentParser parser = context.parser(); Object value; Number numericValue = null; 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 6c3bc4a37fd..b7276e4e114 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java @@ -364,10 +364,7 @@ public class ScaledFloatFieldMapper extends FieldMapper { } @Override - 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); - + protected void parseCreateField(ParseContext context, List fields) throws IOException { XContentParser parser = context.parser(); Object value; Number numericValue = null; 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 2180c49a5ef..f0e4e8c15ac 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java @@ -178,8 +178,7 @@ public class DateFieldMapperTests extends ESSingleNodeTestCase { public void testIncludeInAll() throws Exception { String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") - .startObject("properties").startObject("field").field("type", "date") - .field("include_in_all", true).endObject().endObject() + .startObject("properties").startObject("field").field("type", "date").endObject().endObject() .endObject().endObject().string(); DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping)); @@ -197,7 +196,8 @@ 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").endObject().endObject() + .startObject("properties").startObject("field").field("type", "date") + .field("include_in_all", false).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 9e98f3fb93e..68ef2c2dd56 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java @@ -186,8 +186,7 @@ public class IpFieldMapperTests extends ESSingleNodeTestCase { public void testIncludeInAll() throws Exception { String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") - .startObject("properties").startObject("field").field("type", "ip") - .field("include_in_all", true).endObject().endObject() + .startObject("properties").startObject("field").field("type", "ip").endObject().endObject() .endObject().endObject().string(); DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping)); @@ -205,7 +204,8 @@ public class IpFieldMapperTests extends ESSingleNodeTestCase { assertEquals("::1", fields[0].stringValue()); 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", false).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 8f3cc1f1c74..8375e54d399 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java @@ -264,8 +264,7 @@ 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) - .field("include_in_all", true).endObject().endObject() + .startObject("properties").startObject("field").field("type", type).endObject().endObject() .endObject().endObject().string(); DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping)); @@ -283,7 +282,8 @@ public class NumberFieldMapperTests extends ESSingleNodeTestCase { assertEquals("123", fields[0].stringValue()); 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", false).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 a47220f49d5..e72bb631ad3 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapperTests.java @@ -249,8 +249,7 @@ 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) - .field("include_in_all", true).endObject().endObject() + .field("scaling_factor", 10.0).endObject().endObject() .endObject().endObject().string(); DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping)); @@ -269,7 +268,8 @@ public class ScaledFloatFieldMapperTests extends ESSingleNodeTestCase { mapping = XContentFactory.jsonBuilder().startObject().startObject("type") .startObject("properties").startObject("field") - .field("type", "scaled_float").field("scaling_factor", 10.0).endObject().endObject() + .field("type", "scaled_float").field("scaling_factor", 10.0) + .field("include_in_all", false).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 d00eb88e68a..b5ceef39ae8 100644 --- a/docs/plugins/mapper-attachments.asciidoc +++ b/docs/plugins/mapper-attachments.asciidoc @@ -90,10 +90,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.28582606, + "max_score": 0.25811607, "hits": [ { - "_score": 0.28582606, + "_score": 0.25811607, "_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 b1bbd9da8c4..70fac4ed068 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 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 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 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: +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: [source,js] -------------------------------- @@ -16,28 +16,29 @@ PUT my_index/user/1 <1> { "first_name": "John", "last_name": "Smith", - "place_of_birth": "New York City" + "date_of_birth": "1970-10-24" } GET my_index/_search { "query": { "match": { - "_all": "john smith new york" + "_all": "john smith 1970" } } } -------------------------------- // CONSOLE -<1> The `_all` field will contain the terms: [ `"john"`, `"smith"`, `"new"`, `"york"`, `"city"` ] +<1> The `_all` field will contain the terms: [ `"john"`, `"smith"`, `"1970"`, `"10"`, `"24"` ] [NOTE] -.Only string values are added to _all +.All values treated as strings ============================================================================= -If a `date_of_birth` field mapped as a date were used, or an `age` field that -was an integer were added, they would not be included in the `_all` field, as -`_all` only contains content from _string_ fields. +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"`. 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. @@ -71,7 +72,7 @@ GET _search { "query": { "query_string": { - "query": "john smith new york" + "query": "john smith 1970" } } } @@ -83,7 +84,7 @@ requests>> (which is rewritten to a `query_string` query internally): [source,js] -------------------------------- -GET _search?q=john+smith+new+york +GET _search?q=john+smith+1970 -------------------------------- Other queries, such as the <> and diff --git a/docs/reference/migration/migrate_5_0/mapping.asciidoc b/docs/reference/migration/migrate_5_0/mapping.asciidoc index 35a5c8a85b2..dd467abe9e1 100644 --- a/docs/reference/migration/migrate_5_0/mapping.asciidoc +++ b/docs/reference/migration/migrate_5_0/mapping.asciidoc @@ -158,18 +158,6 @@ of the 4 bytes used previously. While this will make the index much more space-efficient, it also means that index time boosts will be less accurately encoded. -==== `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 - ==== `_ttl` and `_timestamp` cannot be created You can no longer create indexes with `_ttl` or `_timestamp` enabled. Indexes