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 2016/05/12 07:12:43 UTC
[02/28] kylin git commit: minor, fix some typo and style issues
minor, fix some typo and style issues
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ecbff227
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ecbff227
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ecbff227
Branch: refs/heads/1.5.x-HBase1.x
Commit: ecbff227a37c57a9321c85aa05e60741602f0ef0
Parents: 3e876ef
Author: lidongsjtu <li...@apache.org>
Authored: Mon May 9 14:02:59 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Mon May 9 14:02:59 2016 +0800
----------------------------------------------------------------------
tool/pom.xml | 3 ++-
.../apache/kylin/tool/AbstractInfoExtractor.java | 2 +-
.../org/apache/kylin/tool/ClientEnvExtractor.java | 2 +-
.../org/apache/kylin/tool/JobDiagnosisInfoCLI.java | 16 +++++++---------
.../apache/kylin/tool/util/ResourceStoreUtil.java | 1 -
webapp/app/partials/cubes/cube_detail.html | 2 +-
webapp/app/partials/tables/table_unload.html | 4 ++--
7 files changed, 14 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/ecbff227/tool/pom.xml
----------------------------------------------------------------------
diff --git a/tool/pom.xml b/tool/pom.xml
index 3041ae2..2ffa79e 100644
--- a/tool/pom.xml
+++ b/tool/pom.xml
@@ -17,7 +17,8 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
http://git-wip-us.apache.org/repos/asf/kylin/blob/ecbff227/tool/src/main/java/org/apache/kylin/tool/AbstractInfoExtractor.java
----------------------------------------------------------------------
diff --git a/tool/src/main/java/org/apache/kylin/tool/AbstractInfoExtractor.java b/tool/src/main/java/org/apache/kylin/tool/AbstractInfoExtractor.java
index 9e4e83c..014d004 100644
--- a/tool/src/main/java/org/apache/kylin/tool/AbstractInfoExtractor.java
+++ b/tool/src/main/java/org/apache/kylin/tool/AbstractInfoExtractor.java
@@ -51,7 +51,7 @@ public abstract class AbstractInfoExtractor extends AbstractApplication {
private static final Option OPTION_SUBMODULE = OptionBuilder.withArgName("submodule").hasArg().isRequired(false).withDescription("specify whether this is a submodule of other CLI tool").create("submodule");
private static final String DEFAULT_PACKAGE_TYPE = "base";
- private static final String[] COMMIT_SHA1_FILES = {"commit_SHA1", "commit.sha1"};
+ private static final String[] COMMIT_SHA1_FILES = { "commit_SHA1", "commit.sha1" };
protected final Options options;
http://git-wip-us.apache.org/repos/asf/kylin/blob/ecbff227/tool/src/main/java/org/apache/kylin/tool/ClientEnvExtractor.java
----------------------------------------------------------------------
diff --git a/tool/src/main/java/org/apache/kylin/tool/ClientEnvExtractor.java b/tool/src/main/java/org/apache/kylin/tool/ClientEnvExtractor.java
index f1d1851..5e1bd5f 100644
--- a/tool/src/main/java/org/apache/kylin/tool/ClientEnvExtractor.java
+++ b/tool/src/main/java/org/apache/kylin/tool/ClientEnvExtractor.java
@@ -34,9 +34,9 @@ import org.slf4j.LoggerFactory;
import com.google.common.io.Files;
public class ClientEnvExtractor extends AbstractInfoExtractor {
+ private static final Logger logger = LoggerFactory.getLogger(ClientEnvExtractor.class);
private KylinConfig kylinConfig;
private CliCommandExecutor cmdExecutor;
- private static final Logger logger = LoggerFactory.getLogger(ClientEnvExtractor.class);
public ClientEnvExtractor() throws IOException {
super();
http://git-wip-us.apache.org/repos/asf/kylin/blob/ecbff227/tool/src/main/java/org/apache/kylin/tool/JobDiagnosisInfoCLI.java
----------------------------------------------------------------------
diff --git a/tool/src/main/java/org/apache/kylin/tool/JobDiagnosisInfoCLI.java b/tool/src/main/java/org/apache/kylin/tool/JobDiagnosisInfoCLI.java
index a479f9e..6dfb291 100644
--- a/tool/src/main/java/org/apache/kylin/tool/JobDiagnosisInfoCLI.java
+++ b/tool/src/main/java/org/apache/kylin/tool/JobDiagnosisInfoCLI.java
@@ -53,12 +53,10 @@ public class JobDiagnosisInfoCLI extends AbstractInfoExtractor {
@SuppressWarnings("static-access")
private static final Option OPTION_INCLUDE_CLIENT = OptionBuilder.withArgName("includeClient").hasArg().isRequired(false).withDescription("Specify whether to include client info to extract. Default true.").create("includeClient");
-
- private KylinConfig kylinConfig;
- private ExecutableDao executableDao;
-
List<String> requiredResources = Lists.newArrayList();
List<String> yarnLogsResources = Lists.newArrayList();
+ private KylinConfig kylinConfig;
+ private ExecutableDao executableDao;
public JobDiagnosisInfoCLI() {
super();
@@ -74,6 +72,11 @@ public class JobDiagnosisInfoCLI extends AbstractInfoExtractor {
executableDao = ExecutableDao.getInstance(kylinConfig);
}
+ public static void main(String args[]) {
+ JobDiagnosisInfoCLI extractor = new JobDiagnosisInfoCLI();
+ extractor.execute(args);
+ }
+
@Override
protected void executeExtract(OptionsHelper optionsHelper, File exportDir) throws Exception {
String jobId = optionsHelper.getOptionValue(OPTION_JOB_ID);
@@ -183,9 +186,4 @@ public class JobDiagnosisInfoCLI extends AbstractInfoExtractor {
logger.info("adding required resource {}", record);
requiredResources.add(record);
}
-
- public static void main(String args[]) {
- JobDiagnosisInfoCLI extractor = new JobDiagnosisInfoCLI();
- extractor.execute(args);
- }
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/ecbff227/tool/src/main/java/org/apache/kylin/tool/util/ResourceStoreUtil.java
----------------------------------------------------------------------
diff --git a/tool/src/main/java/org/apache/kylin/tool/util/ResourceStoreUtil.java b/tool/src/main/java/org/apache/kylin/tool/util/ResourceStoreUtil.java
index c7fd4d9..70b9adb 100644
--- a/tool/src/main/java/org/apache/kylin/tool/util/ResourceStoreUtil.java
+++ b/tool/src/main/java/org/apache/kylin/tool/util/ResourceStoreUtil.java
@@ -19,7 +19,6 @@
package org.apache.kylin.tool.util;
-import java.io.IOException;
import java.lang.reflect.Method;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/kylin/blob/ecbff227/webapp/app/partials/cubes/cube_detail.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubes/cube_detail.html b/webapp/app/partials/cubes/cube_detail.html
index 4997865..38802ef 100755
--- a/webapp/app/partials/cubes/cube_detail.html
+++ b/webapp/app/partials/cubes/cube_detail.html
@@ -81,7 +81,7 @@
<div class="cube-detail" ng-show="cube.visiblePage=='notification'">
<div style="margin: 15px;">
<form>
- <h5>Notification List(Common Separated)</h5>
+ <h5>Notification List(Comma Separated)</h5>
<div class="form-group">
<input ng-model="cube.notifyListString" class="form-control" placeholder="Notification List..." />
</div>
http://git-wip-us.apache.org/repos/asf/kylin/blob/ecbff227/webapp/app/partials/tables/table_unload.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/tables/table_unload.html b/webapp/app/partials/tables/table_unload.html
index a1fcf6f..258551e 100644
--- a/webapp/app/partials/tables/table_unload.html
+++ b/webapp/app/partials/tables/table_unload.html
@@ -18,7 +18,7 @@
<script type="text/ng-template" id="removeHiveTable.html">
<div class="modal-header">
- <h4>UnLoad Hive Table Metadata</h4>
+ <h4>Unload Hive Table Metadata</h4>
</div>
<div class="modal-body">
<span><strong>Project: </strong>{{ $parent.projectName!=null?$parent.projectName:'NULL'}}</span>
@@ -27,7 +27,7 @@
placeholder="table1,table2 By default,system will choose 'Default' as database,you can specify database like this 'database.table'"></textarea>
</div>
<div class="modal-footer">
- <button class="btn btn-primary" ng-click="remove()">Sync</button>
+ <button class="btn btn-primary" ng-click="remove()">Unload</button>
<button class="btn btn-primary" ng-click="cancel()">Cancel</button>
</div>
</script>