[kylin] branch document updated: add new committer Shaohui & Temple
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch document in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/document by this push: new 14a3c60 add new committer Shaohui & Temple 14a3c60 is described below commit 14a3c60d9c78243dae0fbd4e18f2503538ea4fde Author: Billy Liu AuthorDate: Mon Nov 18 16:58:52 2019 +0800 add new committer Shaohui & Temple --- website/_data/contributors.yml | 10 ++ 1 file changed, 10 insertions(+) diff --git a/website/_data/contributors.yml b/website/_data/contributors.yml index ccfe4a8..f82d664 100644 --- a/website/_data/contributors.yml +++ b/website/_data/contributors.yml @@ -195,3 +195,13 @@ githubId: Wayne1c org: Kyligence Inc. role: committer +- name: Shaohui Liu (刘绍辉) + apacheId: liushaohui + githubId: lshmouse + org: XiaoMi Group. + role: committer +- name: Temple Zhou (周天鹏) + apacheId: ztp + githubId: + org: DXY.cn + role:committer
[kylin] branch document updated: Update 2015-12-25-support-powerbi-tableau9.md
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch document in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/document by this push: new 6d229dc Update 2015-12-25-support-powerbi-tableau9.md 6d229dc is described below commit 6d229dcbbb62892692d89e65fd5887609cd2cb96 Author: Nikhil Jain AuthorDate: Fri Mar 22 14:12:33 2019 +0800 Update 2015-12-25-support-powerbi-tableau9.md Corrected some typos in the doc. --- website/_posts/blog/2015-12-25-support-powerbi-tableau9.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/_posts/blog/2015-12-25-support-powerbi-tableau9.md b/website/_posts/blog/2015-12-25-support-powerbi-tableau9.md index e6f8fb3..11bcace 100644 --- a/website/_posts/blog/2015-12-25-support-powerbi-tableau9.md +++ b/website/_posts/blog/2015-12-25-support-powerbi-tableau9.md @@ -14,11 +14,11 @@ Microsoft Excel is one of the most famous data tool on Windows platform, and has Microsoft Power BI is a business intelligence tool providing rich functionality and experience for data visualization and processing to user. ### Tableau 9 -Tableau is one of the most famous business intelligence software on Windows platform. With simple operation and powerful functionality, users can easily drag and drop to visualize data in large scale. Besides, Tableau supports reading ODBC data sources, in a Live connection mode. In latest version 9.1, user experience gets better improved very much. +Tableau is one of the most famous business intelligence software on Windows platform. With simple operation and powerful functionality, users can easily drag and drop to visualize data in large scale. Besides, Tableau supports reading ODBC data sources, in a Live connection mode. In latest version 9.1, user experience gets improved greatly. ### Support from Kylin community -There are many requirements from eBay and other users who are using Kylin today, especially from analysts who using these tools everyday. The slow query performance of interactive with big data on Hadoop through other tool, like Hive, brings big chellenge for them. -With sub-seconds query latency feature of Apache Kylin platform, analysts are able to run interactive query agaisting billions rows data in seconds, with these fancy reporting and visualization tools. +There are many requirements from eBay and other users who are using Kylin today, especially from analysts who uses these tools everyday. The slow query performance while interacting with big data on Hadoop through other tool, like Hive, brings big challenge for them. +With sub-seconds query latency feature of Apache Kylin platform, analysts are able to run interactive query against billions rows data in seconds, with these fancy reporting and visualization tools. ### Tutorial Can't wait to try? Please refer to following tutorials:
[kylin] 01/01: Update spark download link
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch document
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit baf22ad67372bf4572ea989f5dcb74500303316e
Author: shaofengshi
AuthorDate: Thu Oct 18 18:58:39 2018 +0800
Update spark download link
---
website/_dev/dev_env.cn.md | 4 ++--
website/_dev/dev_env.md| 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/website/_dev/dev_env.cn.md b/website/_dev/dev_env.cn.md
index 8a9a191..dfaf8b6 100644
--- a/website/_dev/dev_env.cn.md
+++ b/website/_dev/dev_env.cn.md
@@ -44,10 +44,10 @@ ln -s /root/apache-maven-3.2.5/bin/mvn /usr/bin/mvn
### 安装 Spark
-在像 /usr/local/spark 这样的本地文件夹下手动安装 spark-2.1.2-bin-hadoop2.7
+在像 /usr/local/spark 这样的本地文件夹下手动安装 Spark；你需要确认所需要的 Spark 的版本，以及从 Spark
下载页面获取下载链接。 Kylin 2.3 - 2.5 需要 Spark 2.1; 例如：
{% highlight Groff markup %}
-wget -O /tmp/spark-2.1.2-bin-hadoop2.7.tgz
http://d3kbcqa49mib13.cloudfront.net/spark-2.1.2-bin-hadoop2.7.tgz
+wget -O /tmp/spark-2.1.2-bin-hadoop2.7.tgz
https://archive.apache.org/dist/spark/spark-2.1.2/spark-2.1.2-bin-hadoop2.7.tgz
cd /usr/local
tar -zxvf /tmp/spark-2.1.2-bin-hadoop2.7.tgz
ln -s spark-2.1.2-bin-hadoop2.7 spark
diff --git a/website/_dev/dev_env.md b/website/_dev/dev_env.md
index 1e02cc1..3eb5909 100644
--- a/website/_dev/dev_env.md
+++ b/website/_dev/dev_env.md
@@ -44,10 +44,11 @@ ln -s /root/apache-maven-3.2.5/bin/mvn /usr/bin/mvn
### Install Spark
-Manually install spark-2.1.2-bin-hadoop2.7 in a local folder like
/usr/local/spark
+Manually install the Spark binary in in a local folder like /usr/local/spark.
You need to check what's the right version for your Kylin version, and then get
the download link from Apache Spark website. Kylin 2.3 to 2.5 requires Spark
2.1; For example:
+
{% highlight Groff markup %}
-wget -O /tmp/spark-2.1.2-bin-hadoop2.7.tgz
http://d3kbcqa49mib13.cloudfront.net/spark-2.1.2-bin-hadoop2.7.tgz
+wget -O /tmp/spark-2.1.2-bin-hadoop2.7.tgz
https://archive.apache.org/dist/spark/spark-2.1.2/spark-2.1.2-bin-hadoop2.7.tgz
cd /usr/local
tar -zxvf /tmp/spark-2.1.2-bin-hadoop2.7.tgz
ln -s spark-2.1.2-bin-hadoop2.7 spark
[kylin] branch document updated: add new committer: Allen
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch document in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/document by this push: new 79e8cc7 add new committer: Allen 79e8cc7 is described below commit 79e8cc744ee8e2a5f2d0ad931d2711895acf2c5f Author: Billy Liu AuthorDate: Tue Oct 16 23:42:03 2018 +0800 add new committer: Allen --- website/_data/contributors.yml | 5 + 1 file changed, 5 insertions(+) diff --git a/website/_data/contributors.yml b/website/_data/contributors.yml index d81f77b..acfd469 100644 --- a/website/_data/contributors.yml +++ b/website/_data/contributors.yml @@ -175,3 +175,8 @@ githubId: terry-chelsea org: Alibaba role: committer +- name: Allen Ma (马刚) + apacheId: magang + githubId: allenma + org: eBay Inc. + role: committer
[kylin] branch KYLIN-2924 deleted (was a0941b3)
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a change to branch KYLIN-2924 in repository https://gitbox.apache.org/repos/asf/kylin.git. was a0941b3 KYLIN-2924 enable google error-prone in compile phase The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[kylin] branch KYLIN-2924 updated (95e77a5 -> a0941b3)
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a change to branch KYLIN-2924 in repository https://gitbox.apache.org/repos/asf/kylin.git. discard 95e77a5 KYLIN-2924 enable google error-prone in compile phase add a0941b3 KYLIN-2924 enable google error-prone in compile phase This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (95e77a5) \ N -- N -- N refs/heads/KYLIN-2924 (a0941b3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: pom.xml | 14 ++ 1 file changed, 6 insertions(+), 8 deletions(-)
[kylin] branch KYLIN-2924 created (now 95e77a5)
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a change to branch KYLIN-2924 in repository https://gitbox.apache.org/repos/asf/kylin.git. at 95e77a5 KYLIN-2924 enable google error-prone in compile phase This branch includes the following new commits: new 95e77a5 KYLIN-2924 enable google error-prone in compile phase The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[kylin] 01/01: KYLIN-2924 enable google error-prone in compile phase
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch KYLIN-2924
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 95e77a5af9a94ed0435024f1bc2467c9bb0edca1
Author: Billy Liu
AuthorDate: Fri Sep 28 23:09:41 2018 +0800
KYLIN-2924 enable google error-prone in compile phase
---
.../org/apache/kylin/common/util/SparkEntry.java | 2 +-
.../org/apache/kylin/cube/model/DimensionDesc.java | 2 +-
.../job/impl/threadpool/DefaultScheduler.java | 10 ++
.../apache/kylin/measure/topn/TopNCounterTest.java | 3 +-
.../kylin/metrics/lib/impl/InstantReservoir.java | 5 +--
pom.xml| 42 ++
.../kylin/rest/controller/ModelController.java | 4 +--
.../kylin/rest/controller/ProjectController.java | 4 +--
.../apache/kylin/rest/util/AclPermissionUtil.java | 9 +++--
.../apache/kylin/tool/AbstractInfoExtractor.java | 2 +-
10 files changed, 61 insertions(+), 22 deletions(-)
diff --git
a/core-common/src/main/java/org/apache/kylin/common/util/SparkEntry.java
b/core-common/src/main/java/org/apache/kylin/common/util/SparkEntry.java
index ce11b91..7022237 100644
--- a/core-common/src/main/java/org/apache/kylin/common/util/SparkEntry.java
+++ b/core-common/src/main/java/org/apache/kylin/common/util/SparkEntry.java
@@ -32,7 +32,7 @@ public final class SparkEntry {
throw new IllegalArgumentException(String.valueOf("-className is
required"));
}
final String className = args[1];
-final Object o = Class.
forName(className).newInstance();
+final Object o = Class.forName(className).newInstance();
if (!(o instanceof AbstractApplication)) {
throw new IllegalArgumentException(String.valueOf(className + " is
not a subClass of AbstractApplication"));
}
diff --git
a/core-cube/src/main/java/org/apache/kylin/cube/model/DimensionDesc.java
b/core-cube/src/main/java/org/apache/kylin/cube/model/DimensionDesc.java
index dbbd4e8..42e3663 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/model/DimensionDesc.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/model/DimensionDesc.java
@@ -170,7 +170,7 @@ public class DimensionDesc implements java.io.Serializable {
return false;
}
-if (derived != null ? !derived.equals(that.derived) : that.derived !=
null) {
+if (derived != null ? !Arrays.equals(derived, that.derived) :
that.derived != null) {
return false;
}
diff --git
a/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/DefaultScheduler.java
b/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/DefaultScheduler.java
index df3f6fa..5dd2c7c 100644
---
a/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/DefaultScheduler.java
+++
b/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/DefaultScheduler.java
@@ -47,15 +47,11 @@ import com.google.common.collect.Maps;
*/
public class DefaultScheduler implements Scheduler,
ConnectionStateListener {
-private static DefaultScheduler INSTANCE = null;
+private static DefaultScheduler INSTANCE;
-public static DefaultScheduler getInstance() {
+public synchronized static DefaultScheduler getInstance() {
if (INSTANCE == null) {
-synchronized (DefaultScheduler.class) {
-if (INSTANCE == null) {
-INSTANCE = createInstance();
-}
-}
+INSTANCE = createInstance();
}
return INSTANCE;
}
diff --git
a/core-metadata/src/test/java/org/apache/kylin/measure/topn/TopNCounterTest.java
b/core-metadata/src/test/java/org/apache/kylin/measure/topn/TopNCounterTest.java
index 2105d37..9343701 100644
---
a/core-metadata/src/test/java/org/apache/kylin/measure/topn/TopNCounterTest.java
+++
b/core-metadata/src/test/java/org/apache/kylin/measure/topn/TopNCounterTest.java
@@ -98,7 +98,8 @@ public class TopNCounterTest {
return tempFile.getAbsolutePath();
}
-//@Test
+@Ignore
+@Test
public void testSingleSpaceSaving() throws IOException {
String dataFile = prepareTestDate();
TopNCounterTest.SpaceSavingConsumer spaceSavingCounter = new
TopNCounterTest.SpaceSavingConsumer(
diff --git
a/core-metrics/src/main/java/org/apache/kylin/metrics/lib/impl/InstantReservoir.java
b/core-metrics/src/main/java/org/apache/kylin/metrics/lib/impl/InstantReservoir.java
index 41b53cf..7b6d710 100644
---
a/core-metrics/src/main/java/org/apache/kylin/metrics/lib/impl/InstantReservoir.java
+++
b/core-metrics/src/main/java/org/apache/kylin/metrics/lib/impl/InstantReservoir.java
@@ -18,6 +18,7 @@
package org.apache.kylin.metrics.lib.impl;
+import java.util.Arrays;
import java.util.List;
import org.apache.kylin.metrics.lib.ActiveReservoirListener;
@@ -49,7 +50,7 @@ public class Inst
[kylin] branch master updated: Use parseInt() to parse a primitive instead of to use boxing/unboxing
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push:
new 08c451f Use parseInt() to parse a primitive instead of to use
boxing/unboxing
08c451f is described below
commit 08c451fb901eb252797be945f31dd113da79d983
Author: Lijun Cao <641507...@qq.com>
AuthorDate: Thu Sep 27 17:17:22 2018 +0800
Use parseInt() to parse a primitive instead of to use boxing/unboxing
---
.../org/apache/kylin/storage/hbase/lookup/HBaseLookupRowEncoder.java| 2 +-
tool/src/main/java/org/apache/kylin/tool/JobInstanceExtractor.java | 2 +-
tool/src/main/java/org/apache/kylin/tool/KylinLogExtractor.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/lookup/HBaseLookupRowEncoder.java
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/lookup/HBaseLookupRowEncoder.java
index 9ceabd2..7269465 100644
---
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/lookup/HBaseLookupRowEncoder.java
+++
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/lookup/HBaseLookupRowEncoder.java
@@ -109,7 +109,7 @@ public class HBaseLookupRowEncoder extends
AbstractLookupRowEncoder {
for (Entry qualifierValEntry :
qualifierValMap.entrySet()) {
byte[] qualifier = qualifierValEntry.getKey();
byte[] value = qualifierValEntry.getValue();
-int valIdx = Integer.valueOf(Bytes.toString(qualifier));
+int valIdx = Integer.parseInt(Bytes.toString(qualifier));
result[valIdx] = fromBytes(value);
}
}
diff --git a/tool/src/main/java/org/apache/kylin/tool/JobInstanceExtractor.java
b/tool/src/main/java/org/apache/kylin/tool/JobInstanceExtractor.java
index bc61f94..18ace6f 100644
--- a/tool/src/main/java/org/apache/kylin/tool/JobInstanceExtractor.java
+++ b/tool/src/main/java/org/apache/kylin/tool/JobInstanceExtractor.java
@@ -83,7 +83,7 @@ public class JobInstanceExtractor extends
AbstractInfoExtractor {
protected void executeExtract(OptionsHelper optionsHelper, File exportDir)
throws Exception {
String cube = optionsHelper.hasOption(OPTION_CUBE) ?
optionsHelper.getOptionValue(OPTION_CUBE) : null;
String project = optionsHelper.hasOption(OPTION_PROJECT) ?
optionsHelper.getOptionValue(OPTION_PROJECT) : null;
-int period = optionsHelper.hasOption(OPTION_PERIOD) ?
Integer.valueOf(optionsHelper.getOptionValue(OPTION_PERIOD)) : DEFAULT_PERIOD;
+int period = optionsHelper.hasOption(OPTION_PERIOD) ?
Integer.parseInt(optionsHelper.getOptionValue(OPTION_PERIOD)) : DEFAULT_PERIOD;
long endTime = System.currentTimeMillis();
long startTime = endTime - period * 24 * 3600 * 1000; // time in Millis
diff --git a/tool/src/main/java/org/apache/kylin/tool/KylinLogExtractor.java
b/tool/src/main/java/org/apache/kylin/tool/KylinLogExtractor.java
index 80af352..a84345b 100644
--- a/tool/src/main/java/org/apache/kylin/tool/KylinLogExtractor.java
+++ b/tool/src/main/java/org/apache/kylin/tool/KylinLogExtractor.java
@@ -73,7 +73,7 @@ public class KylinLogExtractor extends AbstractInfoExtractor {
protected void executeExtract(OptionsHelper optionsHelper, File exportDir)
throws Exception {
beforeExtract();
-int logPeriod = optionsHelper.hasOption(OPTION_LOG_PERIOD) ?
Integer.valueOf(optionsHelper.getOptionValue(OPTION_LOG_PERIOD)) :
DEFAULT_LOG_PERIOD;
+int logPeriod = optionsHelper.hasOption(OPTION_LOG_PERIOD) ?
Integer.parseInt(optionsHelper.getOptionValue(OPTION_LOG_PERIOD)) :
DEFAULT_LOG_PERIOD;
if (logPeriod < 1) {
logger.warn("No logs to extract.");
[kylin] branch master updated: Add private constructor for utility classes.
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push:
new de396e3 Add private constructor for utility classes.
de396e3 is described below
commit de396e3bb019243a4dfe51e11c77db6381de4357
Author: Lijun Cao <641507...@qq.com>
AuthorDate: Thu Sep 27 18:40:21 2018 +0800
Add private constructor for utility classes.
---
.../src/main/java/org/apache/kylin/common/util/BytesUtil.java| 4
.../src/main/java/org/apache/kylin/common/util/ClassUtil.java| 4
.../src/main/java/org/apache/kylin/common/util/CompressionUtils.java | 4
.../src/main/java/org/apache/kylin/common/util/HadoopUtil.java | 3 +++
.../src/main/java/org/apache/kylin/common/util/IdentityUtils.java| 5 +
core-common/src/main/java/org/apache/kylin/common/util/JsonUtil.java | 4
core-common/src/main/java/org/apache/kylin/common/util/MathUtil.java | 5 +
.../src/main/java/org/apache/kylin/common/util/RandomUtil.java | 5 +
.../src/main/java/org/apache/kylin/common/util/RangeUtil.java| 4
core-common/src/main/java/org/apache/kylin/common/util/SortUtil.java | 5 +
.../java/org/apache/kylin/common/util/SourceConfigurationUtil.java | 4
.../src/main/java/org/apache/kylin/common/util/StringUtil.java | 4
core-common/src/main/java/org/apache/kylin/common/util/TimeUtil.java | 4
.../src/main/java/org/apache/kylin/common/util/ZipFileUtils.java | 4
.../src/main/java/org/apache/kylin/common/util/ZooKeeperUtil.java| 4
.../main/java/org/apache/kylin/job/util/MailNotificationUtil.java| 4
core-metadata/src/main/java/org/apache/kylin/util/KryoUtils.java | 4
.../src/main/java/org/apache/kylin/storage/util/SizeOfUtil.java | 1 +
.../main/java/org/apache/kylin/engine/spark/util/IteratorUtils.java | 4
query/src/main/java/org/apache/kylin/query/util/PushDownUtil.java| 4
query/src/main/java/org/apache/kylin/query/util/QueryUtil.java | 4
query/src/main/java/org/apache/kylin/query/util/RexUtil.java | 4
.../src/main/java/org/apache/kylin/rest/util/AclPermissionUtil.java | 4
.../src/main/java/org/apache/kylin/rest/util/QueryRequestLimits.java | 2 +-
.../src/main/java/org/apache/kylin/rest/util/TableauInterceptor.java | 4
.../main/java/org/apache/kylin/source/kafka/util/KafkaClient.java| 4
tool/src/main/java/org/apache/kylin/tool/util/ToolUtil.java | 5 +
27 files changed, 106 insertions(+), 1 deletion(-)
diff --git
a/core-common/src/main/java/org/apache/kylin/common/util/BytesUtil.java
b/core-common/src/main/java/org/apache/kylin/common/util/BytesUtil.java
index faabbd1..a597780 100644
--- a/core-common/src/main/java/org/apache/kylin/common/util/BytesUtil.java
+++ b/core-common/src/main/java/org/apache/kylin/common/util/BytesUtil.java
@@ -26,6 +26,10 @@ import com.google.common.primitives.Shorts;
public class BytesUtil {
+private BytesUtil() {
+throw new IllegalStateException("Class BytesUtil is an utility class
!");
+}
+
public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
public static void writeByte(byte num, byte[] bytes, int offset, int size)
{
diff --git
a/core-common/src/main/java/org/apache/kylin/common/util/ClassUtil.java
b/core-common/src/main/java/org/apache/kylin/common/util/ClassUtil.java
index bfc6ce1..cd78fe0 100644
--- a/core-common/src/main/java/org/apache/kylin/common/util/ClassUtil.java
+++ b/core-common/src/main/java/org/apache/kylin/common/util/ClassUtil.java
@@ -36,6 +36,10 @@ public class ClassUtil {
private static final org.slf4j.Logger logger =
LoggerFactory.getLogger(ClassUtil.class);
+private ClassUtil() {
+throw new IllegalStateException("Class ClassUtil is an utility class
!");
+}
+
public static void addClasspath(String path) {
logger.info("Adding path " + path + " to class path");
File file = new File(path);
diff --git
a/core-common/src/main/java/org/apache/kylin/common/util/CompressionUtils.java
b/core-common/src/main/java/org/apache/kylin/common/util/CompressionUtils.java
index 7bd520c..997a8d8 100644
---
a/core-common/src/main/java/org/apache/kylin/common/util/CompressionUtils.java
+++
b/core-common/src/main/java/org/apache/kylin/common/util/CompressionUtils.java
@@ -30,6 +30,10 @@ import org.slf4j.LoggerFactory;
public class CompressionUtils {
private static final org.slf4j.Logger logger =
LoggerFactory.getLogger(CompressionUtils.class);
+private CompressionUtils() {
+throw new IllegalStateException("Class CompressionUtils is an utility
class !");
+}
+
public static byte[] compress(byte[] data) throws IOException {
long startTime
[kylin] branch master updated: KYLIN-3597 Fix sonar reported static code issues
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push:
new 23e4ffa KYLIN-3597 Fix sonar reported static code issues
23e4ffa is described below
commit 23e4ffa795baede6a772091fe823d5d4bf3048ee
Author: chao long
AuthorDate: Thu Sep 27 14:34:05 2018 +0800
KYLIN-3597 Fix sonar reported static code issues
---
.../org/apache/kylin/metadata/model/TableDesc.java | 11 ++--
.../kylin/engine/spark/SparkCubingMerge.java | 7 ++-
.../kylin/engine/spark/SparkFactDistinct.java | 59 +++---
.../kylin/engine/spark/SparkMergingDictionary.java | 31 +---
.../kylin/storage/hbase/steps/SparkCubeHFile.java | 12 ++---
.../storage/hbase/util/UpdateHTableHostCLI.java| 6 +--
6 files changed, 59 insertions(+), 67 deletions(-)
diff --git
a/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableDesc.java
b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableDesc.java
index d8e3b02..63a78f8 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableDesc.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableDesc.java
@@ -74,7 +74,8 @@ public class TableDesc extends RootPersistentEntity
implements ISourceAware {
if (cut >= 0)
path = path.substring(cut + 1);
-String table, prj;
+String table;
+String prj;
int dash = path.indexOf("--");
if (dash >= 0) {
table = path.substring(0, dash);
@@ -153,9 +154,10 @@ public class TableDesc extends RootPersistentEntity
implements ISourceAware {
if
(existingColumns[i].getName().equalsIgnoreCase(computedColumns[j].getName())) {
// if we're adding a computed column twice, it should be
allowed without producing duplicates
if (!existingColumns[i].isComputedColumn()) {
-throw new
IllegalArgumentException(String.format(Locale.ROOT,
+String errorMsg = String.format(Locale.ROOT,
"There is already a column named %s on table
%s, please change your computed column name",
-new Object[] { computedColumns[j].getName(),
this.getIdentity() }));
+computedColumns[j].getName(),
this.getIdentity());
+throw new IllegalArgumentException(errorMsg);
} else {
isFreshCC = false;
}
@@ -178,7 +180,7 @@ public class TableDesc extends RootPersistentEntity
implements ISourceAware {
public ColumnDesc findColumnByName(String name) {
//ignore the db name and table name if exists
-int lastIndexOfDot = name.lastIndexOf(".");
+int lastIndexOfDot = name.lastIndexOf('.');
if (lastIndexOfDot >= 0) {
name = name.substring(lastIndexOfDot + 1);
}
@@ -204,6 +206,7 @@ public class TableDesc extends RootPersistentEntity
implements ISourceAware {
* @deprecated this is for compatible with data model v1;
* @return
*/
+@Deprecated
public String getResourcePathV1() {
return concatResourcePath(name, null);
}
diff --git
a/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkCubingMerge.java
b/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkCubingMerge.java
index 991c31e..0b03f70 100644
---
a/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkCubingMerge.java
+++
b/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkCubingMerge.java
@@ -143,7 +143,7 @@ public class SparkCubingMerge extends AbstractApplication
implements Serializabl
};
final PairFunction convertTextFunction = new PairFunction, org.apache.hadoop.io.Text, org.apache.hadoop.io.Text>() {
-private volatile transient boolean initialized = false;
+private transient volatile boolean initialized = false;
BufferedMeasureCodec codec;
@Override
@@ -231,12 +231,11 @@ public class SparkCubingMerge extends AbstractApplication
implements Serializabl
}
// output the data size to console, job engine will parse and save the
metric
// please note: this mechanism won't work when
spark.submit.deployMode=cluster
-logger.info("HDFS: Number of bytes written=" +
jobListener.metrics.getBytesWritten());
-//HadoopUtil.deleteHDFSMeta(metaUrl);
+logger.info("HDFS: Number of bytes written={}",
jobListener.metrics.getBytesWritten());
}
static class ReEncodCuboidFunction implements PairFunction, Text, Object[]> {
-private volatile transient boolean initialized = false
[kylin] branch update_travis_maven deleted (was 4ae3435)
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a change to branch update_travis_maven in repository https://gitbox.apache.org/repos/asf/kylin.git. was 4ae3435 minor, update maven to 3.5.4 in travis build This change permanently discards the following revisions: discard 4ae3435 minor, update maven to 3.5.4 in travis build
[kylin] 01/01: minor, update maven to 3.5.4 in travis build
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch update_travis_maven in repository https://gitbox.apache.org/repos/asf/kylin.git commit 4ae34353eb0a2b51cea2d01c965f688c54d6be5d Author: Billy Liu AuthorDate: Wed Sep 12 22:04:46 2018 +0800 minor, update maven to 3.5.4 in travis build --- .travis.yml | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1941c76..bd250ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,16 @@ addons: cache: directories: -- $HOME/.m2 - +- "$HOME/.m2/repository" +- "$HOME/apache-maven-3.5.4" jdk: - oraclejdk8 +before_install: + - export M2_HOME=$HOME/apache-maven-3.5.4 + - if [ ! -d $M2_HOME/bin ]; then curl https://archive.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz | tar zxf - -C $HOME; fi + - export PATH=$M2_HOME/bin:$PATH + before_script: - echo "MAVEN_OPTS='-Xms1024m -Xmx3072m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m'" > ~/.mavenrc
[kylin] branch update_travis_maven updated (1e02623 -> 4ae3435)
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a change to branch update_travis_maven in repository https://gitbox.apache.org/repos/asf/kylin.git. discard 1e02623 minor, update maven to 3.5.4 in travis build add 535c9ed KYLIN-3527 fix hybrid couldn't save when there is only 1 cube add 2b2a203 KYLIN-3526 Add check for hybrid name with special character add 51fa4d0 KYLIN-3528 Add details page for hybrid add bb904b8 minor, comment scala-maven-plugin version to let compile on old maven add 5413975 KYLIN-3531 Save uppercase of usernames to metadata add 6dcd795 KYLIN-3543 Export HBase configuration only for Spark engine add aee4b57 KYLIN-3565 User login error message is inaccurate add dd9909c KYLIN-3439, make default kylin.web.timezone in KylinConfigBase the same with kylin-defaults.properties add 82e1c01 KYLIN-3567 Change scala dependency scope to provided add e093fac KYLIN-3445 Upgrade checkstyle version to 8.6 add cf171da KYLIN-3515 Add uuid for materialized table of hive view add 715f819 KYLIN-3497 Make JDBC Module more testable add 754da80 minor, less log to enable travis-ci add f37be33 KYLIN-3575, fix unclosed JDBC connection in DriverTest. new 4ae3435 minor, update maven to 3.5.4 in travis build This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1e02623) \ N -- N -- N refs/heads/update_travis_maven (4ae3435) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/kylin/common/KylinConfigBase.java | 7 +- .../common/persistence/FileResourceStore.java | 5 +- .../src/main/resources/kylin-defaults.properties | 2 +- .../java/org/apache/kylin/cube/CubeManager.java| 8 +- .../kylin/cube/cli/DictionaryGeneratorCLI.java | 16 +- .../org/apache/kylin/dict/lookup/SnapshotCLI.java | 5 +- .../kylin/job/execution/AbstractExecutable.java| 8 + .../job/execution/DefaultChainedExecutable.java| 1 + .../kylin/job/execution/ExecutableManager.java | 4 + .../org/apache/kylin/metadata/model/TableDesc.java | 8 + .../kylin/metadata/project/ProjectL2Cache.java | 7 - .../main/java/org/apache/kylin/source/ISource.java | 2 +- .../org/apache/kylin/source/SourceManager.java | 4 +- .../java/org/apache/kylin/engine/mr/IMRInput.java | 2 +- .../apache/kylin/engine/mr/JobBuilderSupport.java | 1 + .../java/org/apache/kylin/engine/mr/MRUtil.java| 8 +- .../kylin/engine/mr/steps/CreateDictionaryJob.java | 4 +- .../lookup/LookupSnapshotToMetaStoreStep.java | 2 +- engine-spark/pom.xml | 3 + jdbc/pom.xml | 7 + .../java/org/apache/kylin/jdbc/IRemoteClient.java | 9 +- .../java/org/apache/kylin/jdbc/JdbcFactory.java| 7 +- .../java/org/apache/kylin/jdbc/KylinClient.java| 36 +- .../org/apache/kylin/jdbc/KylinConnection.java | 15 +- .../apache/kylin/jdbc/KylinConnectionInfo.java}| 19 +- .../org/apache/kylin/jdbc/KylinJdbcFactory.java| 4 +- .../java/org/apache/kylin/jdbc/KylinResultSet.java | 2 +- .../org/apache/kylin/jdbc/RemoteClientFactory.java | 6 +- .../java/org/apache/kylin/jdbc/DriverTest.java | 27 + .../java/org/apache/kylin/jdbc/DummyClient.java| 5 +- .../org/apache/kylin/jdbc/DummyJdbcFactory.java| 2 +- .../org/apache/kylin/jdbc/KylinClientTest.java | 114 .../org/apache/kylin/jdbc/KylinConnectionTest.java | 144 .../test/java/org/apache/kylin/jdbc/TestUtil.java | 68 ++ .../src/test/resources/query.json | 55 +- jdbc/src/test/resources/tables_and_columns.json| 747 + .../kylin/source/hive/ITSnapshotManagerTest.java | 2 +- pom.xml| 5 +- .../java/org/apache/kylin/rest/msg/CnMessage.java | 4 + .../java/org/apache/kylin/rest/msg/Message.java| 4 + .../kylin/rest/security/KylinUserManager.java | 4 +- .../org/apache/kylin/rest/service/CubeService.java | 9 +- .../org/apache/kylin/rest/service/JobService.java | 7 + .../
[kylin] branch document updated: update Yonghong new PMC role
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch document in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/document by this push: new 89d63a9 update Yonghong new PMC role 89d63a9 is described below commit 89d63a9af3fccc8baedeadecb88905a97211d4e3 Author: Billy Liu AuthorDate: Sat Sep 22 13:52:19 2018 +0800 update Yonghong new PMC role --- website/_data/contributors.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/_data/contributors.yml b/website/_data/contributors.yml index 019cff7..d81f77b 100644 --- a/website/_data/contributors.yml +++ b/website/_data/contributors.yml @@ -124,7 +124,7 @@ apacheId: nju_yaho githubId: kyotoYaho org: eBay - role: committer + role: PMC - name: Billy Liu (刘一鸣) apacheId: billyliu githubId: yiming187
[kylin] branch document updated: fix typo
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch document
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/document by this push:
new 00c9241 fix typo
00c9241 is described below
commit 00c924115f5d382407cfdee37d41d6aa39839cba
Author: Billy Liu
AuthorDate: Sat Sep 22 13:49:20 2018 +0800
fix typo
---
website/_docs/gettingstarted/faq.md | 6 +++---
website/_docs/gettingstarted/terminology.md | 2 +-
website/_docs/howto/howto_upgrade.md | 6 +++---
website/_docs/howto/howto_use_beeline.md | 2 +-
website/_docs/install/configuration.md | 4 ++--
website/_docs/install/index.md | 2 +-
website/_docs/tutorial/create_cube.md| 4 ++--
website/_docs/tutorial/cube_build_performance.md | 4 ++--
website/_docs/tutorial/cube_spark.md | 6 +++---
website/_docs/tutorial/cube_streaming.md | 4 ++--
website/_docs/tutorial/flink.md | 2 +-
website/_docs/tutorial/hybrid.md | 6 +++---
website/_docs/tutorial/kylin_client_tool.md | 2 +-
website/_docs/tutorial/kylin_sample.md | 2 +-
website/_docs/tutorial/odbc.md | 2 +-
website/_docs/tutorial/query_pushdown.md | 2 +-
website/_docs/tutorial/setup_jdbc_datasource.md | 4 ++--
website/_docs/tutorial/setup_systemcube.md | 14 +++---
website/_docs/tutorial/squirrel.md | 4 ++--
website/_docs/tutorial/tableau_91.md | 2 +-
website/_docs/tutorial/use_dashboard.md | 8
website/_docs/tutorial/web.md| 2 +-
website/community/poweredby.md | 4 ++--
website/index.md | 2 +-
24 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/website/_docs/gettingstarted/faq.md
b/website/_docs/gettingstarted/faq.md
index 99d25a0..9ebcad4 100644
--- a/website/_docs/gettingstarted/faq.md
+++ b/website/_docs/gettingstarted/faq.md
@@ -204,8 +204,8 @@ kylin.engine.spark-conf.spark.yarn.queue=YOUR_QUEUE_NAME
{% endhighlight %}
- SUM(field) returns a negtive result while all the numbers in this field
are > 0
- * If a column is declared as integer in Hive, the SQL engine (calcite) will
use column's type (integer) as the data type for "SUM(field)", while the
aggregated value on this field may exceed the scope of integer; in that case
the cast will cause a negtive value be returned; The workround is, alter that
column's type to BIGINT in hive, and then sync the table schema to Kylin (the
cube doesn't need rebuild); Keep in mind that, always declare as BIGINT in hive
for an integer column which [...]
+ SUM(field) returns a negative result while all the numbers in this field
are > 0
+ * If a column is declared as integer in Hive, the SQL engine (calcite) will
use column's type (integer) as the data type for "SUM(field)", while the
aggregated value on this field may exceed the scope of integer; in that case
the cast will cause a negtive value be returned; The workaround is, alter that
column's type to BIGINT in hive, and then sync the table schema to Kylin (the
cube doesn't need rebuild); Keep in mind that, always declare as BIGINT in hive
for an integer column which [...]
Why Kylin need extract the distinct columns from Fact Table before
building cube?
* Kylin uses dictionary to encode the values in each column, this greatly
reduce the cube's storage size. To build the dictionary, Kylin need fetch the
distinct values for each column.
@@ -307,4 +307,4 @@ Restart Kylin to take effective. If you have multiple Kylin
server as a cluster,
The data in 'hdfs-working-dir' ('hdfs:///kylin/kylin_metadata/' by default)
includes intermediate files (will be GC) and Cuboid data (won't be GC). The
Cuboid data is kept for the further segments' merge, as Kylin couldn't merge
from HBase. If you're sure those segments won't be merged, you can move them to
other paths or even delete.
-Please pay attention to the "resources" sub-folder under 'hdfs-working-dir',
which persists some big metadata files like dictionaries and lookup tables'
snapshots. They shouldn't be moved.
\ No newline at end of file
+Please pay attention to the "resources" sub-folder under 'hdfs-working-dir',
which persists some big metadata files like dictionaries and lookup tables'
snapshots. They shouldn't be moved.
diff --git a/website/_docs/gettingstarted/terminology.md
b/website/_docs/gettingstarted/terminology.md
index 9037469..2d998b3 100644
--- a/website/_docs/gettingstarted/terminology.md
+++ b/website/_docs/gettingstarted/terminology.md
@@ -8,7 +8,7 @@ since: v0.5.x
Here are some domain terms we are using in Apache Kylin, please check them for
your reference.
-They are basic knowledg
[kylin] branch document updated: minor, fix format
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch document in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/document by this push: new 055b57e minor, fix format 055b57e is described below commit 055b57e245fcb85acd1952904391b277e2f611ef Author: Billy Liu AuthorDate: Sat Sep 22 12:51:57 2018 +0800 minor, fix format --- website/_posts/blog/2018-09-20-release-v2.5.0.md | 1 + 1 file changed, 1 insertion(+) diff --git a/website/_posts/blog/2018-09-20-release-v2.5.0.md b/website/_posts/blog/2018-09-20-release-v2.5.0.md index a8a18cb..953e283 100644 --- a/website/_posts/blog/2018-09-20-release-v2.5.0.md +++ b/website/_posts/blog/2018-09-20-release-v2.5.0.md @@ -16,6 +16,7 @@ This is a major release after 2.4.0, including many enhancements. All of the cha Now Kylin's Spark engine will run all distributed jobs in Spark, including fetch distinct dimension values, converting cuboid files to HBase HFile, merging segments, merging dictionaries, etc. The default configurations are tuned so the user can get an out-of-box experience. The overall performance with the previous version is close, but we assume Spark has more room to improve. The related tasks are KYLIN-3427, KYLIN-3441, KYLIN-3442. There are also improvements in the job management. Now you can get the job link on the web console once Spark starts to run. If you discard the job, Kylin will kill the Spark job to release the resource in time. If Kylin is restarted, it can resume from the previous job instead of resubmitting a new job. + ### MySQL as Kylin metastore In the past, HBase is the only option for Kylin metadata. In some cases, this is not applicable, for example using replicated HBase cluster for Kylin's HA (the replicated HBase is read only). Now we introduce the MySQL metastore to fulfill such need. This function is in beta now. Check KYLIN-3488 for more.
[kylin] 01/01: minor, update maven to 3.5.4 in travis build
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch update_travis_maven in repository https://gitbox.apache.org/repos/asf/kylin.git commit 1e02623b0a2af6e13182c3228481db85ff6d6d37 Author: Billy Liu AuthorDate: Wed Sep 12 22:04:46 2018 +0800 minor, update maven to 3.5.4 in travis build --- .travis.yml | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1941c76..bd250ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,16 @@ addons: cache: directories: -- $HOME/.m2 - +- "$HOME/.m2/repository" +- "$HOME/apache-maven-3.5.4" jdk: - oraclejdk8 +before_install: + - export M2_HOME=$HOME/apache-maven-3.5.4 + - if [ ! -d $M2_HOME/bin ]; then curl https://archive.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz | tar zxf - -C $HOME; fi + - export PATH=$M2_HOME/bin:$PATH + before_script: - echo "MAVEN_OPTS='-Xms1024m -Xmx3072m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m'" > ~/.mavenrc
[kylin] branch update_travis_maven updated (4c1faf1 -> 1e02623)
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a change to branch update_travis_maven in repository https://gitbox.apache.org/repos/asf/kylin.git. discard 4c1faf1 minor, update maven to 3.5.4 in travis build add d9972ee KYLIN-3513 add plugin version to pom.xml KYLIN-3513 disable javadoc check KYLIN-3513 use SHA-256 algorithm add 0c1ef1d minor, less test rows in RocksDBLookupTableCacheTest add 501a804 KYLIN-3513 bump main version to 2.6.0 new 1e02623 minor, update maven to 3.5.4 in travis build This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (4c1faf1) \ N -- N -- N refs/heads/update_travis_maven (1e02623) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: assembly/pom.xml | 2 +- atopcalcite/pom.xml| 2 +- core-common/pom.xml| 31 +- .../java/org/apache/kylin/common/KylinVersion.java | 2 +- core-cube/pom.xml | 2 +- core-dictionary/pom.xml| 2 +- .../lookup/cache/RocksDBLookupTableCacheTest.java | 2 +- core-job/pom.xml | 2 +- core-metadata/pom.xml | 2 +- core-metrics/pom.xml | 2 +- core-storage/pom.xml | 2 +- engine-mr/pom.xml | 2 +- engine-spark/pom.xml | 2 +- jdbc/pom.xml | 2 +- kylin-it/pom.xml | 2 +- metrics-reporter-hive/pom.xml | 2 +- metrics-reporter-kafka/pom.xml | 2 +- pom.xml| 18 ++--- query/pom.xml | 2 +- server-base/pom.xml| 2 +- server/pom.xml | 2 +- source-hive/pom.xml| 6 + source-kafka/pom.xml | 2 +- storage-hbase/pom.xml | 2 +- tomcat-ext/pom.xml | 2 +- tool-assembly/pom.xml | 2 +- tool/pom.xml | 2 +- 27 files changed, 40 insertions(+), 63 deletions(-)
[kylin] branch update_travis_maven created (now 4c1faf1)
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a change to branch update_travis_maven in repository https://gitbox.apache.org/repos/asf/kylin.git. at 4c1faf1 minor, update maven to 3.5.4 in travis build This branch includes the following new commits: new 4c1faf1 minor, update maven to 3.5.4 in travis build The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[kylin] 01/01: minor, update maven to 3.5.4 in travis build
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch update_travis_maven in repository https://gitbox.apache.org/repos/asf/kylin.git commit 4c1faf164f0cdf6e105bc453302fd3d22faf135e Author: Billy Liu AuthorDate: Wed Sep 12 22:04:46 2018 +0800 minor, update maven to 3.5.4 in travis build --- .travis.yml | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1941c76..bd250ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,16 @@ addons: cache: directories: -- $HOME/.m2 - +- "$HOME/.m2/repository" +- "$HOME/apache-maven-3.5.4" jdk: - oraclejdk8 +before_install: + - export M2_HOME=$HOME/apache-maven-3.5.4 + - if [ ! -d $M2_HOME/bin ]; then curl https://archive.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz | tar zxf - -C $HOME; fi + - export PATH=$M2_HOME/bin:$PATH + before_script: - echo "MAVEN_OPTS='-Xms1024m -Xmx3072m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m'" > ~/.mavenrc
[kylin] branch master updated: Enable Travis CI cache to speed up CI checks
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/master by this push: new b4f2155 Enable Travis CI cache to speed up CI checks b4f2155 is described below commit b4f21550a773965eb93c639d1c5437661cb5b36f Author: Ian Hu AuthorDate: Fri Aug 17 16:52:52 2018 +0800 Enable Travis CI cache to speed up CI checks While there are a lot of dependencies need to be downloaded from maven central enable Travis CI cache maven dependencies helps speed up the CI process. See http://docs.travis-ci.com/user/caching/ --- .travis.yml | 8 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 38dc93c..1941c76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,10 @@ addons: token: secure: "c918989d018ae3af899798716c35f4fe125296a4" +cache: + directories: +- $HOME/.m2 + jdk: - oraclejdk8 @@ -45,4 +49,8 @@ notification: after_success: - bash <(curl -s https://codecov.io/bash) + +before_cache: + # Remove project's local artifacts to force maven reactor resolve + - rm -rf $HOME/.m2/repository/org/apache/kylin
[kylin] branch master updated: Update README badges
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/master by this push: new d2d2ac7 Update README badges d2d2ac7 is described below commit d2d2ac72d3c3582c3d8cfae4707fd0969b98e228 Author: Ian Hu AuthorDate: Thu Aug 16 14:22:03 2018 +0800 Update README badges --- README.md | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bc4f167..6ddb895 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,10 @@ Apache Kylin [](https://www.apache.org/licenses/LICENSE-2.0.html) [](https://coveralls.io/github/apache/kylin?branch=master) [](https://www.codacy.com/app/kyligence-git/kylin?utm_source=github.comutm_medium=referralutm_content=apache/kylinutm_campaign=Badge_Grade) -[](https://sonarcloud.io/dashboard/index/org.apache.kylin%3Akylin) -[](https://sonarcloud.io/component_measures/metric/coverage/list?id=org.apache.kylin%3Akylin) -[](https://sonarcloud.io/component_measures/metric/reliability_rating/list?id=org.apache.kylin%3Akylin) -[](https://sonarcloud.io/component_measures/metric/security_rating/list?id=org.apache.kylin%3Akylin) +[](https://sonarcloud.io/dashboard/index/org.apache.kylin%3Akylin) +[](https://sonarcloud.io/component_measures/metric/coverage/list?id=org.apache.kylin%3Akylin) +[](https://sonarcloud.io/component_measures/metric/reliability_rating/list?id=org.apache.kylin%3Akylin) +[](https://sonarcloud.io/component_measures/metric/security_rating/list?id=org.apache.kylin%3Akylin) > Extreme OLAP Engine for Big Data
[kylin] branch master updated: KYLIN-3399, makes the code that added in KYLIN-2474 more intuitive.
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push:
new d680a4a KYLIN-3399, makes the code that added in KYLIN-2474 more
intuitive.
d680a4a is described below
commit d680a4aa9162fdcf0e845bde7b6952aeeac81410
Author: tttMelody <245915...@qq.com>
AuthorDate: Wed Jun 20 11:25:03 2018 +0800
KYLIN-3399, makes the code that added in KYLIN-2474 more intuitive.
---
.../java/org/apache/kylin/cube/cli/DictionaryGeneratorCLI.java| 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git
a/core-cube/src/main/java/org/apache/kylin/cube/cli/DictionaryGeneratorCLI.java
b/core-cube/src/main/java/org/apache/kylin/cube/cli/DictionaryGeneratorCLI.java
index 2a24370..7fcf320 100644
---
a/core-cube/src/main/java/org/apache/kylin/cube/cli/DictionaryGeneratorCLI.java
+++
b/core-cube/src/main/java/org/apache/kylin/cube/cli/DictionaryGeneratorCLI.java
@@ -94,8 +94,12 @@ public class DictionaryGeneratorCLI {
cubeSeg = updatedCube.getSegmentById(cubeSeg.getUuid());
for (TableRef lookup : toCheckLookup) {
logger.info("Checking snapshot of " + lookup);
-JoinDesc join =
cubeSeg.getModel().getJoinsTree().getJoinByPKSide(lookup);
-cubeMgr.getLookupTable(cubeSeg, join);
+try {
+JoinDesc join =
cubeSeg.getModel().getJoinsTree().getJoinByPKSide(lookup);
+cubeMgr.getLookupTable(cubeSeg, join);
+} catch (Throwable th) {
+throw new RuntimeException("Checking snapshot of " + lookup +
" failed.", th);
+}
}
}
[kylin] branch master updated: KYLIN-3321, Set env MALLOC_ARENA_MAX=4 by default.
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push:
new 44ac227 KYLIN-3321, Set env MALLOC_ARENA_MAX=4 by default.
44ac227 is described below
commit 44ac227717303ae97b4f6a2bbb53ebc2fd928e64
Author: tttMelody <245915...@qq.com>
AuthorDate: Tue Jun 19 21:37:29 2018 +0800
KYLIN-3321, Set env MALLOC_ARENA_MAX=4 by default.
---
build/conf/setenv.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/build/conf/setenv.sh b/build/conf/setenv.sh
index bec9dc2..487b5ef 100755
--- a/build/conf/setenv.sh
+++ b/build/conf/setenv.sh
@@ -22,6 +22,12 @@
# (if your're deploying KYLIN on a powerful server and want to replace the
default conservative settings)
# uncomment following to for it to take effect
export KYLIN_JVM_SETTINGS="-Xms1024M -Xmx4096M -Xss1024K -XX:MaxPermSize=512M
-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps
-Xloggc:$KYLIN_HOME/logs/kylin.gc.$$ -XX:+UseGCLogFileRotation
-XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=64M"
+
+# Newer versions of glibc use an arena memory allocator that causes virtual
+# memory usage to explode. Tune the variable down to prevent vmem explosion.
+# See HADOOP-7154.
+export MALLOC_ARENA_MAX=${MALLOC_ARENA_MAX:-4}
+
# export KYLIN_JVM_SETTINGS="-Xms16g -Xmx16g -XX:MaxPermSize=512m
-XX:NewSize=3g -XX:MaxNewSize=3g -XX:SurvivorRatio=4
-XX:+CMSClassUnloadingEnabled -XX:+CMSParallelRemarkEnabled
-XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode
-XX:CMSInitiatingOccupancyFraction=70 -XX:+UseCMSInitiatingOccupancyOnly
-XX:+DisableExplicitGC -XX:+HeapDumpOnOutOfMemoryError -verbose:gc
-XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$KYLIN_HOME/logs/kylin.gc.$$
-XX:+UseGCLogFileRotation -XX:NumberOfGCLogFi [...]
# uncomment following to for it to take effect(the values need adjusting to
fit your env)
[kylin] branch master updated: KYLIN-3295, clean unused class:SQLDigestUtil
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push:
new 8325ae9 KYLIN-3295, clean unused class:SQLDigestUtil
8325ae9 is described below
commit 8325ae9abd278d3ce6eae2551403bf41ba9be35a
Author: tttMelody <245915...@qq.com>
AuthorDate: Tue May 29 12:29:53 2018 +0800
KYLIN-3295, clean unused class:SQLDigestUtil
---
.../kylin/metadata/realization/SQLDigestUtil.java | 137 -
1 file changed, 137 deletions(-)
diff --git
a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigestUtil.java
b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigestUtil.java
deleted file mode 100644
index a70a17e..000
---
a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigestUtil.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * 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.metadata.realization;
-
-import org.apache.kylin.common.util.DateFormat;
-import org.apache.kylin.metadata.datatype.DataType;
-import org.apache.kylin.metadata.filter.ColumnTupleFilter;
-import org.apache.kylin.metadata.filter.CompareTupleFilter;
-import org.apache.kylin.metadata.filter.ConstantTupleFilter;
-import org.apache.kylin.metadata.filter.LogicalTupleFilter;
-import org.apache.kylin.metadata.filter.TupleFilter;
-import org.apache.kylin.metadata.model.TblColRef;
-
-import com.google.common.base.Function;
-import com.google.common.collect.BoundType;
-import com.google.common.collect.Range;
-
-/**
- */
-public class SQLDigestUtil {
-
-public static T appendTsFilterToExecute(SQLDigest sqlDigest,
TblColRef partitionColRef, Range tsRange, Function action) {
-
-// add the boundary condition to query real-time
-TupleFilter originalFilter = sqlDigest.filter;
-sqlDigest.filter = createFilterForRealtime(originalFilter,
partitionColRef, tsRange);
-
-boolean addFilterColumn = false, addAllColumn = false;
-
-if (!sqlDigest.filterColumns.contains(partitionColRef)) {
-sqlDigest.filterColumns.add(partitionColRef);
-addFilterColumn = true;
-}
-
-if (!sqlDigest.allColumns.contains(partitionColRef)) {
-sqlDigest.allColumns.add(partitionColRef);
-addAllColumn = true;
-}
-
-T ret = action.apply(null);
-
-// restore the sqlDigest
-sqlDigest.filter = originalFilter;
-
-if (addFilterColumn)
-sqlDigest.filterColumns.remove(partitionColRef);
-
-if (addAllColumn)
-sqlDigest.allColumns.remove(partitionColRef);
-
-return ret;
-}
-
-//ts column type differentiate
-private static String formatTimeStr(DataType type, long ts) {
-String ret;
-if (type == DataType.getType("date")) {
-ret = DateFormat.formatToDateStr(ts);
-} else if (type == DataType.getType("long")) {
-ret = String.valueOf(ts);
-} else {
-throw new IllegalArgumentException("Illegal type for partition
column " + type);
-}
-return ret;
-}
-
-private static TupleFilter createFilterForRealtime(TupleFilter
originFilter, TblColRef partitionColRef, Range tsRange) {
-DataType type = partitionColRef.getColumnDesc().getType();
-
-String startTimeStr, endTimeStr;
-CompareTupleFilter startFilter = null, endFilter = null;
-if (tsRange.hasLowerBound()) {
-startTimeStr = formatTimeStr(type, tsRange.lowerEndpoint());
-if (tsRange.lowerBoundType() == BoundType.CLOSED) {
-startFilter = new
CompareTupleFilter(TupleFilter.FilterOperatorEnum.GTE);
-} else {
-startFilter = new
CompareTupleFilter(TupleFilter.FilterOperatorEnum.GT);
-}
-ColumnTupleFilter columnTupleFilter = new
ColumnTupleFilter(partitionColRef);
-ConstantTupleFilter constantTupleFilter = new
ConstantTupleFilter(startTimeS
[kylin] branch document updated: add redash-kylin plugin from strikingly
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch document in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/document by this push: new 050aa45 add redash-kylin plugin from strikingly 050aa45 is described below commit 050aa454fefb5acf31e4977ea3408ee396b99fe1 Author: Billy Liu <billy...@apache.org> AuthorDate: Tue May 8 18:34:04 2018 +0800 add redash-kylin plugin from strikingly --- .../2018-05-08-redash-kylin-plugin-strikingly.md | 42 + website/images/blog/redash/redash_1.jpeg | Bin 0 -> 371859 bytes website/images/blog/redash/redash_2.jpeg | Bin 0 -> 420526 bytes website/images/blog/redash/redash_3.jpeg | Bin 0 -> 300777 bytes website/images/blog/redash/redash_4.jpeg | Bin 0 -> 400477 bytes 5 files changed, 42 insertions(+) diff --git a/website/_posts/blog/2018-05-08-redash-kylin-plugin-strikingly.md b/website/_posts/blog/2018-05-08-redash-kylin-plugin-strikingly.md new file mode 100644 index 000..70f765d --- /dev/null +++ b/website/_posts/blog/2018-05-08-redash-kylin-plugin-strikingly.md @@ -0,0 +1,42 @@ +--- +layout: post-blog +title: Redash-Kylin plugin from Strikingly +date: 2018-05-08 20:00:00 +author: Chase Zhang +categories: blog +--- + +At strikingly, we are using Apache Kylin as our OLAP engine. Kylin is very powerful and it supports our big data business well. We've chosen Apache Kylin because it fits our demand: it handles a huge amount of data, undertakes multiple concurrent queries and has sub-second response time. + +Although we are mainly using Kylin to provide service to our customers, we've decided to reuse the built result for internal purposes too. Kylin supports Business Intelligence tools like Apache Zeppelin and Tableau. With these BI tools we can provide insight and visualization about our data which will help making business decisions. + +Other than those BI tools mentioned above, we're using another similar application named Redash because: + +1. We've already had a deployment of redash for data analyzing upon traditional databases like PostgreSQL, etc + +2. Redash is open source and easy to deploy, rich in visualization functions and has good integrations with other productivity tools we are using (like Slack). + +Unfortunately, redash doesn't officially support Kylin as a data source for now. Thus we wrote a simple one to include it. The plugin has already been open sourced under BSD-2 license as a [GitHub repository](https://github.com/strikingly/redash-kylin). + +The redash-kylin plugin is just a single piece of python file which implements redash's data source protocol. To install, retrieve the `kylin.py` file inside `redash/query_runner` folder of the plugin's repository and place it under corresponding folder of redash. + + + +Before you can use the plugin, you need to enable it first. Please modify the default enabled plugin list defined in `redash/settings.py`: + + + +At last you have to rebuild the docker image (if you are using docker deployment) of redash and restart both server and worker of it. Currently, the redash-kylin plugin only supports the current stable version of redash (3.0.0) and 2.x version of Apache Kylin. + +Once installed successfully, you'll be able to find a KylinAPI data source type at the New Data Source page. To use it, just select that source type and fill in required fields. The redash-kylin plugin works by calling Kylin's HTTP RESTful API, thus you should make sure your redash deployment has an access to your Kylin cluster (either job mode or query mode). + + + +After a data source is setup and the connection is tested ok. You should be able to view schemas, run queries and make visualizations from tables in Kylin. Just type the SQL query in and get the result out. For more details about redash's usage, please refer to [redash's documentation](https://redash.io/help/). + + + + +You can also add multiple data sources by setting different project names or different API URLs. It's worth to mention that redash has an experiment function which supports making a query from former cached query results. Thus, once query results from different Kylin cluster has been imported, you'll be able to join them together for richer data processing. + +Wish you have a good time with Redash-Kylin! \ No newline at end of file diff --git a/website/images/blog/redash/redash_1.jpeg b/website/images/blog/redash/redash_1.jpeg new file mode 100644 index 000..20b63eb Binary files /dev/null and b/website/images/blog/redash/redash_1.jpeg differ diff --git a/website/images/blog/redash/redash_2.jpeg b/website/images/blog/redash/redash_2.jpeg new file mode 100644 inde
[kylin] branch document updated: update contributor
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch document in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/document by this push: new 0276b9f update contributor 0276b9f is described below commit 0276b9f16116499b358dac18294e411756e3ac02 Author: Billy Liu <billy...@apache.org> AuthorDate: Tue Apr 17 14:34:38 2018 +0800 update contributor --- website/_data/contributors.yml | 5 + 1 file changed, 5 insertions(+) diff --git a/website/_data/contributors.yml b/website/_data/contributors.yml index 2b4859b..db2d397 100644 --- a/website/_data/contributors.yml +++ b/website/_data/contributors.yml @@ -165,4 +165,9 @@ githubId: pengjianhua org: ZTE Corporation role: committer +- name: Julian Pan (潘俍欣) + apacheId: julianpan + githubId: sanjulian + org: eBay Inc. + role: committer -- To stop receiving notification emails like this one, please contact billy...@apache.org.
[kylin] branch master updated: KYLIN-3339, decoupling SQL keywords set with specify implementation.
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push:
new 7540cbd KYLIN-3339, decoupling SQL keywords set with specify
implementation.
7540cbd is described below
commit 7540cbd29ade23771c97c0837a5cf650a822b052
Author: tttMelody <245915...@qq.com>
AuthorDate: Wed Apr 11 20:37:48 2018 +0800
KYLIN-3339, decoupling SQL keywords set with specify implementation.
---
.../source/adhocquery/HivePushDownConverter.java | 89 ++---
.../source/adhocquery/IPushDownConverter.java | 106 +
2 files changed, 115 insertions(+), 80 deletions(-)
diff --git
a/core-metadata/src/main/java/org/apache/kylin/source/adhocquery/HivePushDownConverter.java
b/core-metadata/src/main/java/org/apache/kylin/source/adhocquery/HivePushDownConverter.java
index 2f98304..5fbb86f 100644
---
a/core-metadata/src/main/java/org/apache/kylin/source/adhocquery/HivePushDownConverter.java
+++
b/core-metadata/src/main/java/org/apache/kylin/source/adhocquery/HivePushDownConverter.java
@@ -17,8 +17,12 @@
*/
package org.apache.kylin.source.adhocquery;
+import static com.google.common.base.Predicates.equalTo;
+import static com.google.common.base.Predicates.not;
+
import java.util.HashMap;
import java.util.Map;
+import java.util.Set;
import java.util.Stack;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -26,7 +30,7 @@ import java.util.regex.Pattern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.FluentIterable;
//TODO: Some workaround ways to make sql readable by hive parser, should
replaced it with a more well-designed way
public class HivePushDownConverter implements IPushDownConverter {
@@ -47,85 +51,10 @@ public class HivePushDownConverter implements
IPushDownConverter {
.compile("timestamp(add|diff)\\s*\\(\\s*(.*?)\\s*,",
Pattern.CASE_INSENSITIVE);
private static final Pattern SELECT_PATTERN = Pattern.compile("^select",
Pattern.CASE_INSENSITIVE);
private static final Pattern LIMIT_PATTERN =
Pattern.compile("(limit\\s+[0-9;]+)$", Pattern.CASE_INSENSITIVE);
-private static final ImmutableSet sqlKeyWordsExceptAS =
ImmutableSet.of("A", "ABS", "ABSOLUTE", "ACTION",
-"ADA", "ADD", "ADMIN", "AFTER", "ALL", "ALLOCATE", "ALLOW",
"ALTER", "ALWAYS", "AND", "ANY", "APPLY", "ARE",
-"ARRAY", "ARRAY_MAX_CARDINALITY", "ASC", "ASENSITIVE",
"ASSERTION", "ASSIGNMENT", "ASYMMETRIC", "AT",
-"ATOMIC", "ATTRIBUTE", "ATTRIBUTES", "AUTHORIZATION", "AVG",
"BEFORE", "BEGIN", "BEGIN_FRAME",
-"BEGIN_PARTITION", "BERNOULLI", "BETWEEN", "BIGINT", "BINARY",
"BIT", "BLOB", "BOOLEAN", "BOTH", "BREADTH",
-"BY", "C", "CALL", "CALLED", "CARDINALITY", "CASCADE", "CASCADED",
"CASE", "CAST", "CATALOG",
-"CATALOG_NAME", "CEIL", "CEILING", "CENTURY", "CHAIN", "CHAR",
"CHARACTER", "CHARACTERISTICS", "CHARACTERS",
-"CHARACTER_LENGTH", "CHARACTER_SET_CATALOG", "CHARACTER_SET_NAME",
"CHARACTER_SET_SCHEMA", "CHAR_LENGTH",
-"CHECK", "CLASSIFIER", "CLASS_ORIGIN", "CLOB", "CLOSE",
"COALESCE", "COBOL", "COLLATE", "COLLATION",
-"COLLATION_CATALOG", "COLLATION_NAME", "COLLATION_SCHEMA",
"COLLECT", "COLUMN", "COLUMN_NAME",
-"COMMAND_FUNCTION", "COMMAND_FUNCTION_CODE", "COMMIT",
"COMMITTED", "CONDITION", "CONDITION_NUMBER",
-"CONNECT", "CONNECTION", "CONNECTION_NAME", "CONSTRAINT",
"CONSTRAINTS", "CONSTRAINT_CATALOG",
-"CONSTRAINT_NAME", "CONSTRAINT_SCHEMA", "CONSTRUCTOR", "CONTAINS",
"CONTINUE", "CONVERT", "CORR",
-"CORRESPONDING", "COUNT", "COVAR_POP", "COVAR_SAMP"
[kylin] branch document updated: update download page
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch document in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/document by this push: new 77fd5a4 update download page 77fd5a4 is described below commit 77fd5a45063c57a54ba3cdbfa40788542586 Author: Billy Liu <billy...@apache.org> AuthorDate: Wed Mar 28 18:12:52 2018 +0800 update download page --- website/download/index.cn.md | 8 website/download/index.md| 10 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/website/download/index.cn.md b/website/download/index.cn.md index 0c43e80..0e1b5be 100644 --- a/website/download/index.cn.md +++ b/website/download/index.cn.md @@ -5,13 +5,13 @@ title: 下载 您可以按照这些[步骤](https://www.apache.org/info/verification.html) 并使用这些[KEYS](https://kylin.apache.org/KEYS)来验证下载文件的有效性. -## 2.3.0 +## 2.3.1 - [Release notes](/docs23/release_notes.html) 和 [升级指南](/docs23/howto/howto_upgrade.html) -- 源代码下载: [apache-kylin-2.3.0-src.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-src.tar.gz) \[[asc](https://www.apache.org/dist/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-src.tar.gz.asc)\] \[[md5](https://www.apache.org/dist/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-src.tar.gz.md5)\] +- 源代码下载: [apache-kylin-2.3.1-src.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-src.tar.gz) \[[asc](https://www.apache.org/dist/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-src.tar.gz.asc)\] \[[sha1](https://www.apache.org/dist/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-src.tar.gz.sha1)\] - 二进制包下载: - - for HBase 1.x (includes HDP 2.3+, AWS EMR 5.0+, Azure HDInsight 3.4 - 3.6) - [apache-kylin-2.3.0-bin-hbase1x.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-hbase1x-bin.tar.gz) \[[asc](https://www.apache.org/dist/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-hbase1x-bin.tar.gz.asc)\] \[[md5](https://www.apache.org/dist/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-hbase1x-bin.tar.gz.md5)\] - - for CDH 5.7+ - [apache-kylin-2.3.0-bin-cdh57.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-cdh57-bin.tar.gz) \[[asc](https://www.apache.org/dist/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-cdh57-bin.tar.gz.asc)\] \[[md5](https://www.apache.org/dist/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-cdh57-bin.tar.gz.md5)\] + - for HBase 1.x (includes HDP 2.3+, AWS EMR 5.0+, Azure HDInsight 3.4 - 3.6) - [apache-kylin-2.3.1-bin-hbase1x.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-hbase1x-bin.tar.gz) \[[asc](https://www.apache.org/dist/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-hbase1x-bin.tar.gz.asc)\] \[[sha1](https://www.apache.org/dist/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-hbase1x-bin.tar.gz.sha1)\] + - for CDH 5.7+ - [apache-kylin-2.3.1-bin-cdh57.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-cdh57-bin.tar.gz) \[[asc](https://www.apache.org/dist/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-cdh57-bin.tar.gz.asc)\] \[[sha1](https://www.apache.org/dist/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-cdh57-bin.tar.gz.sha1)\] ## 以前的版本 Apache Kylin的旧版本可以从 [https://archive.apache.org/dist/kylin/](https://archive.apache.org/dist/kylin/) 下载。 diff --git a/website/download/index.md b/website/download/index.md index 2056f65..97730d4 100644 --- a/website/download/index.md +++ b/website/download/index.md @@ -6,13 +6,13 @@ permalink: /download/index.html You can verify the download by following these [procedures](https://www.apache.org/info/verification.html) and using these [KEYS](https://kylin.apache.org/KEYS). -## 2.3.0 -- This is a major release after 2.2.0, with more than 250 bug fixes and enhancements. For the detail list please check release notes. +## 2.3.1 +- This is a bug fix release after 2.3.0, with 12 bug fixes and enhancements. For the detail list please check release notes. - [Release notes](/docs23/release_notes.html) and [upgrade guide](/docs23/howto/howto_upgrade.html) -- Source download: [apache-kylin-2.3.0-src.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-src.tar.gz) \[[asc](https://www.apache.org/dist/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-src.tar.gz.asc)\] \[[md5](https://www.apache.org/dist/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-src.tar.gz.md5)\] +- Source download: [apache-kylin-2.3.1-src.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-src.tar.gz) \[[asc](https://www.apache.org/dist/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-src.tar.gz.asc)\] \[[sha1](https://www.apache.org/dist/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-src.tar.gz.sha1)\] - Binary download: - - for HBase 1.x (includ
[kylin] branch document updated: update release notes for 2.3.1
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch document in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/document by this push: new 46d72f6 update release notes for 2.3.1 46d72f6 is described below commit 46d72f696baae4fe3330bddad5fab2d21ca78b00 Author: Billy Liu <billy...@apache.org> AuthorDate: Wed Mar 28 11:34:30 2018 +0800 update release notes for 2.3.1 --- website/_docs23/release_notes.md | 21 + 1 file changed, 21 insertions(+) diff --git a/website/_docs23/release_notes.md b/website/_docs23/release_notes.md index 40eea53..77e59fe 100644 --- a/website/_docs23/release_notes.md +++ b/website/_docs23/release_notes.md @@ -15,6 +15,27 @@ 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) +## v2.3.1 - 2018-03-28 +_Tag:_ [kylin-2.3.1](https://github.com/apache/kylin/tree/kylin-2.3.1) +This is a bug fix release after 2.3.0, with 12 bug fixes and enhancement. Check [How to upgrade](/docs23/howto/howto_upgrade.html). + +__Improvement__ +* [KYLIN-3233] - CacheController can not handle if cacheKey has "/" +* [KYLIN-3278] - Kylin should not distribute hive table by random at Step1 +* [KYLIN-3300] - Upgrade jackson-databind to 2.6.7.1 with security issue fixed +* [KYLIN-3301] - Upgrade opensaml to 2.6.6 with security issue fixed + +__Bug__ +* [KYLIN-3270] - Fix the blocking issue in Cube optimizing job +* [KYLIN-3276] - Fix the query cache bug with dynamic parameter +* [KYLIN-3288] - "Sqoop To Flat Hive Table" step should specify "mapreduce.queue.name" +* [KYLIN-3306] - Fix the rarely happened unit test exception of generic algorithm +* [KYLIN-3287] - When a shard by column is in dict encoding, dict building error. +* [KYLIN-3280] - The delete button should not be enabled without any segment in cube segment delete confirm dialog +* [KYLIN-3119] - A few bugs in the function 'massageSql' of 'QueryUtil.java' +* [KYLIN-3236] - The function 'reGenerateAdvancedDict()' has an error logical judgment, which will cause an exception when you edit the cube. + + ## v2.3.0 - 2018-03-04 _Tag:_ [kylin-2.3.0](https://github.com/apache/kylin/tree/kylin-2.3.0) This is a major release after 2.2, with more than 250 bug fixes and enhancement. Check [How to upgrade](/docs23/howto/howto_upgrade.html). -- To stop receiving notification emails like this one, please contact billy...@apache.org.
svn commit: r26004 - /release/kylin/apache-kylin-2.3.1/
Author: billyliu Date: Wed Mar 28 02:10:10 2018 New Revision: 26004 Log: checkin release artifacts for Kylin 2.3.1 Added: release/kylin/apache-kylin-2.3.1/ release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-cdh57-bin.tar.gz (with props) release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-cdh57-bin.tar.gz.asc (with props) release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-cdh57-bin.tar.gz.md5 release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-cdh57-bin.tar.gz.sha1 release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-hbase1x-bin.tar.gz (with props) release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-hbase1x-bin.tar.gz.asc (with props) release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-hbase1x-bin.tar.gz.md5 release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-hbase1x-bin.tar.gz.sha1 release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-src.tar.gz (with props) release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-src.tar.gz.asc (with props) release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-src.tar.gz.asc.md5 release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-src.tar.gz.asc.sha1 release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-src.tar.gz.md5 release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-src.tar.gz.sha1 Added: release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-cdh57-bin.tar.gz == Binary file - no diff available. Propchange: release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-cdh57-bin.tar.gz -- svn:mime-type = application/x-gzip Added: release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-cdh57-bin.tar.gz.asc == Binary file - no diff available. Propchange: release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-cdh57-bin.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-cdh57-bin.tar.gz.md5 == --- release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-cdh57-bin.tar.gz.md5 (added) +++ release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-cdh57-bin.tar.gz.md5 Wed Mar 28 02:10:10 2018 @@ -0,0 +1 @@ +dc6ed72c4d4e68c9c906813dd8842249 apache-kylin-2.3.1-cdh57-bin.tar.gz Added: release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-cdh57-bin.tar.gz.sha1 == --- release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-cdh57-bin.tar.gz.sha1 (added) +++ release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-cdh57-bin.tar.gz.sha1 Wed Mar 28 02:10:10 2018 @@ -0,0 +1 @@ +fc9798c2c76104c089997c2c17c86657d1c6eeb2 apache-kylin-2.3.1-cdh57-bin.tar.gz Added: release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-hbase1x-bin.tar.gz == Binary file - no diff available. Propchange: release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-hbase1x-bin.tar.gz -- svn:mime-type = application/x-gzip Added: release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-hbase1x-bin.tar.gz.asc == Binary file - no diff available. Propchange: release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-hbase1x-bin.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-hbase1x-bin.tar.gz.md5 == --- release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-hbase1x-bin.tar.gz.md5 (added) +++ release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-hbase1x-bin.tar.gz.md5 Wed Mar 28 02:10:10 2018 @@ -0,0 +1 @@ +39b9d2652bd7a7ffcdaeb8213758e5d2 apache-kylin-2.3.1-hbase1x-bin.tar.gz Added: release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-hbase1x-bin.tar.gz.sha1 == --- release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-hbase1x-bin.tar.gz.sha1 (added) +++ release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-hbase1x-bin.tar.gz.sha1 Wed Mar 28 02:10:10 2018 @@ -0,0 +1 @@ +0c94869bdd6820e66885b2bfa1bd9274f46dbdc6 apache-kylin-2.3.1-hbase1x-bin.tar.gz Added: release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-src.tar.gz == Binary file - no diff available. Propchange: release/kylin/apache-kylin-2.3.1/apache-kylin-2.3.1-src.tar.gz
[kylin] branch master updated: KYLIN-3293, fix FixedLenHexDimEnc that return a wrong code length leads to cut bytes error.
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push:
new 8350de4 KYLIN-3293, fix FixedLenHexDimEnc that return a wrong code
length leads to cut bytes error.
8350de4 is described below
commit 8350de4493ac792a62878a1aebf6588b3119e4bb
Author: Jiatao Tao <245915...@qq.com>
AuthorDate: Fri Mar 16 22:15:51 2018 +0800
KYLIN-3293, fix FixedLenHexDimEnc that return a wrong code length leads to
cut bytes error.
---
.../cube/gridtable/TrimmedCubeCodeSystem.java | 4 +--
.../kylin/gridtable/TrimmedCubeCodeSystemTest.java | 41 ++
.../apache/kylin/dimension/FixedLenHexDimEnc.java | 6 ++--
3 files changed, 47 insertions(+), 4 deletions(-)
diff --git
a/core-cube/src/main/java/org/apache/kylin/cube/gridtable/TrimmedCubeCodeSystem.java
b/core-cube/src/main/java/org/apache/kylin/cube/gridtable/TrimmedCubeCodeSystem.java
index a0b230e..261e501 100644
---
a/core-cube/src/main/java/org/apache/kylin/cube/gridtable/TrimmedCubeCodeSystem.java
+++
b/core-cube/src/main/java/org/apache/kylin/cube/gridtable/TrimmedCubeCodeSystem.java
@@ -51,7 +51,7 @@ public class TrimmedCubeCodeSystem extends CubeCodeSystem {
serializer.serialize(value, buf);
}
-private static void writeDimensionEncoding(DimensionEncoding encoding,
ByteBuffer out) {
+public static void writeDimensionEncoding(DimensionEncoding encoding,
ByteBuffer out) {
try {
if (encoding == null) {
BytesUtil.writeVInt(1, out);
@@ -71,7 +71,7 @@ public class TrimmedCubeCodeSystem extends CubeCodeSystem {
}
}
-private static DimensionEncoding readDimensionEncoding(ByteBuffer in) {
+public static DimensionEncoding readDimensionEncoding(ByteBuffer in) {
try {
int isNull = BytesUtil.readVInt(in);
if (isNull == 1) {
diff --git
a/core-cube/src/test/java/org/apache/kylin/gridtable/TrimmedCubeCodeSystemTest.java
b/core-cube/src/test/java/org/apache/kylin/gridtable/TrimmedCubeCodeSystemTest.java
new file mode 100644
index 000..dc3c762
--- /dev/null
+++
b/core-cube/src/test/java/org/apache/kylin/gridtable/TrimmedCubeCodeSystemTest.java
@@ -0,0 +1,41 @@
+/*
+ * 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.gridtable;
+
+import static
org.apache.kylin.cube.gridtable.TrimmedCubeCodeSystem.readDimensionEncoding;
+import static
org.apache.kylin.cube.gridtable.TrimmedCubeCodeSystem.writeDimensionEncoding;
+
+import java.nio.ByteBuffer;
+
+import org.apache.kylin.dimension.DimensionEncoding;
+import org.apache.kylin.dimension.FixedLenHexDimEnc;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TrimmedCubeCodeSystemTest {
+@Test
+public void testFixLenHexEncSerDser() {
+FixedLenHexDimEnc enc = new FixedLenHexDimEnc(6);
+ByteBuffer buff = ByteBuffer.allocate(1024);
+writeDimensionEncoding(enc, buff);
+buff.flip();
+DimensionEncoding dimensionEncoding = readDimensionEncoding(buff);
+Assert.assertEquals(3,
dimensionEncoding.asDataTypeSerializer().peekLength(null));
+}
+}
diff --git
a/core-metadata/src/main/java/org/apache/kylin/dimension/FixedLenHexDimEnc.java
b/core-metadata/src/main/java/org/apache/kylin/dimension/FixedLenHexDimEnc.java
index a931450..1d7e3c9 100644
---
a/core-metadata/src/main/java/org/apache/kylin/dimension/FixedLenHexDimEnc.java
+++
b/core-metadata/src/main/java/org/apache/kylin/dimension/FixedLenHexDimEnc.java
@@ -40,7 +40,7 @@ import com.google.common.base.Preconditions;
*
* 1. "" will become null encode and decode
* 2. "AB" will become "AB00"
- *
+ *
*
* Due to these limitations hex representation of hash values(with no padding,
better with even characters) is more suitable
*/
@@ -166,7 +166,7 @@ public class FixedLenHexDimEnc extends DimensionEncoding
implements Serializable
byte[] value = Bytes.toBytes(valueStr);
int valueLen = value
[kylin] branch document updated: KYLIN-3305 Fix typos `kylin.job.run.as.remote.cmd` to `kylin.job.use-remote-cli`
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch document in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/document by this push: new 337f2d0 KYLIN-3305 Fix typos `kylin.job.run.as.remote.cmd` to `kylin.job.use-remote-cli` 337f2d0 is described below commit 337f2d07599b90063ce0ecb5e45b2107dd78e63c Author: Yongjie Zhao <yongjie.z...@gmail.com> AuthorDate: Wed Mar 21 13:33:20 2018 +0800 KYLIN-3305 Fix typos `kylin.job.run.as.remote.cmd` to `kylin.job.use-remote-cli` --- website/_dev/dev_env.md| 2 +- website/_dev/howto_test.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/_dev/dev_env.md b/website/_dev/dev_env.md index b219f39..e604b81 100644 --- a/website/_dev/dev_env.md +++ b/website/_dev/dev_env.md @@ -81,7 +81,7 @@ Local configuration must be modified to point to your hadoop sandbox (or CLI) ma * In **examples/test_case_data/sandbox/kylin.properties** * Find `sandbox` and replace with your hadoop hosts (if you're using HDP sandbox, this can be skipped) - * Find `kylin.job.run.as.remote.cmd` and change it to "true" (in code repository the default is false, which assume running it on hadoop CLI) + * Find `kylin.job.use-remote-cli` and change it to "true" (in code repository the default is false, which assume running it on hadoop CLI) * Find `kylin.job.remote.cli.username` and `kylin.job.remote.cli.password`, fill in the user name and password used to login hadoop cluster for hadoop command execution; If you're using HDP sandbox, the default username is `root` and password is `hadoop`. * In **examples/test_case_data/sandbox** diff --git a/website/_dev/howto_test.md b/website/_dev/howto_test.md index 88b1649..1d52ef2 100644 --- a/website/_dev/howto_test.md +++ b/website/_dev/howto_test.md @@ -52,7 +52,7 @@ If your sandbox is already provisioned and your code change will not affect the ### Cube Provision -Environment cube provision is indeed running kylin cubing jobs to prepare example cubes in the sandbox. These prepared cubes will be used by the ITs. Currently provision step is bound with the maven pre-integration-test phase, and it contains running BuildCubeWithEngine (HBase required), BuildCubeWithStream(Kafka required) and BuildIIWithStream(Kafka Required). You can run the mvn commands on you sandbox or your develop computer. For the latter case you need to set kylin.job.run.as.remot [...] +Environment cube provision is indeed running kylin cubing jobs to prepare example cubes in the sandbox. These prepared cubes will be used by the ITs. Currently provision step is bound with the maven pre-integration-test phase, and it contains running BuildCubeWithEngine (HBase required), BuildCubeWithStream(Kafka required) and BuildIIWithStream(Kafka Required). You can run the mvn commands on you sandbox or your develop computer. For the latter case you need to set kylin.job.use-remote-c [...] Try appending `-DfastBuildMode=true` to mvn verify command to speed up provision by skipping incremental cubing. ## More on v1.3 Mini Cluster -- To stop receiving notification emails like this one, please contact billy...@apache.org.
svn commit: r25938 - in /dev/kylin/apache-kylin-2.3.1-rc1: apache-kylin-2.3.1-rc1-cdh57-bin.tar.gz apache-kylin-2.3.1-rc1-hbase1x-bin.tar.gz
Author: billyliu Date: Sat Mar 24 17:46:22 2018 New Revision: 25938 Log: Upload release artifacts to staging for Kylin 2.3.1 Added: dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-rc1-cdh57-bin.tar.gz (with props) dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-rc1-hbase1x-bin.tar.gz (with props) Added: dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-rc1-cdh57-bin.tar.gz == Binary file - no diff available. Propchange: dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-rc1-cdh57-bin.tar.gz -- svn:mime-type = application/x-gzip Added: dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-rc1-hbase1x-bin.tar.gz == Binary file - no diff available. Propchange: dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-rc1-hbase1x-bin.tar.gz -- svn:mime-type = application/x-gzip
svn commit: r25937 - /dev/kylin/apache-kylin-2.3.1-rc1/
Author: billyliu Date: Sat Mar 24 17:15:01 2018 New Revision: 25937 Log: Upload release artifacts to staging Kylin 2.3.1 rc1 Added: dev/kylin/apache-kylin-2.3.1-rc1/ dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz (with props) dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz.asc (with props) dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz.asc.md5 dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz.asc.sha1 dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz.md5 dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz.sha1 Added: dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz == Binary file - no diff available. Propchange: dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz -- svn:mime-type = application/x-gzip Added: dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz.asc == Binary file - no diff available. Propchange: dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz.asc.md5 == --- dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz.asc.md5 (added) +++ dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz.asc.md5 Sat Mar 24 17:15:01 2018 @@ -0,0 +1 @@ +ba562929956e877782064237e6010afa \ No newline at end of file Added: dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz.asc.sha1 == --- dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz.asc.sha1 (added) +++ dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz.asc.sha1 Sat Mar 24 17:15:01 2018 @@ -0,0 +1 @@ +3441693f75ab68db2baf7172a5a256148614cfba \ No newline at end of file Added: dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz.md5 == --- dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz.md5 (added) +++ dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz.md5 Sat Mar 24 17:15:01 2018 @@ -0,0 +1 @@ +541d8dff9e5caaae349cf61ad394b0d6 \ No newline at end of file Added: dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz.sha1 == --- dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz.sha1 (added) +++ dev/kylin/apache-kylin-2.3.1-rc1/apache-kylin-2.3.1-src.tar.gz.sha1 Sat Mar 24 17:15:01 2018 @@ -0,0 +1 @@ +7ff10d1770d05a8324252547f95adde990bde9dc \ No newline at end of file
[kylin] branch 2.3.x updated: manual update htrace to 2.3.2-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch 2.3.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/2.3.x by this push:
new 35df4d1 manual update htrace to 2.3.2-SNAPSHOT
35df4d1 is described below
commit 35df4d11542a50107757b7f80f87b71fd287f2db
Author: Billy Liu <billy...@apache.org>
AuthorDate: Sun Mar 25 00:59:25 2018 +0800
manual update htrace to 2.3.2-SNAPSHOT
---
external/htrace/pom.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/external/htrace/pom.xml b/external/htrace/pom.xml
index d493b98..5c0516e 100644
--- a/external/htrace/pom.xml
+++ b/external/htrace/pom.xml
@@ -28,7 +28,7 @@
org.apache.kylin
kylin
-2.3.1
+2.3.2-SNAPSHOT
../../pom.xml
diff --git a/pom.xml b/pom.xml
index 3bb9587..e089673 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,7 +200,7 @@
org.apache.kylin
kylin-external-htrace
-2.3.2-SNAPSHOT
+${project.version}
org.apache.kylin
--
To stop receiving notification emails like this one, please contact
billy...@apache.org.
[kylin] 02/02: [maven-release-plugin] prepare release kylin-2.3.1
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch 2.3.x in repository https://gitbox.apache.org/repos/asf/kylin.git commit 928cc1628c546efe7ec348c467f5d26607c8d7e6 Author: Billy Liu <billy...@apache.org> AuthorDate: Sat Mar 24 16:44:29 2018 + [maven-release-plugin] prepare release kylin-2.3.1 --- assembly/pom.xml | 2 +- atopcalcite/pom.xml| 2 +- core-common/pom.xml| 2 +- core-cube/pom.xml | 2 +- core-dictionary/pom.xml| 2 +- core-job/pom.xml | 2 +- core-metadata/pom.xml | 2 +- core-metrics/pom.xml | 2 +- core-storage/pom.xml | 2 +- engine-mr/pom.xml | 2 +- engine-spark/pom.xml | 2 +- external/pom.xml | 2 +- jdbc/pom.xml | 2 +- kylin-it/pom.xml | 2 +- metrics-reporter-hive/pom.xml | 2 +- metrics-reporter-kafka/pom.xml | 2 +- pom.xml| 6 +++--- query/pom.xml | 2 +- server-base/pom.xml| 2 +- server/pom.xml | 2 +- source-hive/pom.xml| 2 +- source-kafka/pom.xml | 2 +- storage-hbase/pom.xml | 2 +- tomcat-ext/pom.xml | 2 +- tool-assembly/pom.xml | 2 +- tool/pom.xml | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 541778b..3563271 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -26,7 +26,7 @@ kylin org.apache.kylin -2.3.1-SNAPSHOT +2.3.1 diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml index 606c439..238ea60 100644 --- a/atopcalcite/pom.xml +++ b/atopcalcite/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1-SNAPSHOT +2.3.1 diff --git a/core-common/pom.xml b/core-common/pom.xml index 1f9af5a..cb1775c 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1-SNAPSHOT +2.3.1 diff --git a/core-cube/pom.xml b/core-cube/pom.xml index 681e634..51e3937 100644 --- a/core-cube/pom.xml +++ b/core-cube/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1-SNAPSHOT +2.3.1 diff --git a/core-dictionary/pom.xml b/core-dictionary/pom.xml index 156bac6..6813b31 100644 --- a/core-dictionary/pom.xml +++ b/core-dictionary/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1-SNAPSHOT +2.3.1 diff --git a/core-job/pom.xml b/core-job/pom.xml index fdb3741..cffc792 100644 --- a/core-job/pom.xml +++ b/core-job/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1-SNAPSHOT +2.3.1 diff --git a/core-metadata/pom.xml b/core-metadata/pom.xml index 70620a0..c635a12 100644 --- a/core-metadata/pom.xml +++ b/core-metadata/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1-SNAPSHOT +2.3.1 diff --git a/core-metrics/pom.xml b/core-metrics/pom.xml index cdd4443..5d41b16 100644 --- a/core-metrics/pom.xml +++ b/core-metrics/pom.xml @@ -28,7 +28,7 @@ kylin org.apache.kylin -2.3.1-SNAPSHOT +2.3.1 diff --git a/core-storage/pom.xml b/core-storage/pom.xml index c05cdfe..ae9b883 100644 --- a/core-storage/pom.xml +++ b/core-storage/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1-SNAPSHOT +2.3.1 diff --git a/engine-mr/pom.xml b/engine-mr/pom.xml index cc9f5dc..ef4d6d6 100644 --- a/engine-mr/pom.xml +++ b/engine-mr/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1-SNAPSHOT +2.3.1 diff --git a/engine-spark/pom.xml b/engine-spark/pom.xml index a3dd727..d54b4d1 100644 --- a/engine-spark/pom.xml +++ b/engine-spark/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1-SNAPSHOT +2.3.1 diff --git a/external/pom.xml b/external/pom.xml index dcc053d..0f4fa40 100644 --- a/external/pom.xml +++ b/external/pom.xml @@ -26,7 +26,7 @@ org.apache.kylin kylin -2.3.1-SNAPSHOT +2.3.1 diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 4efff2c..88ccf2e 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1-SNAPSHOT +2.3.1 diff --git a/kylin-it/pom.xml b/kylin-it/pom.xml index 4a03f86..602c34e 100644 --- a/kylin-it/pom.xml +++ b/kylin-it/pom.xml @@ -29,7 +29,7 @@ kylin org.apache.kylin -2.3.1-SNAPSHOT +2.3.1 diff --git a/metrics-reporter-hive/pom
[kylin] 01/02: manual update htrace to 2.3.1
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch 2.3.x in repository https://gitbox.apache.org/repos/asf/kylin.git commit 46be6530bea076433c24069e4bbc716bc498c79c Author: Billy Liu <billy...@apache.org> AuthorDate: Sat Mar 24 16:36:27 2018 + manual update htrace to 2.3.1 --- external/htrace/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/htrace/pom.xml b/external/htrace/pom.xml index f7bf8f2..d493b98 100644 --- a/external/htrace/pom.xml +++ b/external/htrace/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1-SNAPSHOT +2.3.1 ../../pom.xml -- To stop receiving notification emails like this one, please contact billy...@apache.org.
[kylin] branch 2.3.x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch 2.3.x in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/2.3.x by this push: new 7fbd11a [maven-release-plugin] prepare for next development iteration 7fbd11a is described below commit 7fbd11a3a6b57ce08f30b5b69bb014aaeae3931b Author: Billy Liu <billy...@apache.org> AuthorDate: Sat Mar 24 16:44:48 2018 + [maven-release-plugin] prepare for next development iteration --- assembly/pom.xml | 2 +- atopcalcite/pom.xml| 2 +- core-common/pom.xml| 2 +- core-cube/pom.xml | 2 +- core-dictionary/pom.xml| 2 +- core-job/pom.xml | 2 +- core-metadata/pom.xml | 2 +- core-metrics/pom.xml | 2 +- core-storage/pom.xml | 2 +- engine-mr/pom.xml | 2 +- engine-spark/pom.xml | 2 +- external/pom.xml | 2 +- jdbc/pom.xml | 2 +- kylin-it/pom.xml | 2 +- metrics-reporter-hive/pom.xml | 2 +- metrics-reporter-kafka/pom.xml | 2 +- pom.xml| 6 +++--- query/pom.xml | 2 +- server-base/pom.xml| 2 +- server/pom.xml | 2 +- source-hive/pom.xml| 2 +- source-kafka/pom.xml | 2 +- storage-hbase/pom.xml | 2 +- tomcat-ext/pom.xml | 2 +- tool-assembly/pom.xml | 2 +- tool/pom.xml | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 3563271..977ca73 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -26,7 +26,7 @@ kylin org.apache.kylin -2.3.1 +2.3.2-SNAPSHOT diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml index 238ea60..cb76178 100644 --- a/atopcalcite/pom.xml +++ b/atopcalcite/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1 +2.3.2-SNAPSHOT diff --git a/core-common/pom.xml b/core-common/pom.xml index cb1775c..1f2db9a 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1 +2.3.2-SNAPSHOT diff --git a/core-cube/pom.xml b/core-cube/pom.xml index 51e3937..77996b6 100644 --- a/core-cube/pom.xml +++ b/core-cube/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1 +2.3.2-SNAPSHOT diff --git a/core-dictionary/pom.xml b/core-dictionary/pom.xml index 6813b31..e6d5a10 100644 --- a/core-dictionary/pom.xml +++ b/core-dictionary/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1 +2.3.2-SNAPSHOT diff --git a/core-job/pom.xml b/core-job/pom.xml index cffc792..1db4215 100644 --- a/core-job/pom.xml +++ b/core-job/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1 +2.3.2-SNAPSHOT diff --git a/core-metadata/pom.xml b/core-metadata/pom.xml index c635a12..35b7486 100644 --- a/core-metadata/pom.xml +++ b/core-metadata/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1 +2.3.2-SNAPSHOT diff --git a/core-metrics/pom.xml b/core-metrics/pom.xml index 5d41b16..bd1713f 100644 --- a/core-metrics/pom.xml +++ b/core-metrics/pom.xml @@ -28,7 +28,7 @@ kylin org.apache.kylin -2.3.1 +2.3.2-SNAPSHOT diff --git a/core-storage/pom.xml b/core-storage/pom.xml index ae9b883..54cc786 100644 --- a/core-storage/pom.xml +++ b/core-storage/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1 +2.3.2-SNAPSHOT diff --git a/engine-mr/pom.xml b/engine-mr/pom.xml index ef4d6d6..e5236ee 100644 --- a/engine-mr/pom.xml +++ b/engine-mr/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1 +2.3.2-SNAPSHOT diff --git a/engine-spark/pom.xml b/engine-spark/pom.xml index d54b4d1..d11fd3c 100644 --- a/engine-spark/pom.xml +++ b/engine-spark/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1 +2.3.2-SNAPSHOT diff --git a/external/pom.xml b/external/pom.xml index 0f4fa40..8698932 100644 --- a/external/pom.xml +++ b/external/pom.xml @@ -26,7 +26,7 @@ org.apache.kylin kylin -2.3.1 +2.3.2-SNAPSHOT diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 88ccf2e..ae9d335 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.1 +2.3.2-SNAPSHOT diff --git a/kylin-it/pom.xml b/kylin-it/pom.xml index 602c34e..9ed4efe 100644 --- a/kylin-it/p
[kylin] annotated tag kylin-2.3.1 updated (928cc16 -> 42f77b0)
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a change to annotated tag kylin-2.3.1 in repository https://gitbox.apache.org/repos/asf/kylin.git. *** WARNING: tag kylin-2.3.1 was modified! *** from 928cc16 (commit) to 42f77b0 (tag) tagging 928cc1628c546efe7ec348c467f5d26607c8d7e6 (commit) replaces kylin-2.3.0 by Billy Liu on Sat Mar 24 16:44:43 2018 + - Log - [maven-release-plugin] copy for tag kylin-2.3.1 --- No new revisions were added by this update. Summary of changes: -- To stop receiving notification emails like this one, please contact billy...@apache.org.
[kylin] branch 2.3.x updated (34ec494 -> 928cc16)
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a change to branch 2.3.x in repository https://gitbox.apache.org/repos/asf/kylin.git. from 34ec494 update branch 2.3.x to 2.3.1-SNAPSHOT new 46be653 manual update htrace to 2.3.1 new 928cc16 [maven-release-plugin] prepare release kylin-2.3.1 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: assembly/pom.xml | 2 +- atopcalcite/pom.xml| 2 +- core-common/pom.xml| 2 +- core-cube/pom.xml | 2 +- core-dictionary/pom.xml| 2 +- core-job/pom.xml | 2 +- core-metadata/pom.xml | 2 +- core-metrics/pom.xml | 2 +- core-storage/pom.xml | 2 +- engine-mr/pom.xml | 2 +- engine-spark/pom.xml | 2 +- external/htrace/pom.xml| 2 +- external/pom.xml | 2 +- jdbc/pom.xml | 2 +- kylin-it/pom.xml | 2 +- metrics-reporter-hive/pom.xml | 2 +- metrics-reporter-kafka/pom.xml | 2 +- pom.xml| 6 +++--- query/pom.xml | 2 +- server-base/pom.xml| 2 +- server/pom.xml | 2 +- source-hive/pom.xml| 2 +- source-kafka/pom.xml | 2 +- storage-hbase/pom.xml | 2 +- tomcat-ext/pom.xml | 2 +- tool-assembly/pom.xml | 2 +- tool/pom.xml | 2 +- 27 files changed, 29 insertions(+), 29 deletions(-) -- To stop receiving notification emails like this one, please contact billy...@apache.org.
[kylin] branch 2.3.x updated: update branch 2.3.x to 2.3.1-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch 2.3.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/2.3.x by this push:
new 34ec494 update branch 2.3.x to 2.3.1-SNAPSHOT
34ec494 is described below
commit 34ec494b5cf19825440ca9249583cb992643e7b0
Author: Billy Liu <billy...@apache.org>
AuthorDate: Sat Mar 24 18:13:20 2018 +0800
update branch 2.3.x to 2.3.1-SNAPSHOT
---
assembly/pom.xml | 2 +-
atopcalcite/pom.xml | 2 +-
core-common/pom.xml | 2 +-
.../src/main/java/org/apache/kylin/common/KylinVersion.java | 2 +-
core-cube/pom.xml| 2 +-
core-dictionary/pom.xml | 2 +-
core-job/pom.xml | 2 +-
core-metadata/pom.xml| 2 +-
core-metrics/pom.xml | 2 +-
core-storage/pom.xml | 2 +-
engine-mr/pom.xml| 2 +-
engine-spark/pom.xml | 2 +-
external/htrace/pom.xml | 2 +-
external/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
kylin-it/pom.xml | 2 +-
metrics-reporter-hive/pom.xml| 2 +-
metrics-reporter-kafka/pom.xml | 2 +-
pom.xml | 12 ++--
query/pom.xml| 2 +-
server-base/pom.xml | 2 +-
server/pom.xml | 2 +-
source-hive/pom.xml | 2 +-
source-kafka/pom.xml | 2 +-
storage-hbase/pom.xml| 2 +-
tomcat-ext/pom.xml | 2 +-
tool-assembly/pom.xml| 2 +-
tool/pom.xml | 2 +-
28 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 3563271..541778b 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -26,7 +26,7 @@
kylin
org.apache.kylin
-2.3.1
+2.3.1-SNAPSHOT
diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml
index 238ea60..606c439 100644
--- a/atopcalcite/pom.xml
+++ b/atopcalcite/pom.xml
@@ -28,7 +28,7 @@
org.apache.kylin
kylin
-2.3.1
+2.3.1-SNAPSHOT
diff --git a/core-common/pom.xml b/core-common/pom.xml
index cb1775c..1f9af5a 100644
--- a/core-common/pom.xml
+++ b/core-common/pom.xml
@@ -28,7 +28,7 @@
org.apache.kylin
kylin
-2.3.1
+2.3.1-SNAPSHOT
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 749cb86..e5d786d 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
@@ -95,7 +95,7 @@ public class KylinVersion implements Comparable {
/**
* Require MANUAL updating kylin version per ANY upgrading.
*/
-private static final KylinVersion CURRENT_KYLIN_VERSION = new
KylinVersion("2.3.0.20500");
+private static final KylinVersion CURRENT_KYLIN_VERSION = new
KylinVersion("2.3.1.0");
private static final KylinVersion VERSION_200 = new KylinVersion("2.0.0");
diff --git a/core-cube/pom.xml b/core-cube/pom.xml
index 51e3937..681e634 100644
--- a/core-cube/pom.xml
+++ b/core-cube/pom.xml
@@ -28,7 +28,7 @@
org.apache.kylin
kylin
-2.3.1
+2.3.1-SNAPSHOT
diff --git a/core-dictionary/pom.xml b/core-dictionary/pom.xml
index 6813b31..156bac6 100644
--- a/core-dictionary/pom.xml
+++ b/core-dictionary/pom.xml
@@ -28,7 +28,7 @@
org.apache.kylin
kylin
-2.3.1
+2.3.1-SNAPSHOT
diff --git a/core-job/pom.xml b/core-job/pom.xml
index cffc792..fdb3741 100644
--- a/core-job/pom.xml
+++ b/core-job/pom.xml
@@ -28,7 +28,7 @@
org.apache.kylin
kylin
-2.3.1
+2.3.1-SNAPSHOT
diff --git a/core-metadata/pom.xml b/core-metadata/pom.xml
index c635a12..70620a0 100644
--- a/core-metadata/pom.xml
+++ b/core-metadata/pom.xml
@@ -28,7 +28,
[kylin] 02/02: KYLIN-3276 fix unstable it test case
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch 2.3.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit d9561d06e8e49f87d9fa9ff41a53c20e3291d162
Author: nichunen <chunen...@kyligence.io>
AuthorDate: Tue Mar 13 22:36:27 2018 +0800
KYLIN-3276 fix unstable it test case
---
kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java
b/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java
index de5e193..eb3c773 100644
--- a/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java
+++ b/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java
@@ -306,15 +306,15 @@ public class ITJDBCDriverTest extends
HBaseMetadataTestCase {
Connection conn = getConnection();
PreparedStatement statement = conn
-.prepareStatement("select count(1) as TRANS_CNT from
test_kylin_fact where LSTG_FORMAT_NAME = ?");
+.prepareStatement("select count(1) as TRANS_CNT from
test_kylin_fact where LSTG_FORMAT_NAME like ?");
-statement.setString(1, "ABIN");
+statement.setString(1, "%");
ResultSet rs = statement.executeQuery();
Assert.assertTrue(rs.next());
Object object = rs.getObject(1);
long countFirst = (long) object;
-statement.setString(1, "FP-GTC");
+statement.setString(1, "O%");
rs = statement.executeQuery();
Assert.assertTrue(rs.next());
object = rs.getObject(1);
--
To stop receiving notification emails like this one, please contact
billy...@apache.org.
[kylin] branch 2.3.x updated (066ac49 -> d9561d0)
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a change to branch 2.3.x in repository https://gitbox.apache.org/repos/asf/kylin.git. from 066ac49 KYLIN-3280 The delete button should not be enabled without any segment in cube segment delete confirm dialog new 6063945 KYLIN-3276 Fix query with different dynamic parameters get the same query result new d9561d0 KYLIN-3276 fix unstable it test case The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/kylin/jdbc/ITJDBCDriverTest.java| 27 ++ .../kylin/rest/request/PrepareSqlRequest.java | 18 ++- .../org/apache/kylin/rest/request/SQLRequest.java | 2 +- 3 files changed, 45 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact billy...@apache.org.
[kylin] 01/02: KYLIN-3276 Fix query with different dynamic parameters get the same query result
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch 2.3.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 60639456423a44ea6d88b0548fa3c1541db57e98
Author: nichunen <chunen...@kyligence.io>
AuthorDate: Mon Mar 12 20:28:24 2018 +0800
KYLIN-3276 Fix query with different dynamic parameters get the same query
result
---
.../org/apache/kylin/jdbc/ITJDBCDriverTest.java| 27 ++
.../kylin/rest/request/PrepareSqlRequest.java | 18 ++-
.../org/apache/kylin/rest/request/SQLRequest.java | 2 +-
3 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java
b/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java
index 765b12c..de5e193 100644
--- a/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java
+++ b/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java
@@ -301,6 +301,33 @@ public class ITJDBCDriverTest extends
HBaseMetadataTestCase {
}
+@Test
+public void testPreparedStatementWithCache() throws Exception {
+Connection conn = getConnection();
+
+PreparedStatement statement = conn
+.prepareStatement("select count(1) as TRANS_CNT from
test_kylin_fact where LSTG_FORMAT_NAME = ?");
+
+statement.setString(1, "ABIN");
+ResultSet rs = statement.executeQuery();
+Assert.assertTrue(rs.next());
+Object object = rs.getObject(1);
+long countFirst = (long) object;
+
+statement.setString(1, "FP-GTC");
+rs = statement.executeQuery();
+Assert.assertTrue(rs.next());
+object = rs.getObject(1);
+long countSecond = (long) object;
+
+Assert.assertTrue(countFirst > countSecond);
+
+rs.close();
+statement.close();
+conn.close();
+
+}
+
private static class SystemPropertiesOverride {
HashMap<String, String> backup = new HashMap<String, String>();
diff --git
a/server-base/src/main/java/org/apache/kylin/rest/request/PrepareSqlRequest.java
b/server-base/src/main/java/org/apache/kylin/rest/request/PrepareSqlRequest.java
index e296248..97a4863 100644
---
a/server-base/src/main/java/org/apache/kylin/rest/request/PrepareSqlRequest.java
+++
b/server-base/src/main/java/org/apache/kylin/rest/request/PrepareSqlRequest.java
@@ -19,7 +19,9 @@
package org.apache.kylin.rest.request;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
/**
* @author xduo
@@ -41,7 +43,7 @@ public class PrepareSqlRequest extends SQLRequest {
this.params = params;
}
-public static class StateParam implements Serializable{
+public static class StateParam implements Serializable {
private String className;
private String value;
@@ -97,6 +99,20 @@ public class PrepareSqlRequest extends SQLRequest {
}
@Override
+public Object getCacheKey() {
+if (cacheKey != null)
+return cacheKey;
+
+cacheKey = super.getCacheKey();
+
+if (params != null) {
+ArrayList keyList = (ArrayList) (cacheKey);
+Collections.addAll(keyList, params);
+}
+return cacheKey;
+}
+
+@Override
public int hashCode() {
final int prime = 31;
int result = super.hashCode();
diff --git
a/server-base/src/main/java/org/apache/kylin/rest/request/SQLRequest.java
b/server-base/src/main/java/org/apache/kylin/rest/request/SQLRequest.java
index 92533b8..56db745 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/request/SQLRequest.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/request/SQLRequest.java
@@ -39,7 +39,7 @@ public class SQLRequest implements Serializable {
private Map<String, String> backdoorToggles;
-private volatile Object cacheKey = null;
+protected volatile Object cacheKey = null;
public SQLRequest() {
}
--
To stop receiving notification emails like this one, please contact
billy...@apache.org.
[kylin] branch master updated: minor, refine exception handling.
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push:
new cf6d76d minor, refine exception handling.
cf6d76d is described below
commit cf6d76d2dd5c96d3979481fe4d7ca69bbb626b30
Author: Jiatao Tao <245915...@qq.com>
AuthorDate: Wed Mar 14 11:01:44 2018 +0800
minor, refine exception handling.
---
.../src/main/java/org/apache/kylin/rest/service/AdminService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/server-base/src/main/java/org/apache/kylin/rest/service/AdminService.java
b/server-base/src/main/java/org/apache/kylin/rest/service/AdminService.java
index 70afefd..f7881f1 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/AdminService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/AdminService.java
@@ -93,7 +93,7 @@ public class AdminService extends BasicService {
try {
job = new StorageCleanupJob();
} catch (IOException e) {
-logger.error("can not init StorageCleanupJob", e);
+throw new RuntimeException("Can not init StorageCleanupJob", e);
}
String[] args = new String[] { "-delete", "true" };
job.execute(args);
--
To stop receiving notification emails like this one, please contact
billy...@apache.org.
[kylin] branch master updated: KYLIN-3262 add JaCoCo Java Agent for integration test
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/master by this push: new 537ae8a KYLIN-3262 add JaCoCo Java Agent for integration test 537ae8a is described below commit 537ae8afd1c60d374980c099e5c5fead2c215684 Author: Billy Liu <billy...@apache.org> AuthorDate: Tue Mar 13 15:18:29 2018 -0700 KYLIN-3262 add JaCoCo Java Agent for integration test --- dev-support/jacocoagent.jar | Bin 0 -> 257327 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dev-support/jacocoagent.jar b/dev-support/jacocoagent.jar new file mode 100644 index 000..6e70590 Binary files /dev/null and b/dev-support/jacocoagent.jar differ -- To stop receiving notification emails like this one, please contact billy...@apache.org.
[kylin] branch master updated: APACHE-KYLIN-3262: add on-the-fly instrumentation with using JaCoCo Java Agent for integration test
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push:
new cb3913b APACHE-KYLIN-3262: add on-the-fly instrumentation with using
JaCoCo Java Agent for integration test
cb3913b is described below
commit cb3913b681a1230130376215cfa30477eb3692f0
Author: Zhong <nju_y...@apache.org>
AuthorDate: Thu Feb 22 18:34:39 2018 +0800
APACHE-KYLIN-3262: add on-the-fly instrumentation with using JaCoCo Java
Agent for integration test
Signed-off-by: Billy Liu <billy...@apache.org>
---
kylin-it/pom.xml | 7 +++
1 file changed, 7 insertions(+)
diff --git a/kylin-it/pom.xml b/kylin-it/pom.xml
index fd4fa8b..101f630 100644
--- a/kylin-it/pom.xml
+++ b/kylin-it/pom.xml
@@ -345,6 +345,7 @@
-Xms1G -Xmx2G -XX:PermSize=128M
-XX:MaxPermSize=512M
-Dkylin.server.cluster-servers=localhost:7070
+
-javaagent:${project.basedir}/..//dev-support/jacocoagent.jar=includes=org.apache.kylin.*,output=file,destfile=jacoco-it.exec
@@ -372,6 +373,9 @@
-Dlog4j.configuration=file:${project.basedir}/..//build/conf/kylin-tools-log4j.properties
+
+
-javaagent:${project.basedir}/..//dev-support/jacocoagent.jar=includes=org.apache.kylin.*,output=file,destfile=jacoco-it-engine.exec
+
-classpath
org.apache.kylin.provision.BuildCubeWithEngine
@@ -399,6 +403,9 @@
-Dlog4j.configuration=file:${project.basedir}/..//build/conf/kylin-tools-log4j.properties
+
+
-javaagent:${project.basedir}/..//dev-support/jacocoagent.jar=includes=org.apache.kylin.*,output=file,destfile=jacoco-it-stream.exec
+
-classpath
org.apache.kylin.provision.BuildCubeWithStream
--
To stop receiving notification emails like this one, please contact
billy...@apache.org.
[kylin] 05/05: KYLIN-3280 The delete button should not be enabled without any segment in cube segment delete confirm dialog
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch 2.3.x in repository https://gitbox.apache.org/repos/asf/kylin.git commit 066ac49a34f9c31aa0e500c9d80c4dbd56cf5d92 Author: xingpeng1 <xing.pe...@zte.com.cn> AuthorDate: Tue Mar 13 08:26:13 2018 +0800 KYLIN-3280 The delete button should not be enabled without any segment in cube segment delete confirm dialog --- webapp/app/partials/cubes/cube_delete_segment.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/app/partials/cubes/cube_delete_segment.html b/webapp/app/partials/cubes/cube_delete_segment.html index 8500f3f..93356ee 100644 --- a/webapp/app/partials/cubes/cube_delete_segment.html +++ b/webapp/app/partials/cubes/cube_delete_segment.html @@ -83,7 +83,7 @@ Close -Delete +Delete \ No newline at end of file -- To stop receiving notification emails like this one, please contact billy...@apache.org.
[kylin] 02/05: KYLIN-3233, fix CacheController if cacheKey has "/".
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch 2.3.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit f989aa57c0aa21ec7a0705a007b0bf652e0b31e1
Author: Jiatao Tao <245915...@qq.com>
AuthorDate: Sun Feb 4 21:08:25 2018 +0800
KYLIN-3233, fix CacheController if cacheKey has "/".
---
.../apache/kylin/common/restclient/RestClient.java | 13 +++--
.../rest/broadcaster/BroadcasterReceiveServlet.java | 21 ++---
.../kylin/rest/controller/CacheController.java | 10 ++
3 files changed, 39 insertions(+), 5 deletions(-)
diff --git
a/core-common/src/main/java/org/apache/kylin/common/restclient/RestClient.java
b/core-common/src/main/java/org/apache/kylin/common/restclient/RestClient.java
index e1cc13c..93f5e19 100644
---
a/core-common/src/main/java/org/apache/kylin/common/restclient/RestClient.java
+++
b/core-common/src/main/java/org/apache/kylin/common/restclient/RestClient.java
@@ -38,6 +38,7 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.DefaultHttpClient;
@@ -149,8 +150,16 @@ public class RestClient {
}
public void wipeCache(String entity, String event, String cacheKey) throws
IOException {
-String url = baseUrl + "/cache/" + entity + "/" + cacheKey + "/" +
event;
-HttpPut request = new HttpPut(url);
+HttpPut request;
+String url;
+if (cacheKey.contains("/")) {
+url = baseUrl + "/cache/" + entity + "/" + event;
+request = new HttpPut(url);
+request.setEntity(new StringEntity(cacheKey,
ContentType.create("application/json", "UTF-8")));
+} else {
+url = baseUrl + "/cache/" + entity + "/" + cacheKey + "/" + event;
+request = new HttpPut(url);
+}
HttpResponse response = null;
try {
diff --git
a/server-base/src/main/java/org/apache/kylin/rest/broadcaster/BroadcasterReceiveServlet.java
b/server-base/src/main/java/org/apache/kylin/rest/broadcaster/BroadcasterReceiveServlet.java
index 0a9c0bf..c6247f0 100644
---
a/server-base/src/main/java/org/apache/kylin/rest/broadcaster/BroadcasterReceiveServlet.java
+++
b/server-base/src/main/java/org/apache/kylin/rest/broadcaster/BroadcasterReceiveServlet.java
@@ -18,7 +18,9 @@
package org.apache.kylin.rest.broadcaster;
+import java.io.BufferedReader;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -45,6 +47,7 @@ public class BroadcasterReceiveServlet extends HttpServlet {
}
private static final Pattern PATTERN = Pattern.compile("/(.+)/(.+)/(.+)");
+private static final Pattern PATTERN2 = Pattern.compile("/(.+)/(.+)");
@Override
protected void doPut(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
@@ -61,14 +64,26 @@ public class BroadcasterReceiveServlet extends HttpServlet {
final String requestURI = req.getRequestURI();
final String substring =
requestURI.substring(requestURI.indexOf(startString) + startString.length());
final Matcher matcher = PATTERN.matcher(substring);
+final Matcher matcher2 = PATTERN2.matcher(substring);
+
if (matcher.matches()) {
String type = matcher.group(1);
-String name = matcher.group(2);
+String cacheKey = matcher.group(2);
String event = matcher.group(3);
if (handler != null) {
-handler.handle(type, name, event);
+handler.handle(type, cacheKey, event);
+}
+resp.getWriter().write("type:" + type + " name:" + cacheKey + "
event:" + event);
+} else if (matcher2.matches()) {
+String type = matcher2.group(1);
+String event = matcher2.group(2);
+BufferedReader br = new BufferedReader(new
InputStreamReader(req.getInputStream(), "utf-8"));
+String cacheKey = br.readLine();
+br.close();
+if (handler != null) {
+handler.handle(type, cacheKey, event);
}
-resp.getWriter().write("type:" + type + " name:" + name + "
event:" + event);
+resp.getWriter().write("type:" + type + " name:" + cacheKey + "
event:" + event);
} else {
resp.getWrite
[kylin] 01/05: KYLIN-3236 The function 'reGenerateAdvancedDict()' has an error logical judgment, which will cause an exception when you edit the cube.
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch 2.3.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 2a72dadd0b785c4bd18210230398471013eb1293
Author: xingpeng1 <xing.pe...@zte.com.cn>
AuthorDate: Tue Feb 6 17:11:50 2018 +0800
KYLIN-3236 The function 'reGenerateAdvancedDict()' has an error logical
judgment, which will cause an exception when you edit the cube.
Signed-off-by: xingpeng1 <xing.pe...@zte.com.cn>
---
webapp/app/js/controllers/cubeAdvanceSetting.js | 5 +
webapp/app/js/controllers/cubeEdit.js | 15 +++
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/webapp/app/js/controllers/cubeAdvanceSetting.js
b/webapp/app/js/controllers/cubeAdvanceSetting.js
index dd00da4..5687e12 100755
--- a/webapp/app/js/controllers/cubeAdvanceSetting.js
+++ b/webapp/app/js/controllers/cubeAdvanceSetting.js
@@ -440,4 +440,9 @@ KylinApp.controller('CubeAdvanceSettingCtrl', function
($scope, $modal,cubeConfi
}
};
+ if ($scope.state.mode == 'edit') {
+$scope.$on('$destroy', function () {
+ $scope.$emit('AdvancedSettingEdited');
+});
+ }
});
diff --git a/webapp/app/js/controllers/cubeEdit.js
b/webapp/app/js/controllers/cubeEdit.js
index 3cf248f..1a87dc3 100755
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -773,11 +773,12 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q,
$routeParams, $locatio
});
//remove deprecated distinct measures
-angular.forEach($scope.cubeMetaFrame.dictionaries, function (dict, index) {
- if (distinctMeasures.indexOf(dict.column) === -1 &&
reuseColumns.indexOf(dict.column) === -1) {
-$scope.cubeMetaFrame.dictionaries.splice(index, 1);
+for (var i = $scope.cubeMetaFrame.dictionaries.length - 1; i >= 0; i--) {
+ var dictColumn = $scope.cubeMetaFrame.dictionaries[i].column;
+ if (distinctMeasures.indexOf(dictColumn) === -1 &&
reuseColumns.indexOf(dictColumn) === -1) {
+$scope.cubeMetaFrame.dictionaries.splice(i, 1);
}
-});
+}
}
$scope.$on('MeasuresEdited', function (event) {
@@ -786,6 +787,12 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q,
$routeParams, $locatio
}
});
+ $scope.$on('AdvancedSettingEdited', function (event) {
+if ($scope.cubeMetaFrame) {
+ reGenerateAdvancedDict();
+}
+ });
+
$scope.$on('DimensionsEdited', function (event) {
if ($scope.cubeMetaFrame) {
reGenerateRowKey();
--
To stop receiving notification emails like this one, please contact
billy...@apache.org.
[kylin] branch 2.3.x updated (4273514 -> 066ac49)
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a change to branch 2.3.x in repository https://gitbox.apache.org/repos/asf/kylin.git. from 4273514 bump versin to 2.3.1 new 2a72dad KYLIN-3236 The function 'reGenerateAdvancedDict()' has an error logical judgment, which will cause an exception when you edit the cube. new f989aa5 KYLIN-3233, fix CacheController if cacheKey has "/". new 80d0161 KYLIN-3287, fix when a shard by column is in dict encoding, dict building error. new 348e73d KYLIN-3119 Fix bugs in the function 'massageSql' of 'QueryUtil.java' new 066ac49 KYLIN-3280 The delete button should not be enabled without any segment in cube segment delete confirm dialog The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/kylin/common/restclient/RestClient.java | 13 +- .../kylin/engine/mr/steps/CreateDictionaryJob.java | 2 +- .../localmeta/cube_desc/ci_inner_join_cube.json| 3 +- .../org/apache/kylin/query/util/QueryUtil.java | 29 +++- .../org/apache/kylin/query/util/QueryUtilTest.java | 52 ++ .../broadcaster/BroadcasterReceiveServlet.java | 21 +++-- .../kylin/rest/controller/CacheController.java | 10 + webapp/app/js/controllers/cubeAdvanceSetting.js| 5 +++ webapp/app/js/controllers/cubeEdit.js | 15 +-- webapp/app/partials/cubes/cube_delete_segment.html | 2 +- 10 files changed, 129 insertions(+), 23 deletions(-) -- To stop receiving notification emails like this one, please contact billy...@apache.org.
[kylin] 03/05: KYLIN-3287, fix when a shard by column is in dict encoding, dict building error.
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch 2.3.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 80d01612462bcca129bc950fe101db4c8e9cf6f4
Author: Jiatao Tao <245915...@qq.com>
AuthorDate: Mon Mar 12 14:55:34 2018 +0800
KYLIN-3287, fix when a shard by column is in dict encoding, dict building
error.
---
.../java/org/apache/kylin/engine/mr/steps/CreateDictionaryJob.java | 2 +-
examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json| 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/CreateDictionaryJob.java
b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/CreateDictionaryJob.java
index a457677..dab4880 100644
---
a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/CreateDictionaryJob.java
+++
b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/CreateDictionaryJob.java
@@ -82,7 +82,7 @@ public class CreateDictionaryJob extends AbstractHadoopJob {
List uhcColumns =
cube.getDescriptor().getAllUHCColumns();
Path colDir;
-if (uhcColumns.contains(col)) {
+if (config.isBuildUHCDictWithMREnabled() &&
uhcColumns.contains(col)) {
colDir = new Path(dictPath, col.getIdentity());
} else {
colDir = new Path(factColumnsInputPath, col.getIdentity());
diff --git
a/examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json
b/examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json
index 809e188..ec1100a 100644
--- a/examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json
+++ b/examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json
@@ -342,7 +342,8 @@
},
{
"column": "TEST_KYLIN_FACT.LEAF_CATEG_ID",
-"encoding": "dict"
+"encoding": "dict",
+"isShardBy" : true
},
{
"column": "TEST_CATEGORY_GROUPINGS.META_CATEG_NAME",
--
To stop receiving notification emails like this one, please contact
billy...@apache.org.
[kylin] 04/05: KYLIN-3119 Fix bugs in the function 'massageSql' of 'QueryUtil.java'
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch 2.3.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 348e73d762e0eee7165c1b70984e0f8d4586eab9
Author: pengjianhua <35573...@qq.com>
AuthorDate: Tue Mar 13 08:22:10 2018 +0800
KYLIN-3119 Fix bugs in the function 'massageSql' of 'QueryUtil.java'
---
.../org/apache/kylin/query/util/QueryUtil.java | 29 +++-
.../org/apache/kylin/query/util/QueryUtilTest.java | 52 ++
2 files changed, 70 insertions(+), 11 deletions(-)
diff --git a/query/src/main/java/org/apache/kylin/query/util/QueryUtil.java
b/query/src/main/java/org/apache/kylin/query/util/QueryUtil.java
index 4de6a2c..0552895 100644
--- a/query/src/main/java/org/apache/kylin/query/util/QueryUtil.java
+++ b/query/src/main/java/org/apache/kylin/query/util/QueryUtil.java
@@ -50,22 +50,29 @@ public class QueryUtil {
ProjectManager projectManager =
ProjectManager.getInstance(KylinConfig.getInstanceFromEnv());
ProjectInstance projectInstance = projectManager.getProject(project);
KylinConfig kylinConfig = projectInstance.getConfig();
-
+sql = removeCommentInSql(sql);
while (sql.endsWith(";"))
sql = sql.substring(0, sql.length() - 1);
-if (limit > 0 && !sql.toLowerCase().contains("limit")) {
-sql += ("\nLIMIT " + limit);
-}
+String sql1=sql;
+final String suffixPattern =
"^.+?\\s(limit\\s\\d+)?\\s(offset\\s\\d+)?\\s*$";
+sql = sql.replaceAll("\\s+", " ");
+Pattern pattern = Pattern.compile(suffixPattern);
+Matcher matcher = pattern.matcher(sql.toLowerCase() + " ");
-if (offset > 0 && !sql.toLowerCase().contains("offset")) {
-sql += ("\nOFFSET " + offset);
+if (matcher.find()) {
+if (limit > 0 && matcher.group(1) == null) {
+sql1 += ("\nLIMIT " + limit);
+}
+if (offset > 0 && matcher.group(2) == null) {
+sql1 += ("\nOFFSET " + offset);
+}
}
// https://issues.apache.org/jira/browse/KYLIN-2649
-if (kylinConfig.getForceLimit() > 0 &&
!sql.toLowerCase().contains("limit")
-&& sql.toLowerCase().matches("^select\\s+\\*\\p{all}*")) {
-sql += ("\nLIMIT " + kylinConfig.getForceLimit());
+if (kylinConfig.getForceLimit() > 0 && limit <= 0 && matcher.group(1)
== null
+&& sql1.toLowerCase().matches("^select\\s+\\*\\p{all}*")) {
+sql1 += ("\nLIMIT " + kylinConfig.getForceLimit());
}
// customizable SQL transformation
@@ -73,9 +80,9 @@ public class QueryUtil {
initQueryTransformers();
}
for (IQueryTransformer t : queryTransformers) {
-sql = t.transform(sql, project, defaultSchema);
+sql1 = t.transform(sql1, project, defaultSchema);
}
-return sql;
+return sql1;
}
private static void initQueryTransformers() {
diff --git a/query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java
b/query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java
index 01c2f7f..4d766b9 100644
--- a/query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java
+++ b/query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java
@@ -51,6 +51,58 @@ public class QueryUtilTest extends LocalFileMetadataTestCase
{
"select ( date '2001-09-28' + interval '2' month) from
test_kylin_fact group by ( date '2001-09-28' + interval '2' month)",
s);
}
+{
+String sql = "select count(*) test_limit from test_kylin_fact
where price > 10.0";
+String s = QueryUtil.massageSql(sql, "default", 5, 0,
"DEFAULT");
+Assert.assertEquals(
+"select count(*) test_limit from test_kylin_fact where
price > 10.0\n" +
+"LIMIT 5",
+s);
+}
+{
+String sql = "select count(*) test_offset from test_kylin_fact
where price > 10.0";
+String s = QueryUtil.massageSql(sql, "default", 0, 50, "DEFAULT");
+Assert.assertEquals(
+"select count(*) test_offset from test_kylin_fact where
price > 10.0\n" +
+"OFFSET 50",
+s);
+}
+{
+String sql = "select count(*) test_limit_and_offset from
test_kylin_fact where price > 10.0";
[kylin] branch master updated: KYLIN-3280 The delete button should not be enabled without any segment in cube segment delete confirm dialog
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/master by this push: new ef89806 KYLIN-3280 The delete button should not be enabled without any segment in cube segment delete confirm dialog ef89806 is described below commit ef89806e67145f771aedbb60585e2db05d42076e Author: xingpeng1 <xing.pe...@zte.com.cn> AuthorDate: Tue Mar 13 08:26:13 2018 +0800 KYLIN-3280 The delete button should not be enabled without any segment in cube segment delete confirm dialog --- webapp/app/partials/cubes/cube_delete_segment.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/app/partials/cubes/cube_delete_segment.html b/webapp/app/partials/cubes/cube_delete_segment.html index 8500f3f..93356ee 100644 --- a/webapp/app/partials/cubes/cube_delete_segment.html +++ b/webapp/app/partials/cubes/cube_delete_segment.html @@ -83,7 +83,7 @@ Close -Delete +Delete \ No newline at end of file -- To stop receiving notification emails like this one, please contact billy...@apache.org.
[kylin] branch master updated: KYLIN-3119 Fix bugs in the function 'massageSql' of 'QueryUtil.java'
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push:
new a74cb8a KYLIN-3119 Fix bugs in the function 'massageSql' of
'QueryUtil.java'
a74cb8a is described below
commit a74cb8a8258d46e2021aacd63c3a6d131b09ede1
Author: pengjianhua <35573...@qq.com>
AuthorDate: Tue Mar 13 08:22:10 2018 +0800
KYLIN-3119 Fix bugs in the function 'massageSql' of 'QueryUtil.java'
---
.../org/apache/kylin/query/util/QueryUtil.java | 29 +++-
.../org/apache/kylin/query/util/QueryUtilTest.java | 52 ++
2 files changed, 70 insertions(+), 11 deletions(-)
diff --git a/query/src/main/java/org/apache/kylin/query/util/QueryUtil.java
b/query/src/main/java/org/apache/kylin/query/util/QueryUtil.java
index 4de6a2c..0552895 100644
--- a/query/src/main/java/org/apache/kylin/query/util/QueryUtil.java
+++ b/query/src/main/java/org/apache/kylin/query/util/QueryUtil.java
@@ -50,22 +50,29 @@ public class QueryUtil {
ProjectManager projectManager =
ProjectManager.getInstance(KylinConfig.getInstanceFromEnv());
ProjectInstance projectInstance = projectManager.getProject(project);
KylinConfig kylinConfig = projectInstance.getConfig();
-
+sql = removeCommentInSql(sql);
while (sql.endsWith(";"))
sql = sql.substring(0, sql.length() - 1);
-if (limit > 0 && !sql.toLowerCase().contains("limit")) {
-sql += ("\nLIMIT " + limit);
-}
+String sql1=sql;
+final String suffixPattern =
"^.+?\\s(limit\\s\\d+)?\\s(offset\\s\\d+)?\\s*$";
+sql = sql.replaceAll("\\s+", " ");
+Pattern pattern = Pattern.compile(suffixPattern);
+Matcher matcher = pattern.matcher(sql.toLowerCase() + " ");
-if (offset > 0 && !sql.toLowerCase().contains("offset")) {
-sql += ("\nOFFSET " + offset);
+if (matcher.find()) {
+if (limit > 0 && matcher.group(1) == null) {
+sql1 += ("\nLIMIT " + limit);
+}
+if (offset > 0 && matcher.group(2) == null) {
+sql1 += ("\nOFFSET " + offset);
+}
}
// https://issues.apache.org/jira/browse/KYLIN-2649
-if (kylinConfig.getForceLimit() > 0 &&
!sql.toLowerCase().contains("limit")
-&& sql.toLowerCase().matches("^select\\s+\\*\\p{all}*")) {
-sql += ("\nLIMIT " + kylinConfig.getForceLimit());
+if (kylinConfig.getForceLimit() > 0 && limit <= 0 && matcher.group(1)
== null
+&& sql1.toLowerCase().matches("^select\\s+\\*\\p{all}*")) {
+sql1 += ("\nLIMIT " + kylinConfig.getForceLimit());
}
// customizable SQL transformation
@@ -73,9 +80,9 @@ public class QueryUtil {
initQueryTransformers();
}
for (IQueryTransformer t : queryTransformers) {
-sql = t.transform(sql, project, defaultSchema);
+sql1 = t.transform(sql1, project, defaultSchema);
}
-return sql;
+return sql1;
}
private static void initQueryTransformers() {
diff --git a/query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java
b/query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java
index 01c2f7f..4d766b9 100644
--- a/query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java
+++ b/query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java
@@ -51,6 +51,58 @@ public class QueryUtilTest extends LocalFileMetadataTestCase
{
"select ( date '2001-09-28' + interval '2' month) from
test_kylin_fact group by ( date '2001-09-28' + interval '2' month)",
s);
}
+{
+String sql = "select count(*) test_limit from test_kylin_fact
where price > 10.0";
+String s = QueryUtil.massageSql(sql, "default", 5, 0,
"DEFAULT");
+Assert.assertEquals(
+"select count(*) test_limit from test_kylin_fact where
price > 10.0\n" +
+"LIMIT 5",
+s);
+}
+{
+String sql = "select count(*) test_offset from test_kylin_fact
where price > 10.0";
+String s = QueryUtil.massageSql(sql, "default", 0, 50, "DEFAULT");
+Assert.assertEquals(
+"select count(*) test_offset from test_kylin_fact where
price > 10.0\n" +
+"OFF
[kylin] branch 2.3.x updated: bump versin to 2.3.1
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch 2.3.x in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/2.3.x by this push: new 4273514 bump versin to 2.3.1 4273514 is described below commit 42735142f01fd66b7ab3e23205eaf7c7a47ef14f Author: Billy Liu <billy...@apache.org> AuthorDate: Mon Mar 12 16:37:21 2018 -0700 bump versin to 2.3.1 --- assembly/pom.xml | 2 +- atopcalcite/pom.xml| 2 +- core-common/pom.xml| 2 +- core-cube/pom.xml | 2 +- core-dictionary/pom.xml| 2 +- core-job/pom.xml | 2 +- core-metadata/pom.xml | 2 +- core-metrics/pom.xml | 2 +- core-storage/pom.xml | 2 +- engine-mr/pom.xml | 2 +- engine-spark/pom.xml | 2 +- external/htrace/pom.xml| 2 +- external/pom.xml | 2 +- jdbc/pom.xml | 2 +- kylin-it/pom.xml | 2 +- metrics-reporter-hive/pom.xml | 2 +- metrics-reporter-kafka/pom.xml | 2 +- pom.xml| 4 ++-- query/pom.xml | 2 +- server-base/pom.xml| 2 +- server/pom.xml | 2 +- source-hive/pom.xml| 2 +- source-kafka/pom.xml | 2 +- storage-hbase/pom.xml | 2 +- tomcat-ext/pom.xml | 2 +- tool-assembly/pom.xml | 2 +- tool/pom.xml | 2 +- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 2f7befc..3563271 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -26,7 +26,7 @@ kylin org.apache.kylin -2.4.0-SNAPSHOT +2.3.1 diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml index 1f5c714..238ea60 100644 --- a/atopcalcite/pom.xml +++ b/atopcalcite/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.4.0-SNAPSHOT +2.3.1 diff --git a/core-common/pom.xml b/core-common/pom.xml index 1507833..cb1775c 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.4.0-SNAPSHOT +2.3.1 diff --git a/core-cube/pom.xml b/core-cube/pom.xml index 81fa547..51e3937 100644 --- a/core-cube/pom.xml +++ b/core-cube/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.4.0-SNAPSHOT +2.3.1 diff --git a/core-dictionary/pom.xml b/core-dictionary/pom.xml index 7e8bee1..6813b31 100644 --- a/core-dictionary/pom.xml +++ b/core-dictionary/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.4.0-SNAPSHOT +2.3.1 diff --git a/core-job/pom.xml b/core-job/pom.xml index 0a025d8..cffc792 100644 --- a/core-job/pom.xml +++ b/core-job/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.4.0-SNAPSHOT +2.3.1 diff --git a/core-metadata/pom.xml b/core-metadata/pom.xml index 21aa6ee..c635a12 100644 --- a/core-metadata/pom.xml +++ b/core-metadata/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.4.0-SNAPSHOT +2.3.1 diff --git a/core-metrics/pom.xml b/core-metrics/pom.xml index e76aa2f..5d41b16 100644 --- a/core-metrics/pom.xml +++ b/core-metrics/pom.xml @@ -28,7 +28,7 @@ kylin org.apache.kylin -2.4.0-SNAPSHOT +2.3.1 diff --git a/core-storage/pom.xml b/core-storage/pom.xml index c173c5e..ae9b883 100644 --- a/core-storage/pom.xml +++ b/core-storage/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.4.0-SNAPSHOT +2.3.1 diff --git a/engine-mr/pom.xml b/engine-mr/pom.xml index 129afbe..ef4d6d6 100644 --- a/engine-mr/pom.xml +++ b/engine-mr/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.4.0-SNAPSHOT +2.3.1 diff --git a/engine-spark/pom.xml b/engine-spark/pom.xml index 9fa646e..d54b4d1 100644 --- a/engine-spark/pom.xml +++ b/engine-spark/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.4.0-SNAPSHOT +2.3.1 diff --git a/external/htrace/pom.xml b/external/htrace/pom.xml index cfadfce..d493b98 100644 --- a/external/htrace/pom.xml +++ b/external/htrace/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.4.0-SNAPSHOT +2.3.1 ../../pom.xml diff --git a/external/pom.xml b/external/pom.xml index 8a038ba..0f4fa40 100644 --- a/external/pom.xml +++ b/external/pom.xml @@ -26,7 +26,7 @@ org.apache.kylin kylin -2.4.0-SNAPSHOT +2.3.1 diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 224be54..88ccf2e 100644 ---
[kylin] 07/07: minor, add ut for ValidateUtilTest.
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 56e7dc6f4b7e074826070c806209d0bdab79
Author: Jiatao Tao <245915...@qq.com>
AuthorDate: Sun Feb 11 16:36:43 2018 +0800
minor, add ut for ValidateUtilTest.
---
.../apache/kylin/rest/util/ValidateUtilTest.java | 36 --
.../apache/kylin/rest/util/ValidateUtilTest.java | 134 +
2 files changed, 134 insertions(+), 36 deletions(-)
diff --git
a/server-base/src/test/java/org/apache/kylin/rest/util/ValidateUtilTest.java
b/server-base/src/test/java/org/apache/kylin/rest/util/ValidateUtilTest.java
deleted file mode 100644
index 8f3b14c..000
--- a/server-base/src/test/java/org/apache/kylin/rest/util/ValidateUtilTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.rest.util;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class ValidateUtilTest {
-
-@Test
-public void testIsAlphanumericUnderscore() {
-Assert.assertTrue(ValidateUtil.isAlphanumericUnderscore("a"));
-Assert.assertTrue(ValidateUtil.isAlphanumericUnderscore("123"));
-Assert.assertTrue(ValidateUtil.isAlphanumericUnderscore("abc123"));
-Assert.assertTrue(ValidateUtil.isAlphanumericUnderscore("abc123_"));
-Assert.assertFalse(ValidateUtil.isAlphanumericUnderscore("abc@"));
-Assert.assertFalse(ValidateUtil.isAlphanumericUnderscore(""));
-Assert.assertFalse(ValidateUtil.isAlphanumericUnderscore(null));
-}
-}
diff --git
a/server/src/test/java/org/apache/kylin/rest/util/ValidateUtilTest.java
b/server/src/test/java/org/apache/kylin/rest/util/ValidateUtilTest.java
new file mode 100644
index 000..62bd203
--- /dev/null
+++ b/server/src/test/java/org/apache/kylin/rest/util/ValidateUtilTest.java
@@ -0,0 +1,134 @@
+/*
+ * 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.rest.util;
+
+import static org.apache.kylin.metadata.MetadataConstants.TYPE_GROUP;
+import static org.apache.kylin.metadata.MetadataConstants.TYPE_USER;
+
+import java.io.IOException;
+
+import org.apache.kylin.common.persistence.RootPersistentEntity;
+import org.apache.kylin.rest.security.AclPermission;
+import org.apache.kylin.rest.service.AccessService;
+import org.apache.kylin.rest.service.ServiceTestBase;
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+
+import com.google.common.collect.Lists;
+
+public class ValidateUtilTest extends ServiceTestBase {
+private final String PROJECT = "default";
+private final String NOT_EXISTS = "not_exists";
+private final String TABLE = "DEFAULT.TEST_KYLIN_FACT";
+
+@Autowired
+@Qualifier("validateUtil")
+private ValidateUtil validateUtil;
+
+@Autowired
+@Qualifier("accessService")
+private AccessService accessService;
+
+@Test
+public void testCheckIdentifiersExists() throws IOException {
+validateUtil.checkIdentifiersExists("ADMIN", true);
+validateUtil.checkIdentifiersExist
[kylin] 04/07: minor, check user/group exists when grant access.
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 5807cdf70f8e8215566fcb20ae3b900f20f8ed27
Author: Jiatao Tao <245915...@qq.com>
AuthorDate: Tue Feb 6 19:38:31 2018 +0800
minor, check user/group exists when grant access.
---
.../org/apache/kylin/rest/controller/AccessController.java | 14 +++---
.../main/java/org/apache/kylin/rest/util/ValidateUtil.java | 2 +-
.../apache/kylin/rest/controller/AccessControllerTest.java | 11 ---
.../test/java/org/apache/kylin/rest/util/AclUtilTest.java | 4 +++-
4 files changed, 23 insertions(+), 8 deletions(-)
diff --git
a/server-base/src/main/java/org/apache/kylin/rest/controller/AccessController.java
b/server-base/src/main/java/org/apache/kylin/rest/controller/AccessController.java
index 7935f77..56cae10 100644
---
a/server-base/src/main/java/org/apache/kylin/rest/controller/AccessController.java
+++
b/server-base/src/main/java/org/apache/kylin/rest/controller/AccessController.java
@@ -36,6 +36,7 @@ import org.apache.kylin.rest.service.ProjectService;
import org.apache.kylin.rest.service.TableACLService;
import org.apache.kylin.rest.service.UserService;
import org.apache.kylin.rest.util.AclPermissionUtil;
+import org.apache.kylin.rest.util.ValidateUtil;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -75,7 +76,10 @@ public class AccessController extends BasicController
implements InitializingBea
@Qualifier("userService")
private UserService userService;
-
+@Autowired
+@Qualifier("validateUtil")
+private ValidateUtil validateUtil;
+
@Override
public void afterPropertiesSet() throws Exception {
// init ExternalAclProvider
@@ -138,9 +142,13 @@ public class AccessController extends BasicController
implements InitializingBea
*/
@RequestMapping(value = "/{type}/{uuid}", method = { RequestMethod.POST },
produces = { "application/json" })
@ResponseBody
-public List grant(@PathVariable String type,
@PathVariable String uuid, @RequestBody AccessRequest accessRequest) {
+public List grant(@PathVariable String type,
@PathVariable String uuid, @RequestBody AccessRequest accessRequest) throws
IOException {
+boolean isPrincipal = accessRequest.isPrincipal();
+String name = accessRequest.getSid();
+validateUtil.checkIdentifiersExists(name, isPrincipal);
+
AclEntity ae = accessService.getAclEntity(type, uuid);
-Sid sid = accessService.getSid(accessRequest.getSid(),
accessRequest.isPrincipal());
+Sid sid = accessService.getSid(name, isPrincipal);
Permission permission =
AclPermissionFactory.getPermission(accessRequest.getPermission());
Acl acl = accessService.grant(ae, permission, sid);
diff --git
a/server-base/src/main/java/org/apache/kylin/rest/util/ValidateUtil.java
b/server-base/src/main/java/org/apache/kylin/rest/util/ValidateUtil.java
index c250da7..1d56a71 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/util/ValidateUtil.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/util/ValidateUtil.java
@@ -89,7 +89,7 @@ public class ValidateUtil {
public void validateIdentifiers(String prj, String name, String type)
throws IOException {
Set allIdentifiers = getAllIdentifiersInPrj(prj, type);
if (!allIdentifiers.contains(name)) {
-throw new RuntimeException("Operation failed, identifiers:" + name
+ " not exists");
+throw new RuntimeException("Operation failed, " + type + ":" +
name + " not exists in project.");
}
}
diff --git
a/server/src/test/java/org/apache/kylin/rest/controller/AccessControllerTest.java
b/server/src/test/java/org/apache/kylin/rest/controller/AccessControllerTest.java
index 217b54c..dea37f5 100644
---
a/server/src/test/java/org/apache/kylin/rest/controller/AccessControllerTest.java
+++
b/server/src/test/java/org/apache/kylin/rest/controller/AccessControllerTest.java
@@ -34,6 +34,7 @@ import org.apache.kylin.rest.security.AclEntityType;
import org.apache.kylin.rest.security.AclPermissionType;
import org.apache.kylin.rest.security.ManagedUser;
import org.apache.kylin.rest.service.CubeService;
+import org.apache.kylin.rest.service.IUserGroupService;
import org.apache.kylin.rest.service.ProjectService;
import org.apache.kylin.rest.service.ServiceTestBase;
import org.apache.kylin.rest.service.UserService;
@@ -78,6 +79,10 @@ public class AccessControllerTest extends ServiceTestBase
implements AclEntityTy
@Qualifier("userService")
UserService userService;
+@Autowired
+@Qualifier("userGroupServ
[kylin] 02/07: KYLIN-3220, add manager for project ACL.
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 4de8bfc92814410155fa42b9a030bb86986e9652
Author: Jiatao Tao <245915...@qq.com>
AuthorDate: Thu Feb 1 11:14:03 2018 +0800
KYLIN-3220, add manager for project ACL.
KYLIN-3220, add manager for project ACL.
code review minor changes
---
.../kylin/common/persistence/ResourceStore.java| 1 +
.../apache/kylin/metadata/acl/TableACLManager.java | 2 +-
.../kylin/metadata/cachesync/CachedCrudAssist.java | 6 +-
.../kylin/rest/security/springacl/AclRecord.java | 5 +
.../apache/kylin/rest/service/AccessService.java | 2 -
.../org/apache/kylin/rest/service/AclService.java | 181 ++---
.../kylin/rest/service/KylinUserService.java | 19 +++
.../org/apache/kylin/rest/service/UserService.java | 2 +
.../apache/kylin/rest/service/AclServiceTest.java | 2 +-
.../apache/kylin/rest/service/UserServiceTest.java | 7 +
10 files changed, 161 insertions(+), 66 deletions(-)
diff --git
a/core-common/src/main/java/org/apache/kylin/common/persistence/ResourceStore.java
b/core-common/src/main/java/org/apache/kylin/common/persistence/ResourceStore.java
index a6b3337..2bccd67 100644
---
a/core-common/src/main/java/org/apache/kylin/common/persistence/ResourceStore.java
+++
b/core-common/src/main/java/org/apache/kylin/common/persistence/ResourceStore.java
@@ -76,6 +76,7 @@ abstract public class ResourceStore {
public static final String CUBE_STATISTICS_ROOT = "/cube_statistics";
public static final String BAD_QUERY_RESOURCE_ROOT = "/bad_query";
public static final String DRAFT_RESOURCE_ROOT = "/draft";
+public static final String USER_ROOT = "/user";
public static final String METASTORE_UUID_TAG = "/UUID";
diff --git
a/core-metadata/src/main/java/org/apache/kylin/metadata/acl/TableACLManager.java
b/core-metadata/src/main/java/org/apache/kylin/metadata/acl/TableACLManager.java
index 163d340..9f74dec 100644
---
a/core-metadata/src/main/java/org/apache/kylin/metadata/acl/TableACLManager.java
+++
b/core-metadata/src/main/java/org/apache/kylin/metadata/acl/TableACLManager.java
@@ -58,7 +58,7 @@ public class TableACLManager {
logger.info("Initializing TableACLManager with config " + config);
this.config = config;
this.tableACLMap = new CaseInsensitiveStringCache<>(config,
"table_acl");
-this.crud = new CachedCrudAssist(getStore(), "/table_acl",
"", TableACL.class, tableACLMap) {
+this.crud = new CachedCrudAssist(getStore(), "/table_acl",
"", TableACL.class, tableACLMap, true) {
@Override
protected TableACL initEntityAfterReload(TableACL acl, String
resourceName) {
acl.init(resourceName);
diff --git
a/core-metadata/src/main/java/org/apache/kylin/metadata/cachesync/CachedCrudAssist.java
b/core-metadata/src/main/java/org/apache/kylin/metadata/cachesync/CachedCrudAssist.java
index b3c200e..be3d8d4 100644
---
a/core-metadata/src/main/java/org/apache/kylin/metadata/cachesync/CachedCrudAssist.java
+++
b/core-metadata/src/main/java/org/apache/kylin/metadata/cachesync/CachedCrudAssist.java
@@ -51,16 +51,16 @@ abstract public class CachedCrudAssist {
public CachedCrudAssist(ResourceStore store, String resourceRootPath,
Class entityType,
SingleValueCache<String, T> cache) {
-this(store, resourceRootPath, MetadataConstants.FILE_SURFIX,
entityType, cache);
+this(store, resourceRootPath, MetadataConstants.FILE_SURFIX,
entityType, cache, false);
}
public CachedCrudAssist(ResourceStore store, String resourceRootPath,
String resourcePathSuffix,
-Class entityType, SingleValueCache<String, T> cache) {
+Class entityType, SingleValueCache<String, T> cache, boolean
compact) {
this.store = store;
this.entityType = entityType;
this.resRootPath = resourceRootPath;
this.resPathSuffix = resourcePathSuffix;
-this.serializer = new JsonSerializer(entityType);
+this.serializer = new JsonSerializer(entityType, compact);
this.cache = cache;
this.checkCopyOnWrite = store.getConfig().isCheckCopyOnWrite();
diff --git
a/server-base/src/main/java/org/apache/kylin/rest/security/springacl/AclRecord.java
b/server-base/src/main/java/org/apache/kylin/rest/security/springacl/AclRecord.java
index 3fff632..eb5b792 100644
---
a/server-base/src/main/java/org/apache/kylin/rest/security/springacl/AclRecord.java
+++
b/server-base/src/main/java/org/apache/kylin/rest/security/springacl/AclRecord.java
@@ -105,6 +105,11 @@ public class AclRecord extends RootPersistentEntity
implements Acl, OwnershipAcl
}
}
+
[kylin] branch master updated (1e7825b -> 56e7333)
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git.
from 1e7825b bump to 2.4.0-SNAPSHOT
new 62bfc5f Refactor ACL, AclService, AccessService
new 4de8bfc KYLIN-3220, add manager for project ACL.
new 94a1978 minor refactor about ACL.
new 5807cdf minor, check user/group exists when grant access.
new 7c9892b KYLIN-3246, add manager for user.
new fde86c2 KYLIN-3248, add batch grant API for project ACL.
new 56e7333 minor, add ut for ValidateUtilTest.
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../kylin/common/persistence/JsonSerializer.java | 11 +-
.../kylin/common/persistence/ResourceStore.java| 1 +
.../apache/kylin/metadata/acl/TableACLManager.java | 2 +-
.../kylin/metadata/cachesync/CachedCrudAssist.java | 6 +-
.../localmeta/acl/legacy-test-domain-object| 31 ++
.../kylin/rest/controller/AccessController.java| 39 +-
...eAclController.java => TableACLController.java} | 22 +-
.../apache/kylin/rest/request/AccessRequest.java | 6 +-
.../kylin/rest/security/KylinUserManager.java | 141
.../apache/kylin/rest/security/ManagedUser.java| 5 +
.../kylin/rest/security/springacl/AceImpl.java | 184 ++
.../kylin/rest/security/springacl/AclRecord.java | 281 +++
.../springacl/LegacyAceInfo.java} | 26 +-
.../rest/security/springacl/MutableAclRecord.java | 123 +++
.../security/springacl/ObjectIdentityImpl.java | 134 +++
.../{service => security/springacl}/SidInfo.java | 31 +-
.../apache/kylin/rest/service/AccessService.java | 289 +++
.../org/apache/kylin/rest/service/AclService.java | 393 +
.../kylin/rest/service/AclTableMigrationTool.java | 30 +-
.../kylin/rest/service/DomainObjectInfo.java | 52 ---
.../kylin/rest/service/KylinUserService.java | 53 ++-
.../apache/kylin/rest/service/QueryService.java| 146 ++--
.../org/apache/kylin/rest/util/ValidateUtil.java | 32 +-
.../apache/kylin/rest/util/ValidateUtilTest.java | 36 --
.../rest/controller/AccessControllerTest.java | 21 +-
.../kylin/rest/security/KylinUserManagerTest.java | 51 +++
.../kylin/rest/service/AccessServiceTest.java | 57 ++-
.../apache/kylin/rest/service/AclServiceTest.java | 193 ++
.../apache/kylin/rest/service/UserServiceTest.java | 4 -
.../org/apache/kylin/rest/util/AclUtilTest.java| 4 +-
.../apache/kylin/rest/util/ValidateUtilTest.java | 134 +++
31 files changed, 1820 insertions(+), 718 deletions(-)
create mode 100644
examples/test_case_data/localmeta/acl/legacy-test-domain-object
rename
server-base/src/main/java/org/apache/kylin/rest/controller/{TableAclController.java
=> TableACLController.java} (85%)
create mode 100644
server-base/src/main/java/org/apache/kylin/rest/security/KylinUserManager.java
create mode 100644
server-base/src/main/java/org/apache/kylin/rest/security/springacl/AceImpl.java
create mode 100644
server-base/src/main/java/org/apache/kylin/rest/security/springacl/AclRecord.java
rename server-base/src/main/java/org/apache/kylin/rest/{service/AceInfo.java
=> security/springacl/LegacyAceInfo.java} (68%)
create mode 100644
server-base/src/main/java/org/apache/kylin/rest/security/springacl/MutableAclRecord.java
create mode 100644
server-base/src/main/java/org/apache/kylin/rest/security/springacl/ObjectIdentityImpl.java
rename server-base/src/main/java/org/apache/kylin/rest/{service =>
security/springacl}/SidInfo.java (67%)
delete mode 100644
server-base/src/main/java/org/apache/kylin/rest/service/DomainObjectInfo.java
delete mode 100644
server-base/src/test/java/org/apache/kylin/rest/util/ValidateUtilTest.java
create mode 100644
server/src/test/java/org/apache/kylin/rest/security/KylinUserManagerTest.java
create mode 100644
server/src/test/java/org/apache/kylin/rest/service/AclServiceTest.java
create mode 100644
server/src/test/java/org/apache/kylin/rest/util/ValidateUtilTest.java
--
To stop receiving notification emails like this one, please contact
billy...@apache.org.
[kylin] 06/07: KYLIN-3248, add batch grant API for project ACL.
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit fde86c2d67bdc08b057ab31698a7b01986518b34
Author: Jiatao Tao <245915...@qq.com>
AuthorDate: Thu Feb 8 20:56:36 2018 +0800
KYLIN-3248, add batch grant API for project ACL.
minor, change the batch reqs.
---
.../kylin/rest/controller/AccessController.java| 25
.../apache/kylin/rest/service/AccessService.java | 26 ++---
.../org/apache/kylin/rest/service/AclService.java | 11 +
.../kylin/rest/service/AccessServiceTest.java | 20
.../apache/kylin/rest/service/AclServiceTest.java | 27 ++
5 files changed, 106 insertions(+), 3 deletions(-)
diff --git
a/server-base/src/main/java/org/apache/kylin/rest/controller/AccessController.java
b/server-base/src/main/java/org/apache/kylin/rest/controller/AccessController.java
index 56cae10..b9a00b3 100644
---
a/server-base/src/main/java/org/apache/kylin/rest/controller/AccessController.java
+++
b/server-base/src/main/java/org/apache/kylin/rest/controller/AccessController.java
@@ -20,8 +20,11 @@ package org.apache.kylin.rest.controller;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import com.google.common.base.Preconditions;
import org.apache.kylin.common.persistence.AclEntity;
import org.apache.kylin.common.util.Pair;
import org.apache.kylin.metadata.MetadataConstants;
@@ -156,6 +159,28 @@ public class AccessController extends BasicController
implements InitializingBea
}
/**
+ * Batch API.Grant a new access on a domain object to a user/role
+ */
+@RequestMapping(value = "batch/{type}/{uuid}", method = {
RequestMethod.POST }, produces = { "application/json" })
+@ResponseBody
+public void batchGrant(@PathVariable String type, @PathVariable String
uuid,
+@RequestBody List<Object[]> reqs) throws IOException {
+Map<Sid, Permission> sidToPerm = new HashMap<>();
+AclEntity ae = accessService.getAclEntity(type, uuid);
+for (Object[] req : reqs) {
+Preconditions.checkArgument(req.length == 3, "error access
requests.");
+String name = (String) req[0];
+boolean isPrincipal = (boolean) req[1];
+validateUtil.checkIdentifiersExists(name, isPrincipal);
+
+Sid sid = accessService.getSid(name, isPrincipal);
+Permission permission =
AclPermissionFactory.getPermission((String) req[2]);
+sidToPerm.put(sid, permission);
+}
+accessService.batchGrant(ae, sidToPerm);
+}
+
+/**
* Update a access on a domain object
*
* @param accessRequest
diff --git
a/server-base/src/main/java/org/apache/kylin/rest/service/AccessService.java
b/server-base/src/main/java/org/apache/kylin/rest/service/AccessService.java
index 09a89c8..dfac275 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/AccessService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/AccessService.java
@@ -100,6 +100,29 @@ public class AccessService {
@Transactional
@PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN + " or hasPermission(#ae,
'ADMINISTRATION')")
+public void batchGrant(AclEntity ae, Map<Sid, Permission> sidToPerm) {
+Message msg = MsgPicker.getMsg();
+
+if (ae == null)
+throw new BadRequestException(msg.getACL_DOMAIN_NOT_FOUND());
+if (sidToPerm == null)
+throw new BadRequestException(msg.getACL_PERMISSION_REQUIRED());
+
+MutableAclRecord acl;
+try {
+acl = aclService.readAcl(new ObjectIdentityImpl(ae));
+} catch (NotFoundException e) {
+acl = init(ae, null);
+}
+
+for (Sid sid : sidToPerm.keySet()) {
+secureOwner(acl, sid);
+}
+aclService.batchUpsertAce(acl, sidToPerm);
+}
+
+@Transactional
+@PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN + " or hasPermission(#ae,
'ADMINISTRATION')")
public MutableAclRecord grant(AclEntity ae, Permission permission, Sid
sid) {
Message msg = MsgPicker.getMsg();
@@ -304,9 +327,6 @@ public class AccessService {
/**
* Protect admin permission granted to acl owner.
- *
- * @param acl
- * @param indexOfAce
*/
private void secureOwner(MutableAclRecord acl, Sid sid) {
Message msg = MsgPicker.getMsg();
diff --git
a/server-base/src/main/java/org/apache/kylin/rest/service/AclService.java
b/server-base/src/main/java/org/apache/kylin/rest/service/AclService.java
index adc7c30..f3e2393 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/AclService.java
+++ b/server-base/src/mai
[kylin] 05/07: KYLIN-3246, add manager for user.
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 7c9892b2f8163d63536d4b5e76759186584c3d60
Author: Jiatao Tao <245915...@qq.com>
AuthorDate: Thu Feb 8 15:11:09 2018 +0800
KYLIN-3246, add manager for user.
minor, remove notify project ACL update.
---
.../kylin/rest/security/KylinUserManager.java | 141 +
.../apache/kylin/rest/security/ManagedUser.java| 5 +
.../kylin/rest/service/KylinUserService.java | 72 +++
.../org/apache/kylin/rest/service/UserService.java | 2 -
.../kylin/rest/security/KylinUserManagerTest.java | 51
.../apache/kylin/rest/service/UserServiceTest.java | 11 --
6 files changed, 217 insertions(+), 65 deletions(-)
diff --git
a/server-base/src/main/java/org/apache/kylin/rest/security/KylinUserManager.java
b/server-base/src/main/java/org/apache/kylin/rest/security/KylinUserManager.java
new file mode 100644
index 000..c4b457d
--- /dev/null
+++
b/server-base/src/main/java/org/apache/kylin/rest/security/KylinUserManager.java
@@ -0,0 +1,141 @@
+/*
+ * 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.rest.security;
+
+import static org.apache.kylin.common.persistence.ResourceStore.USER_ROOT;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.apache.kylin.common.KylinConfig;
+import org.apache.kylin.common.persistence.ResourceStore;
+import org.apache.kylin.common.util.AutoReadWriteLock;
+import org.apache.kylin.metadata.cachesync.Broadcaster;
+import org.apache.kylin.metadata.cachesync.CachedCrudAssist;
+import org.apache.kylin.metadata.cachesync.CaseInsensitiveStringCache;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class KylinUserManager {
+
+private static final Logger logger =
LoggerFactory.getLogger(KylinUserManager.class);
+
+public static KylinUserManager getInstance(KylinConfig config) {
+return config.getManager(KylinUserManager.class);
+}
+
+// called by reflection
+static KylinUserManager newInstance(KylinConfig config) throws IOException
{
+return new KylinUserManager(config);
+}
+
+//
+
+private KylinConfig config;
+// user ==> ManagedUser
+private CaseInsensitiveStringCache userMap;
+private CachedCrudAssist crud;
+private AutoReadWriteLock lock = new AutoReadWriteLock();
+
+public KylinUserManager(KylinConfig config) throws IOException {
+logger.info("Initializing KylinUserManager with config " + config);
+this.config = config;
+this.userMap = new CaseInsensitiveStringCache<>(config, "user");
+this.crud = new CachedCrudAssist(getStore(), USER_ROOT,
"", ManagedUser.class, userMap, false) {
+@Override
+protected ManagedUser initEntityAfterReload(ManagedUser user,
String resourceName) {
+return user;
+}
+};
+
+crud.reloadAll();
+Broadcaster.getInstance(config).registerListener(new
ManagedUserSyncListener(), "user");
+}
+
+private class ManagedUserSyncListener extends Broadcaster.Listener {
+
+@Override
+public void onEntityChange(Broadcaster broadcaster, String entity,
Broadcaster.Event event, String cacheKey)
+throws IOException {
+try (AutoReadWriteLock.AutoLock l = lock.lockForWrite()) {
+if (event == Broadcaster.Event.DROP)
+userMap.removeLocal(cacheKey);
+else
+crud.reloadQuietly(cacheKey);
+}
+}
+}
+
+public KylinConfig getConfig() {
+return config;
+}
+
+public ResourceStore getStore() {
+return ResourceStore.getStore(this.config);
+}
+
+public ManagedUser get(String name) {
+try (AutoReadWriteLock.AutoLock l = lock.lockForRead()) {
+
[kylin] 01/07: Refactor ACL, AclService, AccessService
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 62bfc5f70e9553f0c95fe160dbf63f8d20ec3d52
Author: Li Yang <liy...@apache.org>
AuthorDate: Sat Jan 27 22:03:50 2018 +0800
Refactor ACL, AclService, AccessService
---
.../kylin/common/persistence/JsonSerializer.java | 11 +-
.../localmeta/acl/legacy-test-domain-object| 31 +++
.../apache/kylin/rest/request/AccessRequest.java | 6 +-
.../kylin/rest/security/springacl/AceImpl.java | 184 +
.../kylin/rest/security/springacl/AclRecord.java | 276 +++
.../springacl/LegacyAceInfo.java} | 26 +-
.../rest/security/springacl/MutableAclRecord.java | 123 +
.../security/springacl/ObjectIdentityImpl.java | 134 +
.../{service => security/springacl}/SidInfo.java | 31 ++-
.../apache/kylin/rest/service/AccessService.java | 263 +++---
.../org/apache/kylin/rest/service/AclService.java | 303 +++--
.../kylin/rest/service/AclTableMigrationTool.java | 30 +-
.../kylin/rest/service/DomainObjectInfo.java | 52
.../rest/controller/AccessControllerTest.java | 10 +-
.../kylin/rest/service/AccessServiceTest.java | 41 ++-
.../apache/kylin/rest/service/AclServiceTest.java | 166 +++
16 files changed, 1189 insertions(+), 498 deletions(-)
diff --git
a/core-common/src/main/java/org/apache/kylin/common/persistence/JsonSerializer.java
b/core-common/src/main/java/org/apache/kylin/common/persistence/JsonSerializer.java
index 8f0cc51..508b2ab 100644
---
a/core-common/src/main/java/org/apache/kylin/common/persistence/JsonSerializer.java
+++
b/core-common/src/main/java/org/apache/kylin/common/persistence/JsonSerializer.java
@@ -30,11 +30,17 @@ import org.apache.kylin.common.util.JsonUtil;
public class JsonSerializer implements
Serializer {
Class clz;
+boolean compact = false;
public JsonSerializer(Class clz) {
this.clz = clz;
}
+public JsonSerializer(Class clz, boolean compact) {
+this.clz = clz;
+this.compact = compact;
+}
+
@Override
public T deserialize(DataInputStream in) throws IOException {
return JsonUtil.readValue(in, clz);
@@ -42,6 +48,9 @@ public class JsonSerializer
implements Serialize
@Override
public void serialize(T obj, DataOutputStream out) throws IOException {
-JsonUtil.writeValueIndent(out, obj);
+if (compact)
+JsonUtil.writeValue(out, obj);
+else
+JsonUtil.writeValueIndent(out, obj);
}
}
diff --git a/examples/test_case_data/localmeta/acl/legacy-test-domain-object
b/examples/test_case_data/localmeta/acl/legacy-test-domain-object
new file mode 100644
index 000..46cae53
--- /dev/null
+++ b/examples/test_case_data/localmeta/acl/legacy-test-domain-object
@@ -0,0 +1,31 @@
+{
+ "domainObjectInfo" : {
+"id" : "legacy-test-domain-object",
+"type" : "org.apache.kylin.rest.service.AclServiceTest$MockAclEntity"
+ },
+ "parentDomainObjectInfo" : null,
+ "ownerInfo" : {
+"sid" : "ADMIN",
+"principal" : true
+ },
+ "entriesInheriting" : true,
+ "allAceInfo" : {
+"MODELER" : {
+ "sidInfo" : {
+"sid" : "MODELER",
+"principal" : true
+ },
+ "permissionMask" : 1
+},
+"ADMIN" : {
+ "sidInfo" : {
+"sid" : "ADMIN",
+"principal" : true
+ },
+ "permissionMask" : 16
+}
+ },
+ "uuid" : null,
+ "last_modified" : 1517017738360,
+ "version" : "2.3.0.20505"
+}
\ No newline at end of file
diff --git
a/server-base/src/main/java/org/apache/kylin/rest/request/AccessRequest.java
b/server-base/src/main/java/org/apache/kylin/rest/request/AccessRequest.java
index 0ff57b2..ba93fa7 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/request/AccessRequest.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/request/AccessRequest.java
@@ -24,7 +24,7 @@ package org.apache.kylin.rest.request;
*/
public class AccessRequest {
-private Long accessEntryId;
+private int accessEntryId;
private String permission;
private String sid;
private boolean principal;
@@ -32,11 +32,11 @@ public class AccessRequest {
public AccessRequest() {
}
-public Long getAccessEntryId() {
+public int getAccessEntryId() {
return accessEntryId;
}
-public void setAccessEntryId(Long accessEntryId) {
+public void setAccessEntryId(int accessEntryId) {
this.accessEntryId = accessEntryId;
}
diff --git
a/server
[kylin] 03/07: minor refactor about ACL.
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 94a197849e9fb46b52e898adb01cd81a7bc12d78
Author: Jiatao Tao <245915...@qq.com>
AuthorDate: Sun Feb 4 21:06:21 2018 +0800
minor refactor about ACL.
minor.
---
...eAclController.java => TableACLController.java} | 22 +++-
.../apache/kylin/rest/service/QueryService.java| 146 ++---
.../org/apache/kylin/rest/util/ValidateUtil.java | 32 +++--
3 files changed, 74 insertions(+), 126 deletions(-)
diff --git
a/server-base/src/main/java/org/apache/kylin/rest/controller/TableAclController.java
b/server-base/src/main/java/org/apache/kylin/rest/controller/TableACLController.java
similarity index 85%
rename from
server-base/src/main/java/org/apache/kylin/rest/controller/TableAclController.java
rename to
server-base/src/main/java/org/apache/kylin/rest/controller/TableACLController.java
index 198930c..1a97ec5 100644
---
a/server-base/src/main/java/org/apache/kylin/rest/controller/TableAclController.java
+++
b/server-base/src/main/java/org/apache/kylin/rest/controller/TableACLController.java
@@ -22,7 +22,11 @@ import java.io.IOException;
import java.util.List;
import java.util.Set;
+import static org.apache.kylin.metadata.MetadataConstants.TYPE_USER;
+
+import org.apache.kylin.rest.constant.Constant;
import org.apache.kylin.rest.service.TableACLService;
+import org.apache.kylin.rest.service.UserService;
import org.apache.kylin.rest.util.ValidateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -34,7 +38,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
@Controller
@RequestMapping(value = "/acl")
-public class TableAclController extends BasicController {
+public class TableACLController extends BasicController {
@Autowired
@Qualifier("TableAclService")
@@ -44,12 +48,22 @@ public class TableAclController extends BasicController {
@Qualifier("validateUtil")
private ValidateUtil validateUtil;
+@Autowired
+@Qualifier("userService")
+private UserService userService;
+
@RequestMapping(value = "/table/{project}/{type}/{table:.+}", method =
{RequestMethod.GET}, produces = {"application/json"})
@ResponseBody
public List getUsersCanQueryTheTbl(@PathVariable String project,
@PathVariable String type, @PathVariable String table) throws IOException {
validateUtil.validateArgs(project, table);
validateUtil.validateTable(project, table);
-Set allIdentifiers = validateUtil.getAllIdentifiers(project,
type);
+Set allIdentifiers =
validateUtil.getAllIdentifiersInPrj(project, type);
+// add global admins
+if (type.equals(TYPE_USER)) {
+allIdentifiers.addAll(userService.listAdminUsers());
+} else {
+allIdentifiers.add(Constant.ROLE_ADMIN);
+}
return tableACLService.getCanAccessList(project, table,
allIdentifiers, type);
}
@@ -70,7 +84,7 @@ public class TableAclController extends BasicController {
@PathVariable String table,
@PathVariable String name) throws IOException {
validateUtil.validateArgs(project, table, name);
-validateUtil.validateIdentifiers(name, type);
+validateUtil.validateIdentifiers(project, name, type);
validateUtil.validateTable(project, table);
tableACLService.addToTableACL(project, name, table, type);
}
@@ -84,7 +98,7 @@ public class TableAclController extends BasicController {
@PathVariable String table,
@PathVariable String name) throws IOException {
validateUtil.validateArgs(project, table, name);
-validateUtil.validateIdentifiers(name, type);
+validateUtil.validateIdentifiers(project, name, type);
validateUtil.validateTable(project, table);
tableACLService.deleteFromTableACL(project, name, table, type);
}
diff --git
a/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java
b/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java
index 5f67aa1..375b069 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java
@@ -18,15 +18,35 @@
package org.apache.kylin.rest.service;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.CharMatcher;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.Element;
+import static org.apache.kylin.co
[kylin] branch document updated: add 2.3 release blog
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch document in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/document by this push: new e98f444 add 2.3 release blog e98f444 is described below commit e98f4448ec571f15cf16c5bda7ca4831fb1d75cb Author: Billy Liu <billy...@apache.org> AuthorDate: Sun Mar 4 14:40:01 2018 +0800 add 2.3 release blog --- website/_posts/blog/2018-03-04-release-v2.3.0.md | 44 1 file changed, 44 insertions(+) diff --git a/website/_posts/blog/2018-03-04-release-v2.3.0.md b/website/_posts/blog/2018-03-04-release-v2.3.0.md new file mode 100644 index 000..9f102f9 --- /dev/null +++ b/website/_posts/blog/2018-03-04-release-v2.3.0.md @@ -0,0 +1,44 @@ +--- +layout: post-blog +title: Apache Kylin v2.3.0 Release Announcement +date: 2018-03-04 20:00:00 +author: Billy Liu +categories: blog +--- + +The Apache Kylin community is pleased to announce the release of Apache Kylin v2.3.0. + +Apache Kylin is an open source Distributed Analytics Engine designed to provide SQL interface and multi-dimensional analysis (OLAP) on Big Data supporting extremely large datasets. + +This is a major release after 2.2.0. The new features include supporting SparkSQL in building "Intermediate Flat Hive Table", new dropwizard-based metrics framework and the fantastic cube planner which could select the cost-effective cuboids to build based on cost-based algorithm. + +Apache Kylin 2.3.0 resolved 250+ issues including bug fixes, improvements, and new features. All of the changes can be found in the [release notes]( +https://kylin.apache.org/docs23/release_notes.html). + + +## Change Highlights + +- Support SparkSql in Cube building step "Create Intermediate Flat Hive Table" [KYLIN-3125](https://issues.apache.org/jira/browse/KYLIN-3125) +- Support SQL Server as data source [KYLIN-3044](https://issues.apache.org/jira/browse/KYLIN-3044) +- Support user/group and role authentication for LDAP [KYLIN-2960](https://issues.apache.org/jira/browse/KYLIN-2960) +- New metric framework based on dropwizard [KYLIN-2776](https://issues.apache.org/jira/browse/KYLIN-2776) +- Introduce cube planner able to select cost-effective cuboids to be built by cost-based algorithms [KYLIN-2727](https://issues.apache.org/jira/browse/KYLIN-2727) [Document](http://kylin.apache.org/docs23/howto/howto_use_cube_planner.html) +- Introduce a dashboard for showing kylin service related metrics, like query count, query latency, job count, etc [KYLIN-2726](https://issues.apache.org/jira/browse/KYLIN-2726) [Document](http://kylin.apache.org/docs23/howto/howto_use_dashboard.html) +- Support volatile range for segments auto merge [KYLIN-1892](https://issues.apache.org/jira/browse/KYLIN-1892) + + +To download Apache Kylin v2.3.0 source code or binary package, visit the [download](http://kylin.apache.org/download) page. + +__Upgrade__ + +Follow the [upgrade guide](/docs23/howto/howto_upgrade.html). + + +__Support__ + +Any issue or question, +open JIRA to Apache Kylin project: [https://issues.apache.org/jira/browse/KYLIN/](https://issues.apache.org/jira/browse/KYLIN/) +or +send mail to Apache Kylin dev mailing list: [d...@kylin.apache.org](mailto:d...@kylin.apache.org) + +_Great thanks to everyone who contributed!_ -- To stop receiving notification emails like this one, please contact billy...@apache.org.
[kylin] branch document updated: update 2.3.0 release notes
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch document
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/document by this push:
new 2074b5e update 2.3.0 release notes
2074b5e is described below
commit 2074b5eae6e118074e7ba875aa896df347ed6e3f
Author: Billy Liu <billy...@apache.org>
AuthorDate: Sun Mar 4 14:14:34 2018 +0800
update 2.3.0 release notes
---
website/_docs23/release_notes.md | 44 ++--
website/_includes/header.cn.html | 2 +-
website/_includes/header.html| 2 +-
website/download/index.cn.md | 8
website/download/index.md| 8
5 files changed, 51 insertions(+), 13 deletions(-)
diff --git a/website/_docs23/release_notes.md b/website/_docs23/release_notes.md
index 7e0d839..40eea53 100644
--- a/website/_docs23/release_notes.md
+++ b/website/_docs23/release_notes.md
@@ -15,9 +15,9 @@ 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)
-## v2.3.0 - 2018-02-XX
-_Tag:_ [kylin-2.3.0](https://github.com/apache/kylin/tree/kylin-2.2.0)
-This is a major release after 2.2, with more than 200 bug fixes and
enhancement. Check [How to upgrade](/docs23/howto/howto_upgrade.html).
+## v2.3.0 - 2018-03-04
+_Tag:_ [kylin-2.3.0](https://github.com/apache/kylin/tree/kylin-2.3.0)
+This is a major release after 2.2, with more than 250 bug fixes and
enhancement. Check [How to upgrade](/docs23/howto/howto_upgrade.html).
__New Feature__
* [KYLIN-3125] - Support SparkSql in Cube building step "Create Intermediate
Flat Hive Table"
@@ -32,8 +32,15 @@ __New Feature__
* [KYLIN-1892] - Support volatile range for segments auto merge
__Improvement__
+* [KYLIN-3265] - Add "jobSearchMode" as a condition to "/kylin/api/jobs" API
+* [KYLIN-3245] - Searching cube support fuzzy search
+* [KYLIN-3243] - Optimize the code and keep the code consistent in the
access.html
+* [KYLIN-3239] - Refactor the ACL code about "checkPermission" and
"hasPermission"
+* [KYLIN-3215] - Remove 'drop' option when job status is stopped and error
+* [KYLIN-3214] - Initialize ExternalAclProvider when starting kylin
* [KYLIN-3209] - Optimize job partial statistics path be consistent with
existing one
* [KYLIN-3196] - Replace StringUtils.containsOnly with Regex
+* [KYLIN-3194] - Tolerate broken job metadata caused by executable
ClassNotFoundException
* [KYLIN-3193] - No model clone across projects
* [KYLIN-3182] - Update Kylin help menu links
* [KYLIN-3181] - The submit button status of refreshing cube is not suitable
when the start time is equal or more than the end time.
@@ -43,6 +50,7 @@ __Improvement__
* [KYLIN-3157] - Enhance query timeout to entire query life cycle
* [KYLIN-3151] - Enable 'Query History' to show items filtered by different
projects
* [KYLIN-3150] - Support different compression in PercentileCounter measure
+* [KYLIN-3145] - Support Kafka JSON message whose property name includes "_"
* [KYLIN-3144] - Adopt Collections.emptyList() for empty list values
* [KYLIN-3129] - Fix the joda library conflicts during Kylin start on EMR 5.8+
* [KYLIN-3128] - Configs for allowing export query results for admin/nonadmin
user
@@ -101,8 +109,8 @@ __Improvement__
* [KYLIN-2913] - Enable job retry for configurable exceptions
* [KYLIN-2912] - Remove "hfile" folder after bulk load to HBase
* [KYLIN-2909] - Refine Email Template for notification by freemarker
+* [KYLIN-2908] - Add one option for migration tool to indicate whether to
migrate segment data
* [KYLIN-2905] - Refine the process of submitting a job
-* [KYLIN-2895] - Refine query cache
* [KYLIN-2884] - Add delete segment function for portal
* [KYLIN-2881] - Improve hbase coprocessor exception handling at kylin server
side
* [KYLIN-2875] - Cube e-mail notification Validation
@@ -124,7 +132,25 @@ __Improvement__
* [KYLIN-1872] - Make query visible and interruptible, improve server's
stablility
__Bug__
+* [KYLIN-3268] - Tomcat Security Vulnerability Alert. The version of the
tomcat for kylin should upgrade to 7.0.85.
+* [KYLIN-3263] - AbstractExecutable's retry has problem
+* [KYLIN-3247] - REST API 'GET /api/cubes/{cubeName}/segs/{segmentName}/sql'
should return a cube segment sql
+* [KYLIN-3242] - export result should use alias too
+* [KYLIN-3241] - When refresh on 'Add Cube Page', a blank page will appear.
+* [KYLIN-3228] - Should remove the related segment when deleting a job
+* [KYLIN-3227] - Automatically remove the blank at the end of lines in
properties files
+* [KYLIN-3226] - When user logs in with only query permission, 'N/A' is
displayed in the cube's action list.
+* [KYLIN-3224] - data can't show when use kylin pushdown model
+* [KY
[kylin] branch master updated (a05a4d0 -> 1e7825b)
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/kylin.git. from a05a4d0 KYLIN-3251, add a hook that can customize test_case_data and add MetadataCleanupJob UT. new 8e55ba9 manual update htrace to 2.3.0 new 81129cf [maven-release-plugin] prepare release kylin-2.3.0 new 1d4b2d3 [maven-release-plugin] prepare for next development iteration new eae0c95 manual update htrace to 2.4.0-SNAPSHOT new 1e7825b bump to 2.4.0-SNAPSHOT The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: assembly/pom.xml | 5 ++--- atopcalcite/pom.xml| 5 ++--- core-common/pom.xml| 5 ++--- .../java/org/apache/kylin/common/KylinVersion.java | 2 +- core-cube/pom.xml | 5 ++--- core-dictionary/pom.xml| 5 ++--- core-job/pom.xml | 5 ++--- core-metadata/pom.xml | 6 ++ core-metrics/pom.xml | 5 ++--- core-storage/pom.xml | 5 ++--- engine-mr/pom.xml | 5 ++--- engine-spark/pom.xml | 5 ++--- external/htrace/pom.xml| 2 +- external/pom.xml | 6 ++ jdbc/pom.xml | 5 ++--- kylin-it/pom.xml | 18 -- metrics-reporter-hive/pom.xml | 5 ++--- metrics-reporter-kafka/pom.xml | 2 +- pom.xml| 12 +--- query/pom.xml | 5 ++--- server-base/pom.xml| 6 ++ server/pom.xml | 5 ++--- source-hive/pom.xml| 5 ++--- source-kafka/pom.xml | 5 ++--- storage-hbase/pom.xml | 9 +++-- tomcat-ext/pom.xml | 6 ++ tool-assembly/pom.xml | 5 ++--- tool/pom.xml | 5 ++--- 28 files changed, 63 insertions(+), 96 deletions(-) -- To stop receiving notification emails like this one, please contact billy...@apache.org.
[kylin] 05/05: bump to 2.4.0-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 1e7825bd8b69ad7517298175d2d5bb0fde578fca
Author: Billy Liu <billy...@apache.org>
AuthorDate: Sun Mar 4 13:21:37 2018 +0800
bump to 2.4.0-SNAPSHOT
---
core-common/src/main/java/org/apache/kylin/common/KylinVersion.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 749cb86..8fe795c 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
@@ -95,7 +95,7 @@ public class KylinVersion implements Comparable {
/**
* Require MANUAL updating kylin version per ANY upgrading.
*/
-private static final KylinVersion CURRENT_KYLIN_VERSION = new
KylinVersion("2.3.0.20500");
+private static final KylinVersion CURRENT_KYLIN_VERSION = new
KylinVersion("2.4.0.20500");
private static final KylinVersion VERSION_200 = new KylinVersion("2.0.0");
--
To stop receiving notification emails like this one, please contact
billy...@apache.org.
[kylin] 03/05: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kylin.git commit 1d4b2d3ff4cd2c0b8457b4f1ce02f96c69daf616 Author: Billy Liu <billy...@apache.org> AuthorDate: Thu Mar 1 03:01:41 2018 + [maven-release-plugin] prepare for next development iteration --- assembly/pom.xml | 2 +- atopcalcite/pom.xml| 2 +- core-common/pom.xml| 2 +- core-cube/pom.xml | 2 +- core-dictionary/pom.xml| 2 +- core-job/pom.xml | 2 +- core-metadata/pom.xml | 2 +- core-metrics/pom.xml | 2 +- core-storage/pom.xml | 2 +- engine-mr/pom.xml | 2 +- engine-spark/pom.xml | 2 +- external/pom.xml | 2 +- jdbc/pom.xml | 2 +- kylin-it/pom.xml | 2 +- metrics-reporter-hive/pom.xml | 2 +- metrics-reporter-kafka/pom.xml | 2 +- pom.xml| 6 +++--- query/pom.xml | 2 +- server-base/pom.xml| 2 +- server/pom.xml | 2 +- source-hive/pom.xml| 2 +- source-kafka/pom.xml | 2 +- storage-hbase/pom.xml | 2 +- tomcat-ext/pom.xml | 2 +- tool-assembly/pom.xml | 2 +- tool/pom.xml | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 558ae91..2f7befc 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -26,7 +26,7 @@ kylin org.apache.kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml index d5d0325..1f5c714 100644 --- a/atopcalcite/pom.xml +++ b/atopcalcite/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-common/pom.xml b/core-common/pom.xml index 1b81f69..1507833 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-cube/pom.xml b/core-cube/pom.xml index ddf89d2..81fa547 100644 --- a/core-cube/pom.xml +++ b/core-cube/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-dictionary/pom.xml b/core-dictionary/pom.xml index a9d4ef4..7e8bee1 100644 --- a/core-dictionary/pom.xml +++ b/core-dictionary/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-job/pom.xml b/core-job/pom.xml index 5bac3d1..0a025d8 100644 --- a/core-job/pom.xml +++ b/core-job/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-metadata/pom.xml b/core-metadata/pom.xml index 211d04f..21aa6ee 100644 --- a/core-metadata/pom.xml +++ b/core-metadata/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-metrics/pom.xml b/core-metrics/pom.xml index c56e15c..e76aa2f 100644 --- a/core-metrics/pom.xml +++ b/core-metrics/pom.xml @@ -28,7 +28,7 @@ kylin org.apache.kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-storage/pom.xml b/core-storage/pom.xml index 34d7dbe..c173c5e 100644 --- a/core-storage/pom.xml +++ b/core-storage/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/engine-mr/pom.xml b/engine-mr/pom.xml index 2b2d3bb..129afbe 100644 --- a/engine-mr/pom.xml +++ b/engine-mr/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/engine-spark/pom.xml b/engine-spark/pom.xml index 17bc5c5..9fa646e 100644 --- a/engine-spark/pom.xml +++ b/engine-spark/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/external/pom.xml b/external/pom.xml index 1e18edc..8a038ba 100644 --- a/external/pom.xml +++ b/external/pom.xml @@ -26,7 +26,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/jdbc/pom.xml b/jdbc/pom.xml index a730b23..224be54 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/kylin-it/pom.xml b/kylin-it/pom.xml index a119a0d..fd4fa8b 100644 --- a/kylin-it/pom.xml +++ b/kylin-it/pom.xml @@ -29,7 +29,7 @@ kylin org.apache.kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/metrics-reporte
[kylin] 02/05: [maven-release-plugin] prepare release kylin-2.3.0
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kylin.git commit 81129cf25a4bd9d191a68cda9d0e69384a930e3a Author: Billy Liu <billy...@apache.org> AuthorDate: Thu Mar 1 03:01:21 2018 + [maven-release-plugin] prepare release kylin-2.3.0 --- 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 | 6 ++ core-metrics/pom.xml | 5 ++--- core-storage/pom.xml | 5 ++--- engine-mr/pom.xml | 5 ++--- engine-spark/pom.xml | 5 ++--- external/pom.xml | 6 ++ jdbc/pom.xml | 5 ++--- kylin-it/pom.xml | 18 -- metrics-reporter-hive/pom.xml | 5 ++--- metrics-reporter-kafka/pom.xml | 2 +- pom.xml| 14 ++ query/pom.xml | 5 ++--- server-base/pom.xml| 6 ++ server/pom.xml | 5 ++--- source-hive/pom.xml| 5 ++--- source-kafka/pom.xml | 5 ++--- storage-hbase/pom.xml | 9 +++-- tomcat-ext/pom.xml | 6 ++ tool-assembly/pom.xml | 5 ++--- tool/pom.xml | 5 ++--- 26 files changed, 62 insertions(+), 95 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index cc254d1..558ae91 100644 --- a/assembly/pom.xml +++ b/assembly/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-assembly @@ -27,7 +26,7 @@ kylin org.apache.kylin -2.3.0-SNAPSHOT +2.3.0 diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml index 80b3a9a..d5d0325 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 @@ -29,7 +28,7 @@ org.apache.kylin kylin -2.3.0-SNAPSHOT +2.3.0 diff --git a/core-common/pom.xml b/core-common/pom.xml index 4d12a47..1b81f69 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 @@ -29,7 +28,7 @@ org.apache.kylin kylin -2.3.0-SNAPSHOT +2.3.0 diff --git a/core-cube/pom.xml b/core-cube/pom.xml index 2bd1ecd..ddf89d2 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; 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-cube @@ -29,7 +28,7 @@ org.apache.kylin kylin -2.3.0-SNAPSHOT +2.3.0 diff --git a/core-dictionary/pom.xml b/core-dictionary/pom.xml index 3a53149..a9d4ef4 100644 --- a/core-dictionary/pom.xml +++ b/core-dictionary/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.apa
[kylin] 01/05: manual update htrace to 2.3.0
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kylin.git commit 8e55ba90096613012097807acedfc0e42dc3407d Author: Billy Liu <billy...@apache.org> AuthorDate: Thu Mar 1 02:53:33 2018 + manual update htrace to 2.3.0 --- external/htrace/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/htrace/pom.xml b/external/htrace/pom.xml index e83b153..5427e09 100644 --- a/external/htrace/pom.xml +++ b/external/htrace/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0-SNAPSHOT +2.3.0 ../../pom.xml -- To stop receiving notification emails like this one, please contact billy...@apache.org.
[kylin] 04/05: manual update htrace to 2.4.0-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kylin.git commit eae0c95ccb95f5a5a040127ac5ee4d3ff414ba13 Author: Billy Liu <billy...@apache.org> AuthorDate: Thu Mar 1 03:03:23 2018 + manual update htrace to 2.4.0-SNAPSHOT --- external/htrace/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/htrace/pom.xml b/external/htrace/pom.xml index 5427e09..cfadfce 100644 --- a/external/htrace/pom.xml +++ b/external/htrace/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT ../../pom.xml -- To stop receiving notification emails like this one, please contact billy...@apache.org.
svn commit: r25395 - /release/kylin/apache-kylin-1.6.0/
Author: billyliu Date: Sun Mar 4 05:09:13 2018 New Revision: 25395 Log: Remove old release 1.6.0 Removed: release/kylin/apache-kylin-1.6.0/
svn commit: r25394 - /release/kylin/apache-kylin-2.3.0/
Author: billyliu Date: Sun Mar 4 05:03:57 2018 New Revision: 25394 Log: checkin release artifacts for Kylin 2.3.0 Added: release/kylin/apache-kylin-2.3.0/ release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-cdh57-bin.tar.gz (with props) release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-cdh57-bin.tar.gz.asc (with props) release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-cdh57-bin.tar.gz.md5 release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-cdh57-bin.tar.gz.sha1 release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-hbase1x-bin.tar.gz (with props) release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-hbase1x-bin.tar.gz.asc (with props) release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-hbase1x-bin.tar.gz.md5 release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-hbase1x-bin.tar.gz.sha1 release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-src.tar.gz (with props) release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-src.tar.gz.asc (with props) release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-src.tar.gz.asc.md5 release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-src.tar.gz.asc.sha1 release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-src.tar.gz.md5 release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-src.tar.gz.sha1 Added: release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-cdh57-bin.tar.gz == Binary file - no diff available. Propchange: release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-cdh57-bin.tar.gz -- svn:mime-type = application/x-gzip Added: release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-cdh57-bin.tar.gz.asc == Binary file - no diff available. Propchange: release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-cdh57-bin.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-cdh57-bin.tar.gz.md5 == --- release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-cdh57-bin.tar.gz.md5 (added) +++ release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-cdh57-bin.tar.gz.md5 Sun Mar 4 05:03:57 2018 @@ -0,0 +1 @@ +00033d0b78fdfa2f17cda36dc065dd66 apache-kylin-2.3.0-cdh57-bin.tar.gz Added: release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-cdh57-bin.tar.gz.sha1 == --- release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-cdh57-bin.tar.gz.sha1 (added) +++ release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-cdh57-bin.tar.gz.sha1 Sun Mar 4 05:03:57 2018 @@ -0,0 +1 @@ +092e54d9d31f5bce7e7362b1192bedb6aeaf3cea apache-kylin-2.3.0-cdh57-bin.tar.gz Added: release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-hbase1x-bin.tar.gz == Binary file - no diff available. Propchange: release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-hbase1x-bin.tar.gz -- svn:mime-type = application/x-gzip Added: release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-hbase1x-bin.tar.gz.asc == Binary file - no diff available. Propchange: release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-hbase1x-bin.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-hbase1x-bin.tar.gz.md5 == --- release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-hbase1x-bin.tar.gz.md5 (added) +++ release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-hbase1x-bin.tar.gz.md5 Sun Mar 4 05:03:57 2018 @@ -0,0 +1 @@ +c0447bb92f4ded7c3071f025ee0e2649 apache-kylin-2.3.0-hbase1x-bin.tar.gz Added: release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-hbase1x-bin.tar.gz.sha1 == --- release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-hbase1x-bin.tar.gz.sha1 (added) +++ release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-hbase1x-bin.tar.gz.sha1 Sun Mar 4 05:03:57 2018 @@ -0,0 +1 @@ +1247b7448e007e118f3c6d2a40eada8caae33b25 apache-kylin-2.3.0-hbase1x-bin.tar.gz Added: release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-src.tar.gz == Binary file - no diff available. Propchange: release/kylin/apache-kylin-2.3.0/apache-kylin-2.3.0-src.tar.gz
svn commit: r25341 - in /dev/kylin: apache-kylin-2.3.0-rc2/ apache-kylin-2.3.0-rc3/apache-kylin-2.3.0-rc3-cdh57-bin.tar.gz apache-kylin-2.3.0-rc3/apache-kylin-2.3.0-rc3-hbase1x-bin.tar.gz
Author: billyliu Date: Thu Mar 1 04:00:58 2018 New Revision: 25341 Log: Upload release 2.3.0-rc3 artifaccts Added: dev/kylin/apache-kylin-2.3.0-rc3/apache-kylin-2.3.0-rc3-cdh57-bin.tar.gz (with props) dev/kylin/apache-kylin-2.3.0-rc3/apache-kylin-2.3.0-rc3-hbase1x-bin.tar.gz (with props) Removed: dev/kylin/apache-kylin-2.3.0-rc2/ Added: dev/kylin/apache-kylin-2.3.0-rc3/apache-kylin-2.3.0-rc3-cdh57-bin.tar.gz == Binary file - no diff available. Propchange: dev/kylin/apache-kylin-2.3.0-rc3/apache-kylin-2.3.0-rc3-cdh57-bin.tar.gz -- svn:mime-type = application/x-gzip Added: dev/kylin/apache-kylin-2.3.0-rc3/apache-kylin-2.3.0-rc3-hbase1x-bin.tar.gz == Binary file - no diff available. Propchange: dev/kylin/apache-kylin-2.3.0-rc3/apache-kylin-2.3.0-rc3-hbase1x-bin.tar.gz -- svn:mime-type = application/x-gzip
[kylin] branch 2.3.x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch 2.3.x in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/2.3.x by this push: new 541626d [maven-release-plugin] prepare for next development iteration 541626d is described below commit 541626d748b11517370a1c3fca327696c34b9c62 Author: Billy Liu <billy...@apache.org> AuthorDate: Thu Mar 1 03:01:41 2018 + [maven-release-plugin] prepare for next development iteration --- assembly/pom.xml | 2 +- atopcalcite/pom.xml| 2 +- core-common/pom.xml| 2 +- core-cube/pom.xml | 2 +- core-dictionary/pom.xml| 2 +- core-job/pom.xml | 2 +- core-metadata/pom.xml | 2 +- core-metrics/pom.xml | 2 +- core-storage/pom.xml | 2 +- engine-mr/pom.xml | 2 +- engine-spark/pom.xml | 2 +- external/pom.xml | 2 +- jdbc/pom.xml | 2 +- kylin-it/pom.xml | 2 +- metrics-reporter-hive/pom.xml | 2 +- metrics-reporter-kafka/pom.xml | 2 +- pom.xml| 6 +++--- query/pom.xml | 2 +- server-base/pom.xml| 2 +- server/pom.xml | 2 +- source-hive/pom.xml| 2 +- source-kafka/pom.xml | 2 +- storage-hbase/pom.xml | 2 +- tomcat-ext/pom.xml | 2 +- tool-assembly/pom.xml | 2 +- tool/pom.xml | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 558ae91..2f7befc 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -26,7 +26,7 @@ kylin org.apache.kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml index d5d0325..1f5c714 100644 --- a/atopcalcite/pom.xml +++ b/atopcalcite/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-common/pom.xml b/core-common/pom.xml index 1b81f69..1507833 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-cube/pom.xml b/core-cube/pom.xml index ddf89d2..81fa547 100644 --- a/core-cube/pom.xml +++ b/core-cube/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-dictionary/pom.xml b/core-dictionary/pom.xml index a9d4ef4..7e8bee1 100644 --- a/core-dictionary/pom.xml +++ b/core-dictionary/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-job/pom.xml b/core-job/pom.xml index 5bac3d1..0a025d8 100644 --- a/core-job/pom.xml +++ b/core-job/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-metadata/pom.xml b/core-metadata/pom.xml index 211d04f..21aa6ee 100644 --- a/core-metadata/pom.xml +++ b/core-metadata/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-metrics/pom.xml b/core-metrics/pom.xml index c56e15c..e76aa2f 100644 --- a/core-metrics/pom.xml +++ b/core-metrics/pom.xml @@ -28,7 +28,7 @@ kylin org.apache.kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-storage/pom.xml b/core-storage/pom.xml index 34d7dbe..c173c5e 100644 --- a/core-storage/pom.xml +++ b/core-storage/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/engine-mr/pom.xml b/engine-mr/pom.xml index 2b2d3bb..129afbe 100644 --- a/engine-mr/pom.xml +++ b/engine-mr/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/engine-spark/pom.xml b/engine-spark/pom.xml index 17bc5c5..9fa646e 100644 --- a/engine-spark/pom.xml +++ b/engine-spark/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/external/pom.xml b/external/pom.xml index 1e18edc..8a038ba 100644 --- a/external/pom.xml +++ b/external/pom.xml @@ -26,7 +26,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/jdbc/pom.xml b/jdbc/pom.xml index a730b23..224be54 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/kylin-it/pom.xml b/kylin-it/pom.xml index a119a0d..fd4fa8b 100644 --- a/kylin-it/p
[kylin] annotated tag kylin-2.3.0 updated (1179ee7 -> 9864e57)
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a change to annotated tag kylin-2.3.0 in repository https://gitbox.apache.org/repos/asf/kylin.git. *** WARNING: tag kylin-2.3.0 was modified! *** from 1179ee7 (commit) to 9864e57 (tag) tagging 1179ee72d0a2a2c629a649751ef43ae9e82dc87a (commit) replaces kylin-1.2 by Billy Liu on Thu Mar 1 03:01:36 2018 + - Log - [maven-release-plugin] copy for tag kylin-2.3.0 --- No new revisions were added by this update. Summary of changes: -- To stop receiving notification emails like this one, please contact billy...@apache.org.
[kylin] branch 2.3.x updated (4b0d7bd -> 1179ee7)
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a change to branch 2.3.x in repository https://gitbox.apache.org/repos/asf/kylin.git. from 4b0d7bd KYLIN-3265 Add jobSearchMode as a filter condition for jobs UI part new 7965078 manual update htrace to 2.3.0 new 1179ee7 [maven-release-plugin] prepare release kylin-2.3.0 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 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 | 6 ++ core-metrics/pom.xml | 5 ++--- core-storage/pom.xml | 5 ++--- engine-mr/pom.xml | 5 ++--- engine-spark/pom.xml | 5 ++--- external/htrace/pom.xml| 2 +- external/pom.xml | 6 ++ jdbc/pom.xml | 5 ++--- kylin-it/pom.xml | 18 -- metrics-reporter-hive/pom.xml | 5 ++--- metrics-reporter-kafka/pom.xml | 2 +- pom.xml| 14 ++ query/pom.xml | 5 ++--- server-base/pom.xml| 6 ++ server/pom.xml | 5 ++--- source-hive/pom.xml| 5 ++--- source-kafka/pom.xml | 5 ++--- storage-hbase/pom.xml | 9 +++-- tomcat-ext/pom.xml | 6 ++ tool-assembly/pom.xml | 5 ++--- tool/pom.xml | 5 ++--- 27 files changed, 63 insertions(+), 96 deletions(-) -- To stop receiving notification emails like this one, please contact billy...@apache.org.
[kylin] 01/02: manual update htrace to 2.3.0
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch 2.3.x in repository https://gitbox.apache.org/repos/asf/kylin.git commit 7965074cfcdc120b9b063de49b247c4559c1 Author: Billy Liu <billy...@apache.org> AuthorDate: Thu Mar 1 02:53:33 2018 + manual update htrace to 2.3.0 --- external/htrace/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/htrace/pom.xml b/external/htrace/pom.xml index e83b153..5427e09 100644 --- a/external/htrace/pom.xml +++ b/external/htrace/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0-SNAPSHOT +2.3.0 ../../pom.xml -- To stop receiving notification emails like this one, please contact billy...@apache.org.
[kylin] 02/02: [maven-release-plugin] prepare release kylin-2.3.0
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch 2.3.x in repository https://gitbox.apache.org/repos/asf/kylin.git commit 1179ee72d0a2a2c629a649751ef43ae9e82dc87a Author: Billy Liu <billy...@apache.org> AuthorDate: Thu Mar 1 03:01:21 2018 + [maven-release-plugin] prepare release kylin-2.3.0 --- 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 | 6 ++ core-metrics/pom.xml | 5 ++--- core-storage/pom.xml | 5 ++--- engine-mr/pom.xml | 5 ++--- engine-spark/pom.xml | 5 ++--- external/pom.xml | 6 ++ jdbc/pom.xml | 5 ++--- kylin-it/pom.xml | 18 -- metrics-reporter-hive/pom.xml | 5 ++--- metrics-reporter-kafka/pom.xml | 2 +- pom.xml| 14 ++ query/pom.xml | 5 ++--- server-base/pom.xml| 6 ++ server/pom.xml | 5 ++--- source-hive/pom.xml| 5 ++--- source-kafka/pom.xml | 5 ++--- storage-hbase/pom.xml | 9 +++-- tomcat-ext/pom.xml | 6 ++ tool-assembly/pom.xml | 5 ++--- tool/pom.xml | 5 ++--- 26 files changed, 62 insertions(+), 95 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index cc254d1..558ae91 100644 --- a/assembly/pom.xml +++ b/assembly/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-assembly @@ -27,7 +26,7 @@ kylin org.apache.kylin -2.3.0-SNAPSHOT +2.3.0 diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml index 80b3a9a..d5d0325 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 @@ -29,7 +28,7 @@ org.apache.kylin kylin -2.3.0-SNAPSHOT +2.3.0 diff --git a/core-common/pom.xml b/core-common/pom.xml index 4d12a47..1b81f69 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 @@ -29,7 +28,7 @@ org.apache.kylin kylin -2.3.0-SNAPSHOT +2.3.0 diff --git a/core-cube/pom.xml b/core-cube/pom.xml index 2bd1ecd..ddf89d2 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; 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-cube @@ -29,7 +28,7 @@ org.apache.kylin kylin -2.3.0-SNAPSHOT +2.3.0 diff --git a/core-dictionary/pom.xml b/core-dictionary/pom.xml index 3a53149..a9d4ef4 100644 --- a/core-dictionary/pom.xml +++ b/core-dictionary/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/PO
[kylin] branch 2.3.x updated: KYLIN-3265 Add jobSearchMode as a filter condition for jobs UI part
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch 2.3.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/2.3.x by this push:
new 4b0d7bd KYLIN-3265 Add jobSearchMode as a filter condition for jobs
UI part
4b0d7bd is described below
commit 4b0d7bd38b42c5e580fa580d0318834654081dc9
Author: liapan <lia...@ebay.com>
AuthorDate: Mon Feb 26 13:58:32 2018 +0800
KYLIN-3265 Add jobSearchMode as a filter condition for jobs UI part
Signed-off-by: chenzhx <c...@apache.org>
---
webapp/app/js/controllers/job.js | 5 -
webapp/app/js/model/jobConfig.js | 5 +
webapp/app/js/model/jobListModel.js | 2 ++
webapp/app/partials/jobs/jobList.html | 3 +++
4 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/webapp/app/js/controllers/job.js b/webapp/app/js/controllers/job.js
index 51de787..130f14d 100644
--- a/webapp/app/js/controllers/job.js
+++ b/webapp/app/js/controllers/job.js
@@ -28,6 +28,7 @@ KylinApp
//$scope.projects = [];
$scope.action = {};
$scope.timeFilter =
jobConfig.timeFilter[JobList.jobFilter.timeFilterId];
+$scope.searchMode =
jobConfig.searchMode[JobList.jobFilter.searchModeId];
if ($routeParams.jobTimeFilter) {
$scope.timeFilter =
jobConfig.timeFilter[$routeParams.jobTimeFilter];
}
@@ -82,6 +83,7 @@ KylinApp
$scope.cubeName=$scope.cubeName == ""?null:$scope.cubeName;
JobList.jobFilter.cubeName = $scope.cubeName;
JobList.jobFilter.timeFilterId = $scope.timeFilter.value;
+JobList.jobFilter.searchModeId = _.indexOf(jobConfig.searchMode,
$scope.searchMode);
JobList.jobFilter.statusIds = statusIds;
var jobRequest = {
@@ -90,7 +92,8 @@ KylinApp
status: statusIds,
offset: offset,
limit: limit,
-timeFilter: $scope.timeFilter.value
+timeFilter: $scope.timeFilter.value,
+jobSearchMode: $scope.searchMode.value
};
$scope.state.loading = true;
diff --git a/webapp/app/js/model/jobConfig.js b/webapp/app/js/model/jobConfig.js
index 4548366..19ae882 100644
--- a/webapp/app/js/model/jobConfig.js
+++ b/webapp/app/js/model/jobConfig.js
@@ -40,6 +40,11 @@ KylinApp.constant('jobConfig', {
{attr: 'last_modified', name: 'Last Modified Time'},
{attr: 'duration', name: 'Duration'}
],
+ searchMode: [
+{name: 'CUBING', value: 'CUBING_ONLY'},
+{name: 'CHECK POINT', value: 'CHECKPOINT_ONLY'},
+{name: 'ALL', value: 'ALL'}
+ ],
queryitems: [
{attr: 'server', name: 'Server'},
{attr: 'user', name: 'User'},
diff --git a/webapp/app/js/model/jobListModel.js
b/webapp/app/js/model/jobListModel.js
index 45948d6..197532c 100755
--- a/webapp/app/js/model/jobListModel.js
+++ b/webapp/app/js/model/jobListModel.js
@@ -26,6 +26,7 @@ KylinApp.service('JobList',function(JobService,$q){
this.jobFilter = {
cubeName : null,
timeFilterId : 1,
+searchModeId: 2,
statusIds: []
};
@@ -33,6 +34,7 @@ KylinApp.service('JobList',function(JobService,$q){
this.jobFilter = {
cubeName : null,
timeFilterId : 1,
+ searchModeId: 2,
statusIds: []
};
};
diff --git a/webapp/app/partials/jobs/jobList.html
b/webapp/app/partials/jobs/jobList.html
index 1ff6ea4..ae05590 100644
--- a/webapp/app/partials/jobs/jobList.html
+++ b/webapp/app/partials/jobs/jobList.html
@@ -45,6 +45,9 @@
+
+
[kylin] branch 2.3.x updated: KYLIN-3265 Add jobSearchMode as a filter condition for jobs api
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch 2.3.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/2.3.x by this push:
new 5442644 KYLIN-3265 Add jobSearchMode as a filter condition for jobs
api
5442644 is described below
commit 5442644c6387386755bf44fb86721a9c12a1e88f
Author: shaofengshi <shaofeng...@apache.org>
AuthorDate: Sat Feb 24 11:52:03 2018 +0800
KYLIN-3265 Add jobSearchMode as a filter condition for jobs api
Signed-off-by: shaofengshi <shaofeng...@apache.org>
---
.../kylin/rest/controller/JobController.java | 14 +--
.../apache/kylin/rest/request/JobListRequest.java | 10 +
.../org/apache/kylin/rest/service/JobService.java | 48 +++---
.../apache/kylin/rest/service/JobServiceTest.java | 12 +++---
4 files changed, 50 insertions(+), 34 deletions(-)
diff --git
a/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java
b/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java
index ca3be99..1bf6ab6 100644
---
a/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java
+++
b/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java
@@ -20,7 +20,6 @@ package org.apache.kylin.rest.controller;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -60,7 +59,7 @@ public class JobController extends BasicController {
@ResponseBody
public List list(JobListRequest jobRequest) {
-List jobInstanceList = Collections.emptyList();
+List jobInstanceList;
List statusList = new ArrayList();
if (null != jobRequest.getStatus()) {
@@ -74,9 +73,18 @@ public class JobController extends BasicController {
timeFilter =
JobTimeFilterEnum.getByCode(jobRequest.getTimeFilter());
}
+JobService.JobSearchMode jobSearchMode =
JobService.JobSearchMode.CUBING_ONLY;
+if (null != jobRequest.getJobSearchMode()) {
+try {
+jobSearchMode =
JobService.JobSearchMode.valueOf(jobRequest.getJobSearchMode());
+} catch (IllegalArgumentException e) {
+logger.error("Invalid value for JobSearchMode: '" +
jobRequest.getJobSearchMode() + "', skip it.", e);
+}
+}
+
try {
jobInstanceList = jobService.searchJobs(jobRequest.getCubeName(),
jobRequest.getProjectName(), statusList,
-jobRequest.getLimit(), jobRequest.getOffset(), timeFilter);
+jobRequest.getLimit(), jobRequest.getOffset(), timeFilter,
jobSearchMode);
} catch (Exception e) {
logger.error(e.getLocalizedMessage(), e);
throw new InternalErrorException(e);
diff --git
a/server-base/src/main/java/org/apache/kylin/rest/request/JobListRequest.java
b/server-base/src/main/java/org/apache/kylin/rest/request/JobListRequest.java
index 51160d2..1dc4562 100644
---
a/server-base/src/main/java/org/apache/kylin/rest/request/JobListRequest.java
+++
b/server-base/src/main/java/org/apache/kylin/rest/request/JobListRequest.java
@@ -32,6 +32,7 @@ public class JobListRequest {
private Integer offset;
private Integer limit;
private Integer timeFilter;
+private String jobSearchMode;
public JobListRequest() {
}
@@ -83,4 +84,13 @@ public class JobListRequest {
public void setTimeFilter(Integer timeFilter) {
this.timeFilter = timeFilter;
}
+
+public String getJobSearchMode() {
+return jobSearchMode;
+}
+
+public void setJobSearchMode(String jobSearchMode) {
+this.jobSearchMode = jobSearchMode;
+}
+
}
diff --git
a/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
b/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
index 5f80b84..6afc568 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
@@ -18,18 +18,12 @@
package org.apache.kylin.rest.service;
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TimeZone;
-
-import javax.annotation.Nullable;
-
+import com.google.common.base.Function;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
import org.apache.commons.lang3.StringUtils;
import org.apache.directory.api.util.Strings;
import org.apache.kylin.common.KylinCo
[kylin] branch master updated: KYLIN-3265 Add jobSearchMode as a filter condition for jobs api
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push:
new 76934db KYLIN-3265 Add jobSearchMode as a filter condition for jobs
api
76934db is described below
commit 76934db8fcddabf437f490e77c8f06c9a4a3db86
Author: shaofengshi <shaofeng...@apache.org>
AuthorDate: Sat Feb 24 11:52:03 2018 +0800
KYLIN-3265 Add jobSearchMode as a filter condition for jobs api
Signed-off-by: shaofengshi <shaofeng...@apache.org>
---
.../kylin/rest/controller/JobController.java | 14 +--
.../apache/kylin/rest/request/JobListRequest.java | 10 +
.../org/apache/kylin/rest/service/JobService.java | 48 +++---
.../apache/kylin/rest/service/JobServiceTest.java | 12 +++---
4 files changed, 50 insertions(+), 34 deletions(-)
diff --git
a/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java
b/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java
index ca3be99..1bf6ab6 100644
---
a/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java
+++
b/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java
@@ -20,7 +20,6 @@ package org.apache.kylin.rest.controller;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -60,7 +59,7 @@ public class JobController extends BasicController {
@ResponseBody
public List list(JobListRequest jobRequest) {
-List jobInstanceList = Collections.emptyList();
+List jobInstanceList;
List statusList = new ArrayList();
if (null != jobRequest.getStatus()) {
@@ -74,9 +73,18 @@ public class JobController extends BasicController {
timeFilter =
JobTimeFilterEnum.getByCode(jobRequest.getTimeFilter());
}
+JobService.JobSearchMode jobSearchMode =
JobService.JobSearchMode.CUBING_ONLY;
+if (null != jobRequest.getJobSearchMode()) {
+try {
+jobSearchMode =
JobService.JobSearchMode.valueOf(jobRequest.getJobSearchMode());
+} catch (IllegalArgumentException e) {
+logger.error("Invalid value for JobSearchMode: '" +
jobRequest.getJobSearchMode() + "', skip it.", e);
+}
+}
+
try {
jobInstanceList = jobService.searchJobs(jobRequest.getCubeName(),
jobRequest.getProjectName(), statusList,
-jobRequest.getLimit(), jobRequest.getOffset(), timeFilter);
+jobRequest.getLimit(), jobRequest.getOffset(), timeFilter,
jobSearchMode);
} catch (Exception e) {
logger.error(e.getLocalizedMessage(), e);
throw new InternalErrorException(e);
diff --git
a/server-base/src/main/java/org/apache/kylin/rest/request/JobListRequest.java
b/server-base/src/main/java/org/apache/kylin/rest/request/JobListRequest.java
index 51160d2..1dc4562 100644
---
a/server-base/src/main/java/org/apache/kylin/rest/request/JobListRequest.java
+++
b/server-base/src/main/java/org/apache/kylin/rest/request/JobListRequest.java
@@ -32,6 +32,7 @@ public class JobListRequest {
private Integer offset;
private Integer limit;
private Integer timeFilter;
+private String jobSearchMode;
public JobListRequest() {
}
@@ -83,4 +84,13 @@ public class JobListRequest {
public void setTimeFilter(Integer timeFilter) {
this.timeFilter = timeFilter;
}
+
+public String getJobSearchMode() {
+return jobSearchMode;
+}
+
+public void setJobSearchMode(String jobSearchMode) {
+this.jobSearchMode = jobSearchMode;
+}
+
}
diff --git
a/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
b/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
index 5f80b84..6afc568 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
@@ -18,18 +18,12 @@
package org.apache.kylin.rest.service;
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TimeZone;
-
-import javax.annotation.Nullable;
-
+import com.google.common.base.Function;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
import org.apache.commons.lang3.StringUtils;
import org.apache.directory.api.util.Strings;
import org.apache.kylin.common.KylinCo
[kylin] branch 2.3.x updated (8a275da -> 6517469)
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a change to branch 2.3.x in repository https://gitbox.apache.org/repos/asf/kylin.git. discard 8a275da manual update external version to 2.4.0-SNAPSHOT discard 25b08e4 [maven-release-plugin] prepare for next development iteration discard 3747b12 [maven-release-plugin] prepare release kylin-2.3.0 discard 57462fa KYLIN-3263, bugfix with AbstractExecutable's retry. discard 646f440 manual update htrace module to 2.3.0 new bfdd184 KYLIN-3263, bugfix with AbstractExecutable's retry. new f1f808c KYLIN-2884 Add delete segment function for portal - bug fix new 6517469 KYLIN-3268 Tomcat Security Vulnerability Alert. The version of the tomcat for kylin should upgrade to 7.0.85. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8a275da) \ N -- N -- N refs/heads/2.3.x (6517469) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: assembly/pom.xml | 5 +++-- atopcalcite/pom.xml| 5 +++-- build/script/download-tomcat.sh| 4 ++-- core-common/pom.xml| 5 +++-- core-cube/pom.xml | 5 +++-- core-dictionary/pom.xml| 5 +++-- core-job/pom.xml | 5 +++-- core-metadata/pom.xml | 6 -- core-metrics/pom.xml | 5 +++-- core-storage/pom.xml | 5 +++-- engine-mr/pom.xml | 5 +++-- engine-spark/pom.xml | 5 +++-- external/htrace/pom.xml| 2 +- external/pom.xml | 6 -- jdbc/pom.xml | 5 +++-- kylin-it/pom.xml | 18 ++ metrics-reporter-hive/pom.xml | 5 +++-- metrics-reporter-kafka/pom.xml | 2 +- pom.xml| 14 -- query/pom.xml | 5 +++-- server-base/pom.xml| 6 -- server/pom.xml | 5 +++-- source-hive/pom.xml| 5 +++-- source-kafka/pom.xml | 5 +++-- storage-hbase/pom.xml | 9 ++--- tomcat-ext/pom.xml | 6 -- tool-assembly/pom.xml | 5 +++-- tool/pom.xml | 5 +++-- webapp/app/js/controllers/cubes.js | 36 +++- 29 files changed, 117 insertions(+), 82 deletions(-) -- To stop receiving notification emails like this one, please contact billy...@apache.org.
[kylin] 03/03: KYLIN-3268 Tomcat Security Vulnerability Alert. The version of the tomcat for kylin should upgrade to 7.0.85.
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch 2.3.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 65174698094bb2e6a7a12849dc9dd42c6cfe6e82
Author: peng.jianhua <peng.jian...@zte.com.cn>
AuthorDate: Wed Feb 28 14:53:02 2018 +0800
KYLIN-3268 Tomcat Security Vulnerability Alert. The version of the tomcat
for kylin should upgrade to 7.0.85.
Signed-off-by: Billy Liu <billy...@apache.org>
---
build/script/download-tomcat.sh | 4 ++--
pom.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/build/script/download-tomcat.sh b/build/script/download-tomcat.sh
index bf20580..beda172 100755
--- a/build/script/download-tomcat.sh
+++ b/build/script/download-tomcat.sh
@@ -27,8 +27,8 @@ if [[ `uname -a` =~ "Darwin" ]]; then
alias md5cmd="md5 -q"
fi
-tomcat_pkg_version="7.0.82"
-tomcat_pkg_md5="b9c07fb4f37063e9e8185972b3f88a98"
+tomcat_pkg_version="7.0.85"
+tomcat_pkg_md5="1ad4760080164bb08e924c330703c94d"
if [ ! -f "build/apache-tomcat-${tomcat_pkg_version}.tar.gz" ]
then
diff --git a/pom.xml b/pom.xml
index ebc66cb..25ed544 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,7 +113,7 @@
3.2.4
2.4.0
2.5
-7.0.82
+7.0.85
3.1
2.3.23
--
To stop receiving notification emails like this one, please contact
billy...@apache.org.
[kylin] 01/03: KYLIN-3263, bugfix with AbstractExecutable's retry.
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch 2.3.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit bfdd1846f198c6820cf292654d6d42ef5536761d
Author: Jiatao Tao <245915...@qq.com>
AuthorDate: Fri Feb 23 16:37:16 2018 +0800
KYLIN-3263, bugfix with AbstractExecutable's retry.
---
.../kylin/job/execution/AbstractExecutable.java| 32 +-
.../apache/kylin/job/RetryableTestExecutable.java | 50 --
.../job/impl/threadpool/DefaultSchedulerTest.java | 49 +++--
3 files changed, 37 insertions(+), 94 deletions(-)
diff --git
a/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java
b/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java
index 91283f0..dbe11c2 100644
---
a/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java
+++
b/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java
@@ -165,7 +165,7 @@ public abstract class AbstractExecutable implements
Executable, Idempotent {
exception = e;
}
retry++;
-} while (needRetry(result, exception));
+} while (needRetry(this.retry, exception)); //exception in
ExecuteResult should handle by user itself.
if (exception != null) {
onExecuteError(exception, executableContext);
@@ -221,13 +221,6 @@ public abstract class AbstractExecutable implements
Executable, Idempotent {
return false;
}
-private boolean isRetryableExecutionResult(ExecuteResult result) {
-if (result != null && result.getThrowable() != null &&
isRetrableException(result.getThrowable())) {
-return true;
-}
-return false;
-}
-
protected abstract ExecuteResult doWork(ExecutableContext context) throws
ExecuteException;
@Override
@@ -468,25 +461,20 @@ public abstract class AbstractExecutable implements
Executable, Idempotent {
return status == ExecutableState.STOPPED;
}
-protected boolean isRetrableException(Throwable t) {
-return
ArrayUtils.contains(KylinConfig.getInstanceFromEnv().getJobRetryExceptions(),
t.getClass().getName());
-}
-
// Retry will happen in below cases:
// 1) if property "kylin.job.retry-exception-classes" is not set or is
null, all jobs with exceptions will retry according to the retry times.
// 2) if property "kylin.job.retry-exception-classes" is set and is not
null, only jobs with the specified exceptions will retry according to the retry
times.
-protected boolean needRetry(ExecuteResult result, Throwable e) {
-if (this.retry > KylinConfig.getInstanceFromEnv().getJobRetry()) {
+public static boolean needRetry(int retry, Throwable t) {
+if (retry > KylinConfig.getInstanceFromEnv().getJobRetry() || t ==
null) {
return false;
+} else {
+return isRetryableException(t.getClass().getName());
}
-String[] retryableEx =
KylinConfig.getInstanceFromEnv().getJobRetryExceptions();
-if (retryableEx == null || retryableEx.length == 0) {
-return true;
-}
-if ((result != null && isRetryableExecutionResult(result)) || e !=
null && isRetrableException(e)) {
-return true;
-}
-return false;
+}
+
+private static boolean isRetryableException(String exceptionName) {
+String[] jobRetryExceptions =
KylinConfig.getInstanceFromEnv().getJobRetryExceptions();
+return ArrayUtils.isEmpty(jobRetryExceptions) ||
ArrayUtils.contains(jobRetryExceptions, exceptionName);
}
@Override
diff --git
a/core-job/src/test/java/org/apache/kylin/job/RetryableTestExecutable.java
b/core-job/src/test/java/org/apache/kylin/job/RetryableTestExecutable.java
deleted file mode 100644
index f656c44..000
--- a/core-job/src/test/java/org/apache/kylin/job/RetryableTestExecutable.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
[kylin] 02/03: KYLIN-2884 Add delete segment function for portal - bug fix
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch 2.3.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit f1f808ca2f30727d7b6e7b2c3ab6843b9941d380
Author: liapan <lia...@ebay.com>
AuthorDate: Sat Feb 24 14:22:28 2018 +0800
KYLIN-2884 Add delete segment function for portal - bug fix
---
webapp/app/js/controllers/cubes.js | 36 +++-
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/webapp/app/js/controllers/cubes.js
b/webapp/app/js/controllers/cubes.js
index a386202..cbd6fad 100644
--- a/webapp/app/js/controllers/cubes.js
+++ b/webapp/app/js/controllers/cubes.js
@@ -522,23 +522,25 @@ KylinApp.controller('CubesCtrl', function ($scope, $q,
$routeParams, $location,
})
};
-$scope.startDeleteSegment = function (cube) {
- $scope.metaModel={
-model:modelsManager.getModelByCube(cube.name)
- };
- $modal.open({
-templateUrl: 'deleteSegment.html',
-controller: deleteSegmentCtrl,
-resolve: {
- cube: function () {
-return cube;
- },
- scope: function() {
-return $scope;
- }
-}
- });
-};
+ $scope.startDeleteSegment = function (cube) {
+ $scope.loadDetail(cube).then(function () {
+ $scope.metaModel={
+ model:modelsManager.getModelByCube(cube.name)
+ };
+ $modal.open({
+ templateUrl: 'deleteSegment.html',
+ controller: deleteSegmentCtrl,
+ resolve: {
+ cube: function () {
+ return cube;
+ },
+ scope: function() {
+ return $scope;
+ }
+ }
+ });
+ });
+ };
});
--
To stop receiving notification emails like this one, please contact
billy...@apache.org.
[kylin] branch master updated: ignore checkstyle on external htrace
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/master by this push: new 2b38b3b ignore checkstyle on external htrace 2b38b3b is described below commit 2b38b3b59dcf5de154dc0815f44b90b611c2b29e Author: Billy Liu <billy...@apache.org> AuthorDate: Wed Feb 21 11:02:37 2018 +0800 ignore checkstyle on external htrace --- external/htrace/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/external/htrace/pom.xml b/external/htrace/pom.xml index 1c57ddb..e83b153 100644 --- a/external/htrace/pom.xml +++ b/external/htrace/pom.xml @@ -36,6 +36,7 @@ UTF-8 org.apache.kylin.shaded.htrace 3.1.0-incubating +true -- To stop receiving notification emails like this one, please contact billy...@apache.org.
[kylin] annotated tag kylin-2.3.0 deleted (was 3fe2e5e)
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a change to annotated tag kylin-2.3.0 in repository https://gitbox.apache.org/repos/asf/kylin.git. *** WARNING: tag kylin-2.3.0 was deleted! *** tag was 3fe2e5e The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact billy...@apache.org.
[kylin] branch master updated: KYLIN-3268 Tomcat Security Vulnerability Alert. The version of the tomcat for kylin should upgrade to 7.0.85.
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push:
new 045b22d KYLIN-3268 Tomcat Security Vulnerability Alert. The version
of the tomcat for kylin should upgrade to 7.0.85.
045b22d is described below
commit 045b22df330ff5425bdc0538564a2fbd653733e5
Author: peng.jianhua <peng.jian...@zte.com.cn>
AuthorDate: Wed Feb 28 14:53:02 2018 +0800
KYLIN-3268 Tomcat Security Vulnerability Alert. The version of the tomcat
for kylin should upgrade to 7.0.85.
Signed-off-by: Billy Liu <billy...@apache.org>
---
build/script/download-tomcat.sh | 4 ++--
pom.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/build/script/download-tomcat.sh b/build/script/download-tomcat.sh
index bf20580..beda172 100755
--- a/build/script/download-tomcat.sh
+++ b/build/script/download-tomcat.sh
@@ -27,8 +27,8 @@ if [[ `uname -a` =~ "Darwin" ]]; then
alias md5cmd="md5 -q"
fi
-tomcat_pkg_version="7.0.82"
-tomcat_pkg_md5="b9c07fb4f37063e9e8185972b3f88a98"
+tomcat_pkg_version="7.0.85"
+tomcat_pkg_md5="1ad4760080164bb08e924c330703c94d"
if [ ! -f "build/apache-tomcat-${tomcat_pkg_version}.tar.gz" ]
then
diff --git a/pom.xml b/pom.xml
index 5b264b1..9f3d47a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,7 +113,7 @@
3.2.4
2.4.0
2.5
-7.0.82
+7.0.85
3.1
2.3.23
--
To stop receiving notification emails like this one, please contact
billy...@apache.org.
[kylin] branch 2.3.x updated: manual update external version to 2.4.0-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch 2.3.x in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/2.3.x by this push: new 8a275da manual update external version to 2.4.0-SNAPSHOT 8a275da is described below commit 8a275daf456728f7382809059eefcd55ab0cbd4f Author: Billy Liu <billy...@apache.org> AuthorDate: Wed Feb 28 12:05:21 2018 +0800 manual update external version to 2.4.0-SNAPSHOT --- external/htrace/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/htrace/pom.xml b/external/htrace/pom.xml index 5427e09..cfadfce 100644 --- a/external/htrace/pom.xml +++ b/external/htrace/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT ../../pom.xml -- To stop receiving notification emails like this one, please contact billy...@apache.org.
svn commit: r25251 - in /dev/kylin/apache-kylin-2.3.0-rc2: apache-kylin-2.3.0-rc2-cdh57-bin.tar.gz apache-kylin-2.3.0-rc2-hbase1x-bin.tar.gz
Author: billyliu Date: Fri Feb 23 16:43:11 2018 New Revision: 25251 Log: Upload kylin-2.3.0 rc2 artifacts Added: dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-rc2-cdh57-bin.tar.gz (with props) dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-rc2-hbase1x-bin.tar.gz (with props) Added: dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-rc2-cdh57-bin.tar.gz == Binary file - no diff available. Propchange: dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-rc2-cdh57-bin.tar.gz -- svn:mime-type = application/x-gzip Added: dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-rc2-hbase1x-bin.tar.gz == Binary file - no diff available. Propchange: dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-rc2-hbase1x-bin.tar.gz -- svn:mime-type = application/x-gzip
svn commit: r25250 - in /dev/kylin: apache-kylin-2.3.0-rc1/ apache-kylin-2.3.0-rc2/
Author: billyliu Date: Fri Feb 23 16:22:10 2018 New Revision: 25250 Log: Upload release artifacts to staging Added: dev/kylin/apache-kylin-2.3.0-rc2/ dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz (with props) dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz.asc (with props) dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz.asc.md5 dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz.asc.sha1 dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz.md5 dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz.sha1 Removed: dev/kylin/apache-kylin-2.3.0-rc1/ Added: dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz == Binary file - no diff available. Propchange: dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz -- svn:mime-type = application/x-gzip Added: dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz.asc == Binary file - no diff available. Propchange: dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz.asc.md5 == --- dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz.asc.md5 (added) +++ dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz.asc.md5 Fri Feb 23 16:22:10 2018 @@ -0,0 +1 @@ +753418d7924053b87561621df82655a0 \ No newline at end of file Added: dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz.asc.sha1 == --- dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz.asc.sha1 (added) +++ dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz.asc.sha1 Fri Feb 23 16:22:10 2018 @@ -0,0 +1 @@ +0a6cc88cc12d77f774f7c3a858869bb00213f7fb \ No newline at end of file Added: dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz.md5 == --- dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz.md5 (added) +++ dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz.md5 Fri Feb 23 16:22:10 2018 @@ -0,0 +1 @@ +0d53c62782321fc18f00b0754e3401a5 \ No newline at end of file Added: dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz.sha1 == --- dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz.sha1 (added) +++ dev/kylin/apache-kylin-2.3.0-rc2/apache-kylin-2.3.0-src.tar.gz.sha1 Fri Feb 23 16:22:10 2018 @@ -0,0 +1 @@ +3324e8cfbea635357e589964b01c70e643d9f783 \ No newline at end of file
[kylin] branch 2.3.x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch 2.3.x in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/2.3.x by this push: new 25b08e4 [maven-release-plugin] prepare for next development iteration 25b08e4 is described below commit 25b08e4e3d431e59ac57a9f7537691668f74c0e3 Author: Billy Liu <billy...@apache.org> AuthorDate: Fri Feb 23 15:53:26 2018 + [maven-release-plugin] prepare for next development iteration --- assembly/pom.xml | 2 +- atopcalcite/pom.xml| 2 +- core-common/pom.xml| 2 +- core-cube/pom.xml | 2 +- core-dictionary/pom.xml| 2 +- core-job/pom.xml | 2 +- core-metadata/pom.xml | 2 +- core-metrics/pom.xml | 2 +- core-storage/pom.xml | 2 +- engine-mr/pom.xml | 2 +- engine-spark/pom.xml | 2 +- external/pom.xml | 2 +- jdbc/pom.xml | 2 +- kylin-it/pom.xml | 2 +- metrics-reporter-hive/pom.xml | 2 +- metrics-reporter-kafka/pom.xml | 2 +- pom.xml| 6 +++--- query/pom.xml | 2 +- server-base/pom.xml| 2 +- server/pom.xml | 2 +- source-hive/pom.xml| 2 +- source-kafka/pom.xml | 2 +- storage-hbase/pom.xml | 2 +- tomcat-ext/pom.xml | 2 +- tool-assembly/pom.xml | 2 +- tool/pom.xml | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 558ae91..2f7befc 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -26,7 +26,7 @@ kylin org.apache.kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml index d5d0325..1f5c714 100644 --- a/atopcalcite/pom.xml +++ b/atopcalcite/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-common/pom.xml b/core-common/pom.xml index 1b81f69..1507833 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-cube/pom.xml b/core-cube/pom.xml index ddf89d2..81fa547 100644 --- a/core-cube/pom.xml +++ b/core-cube/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-dictionary/pom.xml b/core-dictionary/pom.xml index a9d4ef4..7e8bee1 100644 --- a/core-dictionary/pom.xml +++ b/core-dictionary/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-job/pom.xml b/core-job/pom.xml index 5bac3d1..0a025d8 100644 --- a/core-job/pom.xml +++ b/core-job/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-metadata/pom.xml b/core-metadata/pom.xml index 211d04f..21aa6ee 100644 --- a/core-metadata/pom.xml +++ b/core-metadata/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-metrics/pom.xml b/core-metrics/pom.xml index c56e15c..e76aa2f 100644 --- a/core-metrics/pom.xml +++ b/core-metrics/pom.xml @@ -28,7 +28,7 @@ kylin org.apache.kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/core-storage/pom.xml b/core-storage/pom.xml index 34d7dbe..c173c5e 100644 --- a/core-storage/pom.xml +++ b/core-storage/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/engine-mr/pom.xml b/engine-mr/pom.xml index 2b2d3bb..129afbe 100644 --- a/engine-mr/pom.xml +++ b/engine-mr/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/engine-spark/pom.xml b/engine-spark/pom.xml index 17bc5c5..9fa646e 100644 --- a/engine-spark/pom.xml +++ b/engine-spark/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/external/pom.xml b/external/pom.xml index 1e18edc..8a038ba 100644 --- a/external/pom.xml +++ b/external/pom.xml @@ -26,7 +26,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/jdbc/pom.xml b/jdbc/pom.xml index a730b23..224be54 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -2.3.0 +2.4.0-SNAPSHOT diff --git a/kylin-it/pom.xml b/kylin-it/pom.xml index a119a0d..fd4fa8b 100644 --- a/kylin-it/p
[kylin] branch 2.3.x updated: [maven-release-plugin] prepare release kylin-2.3.0
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a commit to branch 2.3.x in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/2.3.x by this push: new 3747b12 [maven-release-plugin] prepare release kylin-2.3.0 3747b12 is described below commit 3747b1291c1e0bd319bcc2a123fc83819775300d Author: Billy Liu <billy...@apache.org> AuthorDate: Fri Feb 23 15:53:07 2018 + [maven-release-plugin] prepare release kylin-2.3.0 --- 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 | 6 ++ core-metrics/pom.xml | 5 ++--- core-storage/pom.xml | 5 ++--- engine-mr/pom.xml | 5 ++--- engine-spark/pom.xml | 5 ++--- external/pom.xml | 6 ++ jdbc/pom.xml | 5 ++--- kylin-it/pom.xml | 18 -- metrics-reporter-hive/pom.xml | 5 ++--- metrics-reporter-kafka/pom.xml | 2 +- pom.xml| 14 ++ query/pom.xml | 5 ++--- server-base/pom.xml| 6 ++ server/pom.xml | 5 ++--- source-hive/pom.xml| 5 ++--- source-kafka/pom.xml | 5 ++--- storage-hbase/pom.xml | 9 +++-- tomcat-ext/pom.xml | 6 ++ tool-assembly/pom.xml | 5 ++--- tool/pom.xml | 5 ++--- 26 files changed, 62 insertions(+), 95 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index cc254d1..558ae91 100644 --- a/assembly/pom.xml +++ b/assembly/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-assembly @@ -27,7 +26,7 @@ kylin org.apache.kylin -2.3.0-SNAPSHOT +2.3.0 diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml index 80b3a9a..d5d0325 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 @@ -29,7 +28,7 @@ org.apache.kylin kylin -2.3.0-SNAPSHOT +2.3.0 diff --git a/core-common/pom.xml b/core-common/pom.xml index 4d12a47..1b81f69 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 @@ -29,7 +28,7 @@ org.apache.kylin kylin -2.3.0-SNAPSHOT +2.3.0 diff --git a/core-cube/pom.xml b/core-cube/pom.xml index 2bd1ecd..ddf89d2 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; 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-cube @@ -29,7 +28,7 @@ org.apache.kylin kylin -2.3.0-SNAPSHOT +2.3.0 diff --git a/core-dictionary/pom.xml b/core-dictionary/pom.xml index 3a53149..a9d4ef4 100644 --- a/core-dictionary/pom.xml +++ b/core-dictionary/pom.xml @@ -17,8 +17,7 @@ limit
[kylin] annotated tag kylin-2.3.0 updated (3747b12 -> 3fe2e5e)
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a change to annotated tag kylin-2.3.0 in repository https://gitbox.apache.org/repos/asf/kylin.git. *** WARNING: tag kylin-2.3.0 was modified! *** from 3747b12 (commit) to 3fe2e5e (tag) tagging 3747b1291c1e0bd319bcc2a123fc83819775300d (commit) replaces kylin-1.2 by Billy Liu on Fri Feb 23 15:53:21 2018 + - Log - [maven-release-plugin] copy for tag kylin-2.3.0 --- No new revisions were added by this update. Summary of changes: -- To stop receiving notification emails like this one, please contact billy...@apache.org.
[kylin] branch 2.3.x updated (a353e55 -> 57462fa)
This is an automated email from the ASF dual-hosted git repository. billyliu pushed a change to branch 2.3.x in repository https://gitbox.apache.org/repos/asf/kylin.git. discard a353e55 [maven-release-plugin] prepare for next development iteration discard cfe6321 [maven-release-plugin] prepare release kylin-2.3.0 discard f7e4052 [maven-release-plugin] rollback the release of kylin-2.3.0 discard c90b3f9 [maven-release-plugin] prepare release kylin-2.3.0 new 57462fa KYLIN-3263, bugfix with AbstractExecutable's retry. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (a353e55) \ N -- N -- N refs/heads/2.3.x (57462fa) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 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 ++- .../kylin/job/execution/AbstractExecutable.java| 32 +- .../apache/kylin/job/RetryableTestExecutable.java | 50 -- .../job/impl/threadpool/DefaultSchedulerTest.java | 49 +++-- core-metadata/pom.xml | 6 ++- core-metrics/pom.xml | 5 ++- core-storage/pom.xml | 5 ++- engine-mr/pom.xml | 5 ++- engine-spark/pom.xml | 5 ++- external/pom.xml | 6 ++- jdbc/pom.xml | 5 ++- kylin-it/pom.xml | 18 metrics-reporter-hive/pom.xml | 5 ++- metrics-reporter-kafka/pom.xml | 2 +- pom.xml| 12 +++--- query/pom.xml | 5 ++- server-base/pom.xml| 6 ++- server/pom.xml | 5 ++- source-hive/pom.xml| 5 ++- source-kafka/pom.xml | 5 ++- storage-hbase/pom.xml | 9 ++-- tomcat-ext/pom.xml | 6 ++- tool-assembly/pom.xml | 5 ++- tool/pom.xml | 5 ++- 29 files changed, 131 insertions(+), 155 deletions(-) delete mode 100644 core-job/src/test/java/org/apache/kylin/job/RetryableTestExecutable.java -- To stop receiving notification emails like this one, please contact billy...@apache.org.
[kylin] 01/01: KYLIN-3263, bugfix with AbstractExecutable's retry.
This is an automated email from the ASF dual-hosted git repository.
billyliu pushed a commit to branch 2.3.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 57462faa7c96ff9bfbe54048e42c486f5512abe8
Author: Jiatao Tao <245915...@qq.com>
AuthorDate: Fri Feb 23 16:37:16 2018 +0800
KYLIN-3263, bugfix with AbstractExecutable's retry.
---
.../kylin/job/execution/AbstractExecutable.java| 32 +-
.../apache/kylin/job/RetryableTestExecutable.java | 50 --
.../job/impl/threadpool/DefaultSchedulerTest.java | 49 +++--
3 files changed, 37 insertions(+), 94 deletions(-)
diff --git
a/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java
b/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java
index 91283f0..dbe11c2 100644
---
a/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java
+++
b/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java
@@ -165,7 +165,7 @@ public abstract class AbstractExecutable implements
Executable, Idempotent {
exception = e;
}
retry++;
-} while (needRetry(result, exception));
+} while (needRetry(this.retry, exception)); //exception in
ExecuteResult should handle by user itself.
if (exception != null) {
onExecuteError(exception, executableContext);
@@ -221,13 +221,6 @@ public abstract class AbstractExecutable implements
Executable, Idempotent {
return false;
}
-private boolean isRetryableExecutionResult(ExecuteResult result) {
-if (result != null && result.getThrowable() != null &&
isRetrableException(result.getThrowable())) {
-return true;
-}
-return false;
-}
-
protected abstract ExecuteResult doWork(ExecutableContext context) throws
ExecuteException;
@Override
@@ -468,25 +461,20 @@ public abstract class AbstractExecutable implements
Executable, Idempotent {
return status == ExecutableState.STOPPED;
}
-protected boolean isRetrableException(Throwable t) {
-return
ArrayUtils.contains(KylinConfig.getInstanceFromEnv().getJobRetryExceptions(),
t.getClass().getName());
-}
-
// Retry will happen in below cases:
// 1) if property "kylin.job.retry-exception-classes" is not set or is
null, all jobs with exceptions will retry according to the retry times.
// 2) if property "kylin.job.retry-exception-classes" is set and is not
null, only jobs with the specified exceptions will retry according to the retry
times.
-protected boolean needRetry(ExecuteResult result, Throwable e) {
-if (this.retry > KylinConfig.getInstanceFromEnv().getJobRetry()) {
+public static boolean needRetry(int retry, Throwable t) {
+if (retry > KylinConfig.getInstanceFromEnv().getJobRetry() || t ==
null) {
return false;
+} else {
+return isRetryableException(t.getClass().getName());
}
-String[] retryableEx =
KylinConfig.getInstanceFromEnv().getJobRetryExceptions();
-if (retryableEx == null || retryableEx.length == 0) {
-return true;
-}
-if ((result != null && isRetryableExecutionResult(result)) || e !=
null && isRetrableException(e)) {
-return true;
-}
-return false;
+}
+
+private static boolean isRetryableException(String exceptionName) {
+String[] jobRetryExceptions =
KylinConfig.getInstanceFromEnv().getJobRetryExceptions();
+return ArrayUtils.isEmpty(jobRetryExceptions) ||
ArrayUtils.contains(jobRetryExceptions, exceptionName);
}
@Override
diff --git
a/core-job/src/test/java/org/apache/kylin/job/RetryableTestExecutable.java
b/core-job/src/test/java/org/apache/kylin/job/RetryableTestExecutable.java
deleted file mode 100644
index f656c44..000
--- a/core-job/src/test/java/org/apache/kylin/job/RetryableTestExecutable.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
