You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@kylin.apache.org by GitBox <gi...@apache.org> on 2021/04/20 11:01:04 UTC
[GitHub] [kylin] zhengshengjun opened a new pull request #1642: KYLIN-4980 Segment pruner can't prune segments from complex filter co…
zhengshengjun opened a new pull request #1642:
URL: https://github.com/apache/kylin/pull/1642
…nditions
## Proposed changes
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue.
## Types of changes
What types of changes does your code introduce to Kylin?
_Put an `x` in the boxes that apply_
- [x] Bugfix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] Documentation Update (if none of the other choices apply)
## Checklist
_Put an `x` in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code._
- [x] I have create an issue on [Kylin's jira](https://issues.apache.org/jira/browse/KYLIN), and have described the bug/feature there in detail
- [x] Commit messages in my PR start with the related jira ID, like "KYLIN-0000 Make Kylin project open-source"
- [x] Compiling and unit tests pass locally with my changes
- [ ] I have added tests that prove my fix is effective or that my feature works
- [ ] If this change need a document change, I will prepare another pr against the `document` branch
- [x] Any dependent changes have been merged
## Further comments
If this is a relatively large or complex change, kick off the discussion at user@kylin or dev@kylin by explaining why you chose the solution you did and what alternatives you considered, etc...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kylin] zhengshengjun commented on a change in pull request #1642: KYLIN-4980 Support prunning segments from complex filter co…
Posted by GitBox <gi...@apache.org>.
zhengshengjun commented on a change in pull request #1642:
URL: https://github.com/apache/kylin/pull/1642#discussion_r619646558
##########
File path: kylin-spark-project/kylin-spark-common/src/main/scala/org/apache/spark/sql/execution/datasource/FilePruner.scala
##########
@@ -295,8 +295,48 @@ class FilePruner(cubeInstance: CubeInstance,
}
}
- private def getSpecFilter(dataFilters: Seq[Expression], col: Attribute): Seq[Expression] = {
- dataFilters.filter(_.references.subsetOf(AttributeSet(col)))
+ private def getSegmentFilter(dataFilters: Seq[Expression], col: Attribute): Seq[Expression] = {
+ dataFilters.map(extractSegmentFilter(_, col)).filter(!_.equals(None)).map(_.get)
+ }
+
+ private def extractSegmentFilter(filter: Expression, col: Attribute): Option[Expression] = {
+ filter match {
+ case expressions.Or(left, right) =>
+ val leftChild = extractSegmentFilter(left, col)
+ val rightChild = extractSegmentFilter(right, col)
+
+ //if there exists leaf-node that doesn't contain partition column, the parent filter is
+ //unnecessary for segment prunning.
+ //e.g. "where a = xxx or partition = xxx", we can't filter any segment
+ if (leftChild.eq(None) || rightChild.eq(None)) {
+ None
+ } else {
+ Some(expressions.Or(leftChild.get, rightChild.get))
+ }
+ case expressions.And(left, right) =>
+ val leftChild = extractSegmentFilter(left, col)
+ val rightChild = extractSegmentFilter(right, col)
+
+ //if there is only one leaf-node that contains partition column
+ //e.g. "where a = xxx and partition = xxx",
+ //then we can filter segment using "where partition = xxx"
+ if (!leftChild.eq(None) && !rightChild.eq(None)) {
+ Some(expressions.And(leftChild.get, rightChild.get))
+ } else if (!rightChild.eq(None)) {
+ rightChild
+ } else if (!leftChild.eq(None)) {
+ leftChild
+ } else {
+ None
+ }
+ case _ =>
+ //other unary filter like EqualTo, GreaterThan, GreaterThanOrEqual, etc.
+ if (filter.references.contains(col)) {
Review comment:
good suggestion ~
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kylin] zzcclp commented on a change in pull request #1642: KYLIN-4980 Support prunning segments from complex filter co…
Posted by GitBox <gi...@apache.org>.
zzcclp commented on a change in pull request #1642:
URL: https://github.com/apache/kylin/pull/1642#discussion_r619576168
##########
File path: kylin-spark-project/kylin-spark-common/src/main/scala/org/apache/spark/sql/execution/datasource/FilePruner.scala
##########
@@ -295,8 +295,48 @@ class FilePruner(cubeInstance: CubeInstance,
}
}
- private def getSpecFilter(dataFilters: Seq[Expression], col: Attribute): Seq[Expression] = {
- dataFilters.filter(_.references.subsetOf(AttributeSet(col)))
+ private def getSegmentFilter(dataFilters: Seq[Expression], col: Attribute): Seq[Expression] = {
+ dataFilters.map(extractSegmentFilter(_, col)).filter(!_.equals(None)).map(_.get)
+ }
+
+ private def extractSegmentFilter(filter: Expression, col: Attribute): Option[Expression] = {
+ filter match {
+ case expressions.Or(left, right) =>
+ val leftChild = extractSegmentFilter(left, col)
+ val rightChild = extractSegmentFilter(right, col)
+
+ //if there exists leaf-node that doesn't contain partition column, the parent filter is
+ //unnecessary for segment prunning.
+ //e.g. "where a = xxx or partition = xxx", we can't filter any segment
+ if (leftChild.eq(None) || rightChild.eq(None)) {
+ None
+ } else {
+ Some(expressions.Or(leftChild.get, rightChild.get))
+ }
+ case expressions.And(left, right) =>
+ val leftChild = extractSegmentFilter(left, col)
+ val rightChild = extractSegmentFilter(right, col)
+
+ //if there is only one leaf-node that contains partition column
+ //e.g. "where a = xxx and partition = xxx",
+ //then we can filter segment using "where partition = xxx"
+ if (!leftChild.eq(None) && !rightChild.eq(None)) {
+ Some(expressions.And(leftChild.get, rightChild.get))
+ } else if (!rightChild.eq(None)) {
+ rightChild
+ } else if (!leftChild.eq(None)) {
+ leftChild
+ } else {
+ None
+ }
+ case _ =>
+ //other unary filter like EqualTo, GreaterThan, GreaterThanOrEqual, etc.
+ if (filter.references.contains(col)) {
Review comment:
better to use `if (filter.references.subsetOf(AttributeSet(col))) {`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kylin] zhengshengjun commented on pull request #1642: KYLIN-4980 Support prunning segments from complex filter co…
Posted by GitBox <gi...@apache.org>.
zhengshengjun commented on pull request #1642:
URL: https://github.com/apache/kylin/pull/1642#issuecomment-824847680
Added test case
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kylin] zzcclp commented on pull request #1642: KYLIN-4980 Support prunning segments from complex filter co…
Posted by GitBox <gi...@apache.org>.
zzcclp commented on pull request #1642:
URL: https://github.com/apache/kylin/pull/1642#issuecomment-826353467
LGTM
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kylin] zzcclp commented on pull request #1642: KYLIN-4980 Support prunning segments from complex filter co…
Posted by GitBox <gi...@apache.org>.
zzcclp commented on pull request #1642:
URL: https://github.com/apache/kylin/pull/1642#issuecomment-826353467
LGTM
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kylin] zhengshengjun commented on a change in pull request #1642: KYLIN-4980 Support prunning segments from complex filter co…
Posted by GitBox <gi...@apache.org>.
zhengshengjun commented on a change in pull request #1642:
URL: https://github.com/apache/kylin/pull/1642#discussion_r619646558
##########
File path: kylin-spark-project/kylin-spark-common/src/main/scala/org/apache/spark/sql/execution/datasource/FilePruner.scala
##########
@@ -295,8 +295,48 @@ class FilePruner(cubeInstance: CubeInstance,
}
}
- private def getSpecFilter(dataFilters: Seq[Expression], col: Attribute): Seq[Expression] = {
- dataFilters.filter(_.references.subsetOf(AttributeSet(col)))
+ private def getSegmentFilter(dataFilters: Seq[Expression], col: Attribute): Seq[Expression] = {
+ dataFilters.map(extractSegmentFilter(_, col)).filter(!_.equals(None)).map(_.get)
+ }
+
+ private def extractSegmentFilter(filter: Expression, col: Attribute): Option[Expression] = {
+ filter match {
+ case expressions.Or(left, right) =>
+ val leftChild = extractSegmentFilter(left, col)
+ val rightChild = extractSegmentFilter(right, col)
+
+ //if there exists leaf-node that doesn't contain partition column, the parent filter is
+ //unnecessary for segment prunning.
+ //e.g. "where a = xxx or partition = xxx", we can't filter any segment
+ if (leftChild.eq(None) || rightChild.eq(None)) {
+ None
+ } else {
+ Some(expressions.Or(leftChild.get, rightChild.get))
+ }
+ case expressions.And(left, right) =>
+ val leftChild = extractSegmentFilter(left, col)
+ val rightChild = extractSegmentFilter(right, col)
+
+ //if there is only one leaf-node that contains partition column
+ //e.g. "where a = xxx and partition = xxx",
+ //then we can filter segment using "where partition = xxx"
+ if (!leftChild.eq(None) && !rightChild.eq(None)) {
+ Some(expressions.And(leftChild.get, rightChild.get))
+ } else if (!rightChild.eq(None)) {
+ rightChild
+ } else if (!leftChild.eq(None)) {
+ leftChild
+ } else {
+ None
+ }
+ case _ =>
+ //other unary filter like EqualTo, GreaterThan, GreaterThanOrEqual, etc.
+ if (filter.references.contains(col)) {
Review comment:
good suggestion ~
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kylin] zzcclp merged pull request #1642: KYLIN-4980 Support prunning segments from complex filter co…
Posted by GitBox <gi...@apache.org>.
zzcclp merged pull request #1642:
URL: https://github.com/apache/kylin/pull/1642
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kylin] zzcclp merged pull request #1642: KYLIN-4980 Support prunning segments from complex filter co…
Posted by GitBox <gi...@apache.org>.
zzcclp merged pull request #1642:
URL: https://github.com/apache/kylin/pull/1642
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org