Skip to content

Commit 253c15e

Browse files
committed
Fix scala style
1 parent b01244b commit 253c15e

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,11 @@ class SQLContext(@transient val sparkContext: SparkContext)
185185

186186
protected[sql] def parseSql(sql: String): LogicalPlan = ddlParser.parse(sql, false)
187187

188-
protected[sql] def executeSql(sql: String): sparkexecution.QueryExecution = executePlan(parseSql(sql))
188+
protected[sql] def executeSql(sql: String): sparkexecution.QueryExecution =
189+
executePlan(parseSql(sql))
189190

190-
protected[sql] def executePlan(plan: LogicalPlan) = new sparkexecution.QueryExecution(this, plan)
191+
protected[sql] def executePlan(plan: LogicalPlan) =
192+
new sparkexecution.QueryExecution(this, plan)
191193

192194
@transient
193195
protected[sql] val tlSession = new ThreadLocal[SQLSession]() {
@@ -900,7 +902,8 @@ class SQLContext(@transient val sparkContext: SparkContext)
900902
}
901903

902904
@deprecated("use org.apache.spark.sql.QueryExecution")
903-
protected[sql] class QueryExecution(logical: LogicalPlan) extends sparkexecution.QueryExecution(this, logical)
905+
protected[sql] class QueryExecution(logical: LogicalPlan)
906+
extends sparkexecution.QueryExecution(this, logical)
904907

905908
/**
906909
* Parses the data type in our internal string representation. The data type string should

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
3030
*/
3131
@Experimental
3232
class QueryExecution(val sqlContext: SQLContext, val logical: LogicalPlan) {
33-
val analyzer = sqlContext.analyzer
33+
val analyzer = sqlContext.analyzer
3434
val optimizer = sqlContext.optimizer
35-
val planner = sqlContext.planner
35+
val planner = sqlContext.planner
3636
val cacheManager = sqlContext.cacheManager
3737
val prepareForExecution = sqlContext.prepareForExecution
3838

@@ -85,4 +85,4 @@ class QueryExecution(val sqlContext: SQLContext, val logical: LogicalPlan) {
8585
|== RDD ==
8686
""".stripMargin.trim
8787
}
88-
}
88+
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ import org.apache.spark.SparkContext
2121
import org.apache.spark.annotation.Experimental
2222
import org.apache.spark.sql._
2323
import org.apache.spark.sql.catalyst.expressions._
24-
import org.apache.spark.sql.execution.TakeOrderedAndProject
2524
import org.apache.spark.sql.sources.DataSourceStrategy
2625

2726
@Experimental
28-
class SparkPlanner(val sqlContext: SQLContext) extends org.apache.spark.sql.execution.SparkStrategies {
27+
class SparkPlanner(val sqlContext: SQLContext) extends SparkStrategies {
2928
val sparkContext: SparkContext = sqlContext.sparkContext
3029

3130
def codegenEnabled: Boolean = sqlContext.conf.codegenEnabled
@@ -90,4 +89,4 @@ class SparkPlanner(val sqlContext: SQLContext) extends org.apache.spark.sql.exec
9089
Project(projectList, filterCondition.map(Filter(_, scan)).getOrElse(scan))
9190
}
9291
}
93-
}
92+
}

0 commit comments

Comments
 (0)