Fix bug where invalid schema name was being used for returned highlig…

…ht fields Signed-off-by: forestmvey <[email protected]>
opensearch-project · Aug 4, 2022 · 23a24e2 · 23a24e2
1 parent 9fbea30
commit 23a24e2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/core/src/main/java/org/opensearch/sql/expression/HighlightExpression.java b/core/src/main/java/org/opensearch/sql/expression/HighlightExpression.java
@@ -31,9 +31,9 @@ public HighlightExpression(Expression highlightField) {
   }
 
   /**
-   * Return String or Map value matching highlight field.
+   * Return collection value matching highlight field.
    * @param valueEnv : Dataset to parse value from.
-   * @return : String or Map value of highlight fields.
+   * @return : collection value of highlight fields.
    */
   @Override
   public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
@@ -47,7 +47,7 @@ public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
    */
   @Override
   public ExprType type() {
-    return ExprCoreType.STRING;
+    return ExprCoreType.ARRAY;
   }
 
   @Override

diff --git a/core/src/test/java/org/opensearch/sql/expression/HighlightExpressionTest.java b/core/src/test/java/org/opensearch/sql/expression/HighlightExpressionTest.java
@@ -7,6 +7,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.opensearch.sql.data.type.ExprCoreType.ARRAY;
 import static org.opensearch.sql.data.type.ExprCoreType.STRUCT;
 
 import com.google.common.collect.ImmutableMap;
@@ -26,7 +27,7 @@ public void single_highlight_test() {
     HighlightExpression expr = new HighlightExpression(DSL.literal("Title"));
     ExprValue resultVal = expr.valueOf(hlTuple);
 
-    assertEquals(expr.type(), resultVal.type());
+    assertEquals(expr.type(), ARRAY);
     assertEquals("result value", resultVal.stringValue());
   }
 
@@ -54,7 +55,7 @@ public void highlight_all_test() {
     HighlightExpression hlExpr = new HighlightExpression(DSL.literal("*"));
     ExprValue resultVal = hlExpr.valueOf(
         ExprTupleValue.fromExprValueMap(builder.build()).bindingTuples());
-    assertEquals(STRUCT, resultVal.type());
+    assertEquals(ARRAY, resultVal.type());
     for (var field : resultVal.tupleValue().entrySet()) {
       assertTrue(field.toString().contains(hlExpr.getHighlightField().toString()));
     }