Skip to content

Commit aae57a0

Browse files
YANG-DBYANG-DB
authored
Merge pull request opensearch-project#1241 from Bit-Quill/Failing-CI-Hot-Fix
Hot Fix For CI Build
2 parents bac9c37 + a707e3f commit aae57a0

2 files changed

Lines changed: 24 additions & 22 deletions

File tree

‎sql/src/main/java/org/opensearch/sql/sql/parser/AstExpressionBuilder.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
import static org.opensearch.sql.expression.function.BuiltinFunctionName.NOT_LIKE;
1717
import static org.opensearch.sql.expression.function.BuiltinFunctionName.POSITION;
1818
import static org.opensearch.sql.expression.function.BuiltinFunctionName.REGEXP;
19+
import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.AltMultiFieldRelevanceFunctionContext;
20+
import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.AltSingleFieldRelevanceFunctionContext;
1921
import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.AlternateMultiMatchFieldContext;
20-
import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.AlternateMultiMatchQueryContext;
2122
import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.BetweenPredicateContext;
2223
import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.BinaryComparisonPredicateContext;
2324
import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.BooleanContext;
@@ -96,6 +97,7 @@
9697
import org.opensearch.sql.ast.tree.Sort.SortOption;
9798
import org.opensearch.sql.common.utils.StringUtils;
9899
import org.opensearch.sql.expression.function.BuiltinFunctionName;
100+
import org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.AlternateMultiMatchQueryContext;
99101
import org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.AndExpressionContext;
100102
import org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.ColumnNameContext;
101103
import org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.IdentContext;
@@ -431,7 +433,7 @@ public UnresolvedExpression visitSingleFieldRelevanceFunction(
431433

432434
@Override
433435
public UnresolvedExpression visitAltSingleFieldRelevanceFunction(
434-
OpenSearchSQLParser.AltSingleFieldRelevanceFunctionContext ctx) {
436+
AltSingleFieldRelevanceFunctionContext ctx) {
435437
return new Function(
436438
ctx.altSyntaxFunctionName.getText().toLowerCase(),
437439
altSingleFieldRelevanceFunctionArguments(ctx));
@@ -460,7 +462,7 @@ public UnresolvedExpression visitMultiFieldRelevanceFunction(
460462

461463
@Override
462464
public UnresolvedExpression visitAltMultiFieldRelevanceFunction(
463-
OpenSearchSQLParser.AltMultiFieldRelevanceFunctionContext ctx) {
465+
AltMultiFieldRelevanceFunctionContext ctx) {
464466
return new Function(
465467
ctx.altSyntaxFunctionName.getText().toLowerCase(),
466468
altMultiFieldRelevanceFunctionArguments(ctx));
@@ -523,12 +525,12 @@ private List<UnresolvedExpression> singleFieldRelevanceArguments(
523525

524526

525527
private List<UnresolvedExpression> altSingleFieldRelevanceFunctionArguments(
526-
OpenSearchSQLParser.AltSingleFieldRelevanceFunctionContext ctx) {
528+
AltSingleFieldRelevanceFunctionContext ctx) {
527529
// all the arguments are defaulted to string values
528530
// to skip environment resolving and function signature resolving
529531
ImmutableList.Builder<UnresolvedExpression> builder = ImmutableList.builder();
530532
builder.add(new UnresolvedArgument("field",
531-
new Literal(StringUtils.unquoteText(ctx.field.getText()), DataType.STRING)));
533+
new QualifiedName(StringUtils.unquoteText(ctx.field.getText()))));
532534
builder.add(new UnresolvedArgument("query",
533535
new Literal(StringUtils.unquoteText(ctx.query.getText()), DataType.STRING)));
534536
fillRelevanceArgs(ctx.relevanceArg(), builder);
@@ -591,7 +593,7 @@ private List<UnresolvedExpression> alternateMultiMatchArguments(
591593
}
592594

593595
private List<UnresolvedExpression> altMultiFieldRelevanceFunctionArguments(
594-
OpenSearchSQLParser.AltMultiFieldRelevanceFunctionContext ctx) {
596+
AltMultiFieldRelevanceFunctionContext ctx) {
595597
// all the arguments are defaulted to string values
596598
// to skip environment resolving and function signature resolving
597599
var map = new HashMap<String, Float>();

‎sql/src/test/java/org/opensearch/sql/sql/parser/AstExpressionBuilderTest.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -576,53 +576,53 @@ public void relevanceMatch_Query() {
576576
public void relevanceMatchQueryAltSyntax() {
577577
assertEquals(AstDSL.function("match_query",
578578
unresolvedArg("field", stringLiteral("message")),
579-
unresolvedArg("query", stringLiteral("search query"))),
580-
buildExprAst("message = match_query('search query')")
579+
unresolvedArg("query", stringLiteral("search query"))).toString(),
580+
buildExprAst("message = match_query('search query')").toString()
581581
);
582582

583583
assertEquals(AstDSL.function("match_query",
584584
unresolvedArg("field", stringLiteral("message")),
585-
unresolvedArg("query", stringLiteral("search query"))),
586-
buildExprAst("message = match_query(\"search query\")")
585+
unresolvedArg("query", stringLiteral("search query"))).toString(),
586+
buildExprAst("message = match_query(\"search query\")").toString()
587587
);
588588

589589
assertEquals(AstDSL.function("matchquery",
590590
unresolvedArg("field", stringLiteral("message")),
591-
unresolvedArg("query", stringLiteral("search query"))),
592-
buildExprAst("message = matchquery('search query')")
591+
unresolvedArg("query", stringLiteral("search query"))).toString(),
592+
buildExprAst("message = matchquery('search query')").toString()
593593
);
594594

595595
assertEquals(AstDSL.function("matchquery",
596596
unresolvedArg("field", stringLiteral("message")),
597-
unresolvedArg("query", stringLiteral("search query"))),
598-
buildExprAst("message = matchquery(\"search query\")")
597+
unresolvedArg("query", stringLiteral("search query"))).toString(),
598+
buildExprAst("message = matchquery(\"search query\")").toString()
599599
);
600600
}
601601

602602
@Test
603603
public void relevanceMatchPhraseAltSyntax() {
604604
assertEquals(AstDSL.function("match_phrase",
605605
unresolvedArg("field", stringLiteral("message")),
606-
unresolvedArg("query", stringLiteral("search query"))),
607-
buildExprAst("message = match_phrase('search query')")
606+
unresolvedArg("query", stringLiteral("search query"))).toString(),
607+
buildExprAst("message = match_phrase('search query')").toString()
608608
);
609609

610610
assertEquals(AstDSL.function("match_phrase",
611611
unresolvedArg("field", stringLiteral("message")),
612-
unresolvedArg("query", stringLiteral("search query"))),
613-
buildExprAst("message = match_phrase(\"search query\")")
612+
unresolvedArg("query", stringLiteral("search query"))).toString(),
613+
buildExprAst("message = match_phrase(\"search query\")").toString()
614614
);
615615

616616
assertEquals(AstDSL.function("matchphrase",
617617
unresolvedArg("field", stringLiteral("message")),
618-
unresolvedArg("query", stringLiteral("search query"))),
619-
buildExprAst("message = matchphrase('search query')")
618+
unresolvedArg("query", stringLiteral("search query"))).toString(),
619+
buildExprAst("message = matchphrase('search query')").toString()
620620
);
621621

622622
assertEquals(AstDSL.function("matchphrase",
623623
unresolvedArg("field", stringLiteral("message")),
624-
unresolvedArg("query", stringLiteral("search query"))),
625-
buildExprAst("message = matchphrase(\"search query\")")
624+
unresolvedArg("query", stringLiteral("search query"))).toString(),
625+
buildExprAst("message = matchphrase(\"search query\")").toString()
626626
);
627627
}
628628

0 commit comments

Comments
 (0)