[SEDONA-716] Change the spark parser order to use delegate parser fir…

…st (#1832)
apache · Feb 26, 2025 · 5007131 · 5007131
1 parent db6e8cf
commit 5007131
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 15 deletions.
diff --git a/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/parser/SedonaSqlParser.scala b/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/parser/SedonaSqlParser.scala
@@ -28,17 +28,22 @@ class SedonaSqlParser(delegate: ParserInterface) extends SparkSqlParser {
   val parserBuilder = new SedonaSqlAstBuilder
 
   /**
-   * Parse the SQL text and return the logical plan.
+   * Parse the SQL text and return the logical plan. This method first attempts to use the
+   * delegate parser to parse the SQL text. If the delegate parser fails (throws an exception), it
+   * falls back to using the Sedona SQL parser.
+   *
    * @param sqlText
+   *   The SQL text to be parsed.
    * @return
+   *   The parsed logical plan.
    */
   override def parsePlan(sqlText: String): LogicalPlan =
     try {
-      parse(sqlText) { parser =>
-        parserBuilder.visit(parser.singleStatement())
-      }.asInstanceOf[LogicalPlan]
+      delegate.parsePlan(sqlText)
     } catch {
       case _: Exception =>
-        delegate.parsePlan(sqlText)
+        parse(sqlText) { parser =>
+          parserBuilder.visit(parser.singleStatement())
+        }.asInstanceOf[LogicalPlan]
     }
 }
diff --git a/spark/spark-3.4/src/main/scala/org/apache/sedona/sql/parser/SedonaSqlParser.scala b/spark/spark-3.4/src/main/scala/org/apache/sedona/sql/parser/SedonaSqlParser.scala
@@ -28,17 +28,22 @@ class SedonaSqlParser(delegate: ParserInterface) extends SparkSqlParser {
   val parserBuilder = new SedonaSqlAstBuilder
 
   /**
-   * Parse the SQL text and return the logical plan.
+   * Parse the SQL text and return the logical plan. This method first attempts to use the
+   * delegate parser to parse the SQL text. If the delegate parser fails (throws an exception), it
+   * falls back to using the Sedona SQL parser.
+   *
    * @param sqlText
+   *   The SQL text to be parsed.
    * @return
+   *   The parsed logical plan.
    */
   override def parsePlan(sqlText: String): LogicalPlan =
     try {
-      parse(sqlText) { parser =>
-        parserBuilder.visit(parser.singleStatement())
-      }.asInstanceOf[LogicalPlan]
+      delegate.parsePlan(sqlText)
     } catch {
       case _: Exception =>
-        delegate.parsePlan(sqlText)
+        parse(sqlText) { parser =>
+          parserBuilder.visit(parser.singleStatement())
+        }.asInstanceOf[LogicalPlan]
     }
 }
diff --git a/spark/spark-3.5/src/main/scala/org/apache/sedona/sql/parser/SedonaSqlParser.scala b/spark/spark-3.5/src/main/scala/org/apache/sedona/sql/parser/SedonaSqlParser.scala
@@ -28,17 +28,22 @@ class SedonaSqlParser(delegate: ParserInterface) extends SparkSqlParser {
   val parserBuilder = new SedonaSqlAstBuilder
 
   /**
-   * Parse the SQL text and return the logical plan.
+   * Parse the SQL text and return the logical plan. This method first attempts to use the
+   * delegate parser to parse the SQL text. If the delegate parser fails (throws an exception), it
+   * falls back to using the Sedona SQL parser.
+   *
    * @param sqlText
+   *   The SQL text to be parsed.
    * @return
+   *   The parsed logical plan.
    */
   override def parsePlan(sqlText: String): LogicalPlan =
     try {
-      parse(sqlText) { parser =>
-        parserBuilder.visit(parser.singleStatement())
-      }.asInstanceOf[LogicalPlan]
+      delegate.parsePlan(sqlText)
     } catch {
       case _: Exception =>
-        delegate.parsePlan(sqlText)
+        parse(sqlText) { parser =>
+          parserBuilder.visit(parser.singleStatement())
+        }.asInstanceOf[LogicalPlan]
     }
 }