Implementing wildcard with support of nested fields in both SQL and PPL.

Signed-off-by: forestmvey <forestv@bitquilltech.com>
Bit-Quill · Aug 29, 2022 · 5f60b7d · 5f60b7d
1 parent b8eba59
commit 5f60b7d
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/core/src/main/java/org/opensearch/sql/analysis/ExpressionAnalyzer.java b/core/src/main/java/org/opensearch/sql/analysis/ExpressionAnalyzer.java
@@ -193,7 +193,8 @@ public Expression visitWindowFunction(WindowFunction node, AnalysisContext conte
   @Override
   public Expression visitHighlightFunction(HighlightFunction node, AnalysisContext context) {
     Expression expr = node.getHighlightField().accept(this, context);
-    String highlightStr = "highlight(" + expr.toString() + ")";
+    String nestedFields = (node.getNestedFields() != null) ? "." + node.getNestedFields() : "";
+    String highlightStr = "highlight(" + expr.toString() + ")" + nestedFields;
     return new ReferenceExpression(highlightStr, ExprCoreType.STRING);
   }
 

diff --git a/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java b/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java
@@ -262,10 +262,6 @@ public When when(UnresolvedExpression condition, UnresolvedExpression result) {
     return new When(condition, result);
   }
 
-  public UnresolvedExpression highlight(UnresolvedExpression fieldName) {
-    return new HighlightFunction(fieldName);
-  }
-
   public UnresolvedExpression window(UnresolvedExpression function,
                                      List<UnresolvedExpression> partitionByList,
                                      List<Pair<SortOption, UnresolvedExpression>> sortList) {

diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/HighlightFunction.java b/core/src/main/java/org/opensearch/sql/ast/expression/HighlightFunction.java
@@ -21,6 +21,7 @@
 @ToString
 public class HighlightFunction extends UnresolvedExpression {
   private final UnresolvedExpression highlightField;
+  private final UnresolvedExpression nestedFields;
 
   @Override
   public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {

diff --git a/ppl/src/main/antlr/OpenSearchPPLParser.g4 b/ppl/src/main/antlr/OpenSearchPPLParser.g4
@@ -290,7 +290,7 @@ evalFunctionCall
     ;
 
 highlightFunction
-    : HIGHLIGHT LT_PRTHS field=relevanceField  RT_PRTHS            #highlightFunctionCall
+    : HIGHLIGHT LT_PRTHS field=relevanceField  RT_PRTHS (DOT qualifiedName)* #highlightFunctionCall
     ;
 
 /** cast function */

diff --git a/ppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java b/ppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java
@@ -208,7 +208,8 @@ public UnresolvedExpression visitDistinctCountFunctionCall(DistinctCountFunction
   @Override
   public UnresolvedExpression visitHighlightFunctionCall(
       OpenSearchPPLParser.HighlightFunctionCallContext ctx) {
-    return new HighlightFunction(visit(ctx.relevanceField()));
+      return new HighlightFunction(visit(ctx.relevanceField()),
+          visitChildren(ctx.getRuleContext()));
   }
 
   @Override

diff --git a/sql/src/main/antlr/OpenSearchSQLParser.g4 b/sql/src/main/antlr/OpenSearchSQLParser.g4
@@ -304,7 +304,7 @@ functionCall
     ;
 
 highlightFunction
-    : HIGHLIGHT LR_BRACKET relevanceField RR_BRACKET
+    : HIGHLIGHT LR_BRACKET relevanceField RR_BRACKET (DOT qualifiedName)*
     ;
 
 scalarFunctionName

diff --git a/sql/src/main/java/org/opensearch/sql/sql/parser/AstExpressionBuilder.java b/sql/src/main/java/org/opensearch/sql/sql/parser/AstExpressionBuilder.java
@@ -134,7 +134,8 @@ public UnresolvedExpression visitScalarFunctionCall(ScalarFunctionCallContext ct
   @Override
   public UnresolvedExpression visitHighlightFunctionCall(
       OpenSearchSQLParser.HighlightFunctionCallContext ctx) {
-    return new HighlightFunction(visit(ctx.highlightFunction().relevanceField()));
+    return new HighlightFunction(visit(ctx.highlightFunction().relevanceField()),
+        visitChildren(ctx.highlightFunction().getRuleContext()));
   }
 
   @Override