You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by gatorsmile <gi...@git.apache.org> on 2017/09/29 21:37:11 UTC
[GitHub] spark pull request #19393: [SPARK-21644][SQL] LocalLimit.maxRows is defined ...
GitHub user gatorsmile opened a pull request:
https://github.com/apache/spark/pull/19393
[SPARK-21644][SQL] LocalLimit.maxRows is defined incorrectly
## What changes were proposed in this pull request?
The definition of `maxRows` in `LocalLimit` operator was simply wrong. This patch introduces a new `maxRowsPerPartition` method and uses that in pruning. The patch also adds more documentation on why we need local limit vs global limit.
Note that this previously has never been a bug because the way the code is structured, but future use of the maxRows could lead to bugs.
## How was this patch tested?
Should be covered by existing test cases.
Closes #18851
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/gatorsmile/spark pr-18851
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/spark/pull/19393.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #19393
----
commit 9911176d901a6bdfadec3ef68b28e6dd2c82be9e
Author: Reynold Xin <rx...@databricks.com>
Date: 2017-08-05T01:19:26Z
[SPARK-21644][SQL] LocalLimit.maxRows is defined incorrectly
commit fb97a73cd9ad217f04992cd70a44d22b29dc6a9b
Author: gatorsmile <ga...@gmail.com>
Date: 2017-09-29T21:34:05Z
fix
----
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark issue #19393: [SPARK-21644][SQL] LocalLimit.maxRows is defined incorre...
Posted by SparkQA <gi...@git.apache.org>.
Github user SparkQA commented on the issue:
https://github.com/apache/spark/pull/19393
**[Test build #82424 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/82424/testReport)** for PR 19393 at commit [`4312a9c`](https://github.com/apache/spark/commit/4312a9c4f267fe8dc64c2bc4a29f96b9183b9e72).
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark issue #19393: [SPARK-21644][SQL] LocalLimit.maxRows is defined incorre...
Posted by AmplabJenkins <gi...@git.apache.org>.
Github user AmplabJenkins commented on the issue:
https://github.com/apache/spark/pull/19393
Merged build finished. Test PASSed.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark issue #19393: [SPARK-21644][SQL] LocalLimit.maxRows is defined incorre...
Posted by AmplabJenkins <gi...@git.apache.org>.
Github user AmplabJenkins commented on the issue:
https://github.com/apache/spark/pull/19393
Merged build finished. Test PASSed.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark issue #19393: [SPARK-21644][SQL] LocalLimit.maxRows is defined incorre...
Posted by SparkQA <gi...@git.apache.org>.
Github user SparkQA commented on the issue:
https://github.com/apache/spark/pull/19393
**[Test build #82334 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/82334/testReport)** for PR 19393 at commit [`fb97a73`](https://github.com/apache/spark/commit/fb97a73cd9ad217f04992cd70a44d22b29dc6a9b).
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request #19393: [SPARK-21644][SQL] LocalLimit.maxRows is defined ...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/spark/pull/19393
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark issue #19393: [SPARK-21644][SQL] LocalLimit.maxRows is defined incorre...
Posted by gatorsmile <gi...@git.apache.org>.
Github user gatorsmile commented on the issue:
https://github.com/apache/spark/pull/19393
Thanks! Merged to master.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark issue #19393: [SPARK-21644][SQL] LocalLimit.maxRows is defined incorre...
Posted by AmplabJenkins <gi...@git.apache.org>.
Github user AmplabJenkins commented on the issue:
https://github.com/apache/spark/pull/19393
Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/82334/
Test PASSed.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark issue #19393: [SPARK-21644][SQL] LocalLimit.maxRows is defined incorre...
Posted by AmplabJenkins <gi...@git.apache.org>.
Github user AmplabJenkins commented on the issue:
https://github.com/apache/spark/pull/19393
Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/82424/
Test PASSed.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark issue #19393: [SPARK-21644][SQL] LocalLimit.maxRows is defined incorre...
Posted by gatorsmile <gi...@git.apache.org>.
Github user gatorsmile commented on the issue:
https://github.com/apache/spark/pull/19393
cc @rxin @JoshRosen @cloud-fan
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request #19393: [SPARK-21644][SQL] LocalLimit.maxRows is defined ...
Posted by viirya <gi...@git.apache.org>.
Github user viirya commented on a diff in the pull request:
https://github.com/apache/spark/pull/19393#discussion_r142311845
--- Diff: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala ---
@@ -296,13 +296,20 @@ object LimitPushDown extends Rule[LogicalPlan] {
}
}
- private def maybePushLimit(limitExp: Expression, plan: LogicalPlan): LogicalPlan = {
- (limitExp, plan.maxRows) match {
- case (IntegerLiteral(maxRow), Some(childMaxRows)) if maxRow < childMaxRows =>
+ private def maybePushLocalLimit(limitExp: Expression, plan: LogicalPlan): LogicalPlan = {
+ (limitExp, plan.maxRowsPerPartition) match {
+ case (IntegerLiteral(newLimit), Some(childMaxRows)) if newLimit < childMaxRows =>
+ // If the child has a cap on max rows per partition and the cap is smaller than
+ // the new limit, put a new LocalLimit there.
--- End diff --
I think it is `the cap is larger than the new limit`?
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark issue #19393: [SPARK-21644][SQL] LocalLimit.maxRows is defined incorre...
Posted by SparkQA <gi...@git.apache.org>.
Github user SparkQA commented on the issue:
https://github.com/apache/spark/pull/19393
**[Test build #82334 has finished](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/82334/testReport)** for PR 19393 at commit [`fb97a73`](https://github.com/apache/spark/commit/fb97a73cd9ad217f04992cd70a44d22b29dc6a9b).
* This patch passes all tests.
* This patch merges cleanly.
* This patch adds no public classes.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark issue #19393: [SPARK-21644][SQL] LocalLimit.maxRows is defined incorre...
Posted by SparkQA <gi...@git.apache.org>.
Github user SparkQA commented on the issue:
https://github.com/apache/spark/pull/19393
**[Test build #82424 has finished](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/82424/testReport)** for PR 19393 at commit [`4312a9c`](https://github.com/apache/spark/commit/4312a9c4f267fe8dc64c2bc4a29f96b9183b9e72).
* This patch passes all tests.
* This patch merges cleanly.
* This patch adds no public classes.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark issue #19393: [SPARK-21644][SQL] LocalLimit.maxRows is defined incorre...
Posted by viirya <gi...@git.apache.org>.
Github user viirya commented on the issue:
https://github.com/apache/spark/pull/19393
One minor comment otherwise LGTM.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark issue #19393: [SPARK-21644][SQL] LocalLimit.maxRows is defined incorre...
Posted by rxin <gi...@git.apache.org>.
Github user rxin commented on the issue:
https://github.com/apache/spark/pull/19393
LGTM but I wrote most of the code so perhaps we should find somebody else to review.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org