Set analyzer to regex query string search (#3967)

Sets analyzer to regex query string search Signed-off-by: yogev mets <[email protected]> (cherry picked from commit ea4cfcc)
opensearch-project · Oct 12, 2022 · d675e6b · d675e6b
1 parent 51678a8
commit d675e6b
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 7 deletions.
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/190_index_prefix_search.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/190_index_prefix_search.yml
@@ -17,6 +17,12 @@ setup:
           id:     1
           body:   { text: some short words with a stupendously long one }
 
+  - do:
+      index:
+        index:  test
+        id:     2
+        body:   { text: sentence with UPPERCASE WORDS }
+
   - do:
       indices.refresh:
         index: [test]
@@ -76,6 +82,22 @@ setup:
   - match: {hits.max_score: 1}
   - match: {hits.hits.0._score: 1}
 
+---
+"search with uppercase regex":
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            query_string:
+              default_field: text
+              query: /UPPERCASE/
+
+  - match: {hits.total: 1}
+  - match: {hits.max_score: 1}
+  - match: {hits.hits.0._score: 1}
+
 ---
 "search index prefixes with span_multi":
   - do:

diff --git a/server/src/main/java/org/opensearch/index/search/QueryStringQueryParser.java b/server/src/main/java/org/opensearch/index/search/QueryStringQueryParser.java
@@ -56,7 +56,6 @@
 import org.apache.lucene.search.SynonymQuery;
 import org.apache.lucene.search.WildcardQuery;
 import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.automaton.RegExp;
 import org.opensearch.common.lucene.search.Queries;
 import org.opensearch.common.regex.Regex;
 import org.opensearch.common.unit.Fuzziness;
@@ -565,7 +564,7 @@ private Query getPrefixQuerySingle(String field, String termStr) throws ParseExc
             if (currentFieldType == null || currentFieldType.getTextSearchInfo() == TextSearchInfo.NONE) {
                 return newUnmappedFieldQuery(field);
             }
-            setAnalyzer(forceAnalyzer == null ? queryBuilder.context.getSearchAnalyzer(currentFieldType) : forceAnalyzer);
+            setAnalyzer(getSearchAnalyzer(currentFieldType));
             Query query = null;
             if (currentFieldType.getTextSearchInfo().isTokenized() == false) {
                 query = currentFieldType.prefixQuery(termStr, getMultiTermRewriteMethod(), context);
@@ -741,6 +740,13 @@ private Query getWildcardQuerySingle(String field, String termStr) throws ParseE
         }
     }
 
+    private Analyzer getSearchAnalyzer(MappedFieldType currentFieldType) {
+        if (forceAnalyzer == null) {
+            return queryBuilder.context.getSearchAnalyzer(currentFieldType);
+        }
+        return forceAnalyzer;
+    }
+
     @Override
     protected Query getRegexpQuery(String field, String termStr) throws ParseException {
         final int maxAllowedRegexLength = context.getIndexSettings().getMaxRegexLength();
@@ -781,11 +787,8 @@ private Query getRegexpQuerySingle(String field, String termStr) throws ParseExc
             if (currentFieldType == null) {
                 return newUnmappedFieldQuery(field);
             }
-            if (forceAnalyzer != null) {
-                setAnalyzer(forceAnalyzer);
-                return super.getRegexpQuery(field, termStr);
-            }
-            return currentFieldType.regexpQuery(termStr, RegExp.ALL, 0, getDeterminizeWorkLimit(), getMultiTermRewriteMethod(), context);
+            setAnalyzer(getSearchAnalyzer(currentFieldType));
+            return super.getRegexpQuery(field, termStr);
         } catch (RuntimeException e) {
             if (lenient) {
                 return newLenientFieldQuery(field, e);