set analyzer to regex query string search

Signed-off-by: yyyogev <[email protected]>
opensearch-project · Jul 21, 2022 · d2e6e08 · d2e6e08
1 parent bfac8fc
commit d2e6e08
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 13 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;
@@ -717,20 +716,25 @@ private Query getWildcardQuerySingle(String field, String termStr) throws ParseE
             // effectively, we check if a field exists or not
             return existsQuery(field);
         }
+        String indexedNameField = field;
         Analyzer oldAnalyzer = getAnalyzer();
         try {
             MappedFieldType currentFieldType = queryBuilder.context.fieldMapper(field);
-            if (currentFieldType == null) {
-                return newUnmappedFieldQuery(field);
-            }
-            if (forceAnalyzer != null && (analyzeWildcard || currentFieldType.getTextSearchInfo().isTokenized())) {
-                setAnalyzer(forceAnalyzer);
-                return super.getWildcardQuery(currentFieldType.name(), termStr);
+            if (currentFieldType != null) {
+                // return newUnmappedFieldQuery(field);
+                setAnalyzer(forceAnalyzer == null ? queryBuilder.context.getSearchAnalyzer(currentFieldType) : forceAnalyzer);
+                indexedNameField = currentFieldType.name();
             }
+
+            // if (forceAnalyzer != null && (analyzeWildcard || currentFieldType.getTextSearchInfo().isTokenized())) {
+            // setAnalyzer(forceAnalyzer);
+            // return super.getWildcardQuery(currentFieldType.name(), termStr);
+            // }
             if (getAllowLeadingWildcard() == false && (termStr.startsWith("*") || termStr.startsWith("?"))) {
                 throw new ParseException("'*' or '?' not allowed as first character in WildcardQuery");
             }
-            return currentFieldType.wildcardQuery(termStr, getMultiTermRewriteMethod(), context);
+            return super.getWildcardQuery(indexedNameField, termStr);
+            // return currentFieldType.wildcardQuery(termStr, getMultiTermRewriteMethod(), context);
         } catch (RuntimeException e) {
             if (lenient) {
                 return newLenientFieldQuery(field, e);
@@ -781,11 +785,13 @@ 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(forceAnalyzer == null ? queryBuilder.context.getSearchAnalyzer(currentFieldType) : forceAnalyzer);
+            return super.getRegexpQuery(field, termStr);
+            // if (forceAnalyzer != null) {
+            // setAnalyzer(forceAnalyzer);
+            // return super.getRegexpQuery(field, termStr);
+            // }
+            // return currentFieldType.regexpQuery(termStr, RegExp.ALL, 0, getDeterminizeWorkLimit(), getMultiTermRewriteMethod(), context);
         } catch (RuntimeException e) {
             if (lenient) {
                 return newLenientFieldQuery(field, e);