chen - address comment and merge grammar in parser

RyanL1997 · RyanL1997 · commit 374169f5b850 · 2025-09-09T19:51:44.000-07:00
Signed-off-by: Jialiang Liang &lt;jiallian@amazon.com&gt;
diff --git a/core/src/main/java/org/opensearch/sql/calcite/CalciteRelNodeVisitor.java b/core/src/main/java/org/opensearch/sql/calcite/CalciteRelNodeVisitor.java
@@ -2127,10 +2127,7 @@ private void buildExpandRelNode(
     }
   }
 
-  /**
-   * Creates an optimized sed call using native Calcite functions where possible. Falls back to
-   * custom REX_SED for complex cases.
-   */
+  /** Creates an optimized sed call using native Calcite functions */
   private RexNode createOptimizedSedCall(
       RexNode fieldRex, String sedExpression, CalcitePlanContext context) {
     if (sedExpression.startsWith("s/")) {
diff --git a/ppl/src/main/antlr/OpenSearchPPLParser.g4 b/ppl/src/main/antlr/OpenSearchPPLParser.g4
@@ -286,8 +286,7 @@ rexExpr
 
 rexOption
     : MAX_MATCH EQUAL maxMatch=integerLiteral
-    | MODE EQUAL EXTRACT
-    | MODE EQUAL SED
+    | MODE EQUAL (EXTRACT | SED)
     | OFFSET_FIELD EQUAL offsetField=qualifiedName
     ;
 patternsMethod

Original file line number	Diff line number	Diff line change
`@@ -2127,10 +2127,7 @@ private void buildExpandRelNode(`
`2127`	`2127`	`}`
`2128`	`2128`	`}`
`2129`	`2129`
`2130`		`- /**`
`2131`		`- * Creates an optimized sed call using native Calcite functions where possible. Falls back to`
`2132`		`- * custom REX_SED for complex cases.`
`2133`		`- */`
	`2130`	`+ /** Creates an optimized sed call using native Calcite functions */`
`2134`	`2131`	`private RexNode createOptimizedSedCall(`
`2135`	`2132`	`RexNode fieldRex, String sedExpression, CalcitePlanContext context) {`
`2136`	`2133`	`if (sedExpression.startsWith("s/")) {`
Original file line number	Diff line number	Diff line change
`@@ -286,8 +286,7 @@ rexExpr`
`286`	`286`
`287`	`287`	`rexOption`
`288`	`288`	`: MAX_MATCH EQUAL maxMatch=integerLiteral`
`289`		`- \| MODE EQUAL EXTRACT`
`290`		`- \| MODE EQUAL SED`
	`289`	`+ \| MODE EQUAL (EXTRACT \| SED)`
`291`	`290`	`\| OFFSET_FIELD EQUAL offsetField=qualifiedName`
`292`	`291`	`;`
`293`	`292`	`patternsMethod`