date:20160927

svn commit: r1762606 - in /kylin/site: cn/download/index.html docs15/release_notes.html download/index.html feed.xml

2016-09-27 Thread lidong

Author: lidong
Date: Wed Sep 28 05:56:33 2016
New Revision: 1762606

URL: http://svn.apache.org/viewvc?rev=1762606=rev
Log:
update release note for 1.5.4.1

Modified:
kylin/site/cn/download/index.html
kylin/site/docs15/release_notes.html
kylin/site/download/index.html
kylin/site/feed.xml

Modified: kylin/site/cn/download/index.html
URL: 
http://svn.apache.org/viewvc/kylin/site/cn/download/index.html?rev=1762606=1762605=1762606=diff
==
--- kylin/site/cn/download/index.html (original)
+++ kylin/site/cn/download/index.html Wed Sep 28 05:56:33 2016
@@ -162,38 +162,40 @@
   Apache Kylinâ¢ ç¸å
³ä¸è½½
 
   
-ææ°åå¸(æºä»£ç )
+è¯·æ³¨æï¼v1.5.4 æä¸¤ä¸ªå·²ç¥çbug (https://issues.apache.org/jira/browse/KYLIN-2010;>KYLIN-2010 å https://issues.apache.org/jira/browse/KYLIN-2032;>KYLIN-2032) 
ï¼ä¼å½±åæäºç¨æ·ã è¯·åçº§è³v1.5.4.1.__
+
+ææ°åå¸(æºä»£ç )
 
 ææ°åå¸çApache Kylinå¯ä»¥ä»ASFç½ç«ä¸è½½ï¼:
 
 
-  http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-1.5.4/apache-kylin-1.5.4-src.tar.gz;>apache-kylin-1.5.4-src.tar.gz
 [https://dist.apache.org/repos/dist/release/kylin/apache-kylin-1.5.4/apache-kylin-1.5.4-src.tar.gz.asc;>asc]
 [https://dist.apache.org/repos/dist/release/kylin/apache-kylin-1.5.4/apache-kylin-1.5.4-src.tar.gz.md5;>md5]
+  http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-1.5.4.1/apache-kylin-1.5.4.1-src.tar.gz;>apache-kylin-1.5.4.1-src.tar.gz
 [https://dist.apache.org/repos/dist/release/kylin/apache-kylin-1.5.4.1/apache-kylin-1.5.4.1-src.tar.gz.asc;>asc]
 [https://dist.apache.org/repos/dist/release/kylin/apache-kylin-1.5.4.1/apache-kylin-1.5.4.1-src.tar.gz.md5;>md5]
   http://kylin.apache.org/docs15/release_notes.html;>åå¸æ¥å¿
-  Git æ ç¾: https://github.com/apache/kylin/tree/kylin-1.5.4;>kylin-1.5.4
-  Git Commit: https://github.com/apache/kylin/commit/519b93b539c31582f20c5f308dbd7b9f2e6814b9;>519b93b539c31582f20c5f308dbd7b9f2e6814b9
+  Git æ ç¾: https://github.com/apache/kylin/tree/kylin-1.5.4.1;>kylin-1.5.4.1
+  Git Commit: https://github.com/apache/kylin/commit/895a91b1eff68e4bb9b7183664e71b400c6a3d3c;>895a91b1eff68e4bb9b7183664e71b400c6a3d3c
 
 
 ä¸ºæ¹ä¾¿ä½¿ç¨ï¼æä»¬æä¾é¢ç¼è¯çäºè¿å¶å®è£å
ï¼è¯·éæ©åéççæ¬ä¸è½½è¯·åç§http://kylin.apache.org/docs15/install;>å®è£å¸®å©è¿è¡å®è£
ï¼
 
-1.5.4 äºè¿å¶å for HBase 0.98/0.99 (åæ¬HDP 2.2, CDH 
5.2/5.3)
+1.5.4.1 äºè¿å¶å for HBase 0.98/0.99 (åæ¬HDP 2.2, CDH 
5.2/5.3)
 
 
-  http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-1.5.4/apache-kylin-1.5.4-bin.tar.gz;>apache-kylin-1.5.4-bin.tar.gz
 [https://dist.apache.org/repos/dist/release/kylin/apache-kylin-1.5.4/apache-kylin-1.5.4-bin.tar.gz.asc;>asc]
 [https://dist.apache.org/repos/dist/release/kylin/apache-kylin-1.5.4/apache-kylin-1.5.4-bin.tar.gz.md5;>md5]
-  Git Commit: https://github.com/apache/kylin/commit/519b93b539c31582f20c5f308dbd7b9f2e6814b9;>519b93b539c31582f20c5f308dbd7b9f2e6814b9
+  http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-1.5.4.1/apache-kylin-1.5.4.1-bin.tar.gz;>apache-kylin-1.5.4.1-bin.tar.gz
 [https://dist.apache.org/repos/dist/release/kylin/apache-kylin-1.5.4.1/apache-kylin-1.5.4.1-bin.tar.gz.asc;>asc]
 [https://dist.apache.org/repos/dist/release/kylin/apache-kylin-1.5.4.1/apache-kylin-1.5.4.1-bin.tar.gz.md5;>md5]
+  Git Commit: https://github.com/apache/kylin/commit/895a91b1eff68e4bb9b7183664e71b400c6a3d3c;>895a91b1eff68e4bb9b7183664e71b400c6a3d3c
 
 
-1.5.4 äºè¿å¶å for HBase 1.x (åæ¬HDP 2.3/2.4, EMR 
5.0)
+1.5.4.1 äºè¿å¶å for HBase 1.x (åæ¬HDP 2.3/2.4, EMR 
5.0)
 
 
-  http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-1.5.4/apache-kylin-1.5.4-HBase1.x-bin.tar.gz;>apache-kylin-1.5.4-HBase1.x-bin.tar.gz
 [https://dist.apache.org/repos/dist/release/kylin/apache-kylin-1.5.4/apache-kylin-1.5.4-HBase1.x-bin.tar.gz.asc;>asc]
 [https://dist.apache.org/repos/dist/release/kylin/apache-kylin-1.5.4/apache-kylin-1.5.4-HBase1.x-bin.tar.gz.md5;>md5]
-  Git commit https://github.com/apache/kylin/commit/67898bd90623a4792424856a5f000ffb33c52910;>67898bd90623a4792424856a5f000ffb33c52910
+  http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-1.5.4.1/apache-kylin-1.5.4.1-hbase1.x-bin.tar.gz;>apache-kylin-1.5.4.1-hbase1.x-bin.tar.gz
 [https://dist.apache.org/repos/dist/release/kylin/apache-kylin-1.5.4.1/apache-kylin-1.5.4.1-hbase1.x-bin.tar.gz.asc;>asc]
 [https://dist.apache.org/repos/dist/release/kylin/apache-kylin-1.5.4.1/apache-kylin-1.5.4.1-hbase1.x-bin.tar.gz.md5;>md5]
+  Git commit https://github.com/apache/kylin/commit/c4e31c1b3a664f598352061ae8703812e9d9cef7;>c4e31c1b3a664f598352061ae8703812e9d9cef7
 
 
-1.5.4 äºè¿å¶å for CDH 5.7/5.8
+1.5.4.1 äºè¿å¶å for CDH 5.7/5.8
 
 
-

kylin git commit: update release note for 1.5.4.1

2016-09-27 Thread shaofengshi

Repository: kylin
Updated Branches:
  refs/heads/document 5164e23be -> 649d382d5


update release note for 1.5.4.1


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/649d382d
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/649d382d
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/649d382d

Branch: refs/heads/document
Commit: 649d382d52387b1432aa55b66e8acaf51a8cc191
Parents: 5164e23
Author: shaofengshi 
Authored: Wed Sep 28 13:54:53 2016 +0800
Committer: shaofengshi 
Committed: Wed Sep 28 13:54:53 2016 +0800

--
 website/_docs15/release_notes.md | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/649d382d/website/_docs15/release_notes.md
--
diff --git a/website/_docs15/release_notes.md b/website/_docs15/release_notes.md
index 1820709..310f797 100644
--- a/website/_docs15/release_notes.md
+++ b/website/_docs15/release_notes.md
@@ -21,6 +21,7 @@ This version fixes two major bugs introduced in 1.5.4; The 
metadata and HBase co
 
 __Bug__
 
+[KYLIN-2010] - Date dictionary return wrong SQL result
 [KYLIN-2026] - NPE occurs when build a cube without partition column
 [KYLIN-2032] - Cube build failed when partition column isn't in dimension list

kylin git commit: update web site for 1.5.4.1

2016-09-27 Thread shaofengshi

Repository: kylin
Updated Branches:
  refs/heads/document 9c6b3cced -> 5164e23be


update web site for 1.5.4.1


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/5164e23b
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/5164e23b
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/5164e23b

Branch: refs/heads/document
Commit: 5164e23bedcb2b542cbedda324bcc783050376e9
Parents: 9c6b3cc
Author: shaofengshi 
Authored: Wed Sep 28 13:48:47 2016 +0800
Committer: shaofengshi 
Committed: Wed Sep 28 13:48:47 2016 +0800

--
 website/_docs15/release_notes.md |  9 +
 website/download/index.cn.md | 26 ++
 website/download/index.md| 20 ++--
 3 files changed, 33 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/5164e23b/website/_docs15/release_notes.md
--
diff --git a/website/_docs15/release_notes.md b/website/_docs15/release_notes.md
index ea69304..1820709 100644
--- a/website/_docs15/release_notes.md
+++ b/website/_docs15/release_notes.md
@@ -15,6 +15,15 @@ or send to Apache Kylin mailing list:
 * User relative: [u...@kylin.apache.org](mailto:u...@kylin.apache.org)
 * Development relative: [d...@kylin.apache.org](mailto:d...@kylin.apache.org)
 
+## v1.5.4.1 - 2016-09-28
+_Tag:_ [kylin-1.5.4.1](https://github.com/apache/kylin/tree/kylin-1.5.4.1)
+This version fixes two major bugs introduced in 1.5.4; The metadata and HBase 
coprocessor is compatible with 1.5.4.
+
+__Bug__
+
+[KYLIN-2026] - NPE occurs when build a cube without partition column
+[KYLIN-2032] - Cube build failed when partition column isn't in dimension list
+
 ## v1.5.4 - 2016-09-15
 _Tag:_ [kylin-1.5.4](https://github.com/apache/kylin/tree/kylin-1.5.4)
 This version includes bug fixs/enhancements as well as new features; It is 
backward compatiple with v1.5.3; While after upgrade, you still need update 
coprocessor, refer to [How to update 
coprocessor](/docs15/howto/howto_update_coprocessor.html).

http://git-wip-us.apache.org/repos/asf/kylin/blob/5164e23b/website/download/index.cn.md
--
diff --git a/website/download/index.cn.md b/website/download/index.cn.md
index 9cc5a72..d605d25 100644
--- a/website/download/index.cn.md
+++ b/website/download/index.cn.md
@@ -3,32 +3,34 @@ layout: download-cn
 title: ä¸è½½
 ---
 
+è¯·æ³¨æï¼v1.5.4 æä¸¤ä¸ªå·²ç¥çbug 
([KYLIN-2010](https://issues.apache.org/jira/browse/KYLIN-2010) å 
[KYLIN-2032](https://issues.apache.org/jira/browse/KYLIN-2032)) 
ï¼ä¼å½±åæäºç¨æ·ã è¯·åçº§è³v1.5.4.1.__
+
 __ææ°åå¸(æºä»£ç )__
 
 ææ°åå¸çApache Kylinå¯ä»¥ä»ASFç½ç«ä¸è½½ï¼:
 
-* 
[apache-kylin-1.5.4-src.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-1.5.4/apache-kylin-1.5.4-src.tar.gz)
 
\[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-1.5.4/apache-kylin-1.5.4-src.tar.gz.asc)\]
 
\[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-1.5.4/apache-kylin-1.5.4-src.tar.gz.md5)\]
+* 
[apache-kylin-1.5.4.1-src.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-1.5.4.1/apache-kylin-1.5.4.1-src.tar.gz)
 
\[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-1.5.4.1/apache-kylin-1.5.4.1-src.tar.gz.asc)\]
 
\[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-1.5.4.1/apache-kylin-1.5.4.1-src.tar.gz.md5)\]
 * [åå¸æ¥å¿](http://kylin.apache.org/docs15/release_notes.html)
-* Git æ ç¾: [kylin-1.5.4](https://github.com/apache/kylin/tree/kylin-1.5.4)
-* Git Commit: 
[519b93b539c31582f20c5f308dbd7b9f2e6814b9](https://github.com/apache/kylin/commit/519b93b539c31582f20c5f308dbd7b9f2e6814b9)
+* Git æ ç¾: 
[kylin-1.5.4.1](https://github.com/apache/kylin/tree/kylin-1.5.4.1)
+* Git Commit: 
[895a91b1eff68e4bb9b7183664e71b400c6a3d3c](https://github.com/apache/kylin/commit/895a91b1eff68e4bb9b7183664e71b400c6a3d3c)
 
 
 ä¸ºæ¹ä¾¿ä½¿ç¨ï¼æä»¬æä¾é¢ç¼è¯çäºè¿å¶å®è£å
ï¼è¯·éæ©åéççæ¬ä¸è½½è¯·åç§[å®è£
å¸®å©](http://kylin.apache.org/docs15/install)è¿è¡å®è£ï¼
 
-__1.5.4 äºè¿å¶å for HBase 0.98/0.99 (åæ¬HDP 2.2, CDH 5.2/5.3)__
+__1.5.4.1 äºè¿å¶å for HBase 0.98/0.99 (åæ¬HDP 2.2, CDH 5.2/5.3)__
 
-* 
[apache-kylin-1.5.4-bin.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-1.5.4/apache-kylin-1.5.4-bin.tar.gz)
 
\[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-1.5.4/apache-kylin-1.5.4-bin.tar.gz.asc)\]
 
\[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-1.5.4/apache-kylin-1.5.4-bin.tar.gz.md5)\]
-* Git Commit:

kylin git commit: KYLIN-2050: Better close resource for AutoCloseable object

2016-09-27 Thread liyang

Repository: kylin
Updated Branches:
  refs/heads/master d366dc111 -> 31b80905e


KYLIN-2050: Better close resource for AutoCloseable object


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/31b80905
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/31b80905
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/31b80905

Branch: refs/heads/master
Commit: 31b80905ec3645ecf2c0e8bb5c02bdc451974648
Parents: d366dc1
Author: Yiming Liu 
Authored: Sun Sep 25 21:01:33 2016 +0800
Committer: Li Yang 
Committed: Wed Sep 28 13:37:26 2016 +0800

--
 .../org/apache/kylin/common/util/DBUtils.java   | 89 
 .../apache/kylin/common/util/ZipFileUtils.java  |  3 +-
 .../apache/kylin/dict/lookup/LookupTable.java   |  3 +-
 .../apache/kylin/metadata/MetadataManager.java  |  4 +-
 .../java/org/apache/kylin/query/QueryCli.java   | 13 +--
 .../kylin/query/enumerator/HiveEnumerator.java  | 19 +
 .../apache/kylin/rest/service/CubeService.java  |  5 +-
 .../apache/kylin/rest/service/QueryService.java | 23 +
 .../storage/hbase/steps/CubeHTableUtil.java |  7 +-
 .../storage/hbase/steps/DeprecatedGCStep.java   |  8 +-
 .../hbase/util/HBaseRegionSizeCalculator.java   |  3 +-
 .../storage/hbase/util/HbaseStreamingInput.java |  5 +-
 .../kylin/storage/hbase/util/PingHBaseCLI.java  | 13 +--
 13 files changed, 123 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/31b80905/core-common/src/main/java/org/apache/kylin/common/util/DBUtils.java
--
diff --git 
a/core-common/src/main/java/org/apache/kylin/common/util/DBUtils.java 
b/core-common/src/main/java/org/apache/kylin/common/util/DBUtils.java
new file mode 100644
index 000..9ecd3c3
--- /dev/null
+++ b/core-common/src/main/java/org/apache/kylin/common/util/DBUtils.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.kylin.common.util;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DBUtils {
+
+private static final Logger logger = 
LoggerFactory.getLogger(DBUtils.class);
+
+/**
+ * Closes an ResultSet unconditionally.
+ * 
+ * Equivalent to {@link ResultSet#close()}, except any exceptions will be 
ignored.
+ * This is typically used in finally blocks.
+ * 
+ *
+ * @param output the ResultSet to close, may be null or already closed
+ */
+public static void closeQuietly(final ResultSet rs) {
+closeQuietly((AutoCloseable) rs);
+}
+
+/**
+ * Closes an Statement unconditionally.
+ * 
+ * Equivalent to {@link Statement#close()}, except any exceptions will be 
ignored.
+ * This is typically used in finally blocks.
+ * 
+ *
+ * @param output the ResultSet to close, may be null or already closed
+ */
+public static void closeQuietly(final Statement stmt) {
+closeQuietly((AutoCloseable) stmt);
+}
+
+/**
+ * Closes an Connection unconditionally.
+ * 
+ * Equivalent to {@link Connection#close()}, except any exceptions will be 
ignored.
+ * This is typically used in finally blocks.
+ * 
+ *
+ * @param output the ResultSet to close, may be null or already closed
+ */
+public static void closeQuietly(final Connection conn) {
+closeQuietly((AutoCloseable) conn);
+}
+
+/**
+ * Closes a AutoCloseable unconditionally.
+ * 
+ * Equivalent to {@link AutoCloseable#close()}, except any exceptions will 
be ignored. This is typically used in
+ * finally blocks.
+ * 
+ *
+ * @param closeable the objects to close, may be null or already closed
+ */
+public static void closeQuietly(final AutoCloseable closeable) {
+try {
+if (closeable != null) {
+closeable.close();
+}
+

kylin git commit: KYLIN-2054 minor issues

2016-09-27 Thread shaofengshi

Repository: kylin
Updated Branches:
  refs/heads/KYLIN-2054 754899710 -> 26609a20e


KYLIN-2054 minor issues

Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/26609a20
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/26609a20
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/26609a20

Branch: refs/heads/KYLIN-2054
Commit: 26609a20eb2af681f41ac7e7397359b5a519b741
Parents: 7548997
Author: shaofengshi 
Authored: Wed Sep 28 13:14:58 2016 +0800
Committer: shaofengshi 
Committed: Wed Sep 28 13:14:58 2016 +0800

--
 build/bin/kylin.sh| 3 ++-
 .../src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java | 2 +-
 .../java/org/apache/kylin/source/kafka/TimedJsonStreamParser.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/26609a20/build/bin/kylin.sh
--
diff --git a/build/bin/kylin.sh b/build/bin/kylin.sh
index 7a9d2a1..e767492 100644
--- a/build/bin/kylin.sh
+++ b/build/bin/kylin.sh
@@ -31,7 +31,7 @@ function retrieveDependency() {
 #retrive $hive_dependency and $hbase_dependency
 source ${dir}/find-hive-dependency.sh
 source ${dir}/find-hbase-dependency.sh
-source ${dir}/find-kafka-dependency.sh
+#source ${dir}/find-kafka-dependency.sh
 
 #retrive $KYLIN_EXTRA_START_OPTS
 if [ -f "${dir}/setenv.sh" ]
@@ -40,6 +40,7 @@ function retrieveDependency() {
 
 export 
HBASE_CLASSPATH_PREFIX=${KYLIN_HOME}/conf:${KYLIN_HOME}/lib/*:${KYLIN_HOME}/tool/*:${KYLIN_HOME}/ext/*:${HBASE_CLASSPATH_PREFIX}
 export HBASE_CLASSPATH=${HBASE_CLASSPATH}:${hive_dependency}
+#export 
HBASE_CLASSPATH=${HBASE_CLASSPATH}:${hive_dependency}:${kafka_dependency}
 }
 
 # start command

http://git-wip-us.apache.org/repos/asf/kylin/blob/26609a20/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java
--
diff --git 
a/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java 
b/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java
index 729719a..6358ee1 100644
--- a/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java
+++ b/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java
@@ -114,7 +114,7 @@ public class KafkaMRInput implements IMRInput {
 try {
 streamingParser = 
StreamingParser.getStreamingParser(kafkaConfig.getParserName(), 
kafkaConfig.getParserProperties(), columns);
 } catch (ReflectiveOperationException e) {
-throw new IllegalArgumentException();
+throw new IllegalArgumentException(e);
 }
 }
 Text text = (Text) mapperInput;

http://git-wip-us.apache.org/repos/asf/kylin/blob/26609a20/source-kafka/src/main/java/org/apache/kylin/source/kafka/TimedJsonStreamParser.java
--
diff --git 
a/source-kafka/src/main/java/org/apache/kylin/source/kafka/TimedJsonStreamParser.java
 
b/source-kafka/src/main/java/org/apache/kylin/source/kafka/TimedJsonStreamParser.java
index 9faf880..5db602d 100644
--- 
a/source-kafka/src/main/java/org/apache/kylin/source/kafka/TimedJsonStreamParser.java
+++ 
b/source-kafka/src/main/java/org/apache/kylin/source/kafka/TimedJsonStreamParser.java
@@ -88,7 +88,7 @@ public final class TimedJsonStreamParser extends 
StreamingParser {
 try {
 Class clazz = Class.forName(tsParser);
 Constructor constructor = clazz.getConstructor(String[].class);
-streamTimeParser = (AbstractTimeParser) 
constructor.newInstance(properties);
+streamTimeParser = (AbstractTimeParser) 
constructor.newInstance((Object)properties);
 } catch (Exception e) {
 throw new IllegalStateException("Invalid StreamingConfig, 
tsParser " + tsParser + ", parserProperties " + propertiesStr + ".", e);
 }

kylin git commit: KYLIN-2054 TimedJsonStreamParser should support other time format

2016-09-27 Thread shaofengshi

Repository: kylin
Updated Branches:
  refs/heads/KYLIN-2054 [created] 754899710


KYLIN-2054 TimedJsonStreamParser should support other time format

Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/75489971
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/75489971
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/75489971

Branch: refs/heads/KYLIN-2054
Commit: 754899710961e773dcaa24242e948c4cd750a501
Parents: 859230d
Author: shaofengshi 
Authored: Tue Sep 27 22:21:15 2016 +0800
Committer: shaofengshi 
Committed: Tue Sep 27 22:21:15 2016 +0800

--
 .../org/apache/kylin/common/util/BasicTest.java | 13 +++
 source-kafka/pom.xml|  6 +-
 .../kylin/source/kafka/AbstractTimeParser.java  | 34 
 .../kylin/source/kafka/DateTimeParser.java  | 84 
 .../kylin/source/kafka/DefaultTimeParser.java   | 49 
 .../source/kafka/TimedJsonStreamParser.java | 31 ++--
 6 files changed, 208 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/75489971/core-common/src/test/java/org/apache/kylin/common/util/BasicTest.java
--
diff --git 
a/core-common/src/test/java/org/apache/kylin/common/util/BasicTest.java 
b/core-common/src/test/java/org/apache/kylin/common/util/BasicTest.java
index ee15832..5eaa011 100644
--- a/core-common/src/test/java/org/apache/kylin/common/util/BasicTest.java
+++ b/core-common/src/test/java/org/apache/kylin/common/util/BasicTest.java
@@ -24,6 +24,7 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -33,6 +34,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import org.apache.commons.lang3.time.FastDateFormat;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.LoggerFactory;
@@ -206,6 +208,17 @@ public class BasicTest {
 }
 }
 
+@Test
+@Ignore("for dev only")
+public void test3() throws Exception {
+FastDateFormat formatter = 
org.apache.kylin.common.util.DateFormat.getDateFormat("MMM dd,  hh:mm:ss 
aa");
+System.out.println(formatter.format(new Date()));
+
+String timeStr = "Jul 20, 2016 9:59:17 AM";
+
+System.out.println(formatter.parse(timeStr).getTime());
+}
+
 private static String time(long t) {
 DateFormat dateFormat = new SimpleDateFormat("/MM/dd HH:mm:ss");
 Calendar cal = Calendar.getInstance();

http://git-wip-us.apache.org/repos/asf/kylin/blob/75489971/source-kafka/pom.xml
--
diff --git a/source-kafka/pom.xml b/source-kafka/pom.xml
index 212f4c6..f91ab8f 100644
--- a/source-kafka/pom.xml
+++ b/source-kafka/pom.xml
@@ -48,7 +48,11 @@
 kafka_2.10
 provided
 
-
+
+org.apache.commons
+commons-lang3
+${commons-lang3.version}
+
 
 
 org.apache.hadoop

http://git-wip-us.apache.org/repos/asf/kylin/blob/75489971/source-kafka/src/main/java/org/apache/kylin/source/kafka/AbstractTimeParser.java
--
diff --git 
a/source-kafka/src/main/java/org/apache/kylin/source/kafka/AbstractTimeParser.java
 
b/source-kafka/src/main/java/org/apache/kylin/source/kafka/AbstractTimeParser.java
new file mode 100644
index 000..96a4ece
--- /dev/null
+++ 
b/source-kafka/src/main/java/org/apache/kylin/source/kafka/AbstractTimeParser.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+package org.apache.kylin.source.kafka;
+
+/**
+ */
+public abstract class AbstractTimeParser {
+
+public

[kylin] Git Push Summary

2016-09-27 Thread shaofengshi

Repository: kylin
Updated Branches:
  refs/heads/KYLIN-1726 [deleted] 5987979cc

[kylin] Git Push Summary

2016-09-27 Thread shaofengshi

Repository: kylin
Updated Branches:
  refs/heads/stream_m1 [deleted] 761a8a4c7

kylin git commit: KYLIN-1672 support kylin on cdh 5.7

2016-09-27 Thread shaofengshi

Repository: kylin
Updated Branches:
  refs/heads/kylin-1.5.4.1-cdh5.7-release [created] 3bd0c10fe


KYLIN-1672 support kylin on cdh 5.7


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/3bd0c10f
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/3bd0c10f
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/3bd0c10f

Branch: refs/heads/kylin-1.5.4.1-cdh5.7-release
Commit: 3bd0c10fe363fd309377accd73e584cea1d0fdba
Parents: c4e31c1
Author: Lynne Jiang 
Authored: Mon May 16 03:33:27 2016 -0700
Committer: shaofengshi 
Committed: Tue Sep 27 15:30:05 2016 +0800

--
 dev-support/test_all_against_hdp_2_2_4_2_2.sh   |   0
 .../kylin/engine/mr/steps/MockupMapContext.java |  15 +-
 examples/test_case_data/sandbox/core-site.xml   | 146 +++---
 examples/test_case_data/sandbox/hbase-site.xml  | 162 ++
 examples/test_case_data/sandbox/hdfs-site.xml   | 259 ++
 examples/test_case_data/sandbox/mapred-site.xml | 396 ++-
 examples/test_case_data/sandbox/yarn-site.xml   | 496 ++-
 pom.xml |  23 +-
 server/pom.xml  |  36 ++
 .../storage/hbase/steps/MockupMapContext.java   |  19 +-
 tool/pom.xml|   8 +
 11 files changed, 431 insertions(+), 1129 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/3bd0c10f/dev-support/test_all_against_hdp_2_2_4_2_2.sh
--
diff --git a/dev-support/test_all_against_hdp_2_2_4_2_2.sh 
b/dev-support/test_all_against_hdp_2_2_4_2_2.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/kylin/blob/3bd0c10f/engine-mr/src/test/java/org/apache/kylin/engine/mr/steps/MockupMapContext.java
--
diff --git 
a/engine-mr/src/test/java/org/apache/kylin/engine/mr/steps/MockupMapContext.java
 
b/engine-mr/src/test/java/org/apache/kylin/engine/mr/steps/MockupMapContext.java
index 847071d..9900465 100644
--- 
a/engine-mr/src/test/java/org/apache/kylin/engine/mr/steps/MockupMapContext.java
+++ 
b/engine-mr/src/test/java/org/apache/kylin/engine/mr/steps/MockupMapContext.java
@@ -77,6 +77,7 @@ public class MockupMapContext {
 outKV[0] = key;
 outKV[1] = value;
 }
+
 }
 
 @Override
@@ -99,6 +100,7 @@ public class MockupMapContext {
 throw new NotImplementedException();
 }
 
+
 @Override
 public float getProgress() {
 throw new NotImplementedException();
@@ -195,17 +197,17 @@ public class MockupMapContext {
 }
 
 @Override
-public RawComparator getSortComparator() {
+public boolean userClassesTakesPrecedence() {
 throw new NotImplementedException();
 }
 
 @Override
-public String getJar() {
+public RawComparator getSortComparator() {
 throw new NotImplementedException();
 }
 
 @Override
-public RawComparator getGroupingComparator() {
+public String getJar() {
 throw new NotImplementedException();
 }
 
@@ -221,7 +223,7 @@ public class MockupMapContext {
 
 @Override
 public boolean getProfileEnabled() {
-throw new NotImplementedException();
+return false;
 }
 
 @Override
@@ -308,6 +310,11 @@ public class MockupMapContext {
 public RawComparator getCombinerKeyGroupingComparator() {
 throw new NotImplementedException();
 }
+
+@Override
+public RawComparator getGroupingComparator() {
+return null;
+}
 });
 }
 }

http://git-wip-us.apache.org/repos/asf/kylin/blob/3bd0c10f/examples/test_case_data/sandbox/core-site.xml
--
diff --git a/examples/test_case_data/sandbox/core-site.xml 
b/examples/test_case_data/sandbox/core-site.xml
index 9aa588c..6162406 100644
--- a/examples/test_case_data/sandbox/core-site.xml
+++ b/examples/test_case_data/sandbox/core-site.xml
@@ -14,152 +14,146 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+
 
-
 
 fs.defaultFS
-hdfs://sandbox.hortonworks.com:8020
-true
+hdfs://quickstart.cloudera:8020
 
-
 
 fs.trash.interval
-360
+1
 
-
 
-
ha.failover-controller.active-standby-elector.zk.op.retries
-

[1/4] kylin git commit: [maven-release-plugin] prepare release kylin-1.5.4.1

2016-09-27 Thread shaofengshi

Repository: kylin
Updated Branches:
  refs/heads/kylin-1.5.4.1-HBase1.x-release [created] c4e31c1b3


[maven-release-plugin] prepare release kylin-1.5.4.1


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/b08871e7
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/b08871e7
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/b08871e7

Branch: refs/heads/kylin-1.5.4.1-HBase1.x-release
Commit: b08871e7dd4595474832b5b6a2e156935b2d73c6
Parents: 2141b21
Author: shaofengshi 
Authored: Sat Sep 24 00:01:07 2016 +
Committer: shaofengshi 
Committed: Sat Sep 24 00:01:07 2016 +

--
 assembly/pom.xml |  5 ++---
 atopcalcite/pom.xml  |  5 ++---
 core-common/pom.xml  |  5 ++---
 core-cube/pom.xml|  5 ++---
 core-dictionary/pom.xml  |  5 ++---
 core-job/pom.xml |  5 ++---
 core-metadata/pom.xml|  5 ++---
 core-storage/pom.xml |  5 ++---
 engine-mr/pom.xml|  5 ++---
 engine-spark/pom.xml |  5 ++---
 engine-streaming/pom.xml |  5 ++---
 jdbc/pom.xml |  5 ++---
 kylin-it/pom.xml | 13 ++---
 pom.xml  | 11 +--
 query/pom.xml|  5 ++---
 server-base/pom.xml  |  5 ++---
 server/pom.xml   |  5 ++---
 source-hive/pom.xml  |  5 ++---
 source-kafka/pom.xml |  5 ++---
 storage-hbase/pom.xml|  8 +++-
 tomcat-ext/pom.xml   |  6 ++
 tool/pom.xml |  5 ++---
 22 files changed, 52 insertions(+), 76 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/b08871e7/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 151ab0d..9bb8477 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -17,12 +17,11 @@
  limitations under the License.
 -->
 
-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;>
+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;>
 
 kylin
 org.apache.kylin
-1.5.4.1-SNAPSHOT
+1.5.4.1
 
 
 4.0.0

http://git-wip-us.apache.org/repos/asf/kylin/blob/b08871e7/atopcalcite/pom.xml
--
diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml
index 744dbb0..50780f2 100644
--- a/atopcalcite/pom.xml
+++ b/atopcalcite/pom.xml
@@ -17,8 +17,7 @@
  limitations under the License.
 -->
 
-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;>
+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;>
 4.0.0
 
 atopcalcite
@@ -28,7 +27,7 @@
 
 org.apache.kylin
 kylin
-1.5.4.1-SNAPSHOT
+1.5.4.1
 
 
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/b08871e7/core-common/pom.xml
--
diff --git a/core-common/pom.xml b/core-common/pom.xml
index 641f88d..32c9b67 100644
--- a/core-common/pom.xml
+++ b/core-common/pom.xml
@@ -17,8 +17,7 @@
  limitations under the License.
 -->
 
-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;>
+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;>
 4.0.0
 
 kylin-core-common
@@ -28,7 +27,7 @@
 
 org.apache.kylin
 kylin
-1.5.4.1-SNAPSHOT
+1.5.4.1
 
 
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/b08871e7/core-cube/pom.xml
--
diff --git a/core-cube/pom.xml b/core-cube/pom.xml
index 54f4786..d863b1d 100644
--- a/core-cube/pom.xml
+++ b/core-cube/pom.xml
@@ -17,8 +17,7 @@
  limitations under the License.
 -->
 
-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;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;

[2/4] kylin git commit: KYLIN-1528 Create a branch for v1.5 with HBase 1.x API

2016-09-27 Thread shaofengshi

http://git-wip-us.apache.org/repos/asf/kylin/blob/c4e31c1b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/cube/v1/filter/TestFuzzyRowFilterV2EndToEnd.java
--
diff --git 
a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/cube/v1/filter/TestFuzzyRowFilterV2EndToEnd.java
 
b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/cube/v1/filter/TestFuzzyRowFilterV2EndToEnd.java
index 1d85922..04e2e8b 100644
--- 
a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/cube/v1/filter/TestFuzzyRowFilterV2EndToEnd.java
+++ 
b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/cube/v1/filter/TestFuzzyRowFilterV2EndToEnd.java
@@ -44,6 +44,7 @@ import org.apache.hadoop.hbase.filter.FilterList;
 import org.apache.hadoop.hbase.filter.FilterList.Operator;
 import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy;
 import org.apache.hadoop.hbase.regionserver.HRegion;
+import org.apache.hadoop.hbase.regionserver.Region;
 import org.apache.hadoop.hbase.regionserver.RegionScanner;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Pair;
@@ -136,7 +137,7 @@ public class TestFuzzyRowFilterV2EndToEnd {
 
 Put p = new Put(rk);
 p.setDurability(Durability.SKIP_WAL);
-p.add(cf.getBytes(), cq, Bytes.toBytes(c));
+p.addColumn(cf.getBytes(), cq, Bytes.toBytes(c));
 ht.put(p);
 }
 }
@@ -224,7 +225,7 @@ public class TestFuzzyRowFilterV2EndToEnd {
 scan.addFamily(cf.getBytes());
 scan.setFilter(filter);
 List regions = 
TEST_UTIL.getHBaseCluster().getRegions(table.getBytes());
-HRegion first = regions.get(0);
+Region first = regions.get(0);
 first.getScanner(scan);
 RegionScanner scanner = first.getScanner(scan);
 List results = new ArrayList();

[4/4] kylin git commit: KYLIN-1528 Create a branch for v1.5 with HBase 1.x API

2016-09-27 Thread shaofengshi

KYLIN-1528 Create a branch for v1.5 with HBase 1.x API


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c4e31c1b
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c4e31c1b
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c4e31c1b

Branch: refs/heads/kylin-1.5.4.1-HBase1.x-release
Commit: c4e31c1b3a664f598352061ae8703812e9d9cef7
Parents: b08871e
Author: shaofengshi 
Authored: Wed Mar 23 17:07:05 2016 +0800
Committer: shaofengshi 
Committed: Tue Sep 27 14:46:35 2016 +0800

--
 examples/test_case_data/sandbox/hbase-site.xml  |  19 +-
 .../test_case_data/sandbox/kylin_job_conf.xml   |  86 ++---
 examples/test_case_data/sandbox/mapred-site.xml |  23 +-
 .../kylin/provision/BuildCubeWithEngine.java|  53 +--
 pom.xml |  20 +-
 .../kylin/rest/security/AclHBaseStorage.java|   4 +-
 .../rest/security/MockAclHBaseStorage.java  |   8 +-
 .../apache/kylin/rest/security/MockHTable.java  |  95 +
 .../rest/security/RealAclHBaseStorage.java  |   9 +-
 .../apache/kylin/rest/service/AclService.java   |  25 +-
 .../apache/kylin/rest/service/CubeService.java  |  36 +-
 .../apache/kylin/rest/service/QueryService.java |  24 +-
 .../apache/kylin/rest/service/UserService.java  |  17 +-
 .../kylin/storage/hbase/HBaseConnection.java| 100 ++---
 .../kylin/storage/hbase/HBaseResourceStore.java |  31 +-
 .../storage/hbase/cube/SimpleHBaseStore.java|  20 +-
 .../hbase/cube/v1/CubeSegmentTupleIterator.java |  11 +-
 .../storage/hbase/cube/v1/CubeStorageQuery.java |   4 +-
 .../hbase/cube/v1/RegionScannerAdapter.java |  10 +-
 .../cube/v1/SerializedHBaseTupleIterator.java   |   4 +-
 .../observer/AggregateRegionObserver.java   |   4 +-
 .../observer/AggregationScanner.java|  14 +-
 .../observer/ObserverAggregationCache.java  |  10 +-
 .../coprocessor/observer/ObserverEnabler.java   |   4 +-
 .../hbase/cube/v2/CubeHBaseEndpointRPC.java |  10 +-
 .../storage/hbase/cube/v2/CubeHBaseScanRPC.java |   9 +-
 .../coprocessor/endpoint/CubeVisitService.java  |   4 +-
 .../storage/hbase/steps/CubeHTableUtil.java |  16 +-
 .../storage/hbase/steps/DeprecatedGCStep.java   |  23 +-
 .../storage/hbase/steps/HBaseCuboidWriter.java  |   8 +-
 .../hbase/steps/HBaseStreamingOutput.java   |   9 +-
 .../kylin/storage/hbase/steps/MergeGCStep.java  |  23 +-
 .../storage/hbase/util/CleanHtableCLI.java  |  12 +-
 .../storage/hbase/util/CubeMigrationCLI.java| 372 +--
 .../hbase/util/CubeMigrationCheckCLI.java   |  19 +-
 .../hbase/util/DeployCoprocessorCLI.java|  22 +-
 .../hbase/util/ExtendCubeToHybridCLI.java   |   8 +-
 .../hbase/util/GridTableHBaseBenchmark.java |  34 +-
 .../kylin/storage/hbase/util/HBaseClean.java|  18 +-
 .../hbase/util/HBaseRegionSizeCalculator.java   |  35 +-
 .../kylin/storage/hbase/util/HBaseUsage.java|   9 +-
 .../storage/hbase/util/HbaseStreamingInput.java |  30 +-
 .../hbase/util/HtableAlterMetadataCLI.java  |   9 +-
 .../storage/hbase/util/OrphanHBaseCleanJob.java |  17 +-
 .../kylin/storage/hbase/util/PingHBaseCLI.java  |  15 +-
 .../kylin/storage/hbase/util/RowCounterCLI.java |  11 +-
 .../storage/hbase/util/StorageCleanupJob.java   |  20 +-
 .../storage/hbase/util/UpdateHTableHostCLI.java |  17 +-
 .../observer/AggregateRegionObserverTest.java   |  31 +-
 .../v1/filter/TestFuzzyRowFilterV2EndToEnd.java |   5 +-
 50 files changed, 657 insertions(+), 760 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/c4e31c1b/examples/test_case_data/sandbox/hbase-site.xml
--
diff --git a/examples/test_case_data/sandbox/hbase-site.xml 
b/examples/test_case_data/sandbox/hbase-site.xml
index 46d5345..734908e 100644
--- a/examples/test_case_data/sandbox/hbase-site.xml
+++ b/examples/test_case_data/sandbox/hbase-site.xml
@@ -190,22 +190,5 @@
 zookeeper.znode.parent
 /hbase-unsecure
 
-
-hbase.client.pause
-100
-General client pause value.  Used mostly as value to wait
-before running a retry of a failed get, region lookup, etc.
-See hbase.client.retries.number for description of how we backoff 
from
-this initial pause amount and how this pause works w/ 
retries.
-
-
-hbase.client.retries.number
-5
-Maximum retries.  Used as maximum for all retryable
-operations such as the getting of a cell's value, starting a row 
update,
-etc.  Retry interval is a rough function based on 
hbase.client.pause.  At
-first we retry at this interval but then with backoff, we pretty 
quickly reach
-

[3/4] kylin git commit: KYLIN-1528 Create a branch for v1.5 with HBase 1.x API

2016-09-27 Thread shaofengshi

http://git-wip-us.apache.org/repos/asf/kylin/blob/c4e31c1b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHTableUtil.java
--
diff --git 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHTableUtil.java
 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHTableUtil.java
index 9b487a7..4a4f2a3 100644
--- 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHTableUtil.java
+++ 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHTableUtil.java
@@ -25,7 +25,8 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
+import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.hbase.client.Connection;
 import org.apache.hadoop.hbase.io.compress.Compression.Algorithm;
 import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
 import org.apache.hadoop.hbase.regionserver.BloomType;
@@ -78,7 +79,8 @@ public class CubeHTableUtil {
 tableDesc.setValue(IRealizationConstants.HTableSegmentTag, 
cubeSegment.toString());
 
 Configuration conf = HBaseConnection.getCurrentHBaseConfiguration();
-HBaseAdmin admin = new HBaseAdmin(conf);
+Connection conn = HBaseConnection.get(kylinConfig.getStorageUrl());
+Admin admin = conn.getAdmin();
 
 try {
 if (User.isHBaseSecurityEnabled(conf)) {
@@ -91,7 +93,7 @@ public class CubeHTableUtil {
 tableDesc.addFamily(cf);
 }
 
-if (admin.tableExists(tableName)) {
+if (admin.tableExists(TableName.valueOf(tableName))) {
 // admin.disableTable(tableName);
 // admin.deleteTable(tableName);
 throw new RuntimeException("HBase table " + tableName + " 
exists!");
@@ -100,7 +102,7 @@ public class CubeHTableUtil {
 DeployCoprocessorCLI.deployCoprocessor(tableDesc);
 
 admin.createTable(tableDesc, splitKeys);
-Preconditions.checkArgument(admin.isTableAvailable(tableName), 
"table " + tableName + " created, but is not available due to some reasons");
+
Preconditions.checkArgument(admin.isTableAvailable(TableName.valueOf(tableName)),
 "table " + tableName + " created, but is not available due to some reasons");
 logger.info("create hbase table " + tableName + " done.");
 } finally {
 admin.close();
@@ -109,8 +111,7 @@ public class CubeHTableUtil {
 }
 
 public static void deleteHTable(TableName tableName) throws IOException {
-Configuration conf = HBaseConnection.getCurrentHBaseConfiguration();
-HBaseAdmin admin = new HBaseAdmin(conf);
+Admin admin = 
HBaseConnection.get(KylinConfig.getInstanceFromEnv().getStorageUrl()).getAdmin();
 try {
 if (admin.tableExists(tableName)) {
 logger.info("disabling hbase table " + tableName);
@@ -125,8 +126,7 @@ public class CubeHTableUtil {
 
 /** create a HTable that has the same performance settings as normal cube 
table, for benchmark purpose */
 public static void createBenchmarkHTable(TableName tableName, String 
cfName) throws IOException {
-Configuration conf = HBaseConnection.getCurrentHBaseConfiguration();
-HBaseAdmin admin = new HBaseAdmin(conf);
+Admin admin = 
HBaseConnection.get(KylinConfig.getInstanceFromEnv().getStorageUrl()).getAdmin();
 try {
 if (admin.tableExists(tableName)) {
 logger.info("disabling hbase table " + tableName);

http://git-wip-us.apache.org/repos/asf/kylin/blob/c4e31c1b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/DeprecatedGCStep.java
--
diff --git 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/DeprecatedGCStep.java
 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/DeprecatedGCStep.java
index 7aecd7e..9dc9715 100644
--- 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/DeprecatedGCStep.java
+++ 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/DeprecatedGCStep.java
@@ -28,9 +28,10 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.hbase.client.Connection;
 import org.apache.kylin.common.KylinConfig;
-import org.apache.kylin.common.util.Bytes;
 import org.apache.kylin.engine.mr.HadoopUtil;
 import org.apache.kylin.job.exception.ExecuteException;
 import

svn commit: r1762606 - in /kylin/site: cn/download/index.html docs15/release_notes.html download/index.html feed.xml

kylin git commit: update release note for 1.5.4.1

kylin git commit: update web site for 1.5.4.1

kylin git commit: KYLIN-2050: Better close resource for AutoCloseable object

kylin git commit: KYLIN-2054 minor issues

kylin git commit: KYLIN-2054 TimedJsonStreamParser should support other time format

[kylin] Git Push Summary

[kylin] Git Push Summary

kylin git commit: KYLIN-1672 support kylin on cdh 5.7

[1/4] kylin git commit: [maven-release-plugin] prepare release kylin-1.5.4.1

[2/4] kylin git commit: KYLIN-1528 Create a branch for v1.5 with HBase 1.x API

[4/4] kylin git commit: KYLIN-1528 Create a branch for v1.5 with HBase 1.x API

[3/4] kylin git commit: KYLIN-1528 Create a branch for v1.5 with HBase 1.x API

13 matches

Site Navigation

Mail list logo

Footer information