[19/50] [abbrv] kylin git commit: KYLIN-2085 Consider dynamicVariables in CompareTupleFilter operator swap

2016-10-18 Thread lidong 
KYLIN-2085 Consider dynamicVariables in CompareTupleFilter operator swap


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/8fbfc580
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/8fbfc580
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/8fbfc580

Branch: refs/heads/master-hbase1.x
Commit: 8fbfc580c1b89e3e0065027eb22f8e3e5b7e0c67
Parents: 58afe01
Author: lidongsjtu 
Authored: Wed Oct 12 13:44:11 2016 +0800
Committer: lidongsjtu 
Committed: Wed Oct 12 16:32:44 2016 +0800

--
 .../java/org/apache/kylin/metadata/filter/CompareTupleFilter.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/8fbfc580/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
 
b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
index fe51710..c7a3721 100644
--- 
a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
+++ 
b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
@@ -75,7 +75,8 @@ public class CompareTupleFilter extends TupleFilter {
 }
 this.column = columnFilter.getColumn();
 // if value is before column, we need to reverse the operator. 
e.g. "1 >= c1" => "c1 <= 1"
-if (!this.conditionValues.isEmpty() && needSwapOperator()) {
+// children.size() > 1 means already added one conditionValue or 
dynamicVariable
+if (this.children.size() > 1 && needSwapOperator()) {
 this.operator = SWAP_OP_MAP.get(this.operator);
 TupleFilter last = this.children.remove(this.children.size() - 
1);
 this.children.add(0, last);

[1/5] kylin git commit: KYLIN-2085 Consider dynamicVariables in CompareTupleFilter operator swap [Forced Update!]

2016-10-13 Thread lidong 
Repository: kylin
Updated Branches:
  refs/heads/yang21-cdh5.7 0a88ebfed -> 1a8f2c862 (forced update)


KYLIN-2085 Consider dynamicVariables in CompareTupleFilter operator swap


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c1ad4491
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c1ad4491
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c1ad4491

Branch: refs/heads/yang21-cdh5.7
Commit: c1ad4491e071592821df991029210f85dc54c4ae
Parents: 5a11458
Author: lidongsjtu 
Authored: Wed Oct 12 13:44:11 2016 +0800
Committer: lidongsjtu 
Committed: Wed Oct 12 16:33:13 2016 +0800

--
 .../java/org/apache/kylin/metadata/filter/CompareTupleFilter.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/c1ad4491/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
 
b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
index fe51710..c7a3721 100644
--- 
a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
+++ 
b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
@@ -75,7 +75,8 @@ public class CompareTupleFilter extends TupleFilter {
 }
 this.column = columnFilter.getColumn();
 // if value is before column, we need to reverse the operator. 
e.g. "1 >= c1" => "c1 <= 1"
-if (!this.conditionValues.isEmpty() && needSwapOperator()) {
+// children.size() > 1 means already added one conditionValue or 
dynamicVariable
+if (this.children.size() > 1 && needSwapOperator()) {
 this.operator = SWAP_OP_MAP.get(this.operator);
 TupleFilter last = this.children.remove(this.children.size() - 
1);
 this.children.add(0, last);

kylin git commit: KYLIN-2085 Consider dynamicVariables in CompareTupleFilter operator swap

2016-10-12 Thread lidong 
Repository: kylin
Updated Branches:
  refs/heads/yang21 5a1145853 -> c1ad4491e


KYLIN-2085 Consider dynamicVariables in CompareTupleFilter operator swap


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c1ad4491
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c1ad4491
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c1ad4491

Branch: refs/heads/yang21
Commit: c1ad4491e071592821df991029210f85dc54c4ae
Parents: 5a11458
Author: lidongsjtu 
Authored: Wed Oct 12 13:44:11 2016 +0800
Committer: lidongsjtu 
Committed: Wed Oct 12 16:33:13 2016 +0800

--
 .../java/org/apache/kylin/metadata/filter/CompareTupleFilter.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/c1ad4491/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
 
b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
index fe51710..c7a3721 100644
--- 
a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
+++ 
b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
@@ -75,7 +75,8 @@ public class CompareTupleFilter extends TupleFilter {
 }
 this.column = columnFilter.getColumn();
 // if value is before column, we need to reverse the operator. 
e.g. "1 >= c1" => "c1 <= 1"
-if (!this.conditionValues.isEmpty() && needSwapOperator()) {
+// children.size() > 1 means already added one conditionValue or 
dynamicVariable
+if (this.children.size() > 1 && needSwapOperator()) {
 this.operator = SWAP_OP_MAP.get(this.operator);
 TupleFilter last = this.children.remove(this.children.size() - 
1);
 this.children.add(0, last);

kylin git commit: KYLIN-2085 Consider dynamicVariables in CompareTupleFilter operator swap

2016-10-12 Thread lidong 
Repository: kylin
Updated Branches:
  refs/heads/master 58afe0103 -> 8fbfc580c


KYLIN-2085 Consider dynamicVariables in CompareTupleFilter operator swap


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/8fbfc580
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/8fbfc580
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/8fbfc580

Branch: refs/heads/master
Commit: 8fbfc580c1b89e3e0065027eb22f8e3e5b7e0c67
Parents: 58afe01
Author: lidongsjtu 
Authored: Wed Oct 12 13:44:11 2016 +0800
Committer: lidongsjtu 
Committed: Wed Oct 12 16:32:44 2016 +0800

--
 .../java/org/apache/kylin/metadata/filter/CompareTupleFilter.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/8fbfc580/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
 
b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
index fe51710..c7a3721 100644
--- 
a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
+++ 
b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
@@ -75,7 +75,8 @@ public class CompareTupleFilter extends TupleFilter {
 }
 this.column = columnFilter.getColumn();
 // if value is before column, we need to reverse the operator. 
e.g. "1 >= c1" => "c1 <= 1"
-if (!this.conditionValues.isEmpty() && needSwapOperator()) {
+// children.size() > 1 means already added one conditionValue or 
dynamicVariable
+if (this.children.size() > 1 && needSwapOperator()) {
 this.operator = SWAP_OP_MAP.get(this.operator);
 TupleFilter last = this.children.remove(this.children.size() - 
1);
 this.children.add(0, last);

kylin git commit: KYLIN-2085 Consider dynamicVariables in CompareTupleFilter operator swap

2016-10-11 Thread lidong 
Repository: kylin
Updated Branches:
  refs/heads/KYLIN-2085 [created] c421a68d1


KYLIN-2085 Consider dynamicVariables in CompareTupleFilter operator swap


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c421a68d
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c421a68d
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c421a68d

Branch: refs/heads/KYLIN-2085
Commit: c421a68d12bde096fdf531652b44a35fcb38df5c
Parents: ff85103
Author: lidongsjtu 
Authored: Wed Oct 12 13:44:11 2016 +0800
Committer: lidongsjtu 
Committed: Wed Oct 12 13:44:19 2016 +0800

--
 .../java/org/apache/kylin/metadata/filter/CompareTupleFilter.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/c421a68d/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
 
b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
index fe51710..c7a3721 100644
--- 
a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
+++ 
b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
@@ -75,7 +75,8 @@ public class CompareTupleFilter extends TupleFilter {
 }
 this.column = columnFilter.getColumn();
 // if value is before column, we need to reverse the operator. 
e.g. "1 >= c1" => "c1 <= 1"
-if (!this.conditionValues.isEmpty() && needSwapOperator()) {
+// children.size() > 1 means already added one conditionValue or 
dynamicVariable
+if (this.children.size() > 1 && needSwapOperator()) {
 this.operator = SWAP_OP_MAP.get(this.operator);
 TupleFilter last = this.children.remove(this.children.size() - 
1);
 this.children.add(0, last);