Skip to content

Commit 39ac56f

Browse files
committed
[SPARK-12889][SQL] Rename ParserDialect -> ParserInterface.
Based on discussions in #10801, I'm submitting a pull request to rename ParserDialect to ParserInterface. Author: Reynold Xin <[email protected]> Closes #10817 from rxin/SPARK-12889.
1 parent 721845c commit 39ac56f

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/AbstractSparkSQLParser.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import scala.util.parsing.input.CharArrayReader.EofCh
2626
import org.apache.spark.sql.catalyst.plans.logical._
2727

2828
private[sql] abstract class AbstractSparkSQLParser
29-
extends StandardTokenParsers with PackratParsers with ParserDialect {
29+
extends StandardTokenParsers with PackratParsers with ParserInterface {
3030

3131
def parsePlan(input: String): LogicalPlan = synchronized {
3232
// Initialize the Keywords.

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/CatalystQl.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import org.apache.spark.util.random.RandomSampler
3333
/**
3434
* This class translates SQL to Catalyst [[LogicalPlan]]s or [[Expression]]s.
3535
*/
36-
private[sql] class CatalystQl(val conf: ParserConf = SimpleParserConf()) extends ParserDialect {
36+
private[sql] class CatalystQl(val conf: ParserConf = SimpleParserConf()) extends ParserInterface {
3737
object Token {
3838
def unapply(node: ASTNode): Some[(String, List[ASTNode])] = {
3939
CurrentOrigin.setPosition(node.line, node.positionInLine)

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ParserDialect.scala renamed to sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ParserInterface.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
2323
/**
2424
* Interface for a parser.
2525
*/
26-
trait ParserDialect {
26+
trait ParserInterface {
2727
/** Creates LogicalPlan for a given SQL string. */
2828
def parsePlan(sqlText: String): LogicalPlan
2929

sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ class SQLContext private[sql](
203203
protected[sql] lazy val optimizer: Optimizer = new SparkOptimizer(this)
204204

205205
@transient
206-
protected[sql] val sqlParser: ParserDialect = new SparkSQLParser(new SparkQl(conf))
206+
protected[sql] val sqlParser: ParserInterface = new SparkSQLParser(new SparkQl(conf))
207207

208208
@transient
209209
protected[sql] val ddlParser: DDLParser = new DDLParser(sqlParser)

sql/core/src/main/scala/org/apache/spark/sql/execution/SparkSQLParser.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package org.apache.spark.sql.execution
1919

2020
import scala.util.parsing.combinator.RegexParsers
2121

22-
import org.apache.spark.sql.catalyst.{AbstractSparkSQLParser, ParserDialect, TableIdentifier}
22+
import org.apache.spark.sql.catalyst.{AbstractSparkSQLParser, ParserInterface, TableIdentifier}
2323
import org.apache.spark.sql.catalyst.expressions.{Attribute, AttributeReference, Expression}
2424
import org.apache.spark.sql.catalyst.plans.logical
2525
import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
@@ -33,7 +33,7 @@ import org.apache.spark.sql.types.StringType
3333
* parameter because this allows us to return a different dialect if we
3434
* have to.
3535
*/
36-
class SparkSQLParser(fallback: => ParserDialect) extends AbstractSparkSQLParser {
36+
class SparkSQLParser(fallback: => ParserInterface) extends AbstractSparkSQLParser {
3737

3838
override def parseExpression(sql: String): Expression = fallback.parseExpression(sql)
3939

sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/DDLParser.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import scala.util.matching.Regex
2222

2323
import org.apache.spark.Logging
2424
import org.apache.spark.sql.SaveMode
25-
import org.apache.spark.sql.catalyst.{AbstractSparkSQLParser, ParserDialect, TableIdentifier}
25+
import org.apache.spark.sql.catalyst.{AbstractSparkSQLParser, ParserInterface, TableIdentifier}
2626
import org.apache.spark.sql.catalyst.analysis.UnresolvedRelation
2727
import org.apache.spark.sql.catalyst.expressions.Expression
2828
import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
@@ -32,7 +32,7 @@ import org.apache.spark.sql.types._
3232
/**
3333
* A parser for foreign DDL commands.
3434
*/
35-
class DDLParser(fallback: => ParserDialect)
35+
class DDLParser(fallback: => ParserInterface)
3636
extends AbstractSparkSQLParser with DataTypeParser with Logging {
3737

3838
override def parseExpression(sql: String): Expression = fallback.parseExpression(sql)

sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import org.apache.spark.api.java.JavaSparkContext
4242
import org.apache.spark.sql._
4343
import org.apache.spark.sql.SQLConf.SQLConfEntry
4444
import org.apache.spark.sql.SQLConf.SQLConfEntry._
45-
import org.apache.spark.sql.catalyst.{InternalRow, ParserDialect}
45+
import org.apache.spark.sql.catalyst.{InternalRow, ParserInterface}
4646
import org.apache.spark.sql.catalyst.analysis._
4747
import org.apache.spark.sql.catalyst.expressions.{Expression, LeafExpression}
4848
import org.apache.spark.sql.catalyst.expressions.codegen.CodegenFallback
@@ -546,7 +546,7 @@ class HiveContext private[hive](
546546
}
547547

548548
@transient
549-
protected[sql] override val sqlParser: ParserDialect = {
549+
protected[sql] override val sqlParser: ParserInterface = {
550550
new SparkSQLParser(new ExtendedHiveQlParser(this))
551551
}
552552

0 commit comments

Comments
 (0)