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/01/31 13:01:30 UTC
[03/50] incubator-kylin git commit: KYLIN-512 clean code
KYLIN-512 clean code
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/ddbab01a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/ddbab01a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/ddbab01a
Branch: refs/heads/inverted-index
Commit: ddbab01a96f22f6d151697b0289b6b2e4629b891
Parents: 061aa18
Author: honma <ho...@ebay.com>
Authored: Tue Jan 27 20:13:06 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Tue Jan 27 22:27:23 2015 +0800
----------------------------------------------------------------------
.../kylinolap/cube/CubeCapabilityChecker.java | 2 +-
examples/test_case_cube/II_hfile/_SUCCESS | 0
.../II_hfile/f/1081eacfef204c9cb435500dcde43286 | Bin 31613 -> 0 bytes
.../II_hfile/f/3a81823bb67d426c9a1f7c00fa975fe4 | Bin 28722 -> 0 bytes
.../II_hfile/f/3e7132ceaf6e49b88764461bd197d041 | Bin 27301 -> 0 bytes
.../II_hfile/f/99300c50aa48489c8b2f95779912d5a5 | Bin 34062 -> 0 bytes
.../kylinolap/metadata/model/FunctionDesc.java | 4 +--
.../AdjustForWeeklyMatchCubeRule.java | 2 +-
.../hbase/coprocessor/CoprocessorFilter.java | 31 ++++---------------
.../endpoint/EndpointTupleIterator.java | 6 +++-
10 files changed, 15 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ddbab01a/cube/src/main/java/com/kylinolap/cube/CubeCapabilityChecker.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/com/kylinolap/cube/CubeCapabilityChecker.java b/cube/src/main/java/com/kylinolap/cube/CubeCapabilityChecker.java
index 22866e5..b939873 100644
--- a/cube/src/main/java/com/kylinolap/cube/CubeCapabilityChecker.java
+++ b/cube/src/main/java/com/kylinolap/cube/CubeCapabilityChecker.java
@@ -117,7 +117,7 @@ public class CubeCapabilityChecker {
if (functionDesc.isCountDistinct()) // calcite can not handle distinct count
matched = false;
- TblColRef col = functionDesc.selectTblColByMetrics(metricColumns, cubeDesc.getFactTable());
+ TblColRef col = functionDesc.selectTblColRef(metricColumns, cubeDesc.getFactTable());
if (col == null || !cubeDesc.listDimensionColumnsIncludingDerived().contains(col)) {
matched = false;
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ddbab01a/examples/test_case_cube/II_hfile/_SUCCESS
----------------------------------------------------------------------
diff --git a/examples/test_case_cube/II_hfile/_SUCCESS b/examples/test_case_cube/II_hfile/_SUCCESS
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ddbab01a/examples/test_case_cube/II_hfile/f/1081eacfef204c9cb435500dcde43286
----------------------------------------------------------------------
diff --git a/examples/test_case_cube/II_hfile/f/1081eacfef204c9cb435500dcde43286 b/examples/test_case_cube/II_hfile/f/1081eacfef204c9cb435500dcde43286
deleted file mode 100644
index 95830fa..0000000
Binary files a/examples/test_case_cube/II_hfile/f/1081eacfef204c9cb435500dcde43286 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ddbab01a/examples/test_case_cube/II_hfile/f/3a81823bb67d426c9a1f7c00fa975fe4
----------------------------------------------------------------------
diff --git a/examples/test_case_cube/II_hfile/f/3a81823bb67d426c9a1f7c00fa975fe4 b/examples/test_case_cube/II_hfile/f/3a81823bb67d426c9a1f7c00fa975fe4
deleted file mode 100644
index 0bd4860..0000000
Binary files a/examples/test_case_cube/II_hfile/f/3a81823bb67d426c9a1f7c00fa975fe4 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ddbab01a/examples/test_case_cube/II_hfile/f/3e7132ceaf6e49b88764461bd197d041
----------------------------------------------------------------------
diff --git a/examples/test_case_cube/II_hfile/f/3e7132ceaf6e49b88764461bd197d041 b/examples/test_case_cube/II_hfile/f/3e7132ceaf6e49b88764461bd197d041
deleted file mode 100644
index ad3b9be..0000000
Binary files a/examples/test_case_cube/II_hfile/f/3e7132ceaf6e49b88764461bd197d041 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ddbab01a/examples/test_case_cube/II_hfile/f/99300c50aa48489c8b2f95779912d5a5
----------------------------------------------------------------------
diff --git a/examples/test_case_cube/II_hfile/f/99300c50aa48489c8b2f95779912d5a5 b/examples/test_case_cube/II_hfile/f/99300c50aa48489c8b2f95779912d5a5
deleted file mode 100644
index 191949f..0000000
Binary files a/examples/test_case_cube/II_hfile/f/99300c50aa48489c8b2f95779912d5a5 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ddbab01a/metadata/src/main/java/com/kylinolap/metadata/model/FunctionDesc.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/com/kylinolap/metadata/model/FunctionDesc.java b/metadata/src/main/java/com/kylinolap/metadata/model/FunctionDesc.java
index 138519b..f23c184 100644
--- a/metadata/src/main/java/com/kylinolap/metadata/model/FunctionDesc.java
+++ b/metadata/src/main/java/com/kylinolap/metadata/model/FunctionDesc.java
@@ -152,7 +152,7 @@ public class FunctionDesc {
this.returnType = returnType;
}
- public TblColRef selectTblColByMetrics(Collection<TblColRef> dimensionColumns, String factTableName) {
+ public TblColRef selectTblColRef(Collection<TblColRef> metricColumns, String factTableName) {
if (this.isCount())
return null; // count is not about any column but the whole row
@@ -161,7 +161,7 @@ public class FunctionDesc {
return null;
String columnName = parameter.getValue();
- for (TblColRef col : dimensionColumns) {
+ for (TblColRef col : metricColumns) {
if (col.isSameAs(factTableName, columnName)) {
return col;
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ddbab01a/query/src/main/java/com/kylinolap/query/routing/RoutingRules/AdjustForWeeklyMatchCubeRule.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/com/kylinolap/query/routing/RoutingRules/AdjustForWeeklyMatchCubeRule.java b/query/src/main/java/com/kylinolap/query/routing/RoutingRules/AdjustForWeeklyMatchCubeRule.java
index b7a8bee..ba91789 100644
--- a/query/src/main/java/com/kylinolap/query/routing/RoutingRules/AdjustForWeeklyMatchCubeRule.java
+++ b/query/src/main/java/com/kylinolap/query/routing/RoutingRules/AdjustForWeeklyMatchCubeRule.java
@@ -51,7 +51,7 @@ public class AdjustForWeeklyMatchCubeRule extends RoutingRule {
FunctionDesc functionDesc = it.next();
if (!cubeFuncs.contains(functionDesc)) {
// try to convert the metric to dimension to see if it works
- TblColRef col = functionDesc.selectTblColByMetrics(metricsColumns, cubeDesc.getFactTable());
+ TblColRef col = functionDesc.selectTblColRef(metricsColumns, cubeDesc.getFactTable());
functionDesc.setAppliedOnDimension(true);
rewriteFields.remove(functionDesc.getRewriteFieldName());
if (col != null) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ddbab01a/storage/src/main/java/com/kylinolap/storage/hbase/coprocessor/CoprocessorFilter.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/com/kylinolap/storage/hbase/coprocessor/CoprocessorFilter.java b/storage/src/main/java/com/kylinolap/storage/hbase/coprocessor/CoprocessorFilter.java
index 983335d..ecce543 100644
--- a/storage/src/main/java/com/kylinolap/storage/hbase/coprocessor/CoprocessorFilter.java
+++ b/storage/src/main/java/com/kylinolap/storage/hbase/coprocessor/CoprocessorFilter.java
@@ -19,22 +19,17 @@ package com.kylinolap.storage.hbase.coprocessor;
import java.util.Collection;
import java.util.Set;
-import com.kylinolap.invertedindex.IISegment;
import org.apache.hadoop.hbase.util.Bytes;
import com.google.common.collect.Sets;
import com.kylinolap.common.util.BytesUtil;
-import com.kylinolap.cube.CubeSegment;
import com.kylinolap.cube.kv.RowKeyColumnIO;
import com.kylinolap.dict.Dictionary;
-import com.kylinolap.metadata.model.TblColRef;
-import com.kylinolap.metadata.filter.ColumnTupleFilter;
-import com.kylinolap.metadata.filter.CompareTupleFilter;
-import com.kylinolap.metadata.filter.ConstantTupleFilter;
-import com.kylinolap.metadata.filter.TupleFilter;
+import com.kylinolap.dict.ISegment;
+import com.kylinolap.metadata.filter.*;
import com.kylinolap.metadata.filter.TupleFilter.FilterOperatorEnum;
-import com.kylinolap.metadata.filter.TupleFilterSerializer;
import com.kylinolap.metadata.filter.TupleFilterSerializer.Decorator;
+import com.kylinolap.metadata.model.TblColRef;
import com.kylinolap.metadata.tuple.ITuple;
/**
@@ -46,11 +41,7 @@ public class CoprocessorFilter {
private RowKeyColumnIO columnIO;
- public FilterDecorator(CubeSegment seg) {
- columnIO = new RowKeyColumnIO(seg);
- }
-
- public FilterDecorator(IISegment seg) {
+ public FilterDecorator(ISegment seg) {
columnIO = new RowKeyColumnIO(seg);
}
@@ -173,17 +164,9 @@ public class CoprocessorFilter {
columnIO.writeColumn(column, value, value.length, roundingFlag, Dictionary.NULL, id, 0);
return Dictionary.dictIdToString(id, 0, id.length);
}
-
- }
-
- public static CoprocessorFilter fromFilter(final IISegment seg, TupleFilter rootFilter) {
- // translate constants into dictionary IDs via a serialize copy
- byte[] bytes = TupleFilterSerializer.serialize(rootFilter, new FilterDecorator(seg));
- TupleFilter copy = TupleFilterSerializer.deserialize(bytes);
- return new CoprocessorFilter(copy);
}
- public static CoprocessorFilter fromFilter(final CubeSegment seg, TupleFilter rootFilter) {
+ public static CoprocessorFilter fromFilter(final ISegment seg, TupleFilter rootFilter) {
// translate constants into dictionary IDs via a serialize copy
byte[] bytes = TupleFilterSerializer.serialize(rootFilter, new FilterDecorator(seg));
TupleFilter copy = TupleFilterSerializer.deserialize(bytes);
@@ -195,9 +178,7 @@ public class CoprocessorFilter {
}
public static CoprocessorFilter deserialize(byte[] filterBytes) {
- TupleFilter filter = (filterBytes == null || filterBytes.length == 0) //
- ? null //
- : TupleFilterSerializer.deserialize(filterBytes);
+ TupleFilter filter = (filterBytes == null || filterBytes.length == 0) ? null : TupleFilterSerializer.deserialize(filterBytes);
return new CoprocessorFilter(filter);
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ddbab01a/storage/src/main/java/com/kylinolap/storage/hbase/coprocessor/endpoint/EndpointTupleIterator.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/com/kylinolap/storage/hbase/coprocessor/endpoint/EndpointTupleIterator.java b/storage/src/main/java/com/kylinolap/storage/hbase/coprocessor/endpoint/EndpointTupleIterator.java
index 33f33b6..70a5f96 100644
--- a/storage/src/main/java/com/kylinolap/storage/hbase/coprocessor/endpoint/EndpointTupleIterator.java
+++ b/storage/src/main/java/com/kylinolap/storage/hbase/coprocessor/endpoint/EndpointTupleIterator.java
@@ -165,7 +165,11 @@ public class EndpointTupleIterator implements ITupleIterator {
}
private IIProtos.IIRequest prepareRequest() throws IOException {
- IIProtos.IIRequest request = IIProtos.IIRequest.newBuilder().setType(ByteString.copyFrom(CoprocessorRowType.serialize(pushedDownRowType))).setFilter(ByteString.copyFrom(CoprocessorFilter.serialize(pushedDownFilter))).setProjector(ByteString.copyFrom(CoprocessorProjector.serialize(pushedDownProjector))).setAggregator(ByteString.copyFrom(EndpointAggregators.serialize(pushedDownAggregators))).build();
+ IIProtos.IIRequest request = IIProtos.IIRequest.newBuilder() //
+ .setType(ByteString.copyFrom(CoprocessorRowType.serialize(pushedDownRowType))) //
+ .setFilter(ByteString.copyFrom(CoprocessorFilter.serialize(pushedDownFilter))) //
+ .setProjector(ByteString.copyFrom(CoprocessorProjector.serialize(pushedDownProjector))) //
+ .setAggregator(ByteString.copyFrom(EndpointAggregators.serialize(pushedDownAggregators))).build();
return request;
}