Skip to content

[SPARK-3395] [SQL] DSL sometimes incorrectly reuses attribute ids, breaking queries #2266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[SPARK-3395] [SQL] DSL sometimes incorrectly reuses attribute ids, breaking queries #2266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05bd1e4
in the dsl, create a new schema instance in each applySchema
Sep 4, 2014
7f2b6f0
add regression test
Sep 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/SchemaRDD.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,8 @@ class SchemaRDD(
*/
private def applySchema(rdd: RDD[Row]): SchemaRDD = {
new SchemaRDD(sqlContext,
SparkLogicalPlan(ExistingRdd(queryExecution.analyzed.output, rdd))(sqlContext))
SparkLogicalPlan(
ExistingRdd(queryExecution.analyzed.output.map(_.newInstance), rdd))(sqlContext))
}

// =======================================================================
Expand Down
14 changes: 14 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/DslQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
package org.apache.spark.sql

import org.apache.spark.sql.catalyst.analysis._
import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.plans._
import org.apache.spark.sql.test._

/* Implicits */
Expand Down Expand Up @@ -133,6 +135,18 @@ class DslQuerySuite extends QueryTest {
mapData.take(1).toSeq)
}

test("SPARK-3395 limit distinct") {
val filtered = TestData.testData2
.distinct()
.orderBy(SortOrder('a, Ascending), SortOrder('b, Ascending))
.limit(1)
.registerTempTable("onerow")
checkAnswer(
sql("select * from onerow inner join testData2 on onerow.a = testData2.a"),
(1, 1, 1, 1) ::
(1, 1, 1, 2) :: Nil)
}

test("average") {
checkAnswer(
testData2.groupBy()(avg('a)),
Expand Down