You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2016/12/16 08:53:21 UTC
kylin git commit: KYLIN-2290 bug fix
Repository: kylin
Updated Branches:
refs/heads/yang22 398fa0ded -> 4232e0dac
KYLIN-2290 bug fix
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/4232e0da
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/4232e0da
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/4232e0da
Branch: refs/heads/yang22
Commit: 4232e0dac801eacf60b08b3f22e383787be54d51
Parents: 398fa0d
Author: Hongbin Ma <ma...@apache.org>
Authored: Fri Dec 16 16:53:33 2016 +0800
Committer: Hongbin Ma <ma...@apache.org>
Committed: Fri Dec 16 16:53:33 2016 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/query/relnode/OLAPAggregateRel.java | 4 ++++
.../main/java/org/apache/kylin/query/relnode/OLAPLimitRel.java | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/4232e0da/query/src/main/java/org/apache/kylin/query/relnode/OLAPAggregateRel.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/relnode/OLAPAggregateRel.java b/query/src/main/java/org/apache/kylin/query/relnode/OLAPAggregateRel.java
index 62351d3..3242371 100644
--- a/query/src/main/java/org/apache/kylin/query/relnode/OLAPAggregateRel.java
+++ b/query/src/main/java/org/apache/kylin/query/relnode/OLAPAggregateRel.java
@@ -157,6 +157,10 @@ public class OLAPAggregateRel extends Aggregate implements OLAPRel {
this.context.groupByColumns.addAll(this.groups);
this.context.aggregations.addAll(this.aggregations);
this.context.afterAggregate = true;
+
+ if (this.context.afterLimit) {
+ this.context.limitPrecedesAggr = true;
+ }
} else {
for (AggregateCall aggCall : aggCalls) {
// check if supported by kylin
http://git-wip-us.apache.org/repos/asf/kylin/blob/4232e0da/query/src/main/java/org/apache/kylin/query/relnode/OLAPLimitRel.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/relnode/OLAPLimitRel.java b/query/src/main/java/org/apache/kylin/query/relnode/OLAPLimitRel.java
index 9ebdf60..8179807 100644
--- a/query/src/main/java/org/apache/kylin/query/relnode/OLAPLimitRel.java
+++ b/query/src/main/java/org/apache/kylin/query/relnode/OLAPLimitRel.java
@@ -91,10 +91,6 @@ public class OLAPLimitRel extends SingleRel implements OLAPRel {
}
context.afterLimit = true;
-
- if (!this.context.afterAggregate) {
- this.context.limitPrecedesAggr = true;
- }
}
}