[SEDONA-636] Parser extension optimization

apache · Nov 25, 2024 · ceb3cc0 · ceb3cc0
1 parent b4163e7
commit ceb3cc0
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 84 deletions.
diff --git a/spark/common/src/main/scala/org/apache/sedona/sql/ParserRegistrator.scala b/spark/common/src/main/scala/org/apache/sedona/sql/ParserRegistrator.scala
@@ -38,21 +38,6 @@ object ParserRegistrator {
       val field = sparkSession.sessionState.getClass.getDeclaredField("sqlParser")
       field.setAccessible(true)
       field.set(sparkSession.sessionState, parser)
-      return // return if the new constructor is available
-    } catch {
-      case _: Exception =>
-    }
-
-    // try to register the parser with the legacy constructor for spark 3.0
-    try {
-      val parserClassName = "org.apache.sedona.sql.parser.SedonaSqlParser"
-      val delegate: ParserInterface = sparkSession.sessionState.sqlParser
-
-      val parser =
-        ParserFactory.getParser(parserClassName, sparkSession.sessionState.conf, delegate)
-      val field = sparkSession.sessionState.getClass.getDeclaredField("sqlParser")
-      field.setAccessible(true)
-      field.set(sparkSession.sessionState, parser)
     } catch {
       case _: Exception =>
     }

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
@@ -19,30 +19,8 @@
 package org.apache.sedona.sql.parser
 
 import org.apache.spark.sql.catalyst.parser.ParserInterface
-import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
 import org.apache.spark.sql.execution.SparkSqlParser
 
 class SedonaSqlParser(delegate: ParserInterface) extends SparkSqlParser {
-
-  // The parser builder for the Sedona SQL AST
-  val parserBuilder = new SedonaSqlAstBuilder
-
-  /**
-   * Parse the SQL text and return the logical plan.
-   * @param sqlText
-   * @return
-   */
-  override def parsePlan(sqlText: String): LogicalPlan =
-    try {
-      parse(sqlText) { parser =>
-        parserBuilder.visit(parser.singleStatement()) match {
-          case plan: LogicalPlan => plan
-          case _ =>
-            delegate.parsePlan(sqlText)
-        }
-      }
-    } catch {
-      case _: Exception =>
-        delegate.parsePlan(sqlText)
-    }
+  override val astBuilder = new SedonaSqlAstBuilder
 }
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
@@ -19,30 +19,8 @@
 package org.apache.sedona.sql.parser
 
 import org.apache.spark.sql.catalyst.parser.ParserInterface
-import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
 import org.apache.spark.sql.execution.SparkSqlParser
 
 class SedonaSqlParser(delegate: ParserInterface) extends SparkSqlParser {
-
-  // The parser builder for the Sedona SQL AST
-  val parserBuilder = new SedonaSqlAstBuilder
-
-  /**
-   * Parse the SQL text and return the logical plan.
-   * @param sqlText
-   * @return
-   */
-  override def parsePlan(sqlText: String): LogicalPlan =
-    try {
-      parse(sqlText) { parser =>
-        parserBuilder.visit(parser.singleStatement()) match {
-          case plan: LogicalPlan => plan
-          case _ =>
-            delegate.parsePlan(sqlText)
-        }
-      }
-    } catch {
-      case _: Exception =>
-        delegate.parsePlan(sqlText)
-    }
+  override val astBuilder = new SedonaSqlAstBuilder
 }
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
@@ -19,30 +19,8 @@
 package org.apache.sedona.sql.parser
 
 import org.apache.spark.sql.catalyst.parser.ParserInterface
-import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
 import org.apache.spark.sql.execution.SparkSqlParser
 
 class SedonaSqlParser(delegate: ParserInterface) extends SparkSqlParser {
-
-  // The parser builder for the Sedona SQL AST
-  val parserBuilder = new SedonaSqlAstBuilder
-
-  /**
-   * Parse the SQL text and return the logical plan.
-   * @param sqlText
-   * @return
-   */
-  override def parsePlan(sqlText: String): LogicalPlan =
-    try {
-      parse(sqlText) { parser =>
-        parserBuilder.visit(parser.singleStatement()) match {
-          case plan: LogicalPlan => plan
-          case _ =>
-            delegate.parsePlan(sqlText)
-        }
-      }
-    } catch {
-      case _: Exception =>
-        delegate.parsePlan(sqlText)
-    }
+  override val astBuilder = new SedonaSqlAstBuilder
 }