Skip to content

Commit 74ba84b

Browse files
gatorsmileJoshRosen
authored andcommitted
[HOT][BUILD] Changed the import order
This PR is to fix the master's build break. The following tests failed due to the import order issues in the master. https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/49651/consoleFull https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/49652/consoleFull https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/49653/consoleFull Author: gatorsmile <[email protected]> Closes #10823 from gatorsmile/importOrder.
1 parent 2b5d11f commit 74ba84b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package org.apache.spark.sql.execution
1919

20-
import org.apache.spark.sql.execution.joins.{BuildLeft, BuildRight}
2120
import org.apache.spark.sql.{execution, Strategy}
2221
import org.apache.spark.sql.catalyst.InternalRow
2322
import org.apache.spark.sql.catalyst.expressions._
@@ -29,6 +28,7 @@ import org.apache.spark.sql.catalyst.plans.physical._
2928
import org.apache.spark.sql.execution.{DescribeCommand => RunnableDescribeCommand}
3029
import org.apache.spark.sql.execution.columnar.{InMemoryColumnarTableScan, InMemoryRelation}
3130
import org.apache.spark.sql.execution.datasources.{CreateTableUsing, CreateTempTableUsing, DescribeCommand => LogicalDescribeCommand, _}
31+
import org.apache.spark.sql.execution.joins.{BuildLeft, BuildRight}
3232

3333
private[sql] abstract class SparkStrategies extends QueryPlanner[SparkPlan] {
3434
self: SparkPlanner =>

sql/core/src/test/scala/org/apache/spark/sql/execution/joins/InnerJoinSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717

1818
package org.apache.spark.sql.execution.joins
1919

20+
import org.apache.spark.sql.{DataFrame, Row, SQLConf}
2021
import org.apache.spark.sql.catalyst.expressions.Expression
2122
import org.apache.spark.sql.catalyst.planning.ExtractEquiJoinKeys
2223
import org.apache.spark.sql.catalyst.plans.Inner
2324
import org.apache.spark.sql.catalyst.plans.logical.Join
2425
import org.apache.spark.sql.execution._
2526
import org.apache.spark.sql.test.SharedSQLContext
2627
import org.apache.spark.sql.types.{IntegerType, StringType, StructType}
27-
import org.apache.spark.sql.{DataFrame, Row, SQLConf}
2828

2929
class InnerJoinSuite extends SparkPlanTest with SharedSQLContext {
3030
import testImplicits.localSeqToDataFrameHolder

0 commit comments

Comments
 (0)