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/04/30 04:10:54 UTC
[1/3] kylin git commit: KYLIN-1614 Refine diag output format
Repository: kylin
Updated Branches:
refs/heads/master 5da8ea857 -> 42bf1b562
KYLIN-1614 Refine diag output format
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/2ab68ed3
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/2ab68ed3
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/2ab68ed3
Branch: refs/heads/master
Commit: 2ab68ed352854ebd616099ea97eed050f71184eb
Parents: 5da8ea8
Author: lidongsjtu <li...@apache.org>
Authored: Fri Apr 29 16:12:38 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Fri Apr 29 22:59:30 2016 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/kylin/common/KylinVersion.java | 2 +-
tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/2ab68ed3/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java
----------------------------------------------------------------------
diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java b/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java
index 992fd5b..03a0720 100644
--- a/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java
@@ -127,7 +127,7 @@ public class KylinVersion {
StringBuilder buf = new StringBuilder();
buf.append("kylin.version:").append(KylinVersion.getCurrentVersion()).append("\n");
- buf.append("commit:").append(getGitCommitInfo());
+ buf.append("commit:").append(getGitCommitInfo()).append("\n");
buf.append("os.name:").append(System.getProperty("os.name")).append("\n");
buf.append("os.arch:").append(System.getProperty("os.arch")).append("\n");
buf.append("os.version:").append(System.getProperty("os.version")).append("\n");
http://git-wip-us.apache.org/repos/asf/kylin/blob/2ab68ed3/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java
----------------------------------------------------------------------
diff --git a/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java b/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java
index f12f1da..05285bd 100644
--- a/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java
+++ b/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java
@@ -134,7 +134,7 @@ public class DiagnosisInfoCLI extends AbstractInfoExtractor {
output = kylinConfig.getCliCommandExecutor().execute("lsb_release -a").getSecond();
FileUtils.writeStringToFile(new File(basicDir, "lsb_release"), output);
output = KylinVersion.getKylinClientInformation();
- FileUtils.writeStringToFile(new File(basicDir, "client"), output);
+ FileUtils.writeStringToFile(new File(basicDir, "client"), output + "\n");
output = ToolUtil.getHBaseMetaStoreId();
FileUtils.writeStringToFile(new File(basicDir, "client"), output, true);
[3/3] kylin git commit: minor,
fix smoke test scripts affected by cache
Posted by li...@apache.org.
minor, fix smoke test scripts affected by cache
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/42bf1b56
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/42bf1b56
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/42bf1b56
Branch: refs/heads/master
Commit: 42bf1b5627002e268d8b848b8219a3776f41bc81
Parents: 96dc57b
Author: lidongsjtu <li...@apache.org>
Authored: Sat Apr 30 10:10:52 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Sat Apr 30 10:11:01 2016 +0800
----------------------------------------------------------------------
build/smoke-test/sql/sql1.json | 2 --
build/smoke-test/testQuery.py | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/42bf1b56/build/smoke-test/sql/sql1.json
----------------------------------------------------------------------
diff --git a/build/smoke-test/sql/sql1.json b/build/smoke-test/sql/sql1.json
index b0b7c77..7cb3258 100644
--- a/build/smoke-test/sql/sql1.json
+++ b/build/smoke-test/sql/sql1.json
@@ -3,13 +3,11 @@
"partial": false,
"affectedRowCount": 0,
"isException": false,
- "storageCacheUsed": false,
"results": [
[
"10000"
]
],
- "hitExceptionCache": false,
"exceptionMessage": null,
"totalScanCount": 1,
"columnMetas": [
http://git-wip-us.apache.org/repos/asf/kylin/blob/42bf1b56/build/smoke-test/testQuery.py
----------------------------------------------------------------------
diff --git a/build/smoke-test/testQuery.py b/build/smoke-test/testQuery.py
index 3772333..5656e66 100644
--- a/build/smoke-test/testQuery.py
+++ b/build/smoke-test/testQuery.py
@@ -52,6 +52,8 @@ class testQuery(unittest.TestCase):
actual_result = json.loads(response.text)
print 'Query duration: ' + str(actual_result['duration']) + 'ms'
del actual_result['duration']
+ del actual_result['hitExceptionCache']
+ del actual_result['storageCacheUsed']
expect_result = json.loads(open(sql_file[:-4] + '.json').read().strip())
self.assertEqual(actual_result, expect_result, 'Query result does not equal.')
[2/3] kylin git commit: KYLIN-1638 Unclosed HBaseAdmin in
ToolUtil#getHBaseMetaStoreId()
Posted by li...@apache.org.
KYLIN-1638 Unclosed HBaseAdmin in ToolUtil#getHBaseMetaStoreId()
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/96dc57bc
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/96dc57bc
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/96dc57bc
Branch: refs/heads/master
Commit: 96dc57bc7f96ed320ce461b3bb1bbea33b0b1737
Parents: 2ab68ed
Author: lidongsjtu <li...@apache.org>
Authored: Sat Apr 30 10:04:00 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Sat Apr 30 10:04:00 2016 +0800
----------------------------------------------------------------------
tool/src/main/java/org/apache/kylin/tool/ToolUtil.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/96dc57bc/tool/src/main/java/org/apache/kylin/tool/ToolUtil.java
----------------------------------------------------------------------
diff --git a/tool/src/main/java/org/apache/kylin/tool/ToolUtil.java b/tool/src/main/java/org/apache/kylin/tool/ToolUtil.java
index 021f171..982e388 100644
--- a/tool/src/main/java/org/apache/kylin/tool/ToolUtil.java
+++ b/tool/src/main/java/org/apache/kylin/tool/ToolUtil.java
@@ -46,9 +46,10 @@ public class ToolUtil {
}
public static String getHBaseMetaStoreId() throws IOException {
- final HBaseAdmin hbaseAdmin = new HBaseAdmin(HBaseConfiguration.create(HadoopUtil.getCurrentConfiguration()));
- final String metaStoreName = KylinConfig.getInstanceFromEnv().getMetadataUrlPrefix();
- final HTableDescriptor desc = hbaseAdmin.getTableDescriptor(TableName.valueOf(metaStoreName));
- return "MetaStore UUID: " + desc.getValue(HBaseConnection.HTABLE_UUID_TAG);
+ try (final HBaseAdmin hbaseAdmin = new HBaseAdmin(HBaseConfiguration.create(HadoopUtil.getCurrentConfiguration()))) {
+ final String metaStoreName = KylinConfig.getInstanceFromEnv().getMetadataUrlPrefix();
+ final HTableDescriptor desc = hbaseAdmin.getTableDescriptor(TableName.valueOf(metaStoreName));
+ return "MetaStore UUID: " + desc.getValue(HBaseConnection.HTABLE_UUID_TAG);
+ }
}
}