-
Notifications
You must be signed in to change notification settings - Fork 28.1k
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.
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
[SPARK-13668][SQL] Reorder filter/join predicates to short-circuit isNotNull checks #11511
Closed
Closed
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
103 changes: 103 additions & 0 deletions
103
sql/core/src/test/scala/org/apache/spark/sql/execution/ReorderedPredicateSuite.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.sql.execution | ||
|
|
||
| import org.apache.spark.sql.catalyst.expressions.{Expression, IsNotNull, PredicateHelper} | ||
| import org.apache.spark.sql.catalyst.plans.logical | ||
| import org.apache.spark.sql.catalyst.plans.logical.Join | ||
| import org.apache.spark.sql.execution | ||
| import org.apache.spark.sql.execution.joins.LeftSemiJoinHash | ||
| import org.apache.spark.sql.test.SharedSQLContext | ||
|
|
||
|
|
||
| class ReorderedPredicateSuite extends SharedSQLContext with PredicateHelper { | ||
|
|
||
| setupTestData() | ||
|
|
||
| // Verifies that (a) In the new condition, the IsNotNull operators precede rest of the operators | ||
| // and (b) The relative sort order of IsNotNull and !IsNotNull operators is still maintained | ||
| private def verifyStableOrder(before: Expression, after: Expression): Unit = { | ||
| val oldPredicates = splitConjunctivePredicates(before) | ||
| splitConjunctivePredicates(after).sliding(2).foreach { case Seq(x, y) => | ||
| // Verify IsNotNull operator ordering | ||
| assert(x.isInstanceOf[IsNotNull] || !y.isInstanceOf[IsNotNull]) | ||
|
|
||
| // Verify stable sort order | ||
| if ((x.isInstanceOf[IsNotNull] && y.isInstanceOf[IsNotNull]) || | ||
| (!x.isInstanceOf[IsNotNull] && !y.isInstanceOf[IsNotNull])) { | ||
| assert(oldPredicates.indexOf(x) <= oldPredicates.indexOf(y)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| test("null ordering in filter predicates") { | ||
| val query = sql( | ||
| """ | ||
| |SELECT * from testData | ||
| |WHERE value != '5' AND value != '4' AND value IS NOT NULL AND key != 5 | ||
| """.stripMargin) | ||
| .queryExecution | ||
|
|
||
| val logicalPlan = query.optimizedPlan | ||
| val physicalPlan = query.sparkPlan | ||
| assert(logicalPlan.find(_.isInstanceOf[logical.Filter]).isDefined) | ||
| assert(physicalPlan.find(_.isInstanceOf[execution.Filter]).isDefined) | ||
|
|
||
| val logicalCondition = logicalPlan.collect { | ||
| case logical.Filter(condition, _) => | ||
| condition | ||
| }.head | ||
|
|
||
| val physicalCondition = physicalPlan.collect { | ||
| case Filter(condition, _) => | ||
| condition | ||
| }.head | ||
|
|
||
| verifyStableOrder(logicalCondition, physicalCondition) | ||
| } | ||
|
|
||
| test("null ordering in join predicates") { | ||
| sqlContext.cacheManager.clearCache() | ||
| val query = sql( | ||
| """ | ||
| |SELECT * FROM testData t1 | ||
| |LEFT SEMI JOIN testData t2 | ||
| |ON t1.key = t2.key | ||
| |AND t1.key + t2.key != 5 | ||
| |AND CONCAT(t1.value, t2.value) IS NOT NULL | ||
| """.stripMargin) | ||
| .queryExecution | ||
|
|
||
| val logicalPlan = query.optimizedPlan | ||
| val physicalPlan = query.sparkPlan | ||
| assert(logicalPlan.find(_.isInstanceOf[Join]).isDefined) | ||
| assert(physicalPlan.find(_.isInstanceOf[LeftSemiJoinHash]).isDefined) | ||
|
|
||
| val logicalCondition = logicalPlan.collect { | ||
| case Join(_, _, _, condition) => | ||
| condition.get | ||
| }.head | ||
|
|
||
| val physicalCondition = physicalPlan.collect { | ||
| case LeftSemiJoinHash(_, _, _, _, conditionOpt) => | ||
| conditionOpt.get | ||
| }.head | ||
|
|
||
| verifyStableOrder(logicalCondition, physicalCondition) | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we have a test to make sure this reordering is stable?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, I modified the 2 tests in
ReorderPredicateSuiteto verify that the sort is stable.