Skip to content

Commit 77fcacd

Browse files
Added IT Test To Compare Alternate Syntaxes
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
1 parent cbccd33 commit 77fcacd

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

integ-test/src/test/java/org/opensearch/sql/sql/MatchIT.java

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,24 @@ public void match_query_in_where() throws IOException {
5959

6060
@Test
6161
public void match_query_in_having() throws IOException {
62-
JSONObject result = executeJdbcRequest("SELECT lastname FROM " + TEST_INDEX_ACCOUNT + " HAVING match_query(firstname, 'Nanette')");
62+
JSONObject result = executeJdbcRequest(
63+
"SELECT lastname FROM " + TEST_INDEX_ACCOUNT + " HAVING match_query(firstname, 'Nanette')");
6364
verifySchema(result, schema("lastname", "text"));
6465
verifyDataRows(result, rows("Bates"));
6566
}
67+
68+
@Test
69+
public void alternate_syntaxes_return_the_same_results() throws IOException {
70+
String query1 = "SELECT lastname FROM "
71+
+ TEST_INDEX_ACCOUNT + " HAVING match(firstname, 'Nanette')";
72+
JSONObject result1 = executeJdbcRequest(query1);
73+
String query2 = "SELECT lastname FROM "
74+
+ TEST_INDEX_ACCOUNT + " HAVING matchquery(firstname, 'Nanette')";
75+
JSONObject result2 = executeJdbcRequest(query2);
76+
String query3 = "SELECT lastname FROM "
77+
+ TEST_INDEX_ACCOUNT + " HAVING match_query(firstname, 'Nanette')";
78+
JSONObject result3 = executeJdbcRequest(query3);
79+
assertEquals(result1.getInt("total"), result2.getInt("total"));
80+
assertEquals(result1.getInt("total"), result3.getInt("total"));
81+
}
6682
}

opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchQueryTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.junit.jupiter.params.ParameterizedTest;
1717
import org.junit.jupiter.params.provider.MethodSource;
1818
import org.opensearch.sql.common.antlr.SyntaxCheckException;
19-
import org.opensearch.sql.common.grok.Match;
2019
import org.opensearch.sql.data.model.ExprValue;
2120
import org.opensearch.sql.data.type.ExprType;
2221
import org.opensearch.sql.exception.SemanticCheckException;

sql/src/main/antlr/OpenSearchSQLParser.g4

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -436,10 +436,6 @@ multiFieldRelevanceFunctionName
436436
| QUERY_STRING
437437
;
438438

439-
legacyRelevanceFunctionName
440-
: QUERY
441-
;
442-
443439
functionArgs
444440
: (functionArg (COMMA functionArg)*)?
445441
;

0 commit comments

Comments
 (0)