Revert "Wildcard field - add normalizer support (elastic#53851) (elastic#54109)"

This reverts commit 6a60f85.

Author: markharwood

docs/reference/mapping/types/wildcard.asciidoc

@@ -50,23 +50,6 @@ POST my_index/_doc/_search
 --------------------------------------------------
 
 
-[[wildcard-params]]
-==== Parameters for wildcard fields
-
-The following parameters are accepted by `wildcard` fields:
-
-[horizontal]
-
-<<ignore-above,`ignore_above`>>::
-
-    Do not index any string longer than this value.  Defaults to `2147483647`
-    so that all values would be accepted.
-
-<<normalizer,`normalizer`>>::
-
-    How to pre-process the value prior to indexing. Defaults to `null`,
-    meaning the value is kept as-is.
-
 ==== Limitations
 
 * `wildcard` fields are untokenized like keyword fields, so do not support queries that rely on word positions such as phrase queries.

server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java

@@ -358,14 +358,14 @@ public Query fuzzyQuery(Object value, Fuzziness fuzziness, int prefixLength, int
     }
 
     public Query prefixQuery(String value, @Nullable MultiTermQuery.RewriteMethod method, QueryShardContext context) {
-        throw new QueryShardException(context, "Can only use prefix queries on keyword, text and wildcard fields - not on [" + name
+        throw new QueryShardException(context, "Can only use prefix queries on keyword and text fields - not on [" + name
             + "] which is of type [" + typeName() + "]");
     }
 
     public Query wildcardQuery(String value,
                                @Nullable MultiTermQuery.RewriteMethod method,
                                QueryShardContext context) {
-        throw new QueryShardException(context, "Can only use wildcard queries on keyword, text and wildcard fields - not on [" + name
+        throw new QueryShardException(context, "Can only use wildcard queries on keyword and text fields - not on [" + name
             + "] which is of type [" + typeName() + "]");
     }
 

server/src/main/java/org/elasticsearch/index/mapper/StringFieldType.java

@@ -19,7 +19,6 @@
 
 package org.elasticsearch.index.mapper;
 
-import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.FuzzyQuery;
 import org.apache.lucene.search.MultiTermQuery;
@@ -94,36 +93,6 @@ public Query prefixQuery(String value, MultiTermQuery.RewriteMethod method, Quer
         return query;
     }
 
-    public static final String normalizeWildcardPattern(String fieldname, String value, Analyzer normalizer)  {
-        if (normalizer == null) {
-            return value;
-        }
-        // we want to normalize everything except wildcard characters, e.g. F?o Ba* to f?o ba*, even if e.g there
-        // is a char_filter that would otherwise remove them
-        Matcher wildcardMatcher = WILDCARD_PATTERN.matcher(value);
-        BytesRefBuilder sb = new BytesRefBuilder();
-        int last = 0;
-
-        while (wildcardMatcher.find()) {
-            if (wildcardMatcher.start() > 0) {
-                String chunk = value.substring(last, wildcardMatcher.start());
-
-                BytesRef normalized = normalizer.normalize(fieldname, chunk);
-                sb.append(normalized);
-            }
-            // append the matched group - without normalizing
-            sb.append(new BytesRef(wildcardMatcher.group()));
-
-            last = wildcardMatcher.end();
-        }
-        if (last < value.length()) {
-            String chunk = value.substring(last);
-            BytesRef normalized = normalizer.normalize(fieldname, chunk);
-            sb.append(normalized);
-        }
-        return sb.toBytesRef().utf8ToString();
-    }    
-    
     @Override
     public Query wildcardQuery(String value, MultiTermQuery.RewriteMethod method, QueryShardContext context) {
         failIfNotIndexed();
@@ -134,8 +103,30 @@ public Query wildcardQuery(String value, MultiTermQuery.RewriteMethod method, Qu
 
         Term term;
         if (searchAnalyzer() != null) {
-            value = normalizeWildcardPattern(name(), value, searchAnalyzer());
-            term = new Term(name(), value);
+            // we want to normalize everything except wildcard characters, e.g. F?o Ba* to f?o ba*, even if e.g there
+            // is a char_filter that would otherwise remove them
+            Matcher wildcardMatcher = WILDCARD_PATTERN.matcher(value);
+            BytesRefBuilder sb = new BytesRefBuilder();
+            int last = 0;
+
+            while (wildcardMatcher.find()) {
+                if (wildcardMatcher.start() > 0) {
+                    String chunk = value.substring(last, wildcardMatcher.start());
+
+                    BytesRef normalized = searchAnalyzer().normalize(name(), chunk);
+                    sb.append(normalized);
+                }
+                // append the matched group - without normalizing
+                sb.append(new BytesRef(wildcardMatcher.group()));
+
+                last = wildcardMatcher.end();
+            }
+            if (last < value.length()) {
+                String chunk = value.substring(last);
+                BytesRef normalized = searchAnalyzer().normalize(name(), chunk);
+                sb.append(normalized);
+            }
+            term = new Term(name(), sb.toBytesRef());
         } else {
             term = new Term(name(), indexedValueForSearch(value));
         }

server/src/main/java/org/elasticsearch/index/query/QueryBuilders.java

@@ -264,7 +264,7 @@ public static RangeQueryBuilder rangeQuery(String name) {
      * which matches any single character. Note this query can be slow, as it
      * needs to iterate over many terms. In order to prevent extremely slow WildcardQueries,
      * a Wildcard term should not start with one of the wildcards {@code *} or
-     * {@code ?}. (The wildcard field type however, is optimised for leading wildcards)
+     * {@code ?}.
      *
      * @param name  The field name
      * @param query The wildcard query string

server/src/test/java/org/elasticsearch/index/query/PrefixQueryBuilderTests.java

@@ -116,7 +116,7 @@ public void testNumeric() throws Exception {
         QueryShardContext context = createShardContext();
         QueryShardException e = expectThrows(QueryShardException.class,
                 () -> query.toQuery(context));
-        assertEquals("Can only use prefix queries on keyword, text and wildcard fields - not on [mapped_int] which is of type [integer]",
+        assertEquals("Can only use prefix queries on keyword and text fields - not on [mapped_int] which is of type [integer]",
                 e.getMessage());
     }
 

server/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java

@@ -816,7 +816,7 @@ public void testPrefixNumeric() throws Exception {
         QueryShardContext context = createShardContext();
         QueryShardException e = expectThrows(QueryShardException.class,
                 () -> query.toQuery(context));
-        assertEquals("Can only use prefix queries on keyword, text and wildcard fields - not on [mapped_int] which is of type [integer]",
+        assertEquals("Can only use prefix queries on keyword and text fields - not on [mapped_int] which is of type [integer]",
                 e.getMessage());
         query.lenient(true);
         query.toQuery(context); // no exception

x-pack/plugin/src/test/resources/rest-api-spec/test/wildcard/10_wildcard_basic.yml

@@ -10,20 +10,10 @@ setup:
         body:
           settings:
             number_of_replicas: 0
-            analysis:
-              normalizer:
-                lowercase:
-                  type: custom
-                  char_filter: []
-                  filter: ["lowercase"]
           mappings:
             properties:
               my_wildcard:
                  type: wildcard
-                 normalizer: lowercase
-                 fields:
-                   case_sensitive:
-                     type: wildcard
   - do:
       index:
         index: test-index
@@ -36,12 +26,6 @@ setup:
         id: 2
         body:
           my_wildcard: goodbye world
-  - do:
-      index:
-        index: test-index
-        id: 3
-        body:
-          my_wildcard: cAsE iNsEnSiTiVe World
 
   - do:
       indices.refresh: {}
@@ -96,31 +80,6 @@ setup:
               my_wildcard: {value: "*ello worl*" }
 
 
-  - match: {hits.total.value: 1}
----
-"Case insensitive query":
-  - do:
-      search:
-        body:
-          track_total_hits: true
-          query:
-            wildcard:
-              my_wildcard: {value: "*Worl*" }
-
-
-  - match: {hits.total.value: 3}
-
----
-"Case sensitive query":
-  - do:
-      search:
-        body:
-          track_total_hits: true
-          query:
-            wildcard:
-              my_wildcard.case_sensitive: {value: "*Worl*" }
-
-
   - match: {hits.total.value: 1}
 
 ---
@@ -134,7 +93,7 @@ setup:
               my_wildcard: {value: "*ld" }
 
 
-  - match: {hits.total.value: 3}
+  - match: {hits.total.value: 2}
 
 ---
 "Long suffix query":
@@ -229,8 +188,8 @@ setup:
               terms: {field: "my_wildcard" }
 
 
-  - match: {hits.total.value: 3}
-  - length: { aggregations.top_vals.buckets: 3 }
+  - match: {hits.total.value: 2}
+  - length: { aggregations.top_vals.buckets: 2 }
 
 ---
 "Sort works":
@@ -240,21 +199,20 @@ setup:
           track_total_hits: true
           sort: [ { "my_wildcard": "desc" } ]
 
-  - match: { hits.total.value: 3 }
-  - length: { hits.hits: 3 }
+  - match: { hits.total.value: 2 }
+  - length: { hits.hits: 2 }
   - match: { hits.hits.0._id: "1" }
   - match: { hits.hits.1._id: "2" }
-  - match: { hits.hits.2._id: "3" }
 
   - do:
       search:
         body:
           track_total_hits: true
           sort: [ { "my_wildcard": "asc" } ]
 
-  - match: { hits.total.value: 3 }
-  - length: { hits.hits: 3 }
-  - match: { hits.hits.0._id: "3" }
-  - match: { hits.hits.1._id: "2" }
-  - match: { hits.hits.2._id: "1" }
+  - match: { hits.total.value: 2 }
+  - length: { hits.hits: 2 }
+  - match: { hits.hits.0._id: "2" }
+  - match: { hits.hits.1._id: "1" }
+