fix regex query to work with field alias

Signed-off-by: bowenlan-amzn <[email protected]>

Author: bowenlan-amzn

rest-api-spec/src/main/resources/rest-api-spec/test/search/61_regex_query_field_alias.yml

@@ -0,0 +1,48 @@
+"field alias with regex pattern search":
+  - do:
+      indices.create:
+        index: test_index
+        body:
+          settings:
+            number_of_shards: 1
+            number_of_replicas: 0
+          mappings:
+            properties:
+              test:
+                type: text
+              test_alias:
+                type: alias
+                path: test
+
+  - do:
+      bulk:
+        refresh: true
+        body: |
+          {"index":{"_index":"test_index","_id":"1"}}
+          {"test":"hello"}
+          {"index":{"_index":"test_index","_id":"2"}}
+          {"test":"world"}
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test_index
+        body:
+          query:
+            query_string:
+              query: "test: /h[a-z].*/"
+
+  - match: {hits.total: 1}
+  - match: {hits.hits.0._id: "1"}
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test_index
+        body:
+          query:
+            query_string:
+              query: "test_alias: /h[a-z].*/"
+
+  - match: {hits.total: 1}
+  - match: {hits.hits.0._id: "1"}

server/src/main/java/org/opensearch/index/search/QueryStringQueryParser.java

@@ -56,6 +56,7 @@
 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;
@@ -787,8 +788,12 @@ private Query getRegexpQuerySingle(String field, String termStr) throws ParseExc
             if (currentFieldType == null) {
                 return newUnmappedFieldQuery(field);
             }
-            setAnalyzer(getSearchAnalyzer(currentFieldType));
-            return super.getRegexpQuery(field, termStr);
+            if (forceAnalyzer != null) {
+                setAnalyzer(forceAnalyzer);
+                return super.getRegexpQuery(field, termStr);
+            }
+            termStr = getAnalyzer().normalize(field, termStr).utf8ToString();
+            return currentFieldType.regexpQuery(termStr, RegExp.ALL, 0, getDeterminizeWorkLimit(), getMultiTermRewriteMethod(), context);
         } catch (RuntimeException e) {
             if (lenient) {
                 return newLenientFieldQuery(field, e);