Repository: spark Updated Branches: refs/heads/branch-1.4 15beccb71 -> 8f82bb440
[SPARK-10377] [SQL] [BRANCH-1.4] Rename TakeOrderedAndProject back to TakeOrdered. https://issues.apache.org/jira/browse/SPARK-10377 https://github.com/apache/spark/pull/8252#issuecomment-136480957 renames `TakeOrdered` to `TakeOrderedAndProject` (this is an internal API), which breaks third-party code using Spark 1.4 branch (e.g. Cassandra connector https://github.com/datastax/spark-cassandra-connector/blob/v1.4.0-M3/spark-cassandra-connector/src/main/scala/org/apache/spark/sql/cassandra/CassandraSQLContext.scala#L90). This PR renames this class back to `TakeOrdered`. Author: Yin Huai <[email protected]> Closes #8545 from yhuai/SPARK-10377. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8f82bb44 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8f82bb44 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8f82bb44 Branch: refs/heads/branch-1.4 Commit: 8f82bb440879b82012b78563347d00b55547a964 Parents: 15beccb Author: Yin Huai <[email protected]> Authored: Tue Sep 1 11:02:08 2015 -0700 Committer: Yin Huai <[email protected]> Committed: Tue Sep 1 11:02:08 2015 -0700 ---------------------------------------------------------------------- sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala | 2 +- .../scala/org/apache/spark/sql/execution/SparkStrategies.scala | 2 +- .../test/scala/org/apache/spark/sql/execution/PlannerSuite.scala | 4 ++-- .../src/main/scala/org/apache/spark/sql/hive/HiveContext.scala | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/8f82bb44/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala index 6a7569d..bd3f690 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala @@ -827,7 +827,7 @@ class SQLContext(@transient val sparkContext: SparkContext) experimental.extraStrategies ++ ( DataSourceStrategy :: DDLStrategy :: - TakeOrderedAndProject :: + TakeOrdered :: HashAggregation :: LeftSemiJoin :: HashJoin :: http://git-wip-us.apache.org/repos/asf/spark/blob/8f82bb44/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkStrategies.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkStrategies.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkStrategies.scala index bf75cc2..f840e03 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkStrategies.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkStrategies.scala @@ -205,7 +205,7 @@ private[sql] abstract class SparkStrategies extends QueryPlanner[SparkPlan] { protected lazy val singleRowRdd = sparkContext.parallelize(Seq(new GenericRow(Array[Any]()): Row), 1) - object TakeOrderedAndProject extends Strategy { + object TakeOrdered extends Strategy { def apply(plan: LogicalPlan): Seq[SparkPlan] = plan match { case logical.Limit(IntegerLiteral(limit), logical.Sort(order, true, child)) => execution.TakeOrderedAndProject(limit, order, None, planLater(child)) :: Nil http://git-wip-us.apache.org/repos/asf/spark/blob/8f82bb44/sql/core/src/test/scala/org/apache/spark/sql/execution/PlannerSuite.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/PlannerSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/PlannerSuite.scala index 0b0f433..fc8433d 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/execution/PlannerSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/PlannerSuite.scala @@ -147,7 +147,7 @@ class PlannerSuite extends SparkFunSuite { { val query = testData.select('key, 'value).sort('key).limit(2).logicalPlan - val planned = planner.TakeOrderedAndProject(query) + val planned = planner.TakeOrdered(query) assert(planned.head.isInstanceOf[execution.TakeOrderedAndProject]) assert(planned.head.output === testData.select('key, 'value).logicalPlan.output) } @@ -157,7 +157,7 @@ class PlannerSuite extends SparkFunSuite { // into it. val query = testData.select('key, 'value).sort('key).select('value, 'key).limit(2).logicalPlan - val planned = planner.TakeOrderedAndProject(query) + val planned = planner.TakeOrdered(query) assert(planned.head.isInstanceOf[execution.TakeOrderedAndProject]) assert(planned.head.output === testData.select('value, 'key).logicalPlan.output) } http://git-wip-us.apache.org/repos/asf/spark/blob/8f82bb44/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala ---------------------------------------------------------------------- diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala index 43c08eb..d43afb7 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala @@ -447,7 +447,7 @@ class HiveContext(sc: SparkContext) extends SQLContext(sc) { HiveCommandStrategy(self), HiveDDLStrategy, DDLStrategy, - TakeOrderedAndProject, + TakeOrdered, ParquetOperations, InMemoryScans, ParquetConversion, // Must be before HiveTableScans --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
