Revert score and ignore failed IT

Signed-off-by: Chen Dai <daichen@amazon.com>
opensearch-project · Dec 20, 2022 · e78e5ec · e78e5ec
1 parent 1df8bc3
commit e78e5ec
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/AggregationExpressionIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/AggregationExpressionIT.java
@@ -121,6 +121,7 @@ public void hasGroupKeyMaxAddLiteralShouldPass() {
         rows("f", 1));
   }
 
+  @Ignore("Handled by v2 engine which returns 'name': 'Log(MAX(age) + MIN(age))' instead")
   @Test
   public void noGroupKeyLogMaxAddMinShouldPass() {
     JSONObject response = executeJdbcRequest(String.format(

diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/JdbcTestIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/JdbcTestIT.java
@@ -165,6 +165,7 @@ public void functionWithoutAliasShouldHaveEntireFunctionAsNameInSchema() {
     );
   }
 
+  @Ignore("Handled by v2 engine which returns 'name': 'substring(lastname, 1, 2)' instead")
   @Test
   public void functionWithAliasShouldHaveAliasAsNameInSchema() {
     assertThat(

diff --git a/sql/src/main/antlr/OpenSearchSQLLexer.g4 b/sql/src/main/antlr/OpenSearchSQLLexer.g4
@@ -315,6 +315,7 @@ REGEXP_QUERY:                       'REGEXP_QUERY';
 REVERSE_NESTED:                     'REVERSE_NESTED';
 QUERY:                              'QUERY';
 RANGE:                              'RANGE';
+SCORE:                              'SCORE';
 SECOND_OF_MINUTE:                   'SECOND_OF_MINUTE';
 STATS:                              'STATS';
 TERM:                               'TERM';

diff --git a/sql/src/test/java/org/opensearch/sql/sql/parser/AstQualifiedNameBuilderTest.java b/sql/src/test/java/org/opensearch/sql/sql/parser/AstQualifiedNameBuilderTest.java
@@ -53,10 +53,7 @@ public void canBuildQualifiedIdentifier() {
 
   @Test
   public void commonKeywordCanBeUsedAsIdentifier() {
-    String[] keywords = {"score", "type"};
-    for (String keyword : keywords) {
-      buildFromIdentifier(keyword).expectQualifiedName(keyword);
-    }
+    buildFromIdentifier("type").expectQualifiedName("type");
   }
 
   @Test