From e78e5ec61ee9cb819166ea3db40d133a5e424625 Mon Sep 17 00:00:00 2001
From: Chen Dai <daichen@amazon.com>
Date: Tue, 20 Dec 2022 11:33:05 -0800
Subject: [PATCH] Revert score and ignore failed IT

Signed-off-by: Chen Dai <daichen@amazon.com>
---
 .../org/opensearch/sql/legacy/AggregationExpressionIT.java   | 1 +
 .../src/test/java/org/opensearch/sql/legacy/JdbcTestIT.java  | 1 +
 sql/src/main/antlr/OpenSearchSQLLexer.g4                     | 1 +
 .../sql/sql/parser/AstQualifiedNameBuilderTest.java          | 5 +----
 4 files changed, 4 insertions(+), 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
index d4374dcbaf..854a33fc91 100644
--- 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
index c50a03f596..bd72877e1c 100644
--- 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
index f58f7835c5..a359f48be3 100644
--- 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
index f35e73bfd5..28665dd7ef 100644
--- 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