Skip to content

[SPARK-12660] [SPARK-14967] [SQL] Implement Except Distinct by Left Anti Join #12736

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
gatorsmile wants to merge 10 commits into from
Closed

[SPARK-12660] [SPARK-14967] [SQL] Implement Except Distinct by Left Anti Join #12736

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cd6b684
initial fix
gatorsmile Apr 27, 2016
43e7436
added a test case.
gatorsmile Apr 27, 2016
89fae2a
antiJoin fix from Herman
gatorsmile Apr 27, 2016
8397f22
added test cases
gatorsmile Apr 27, 2016
a104f99
Merge remote-tracking branch 'upstream/master' into exceptByAntiJoin
gatorsmile Apr 27, 2016
f825dca
style fix.
gatorsmile Apr 27, 2016
70da501
fixed the test case.
gatorsmile Apr 27, 2016
3c61a5a
Merge remote-tracking branch 'upstream/master' into exceptByAntiJoin
gatorsmile Apr 27, 2016
7ccd95b
one more test case
gatorsmile Apr 27, 2016
4920360
address comments
gatorsmile Apr 28, 2016
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
Prev Previous commit
Next Next commit
style fix.
  • Loading branch information
@gatorsmile
gatorsmile committed Apr 27, 2016
commit f825dcaabf9d5bf7ffb20a72166e28f32aeec67a
1 change: 0 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,6 @@ trait CheckAnalysis extends PredicateHelper {
|Conflicting attributes: ${conflictingAttributes.mkString(",")}
""".stripMargin)


case e: Except if !e.duplicateResolved =>
val conflictingAttributes = e.left.outputSet.intersect(e.right.outputSet)
failAnalysis(
Expand Down
11 changes: 5 additions & 6 deletions sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,9 +393,9 @@ class DataFrameSuite extends QueryTest with SharedSQLContext {
checkAnswer(
lowerCaseData.except(upperCaseData),
Row(1, "a") ::
Row(2, "b") ::
Row(3, "c") ::
Row(4, "d") :: Nil)
Row(2, "b") ::
Row(3, "c") ::
Row(4, "d") :: Nil)
checkAnswer(lowerCaseData.except(lowerCaseData), Nil)
checkAnswer(upperCaseData.except(upperCaseData), Nil)

Expand All @@ -420,8 +420,8 @@ class DataFrameSuite extends QueryTest with SharedSQLContext {
checkAnswer(
df.except(df.filter("0 = 1")),
Row("id1", 1) ::
Row("id", 1) ::
Row("id1", 2) :: Nil)
Row("id", 1) ::
Row("id1", 2) :: Nil)

// check if the empty set on the left side works
checkAnswer(
Expand Down Expand Up @@ -1135,7 +1135,6 @@ class DataFrameSuite extends QueryTest with SharedSQLContext {
val df2 = (1 to 30).map(Tuple1.apply).toDF("i")
val intersect = df1.intersect(df2)
val except = df1.except(df2)
except.explain(true)
assert(intersect.count() === 30)
assert(except.count() === 70)
}
Expand Down