You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2016/07/25 08:05:01 UTC
kylin git commit: KYLIN-1821 move checkstyle plugin back into plugins
Repository: kylin
Updated Branches:
refs/heads/beforepomupdate 094e98553 -> fae112c18
KYLIN-1821 move checkstyle plugin back into plugins
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/fae112c1
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/fae112c1
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/fae112c1
Branch: refs/heads/beforepomupdate
Commit: fae112c18dcfd274bd4a6e5980f62f64a5200c01
Parents: 094e985
Author: Hongbin Ma <ma...@apache.org>
Authored: Mon Jul 25 15:13:32 2016 +0800
Committer: Hongbin Ma <ma...@apache.org>
Committed: Mon Jul 25 15:13:32 2016 +0800
----------------------------------------------------------------------
.../validation/rule/AggregationGroupRule.java | 4 +-
.../job/execution/DefaultChainedExecutable.java | 2 +-
.../apache/kylin/metadata/MetadataManager.java | 3 --
pom.xml | 44 ++++++++++----------
.../hbase/util/DeployCoprocessorCLI.java | 18 +++++---
5 files changed, 38 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/fae112c1/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/fae112c1/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/fae112c1/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/fae112c1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1d09a90..f101c5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -608,27 +608,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.13</version>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <configuration>
- <configLocation>checkstyle.xml</configLocation>
- <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
- <encoding>UTF-8</encoding>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
- </configuration>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
@@ -663,6 +642,29 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.13</version>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <configuration>
+ <configLocation>checkstyle.xml</configLocation>
+ <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+ <encoding>UTF-8</encoding>
+ <consoleOutput>true</consoleOutput>
+ <failsOnError>true</failsOnError>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<modules>
http://git-wip-us.apache.org/repos/asf/kylin/blob/fae112c1/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;
/**
*/