Repository: kylin Updated Branches: refs/heads/master d11055c5d -> c1a19038d
minor, fix typo for massin Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c1a19038 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c1a19038 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c1a19038 Branch: refs/heads/master Commit: c1a19038d04b33d0d87b84c731c9cd44145d30c2 Parents: d11055c Author: lidongsjtu <lid...@apache.org> Authored: Thu May 5 14:49:07 2016 +0800 Committer: lidongsjtu <lid...@apache.org> Committed: Thu May 5 14:49:07 2016 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/kylin/cube/CubeCapabilityChecker.java | 2 +- .../org/apache/kylin/metadata/filter/UDF/MassInTupleFilter.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/c1a19038/core-cube/src/main/java/org/apache/kylin/cube/CubeCapabilityChecker.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeCapabilityChecker.java b/core-cube/src/main/java/org/apache/kylin/cube/CubeCapabilityChecker.java index bd45d07..1f16b1b 100644 --- a/core-cube/src/main/java/org/apache/kylin/cube/CubeCapabilityChecker.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeCapabilityChecker.java @@ -86,7 +86,7 @@ public class CubeCapabilityChecker { return result; } - if (cube.getStorageType() == IStorageAware.ID_HBASE && MassInTupleFilter.constainsMassInTupleFilter(digest.filter)) { + if (cube.getStorageType() == IStorageAware.ID_HBASE && MassInTupleFilter.containsMassInTupleFilter(digest.filter)) { logger.info("Exclude cube " + cube.getName() + " because only v2 storage + v2 query engine supports massin"); return result; http://git-wip-us.apache.org/repos/asf/kylin/blob/c1a19038/core-metadata/src/main/java/org/apache/kylin/metadata/filter/UDF/MassInTupleFilter.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/UDF/MassInTupleFilter.java b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/UDF/MassInTupleFilter.java index 5889c61..66c9f21 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/UDF/MassInTupleFilter.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/UDF/MassInTupleFilter.java @@ -32,7 +32,6 @@ import org.apache.kylin.metadata.filter.TupleFilter; import org.apache.kylin.metadata.filter.function.Functions; import org.apache.kylin.metadata.model.ExternalFilterDesc; import org.apache.kylin.metadata.model.TblColRef; -import org.apache.kylin.metadata.project.ProjectManager; import org.apache.kylin.metadata.tuple.IEvaluatableTuple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -123,7 +122,7 @@ public class MassInTupleFilter extends FunctionTupleFilter { filterTableType = Functions.FilterTableType.valueOf(BytesUtil.readUTFString(buffer)); } - public static boolean constainsMassInTupleFilter(TupleFilter filter) { + public static boolean containsMassInTupleFilter(TupleFilter filter) { if (filter == null) return false; @@ -132,7 +131,7 @@ public class MassInTupleFilter extends FunctionTupleFilter { } for (TupleFilter child : filter.getChildren()) { - if (constainsMassInTupleFilter(child)) + if (containsMassInTupleFilter(child)) return true; } return false;