undo change in wildcard queries to preserve pipeline

Signed-off-by: yogev mets <[email protected]>
opensearch-project · Jul 26, 2022 · f28e335 · f28e335
1 parent 105f68d
commit f28e335
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/server/src/main/java/org/opensearch/index/search/QueryStringQueryParser.java b/server/src/main/java/org/opensearch/index/search/QueryStringQueryParser.java
@@ -719,10 +719,13 @@ private Query getWildcardQuerySingle(String field, String termStr) throws ParseE
         Analyzer oldAnalyzer = getAnalyzer();
         try {
             MappedFieldType currentFieldType = queryBuilder.context.fieldMapper(field);
-            if (currentFieldType != null) {
-                setAnalyzer(getSearchAnalyzer(currentFieldType));
+            if (currentFieldType == null) {
+                return newUnmappedFieldQuery(field);
+            }
+            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");
             }
@@ -737,6 +740,7 @@ private Query getWildcardQuerySingle(String field, String termStr) throws ParseE
         }
     }
 
+
     private Analyzer getSearchAnalyzer(MappedFieldType currentFieldType) {
         if (forceAnalyzer == null) {
             return queryBuilder.context.getSearchAnalyzer(currentFieldType);