Repository: kylin Updated Branches: refs/heads/master 4229a28b0 -> aac4e7e49
KYLIN-1821 Re-enable checkstyle Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/aac4e7e4 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/aac4e7e4 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/aac4e7e4 Branch: refs/heads/master Commit: aac4e7e49faf7730621ac6397fbac8fb741fdc62 Parents: 4229a28 Author: Yang Li <liy...@apache.org> Authored: Tue Jul 26 07:45:58 2016 +0800 Committer: Yang Li <liy...@apache.org> Committed: Tue Jul 26 07:45:58 2016 +0800 ---------------------------------------------------------------------- .../validation/rule/AggregationGroupRule.java | 4 ++-- .../job/execution/DefaultChainedExecutable.java | 2 +- .../apache/kylin/metadata/MetadataManager.java | 3 --- .../java/org/apache/kylin/jdbc/KylinMeta.java | 1 - pom.xml | 6 ++++++ .../cube/v2/filter/MassInValueProviderImpl.java | 2 -- .../storage/hbase/util/DeployCoprocessorCLI.java | 18 ++++++++++++------ 7 files changed, 21 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/aac4e7e4/core-cube/src/main/java/org/apache/kylin/cube/model/validation/rule/AggregationGroupRule.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/model/validation/rule/AggregationGroupRule.java b/core-cube/src/main/java/org/apache/kylin/cube/model/validation/rule/AggregationGroupRule.java index 958ac2b..defe898 100644 --- a/core-cube/src/main/java/org/apache/kylin/cube/model/validation/rule/AggregationGroupRule.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/model/validation/rule/AggregationGroupRule.java @@ -110,9 +110,9 @@ public class AggregationGroupRule implements IValidatorRule<CubeDesc> { int normalDimSize = normalDims.size(); int hierarchySize = count(agg.getSelectRule().hierarchy_dims); int jointSize = count(agg.getSelectRule().joint_dims); - int mandatorySize = mandatoryDims.size() > 0 ? 1 : 0 ; + int mandatorySize = mandatoryDims.size() > 0 ? 1 : 0; - if ( mandatorySize + normalDimSize + hierarchySize + jointSize > maxSize) { + if (mandatorySize + normalDimSize + hierarchySize + jointSize > maxSize) { context.addResult(ResultLevel.ERROR, "Aggregation group " + index + " has too many dimensions"); continue; } http://git-wip-us.apache.org/repos/asf/kylin/blob/aac4e7e4/core-job/src/main/java/org/apache/kylin/job/execution/DefaultChainedExecutable.java ---------------------------------------------------------------------- diff --git a/core-job/src/main/java/org/apache/kylin/job/execution/DefaultChainedExecutable.java b/core-job/src/main/java/org/apache/kylin/job/execution/DefaultChainedExecutable.java index b4c3adc..753b389 100644 --- a/core-job/src/main/java/org/apache/kylin/job/execution/DefaultChainedExecutable.java +++ b/core-job/src/main/java/org/apache/kylin/job/execution/DefaultChainedExecutable.java @@ -74,7 +74,7 @@ public class DefaultChainedExecutable extends AbstractExecutable implements Chai @Override protected void onExecuteError(Throwable exception, ExecutableContext executableContext) { - super.onExecuteError(exception,executableContext); + super.onExecuteError(exception, executableContext); notifyUserStatusChange(executableContext, ExecutableState.ERROR); } http://git-wip-us.apache.org/repos/asf/kylin/blob/aac4e7e4/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java index f4fbcd0..c8e086e 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java @@ -45,9 +45,6 @@ import org.apache.kylin.metadata.model.ExternalFilterDesc; import org.apache.kylin.metadata.model.TableDesc; import org.apache.kylin.metadata.project.ProjectInstance; import org.apache.kylin.metadata.project.ProjectManager; -import org.apache.kylin.metadata.project.RealizationEntry; -import org.apache.kylin.metadata.realization.IRealization; -import org.apache.kylin.metadata.realization.RealizationRegistry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/kylin/blob/aac4e7e4/jdbc/src/main/java/org/apache/kylin/jdbc/KylinMeta.java ---------------------------------------------------------------------- diff --git a/jdbc/src/main/java/org/apache/kylin/jdbc/KylinMeta.java b/jdbc/src/main/java/org/apache/kylin/jdbc/KylinMeta.java index 002e5bd..a1b9aef 100644 --- a/jdbc/src/main/java/org/apache/kylin/jdbc/KylinMeta.java +++ b/jdbc/src/main/java/org/apache/kylin/jdbc/KylinMeta.java @@ -29,7 +29,6 @@ import java.util.regex.Pattern; import org.apache.calcite.avatica.AvaticaUtils; import org.apache.calcite.avatica.ColumnMetaData; -import org.apache.calcite.avatica.Meta; import org.apache.calcite.avatica.MetaImpl; import org.apache.calcite.avatica.MissingResultsException; import org.apache.calcite.avatica.NoSuchStatementException; http://git-wip-us.apache.org/repos/asf/kylin/blob/aac4e7e4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f9af9db..8077377 100644 --- a/pom.xml +++ b/pom.xml @@ -951,6 +951,12 @@ </plugin> </plugins> </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + </plugins> </build> <modules> http://git-wip-us.apache.org/repos/asf/kylin/blob/aac4e7e4/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/filter/MassInValueProviderImpl.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/filter/MassInValueProviderImpl.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/filter/MassInValueProviderImpl.java index c4725bd..2f8b0a0 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/filter/MassInValueProviderImpl.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/filter/MassInValueProviderImpl.java @@ -43,8 +43,6 @@ import com.google.common.cache.RemovalListener; import com.google.common.cache.RemovalNotification; import com.google.common.collect.Sets; -import static java.util.concurrent.TimeUnit.MILLISECONDS; - public class MassInValueProviderImpl implements MassInValueProvider { public static final Logger logger = LoggerFactory.getLogger(MassInValueProviderImpl.class); http://git-wip-us.apache.org/repos/asf/kylin/blob/aac4e7e4/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java index 63e8ac1..a1193e7 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java @@ -18,7 +18,17 @@ package org.apache.kylin.storage.hbase.util; -import com.google.common.collect.Lists; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; + import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configuration; @@ -44,11 +54,7 @@ import org.apache.kylin.storage.hbase.HBaseConnection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.util.*; -import java.util.regex.Matcher; +import com.google.common.collect.Lists; /** */
