You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/03/21 01:27:42 UTC
[37/50] [abbrv] incubator-kylin git commit: fix bug
fix bug
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/55c8257e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/55c8257e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/55c8257e
Branch: refs/heads/streaming-localdict
Commit: 55c8257ef5b9ca8aeae10e2edfe49fcf4226349b
Parents: 696a673
Author: qianhao.zhou <qi...@ebay.com>
Authored: Fri Mar 20 15:21:23 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Fri Mar 20 15:21:23 2015 +0800
----------------------------------------------------------------------
.../coprocessor/endpoint/EndpointTupleIterator.java | 2 +-
.../apache/kylin/storage/filter/FilterBaseTest.java | 8 ++++++++
.../kylin/storage/filter/FilterSerializeTest.java | 16 ++++++++++++++++
3 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/55c8257e/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/EndpointTupleIterator.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/EndpointTupleIterator.java b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/EndpointTupleIterator.java
index cb543c7..86736ba 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/EndpointTupleIterator.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/EndpointTupleIterator.java
@@ -119,7 +119,7 @@ public class EndpointTupleIterator implements ITupleIterator {
this.tableRecordInfo = new TableRecordInfo(this.seg);
this.pushedDownRowType = CoprocessorRowType.fromTableRecordInfo(tableRecordInfo, this.columns);
- this.pushedDownFilter = CoprocessorFilter.fromFilter(this.seg, rootFilter, FilterDecorator.FilterConstantsTreatment.AS_IT_IS);
+ this.pushedDownFilter = CoprocessorFilter.fromFilter(new ClearTextDictionary(this.tableRecordInfo), rootFilter, FilterDecorator.FilterConstantsTreatment.AS_IT_IS);
for (TblColRef column : this.pushedDownFilter.getUnstrictlyFilteredColumns()) {
groupBy.add(column);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/55c8257e/storage/src/test/java/org/apache/kylin/storage/filter/FilterBaseTest.java
----------------------------------------------------------------------
diff --git a/storage/src/test/java/org/apache/kylin/storage/filter/FilterBaseTest.java b/storage/src/test/java/org/apache/kylin/storage/filter/FilterBaseTest.java
index 95c6555..87e216a 100644
--- a/storage/src/test/java/org/apache/kylin/storage/filter/FilterBaseTest.java
+++ b/storage/src/test/java/org/apache/kylin/storage/filter/FilterBaseTest.java
@@ -136,6 +136,14 @@ public class FilterBaseTest {
return compareFilter;
}
+ protected CompareTupleFilter buildCompareDynamicFilter(List<TblColRef> groups) {
+ CompareTupleFilter compareFilter = new CompareTupleFilter(FilterOperatorEnum.EQ);
+ compareFilter.addChild(new ColumnTupleFilter(groups.get(0)));
+ compareFilter.addChild(new DynamicTupleFilter("?0"));
+ compareFilter.bindVariable("?0", "abc");
+ return compareFilter;
+ }
+
protected void compareFilter(TupleFilter f1, TupleFilter f2) {
if (f1 == null && f2 == null) {
return;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/55c8257e/storage/src/test/java/org/apache/kylin/storage/filter/FilterSerializeTest.java
----------------------------------------------------------------------
diff --git a/storage/src/test/java/org/apache/kylin/storage/filter/FilterSerializeTest.java b/storage/src/test/java/org/apache/kylin/storage/filter/FilterSerializeTest.java
index a095012..f2c531a 100644
--- a/storage/src/test/java/org/apache/kylin/storage/filter/FilterSerializeTest.java
+++ b/storage/src/test/java/org/apache/kylin/storage/filter/FilterSerializeTest.java
@@ -21,6 +21,7 @@ package org.apache.kylin.storage.filter;
import java.util.ArrayList;
import java.util.List;
+import org.apache.kylin.metadata.filter.CompareTupleFilter;
import org.apache.kylin.metadata.filter.LogicalTupleFilter;
import org.apache.kylin.metadata.filter.TupleFilter;
import org.apache.kylin.metadata.filter.TupleFilterSerializer;
@@ -202,4 +203,19 @@ public class FilterSerializeTest extends FilterBaseTest {
compareFilter(filter, newFilter);
}
+ @Test
+ public void testDynamic() {
+ final CompareTupleFilter compareDynamicFilter = buildCompareDynamicFilter(buildGroups());
+
+ byte[] bytes = TupleFilterSerializer.serialize(compareDynamicFilter, CS);
+ TupleFilter newFilter = TupleFilterSerializer.deserialize(bytes, CS);
+
+ bytes = TupleFilterSerializer.serialize(newFilter, CS);
+ TupleFilter newFilter2 = TupleFilterSerializer.deserialize(bytes, CS);
+
+ compareFilter(compareDynamicFilter, newFilter);
+ compareFilter(compareDynamicFilter, newFilter2);
+
+ }
+
}