[kylin] branch v3.1.3-release updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. shaofengshi pushed a commit to branch v3.1.3-release in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/v3.1.3-release by this push: new 4da22da [maven-release-plugin] prepare for next development iteration 4da22da is described below commit 4da22da2652ec248b865cbc68a8cdf7d274dc3b3 Author: nichunen AuthorDate: Mon Dec 27 07:18:54 2021 + [maven-release-plugin] prepare for next development iteration --- assembly/pom.xml | 2 +- cache/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 +- cube-migration/pom.xml | 2 +- datasource-sdk/pom.xml | 2 +- engine-flink/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| 4 ++-- query/pom.xml | 2 +- server-base/pom.xml| 2 +- server/pom.xml | 2 +- source-hive/pom.xml| 2 +- source-jdbc/pom.xml| 2 +- source-kafka/pom.xml | 2 +- storage-hbase/pom.xml | 2 +- storage-stream/pom.xml | 2 +- stream-coordinator/pom.xml | 2 +- stream-core/pom.xml| 2 +- stream-receiver/pom.xml| 2 +- stream-source-kafka/pom.xml| 2 +- tomcat-ext/pom.xml | 2 +- tool-assembly/pom.xml | 2 +- tool/pom.xml | 2 +- 34 files changed, 35 insertions(+), 35 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index b0ade26..3597a33 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -26,7 +26,7 @@ kylin org.apache.kylin -3.1.3 +3.1.4-SNAPSHOT diff --git a/cache/pom.xml b/cache/pom.xml index 1c66581..29d776a 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -26,7 +26,7 @@ org.apache.kylin kylin -3.1.3 +3.1.4-SNAPSHOT diff --git a/core-common/pom.xml b/core-common/pom.xml index 7024a91..532771c 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -3.1.3 +3.1.4-SNAPSHOT diff --git a/core-cube/pom.xml b/core-cube/pom.xml index 18aebc6..76f6d0b 100644 --- a/core-cube/pom.xml +++ b/core-cube/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -3.1.3 +3.1.4-SNAPSHOT diff --git a/core-dictionary/pom.xml b/core-dictionary/pom.xml index 331e0ca..9e05006 100644 --- a/core-dictionary/pom.xml +++ b/core-dictionary/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -3.1.3 +3.1.4-SNAPSHOT diff --git a/core-job/pom.xml b/core-job/pom.xml index 28ff648..91b013d 100644 --- a/core-job/pom.xml +++ b/core-job/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -3.1.3 +3.1.4-SNAPSHOT diff --git a/core-metadata/pom.xml b/core-metadata/pom.xml index 1e4c2af..c85125f 100644 --- a/core-metadata/pom.xml +++ b/core-metadata/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -3.1.3 +3.1.4-SNAPSHOT diff --git a/core-metrics/pom.xml b/core-metrics/pom.xml index 17e20e4..1825f7b 100644 --- a/core-metrics/pom.xml +++ b/core-metrics/pom.xml @@ -28,7 +28,7 @@ kylin org.apache.kylin -3.1.3 +3.1.4-SNAPSHOT diff --git a/core-storage/pom.xml b/core-storage/pom.xml index 333ffbc..ecdb257 100644 --- a/core-storage/pom.xml +++ b/core-storage/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -3.1.3 +3.1.4-SNAPSHOT diff --git a/cube-migration/pom.xml b/cube-migration/pom.xml index 0557149..9e48167 100755 --- a/cube-migration/pom.xml +++ b/cube-migration/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -3.1.3 +3.1.4-SNAPSHOT diff --git a/datasource-sdk/pom.xml b/datasource-sdk/pom.xml index 68586b3..5411360 100644 --- a/datasource-sdk/pom.xml +++ b/datasource-sdk/pom.xml @@ -26,7 +26,7 @@ org.apache.kylin kylin -3.1.3 +3.1.4-SNAPSHOT diff --git a/engine-flink/pom.xml b/engine-flink/pom.xml index 2411409..5e69520 100644 --- a/engine-flink/pom.xml +++ b/engine-flink/pom.xml @@ -28,7 +28,7 @@ kylin org.apache.kylin -3.1.3 +3.1.4-SNAPSHOT
[kylin] annotated tag kylin-3.1.3 updated (4eb57a5 -> 1d16e20)
This is an automated email from the ASF dual-hosted git repository. shaofengshi pushed a change to annotated tag kylin-3.1.3 in repository https://gitbox.apache.org/repos/asf/kylin.git. *** WARNING: tag kylin-3.1.3 was modified! *** from 4eb57a5 (commit) to 1d16e20 (tag) tagging 4eb57a56e358440c5e51a7f261cb0381678e0da7 (commit) replaces kylin-1.2 by nichunen on Mon Dec 27 07:18:52 2021 + - Log - [maven-release-plugin] copy for tag kylin-3.1.3 --- No new revisions were added by this update. Summary of changes:
[kylin] 01/01: Modify shaded-guava version from release kylin3.1.3
This is an automated email from the ASF dual-hosted git repository. nic pushed a commit to branch v3.1.3-release in repository https://gitbox.apache.org/repos/asf/kylin.git commit 432041723ae5e3072fe6c3ce73f0c76ad62984e4 Author: nichunen AuthorDate: Mon Dec 27 07:11:01 2021 + Modify shaded-guava version from release kylin3.1.3 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index dd4375d..068d6de 100644 --- a/pom.xml +++ b/pom.xml @@ -248,7 +248,7 @@ org.apache.kylin kylin-shaded-guava -${project.version} +3.1.0 org.apache.kylin @@ -1362,7 +1362,7 @@ -external + core-common core-metadata core-dictionary
[kylin] branch v3.1.3-release updated (cbf982d -> 4320417)
This is an automated email from the ASF dual-hosted git repository. nic pushed a change to branch v3.1.3-release in repository https://gitbox.apache.org/repos/asf/kylin.git. discard cbf982d Modify shaded-guava version from release kylin3.1.3 new 4320417 Modify shaded-guava version from release kylin3.1.3 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 (cbf982d) \ N -- N -- N refs/heads/v3.1.3-release (4320417) 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[kylin] 01/01: Modify shaded-guava version from release kylin3.1.3
This is an automated email from the ASF dual-hosted git repository. nic pushed a commit to branch v3.1.3-release in repository https://gitbox.apache.org/repos/asf/kylin.git commit cbf982d44779bd2b319af93f7164a588f6363274 Author: nichunen AuthorDate: Mon Dec 27 07:11:01 2021 + Modify shaded-guava version from release kylin3.1.3 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index dd4375d..7a07bdd 100644 --- a/pom.xml +++ b/pom.xml @@ -248,7 +248,7 @@ org.apache.kylin kylin-shaded-guava -${project.version} +3.1.0 org.apache.kylin @@ -1362,7 +1362,7 @@ -external + core-common core-metadata core-dictionary
[kylin] branch v3.1.3-release created (now cbf982d)
This is an automated email from the ASF dual-hosted git repository. nic pushed a change to branch v3.1.3-release in repository https://gitbox.apache.org/repos/asf/kylin.git. at cbf982d Modify shaded-guava version from release kylin3.1.3 This branch includes the following new commits: new cbf982d Modify shaded-guava version from release kylin3.1.3 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] branch v4.0.1-release updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. shaofengshi pushed a commit to branch v4.0.1-release in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/v4.0.1-release by this push: new 2a7f7a6 [maven-release-plugin] prepare for next development iteration 2a7f7a6 is described below commit 2a7f7a60738766f4c7886fa6eb200f6fb6d9a8ce Author: nichunen AuthorDate: Mon Dec 27 06:19:59 2021 + [maven-release-plugin] prepare for next development iteration --- build-engine/pom.xml| 2 +- cache/pom.xml | 2 +- core-common/pom.xml | 2 +- core-cube/pom.xml | 2 +- core-job/pom.xml| 2 +- core-metadata/pom.xml | 2 +- core-metrics/pom.xml| 2 +- core-storage/pom.xml| 2 +- jdbc/pom.xml| 2 +- kylin-spark-project/kylin-spark-classloader/pom.xml | 4 ++-- kylin-spark-project/kylin-spark-common/pom.xml | 4 ++-- kylin-spark-project/kylin-spark-engine/pom.xml | 2 +- kylin-spark-project/kylin-spark-metadata/pom.xml| 2 +- kylin-spark-project/kylin-spark-query/pom.xml | 2 +- kylin-spark-project/kylin-spark-test/pom.xml| 2 +- kylin-spark-project/pom.xml | 2 +- metastore-hbase/pom.xml | 2 +- metrics-reporter-hive/pom.xml | 2 +- metrics-reporter-kafka/pom.xml | 2 +- parquet-assembly/pom.xml| 2 +- pom.xml | 4 ++-- query/pom.xml | 2 +- server-base/pom.xml | 6 +++--- server/pom.xml | 4 ++-- source-hive/pom.xml | 2 +- tool-assembly/pom.xml | 2 +- tool/pom.xml| 2 +- 27 files changed, 33 insertions(+), 33 deletions(-) diff --git a/build-engine/pom.xml b/build-engine/pom.xml index 7a0685a..4f11140 100644 --- a/build-engine/pom.xml +++ b/build-engine/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -4.0.1 +4.0.2-SNAPSHOT diff --git a/cache/pom.xml b/cache/pom.xml index bbc05f4..e79cbcc 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -26,7 +26,7 @@ org.apache.kylin kylin -4.0.1 +4.0.2-SNAPSHOT diff --git a/core-common/pom.xml b/core-common/pom.xml index 1824f5b..b5e3503 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -4.0.1 +4.0.2-SNAPSHOT diff --git a/core-cube/pom.xml b/core-cube/pom.xml index c005350..c461229 100644 --- a/core-cube/pom.xml +++ b/core-cube/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -4.0.1 +4.0.2-SNAPSHOT diff --git a/core-job/pom.xml b/core-job/pom.xml index 7481f55..a2b19c8 100644 --- a/core-job/pom.xml +++ b/core-job/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -4.0.1 +4.0.2-SNAPSHOT diff --git a/core-metadata/pom.xml b/core-metadata/pom.xml index 3ec8836..015058b 100644 --- a/core-metadata/pom.xml +++ b/core-metadata/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -4.0.1 +4.0.2-SNAPSHOT diff --git a/core-metrics/pom.xml b/core-metrics/pom.xml index 12a205c..6280969 100644 --- a/core-metrics/pom.xml +++ b/core-metrics/pom.xml @@ -28,7 +28,7 @@ kylin org.apache.kylin -4.0.1 +4.0.2-SNAPSHOT diff --git a/core-storage/pom.xml b/core-storage/pom.xml index 6346aaa..30f6850 100644 --- a/core-storage/pom.xml +++ b/core-storage/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -4.0.1 +4.0.2-SNAPSHOT diff --git a/jdbc/pom.xml b/jdbc/pom.xml index bd3bbd0..4c46149 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -4.0.1 +4.0.2-SNAPSHOT diff --git a/kylin-spark-project/kylin-spark-classloader/pom.xml b/kylin-spark-project/kylin-spark-classloader/pom.xml index 13ac1f8..ad27ec7 100644 --- a/kylin-spark-project/kylin-spark-classloader/pom.xml +++ b/kylin-spark-project/kylin-spark-classloader/pom.xml @@ -23,12 +23,12 @@ Apache Kylin 4.X - Classloader jar kylin-spark-classloader -4.0.1 +4.0.2-SNAPSHOT kylin-spark-project org.apache.kylin -4.0.1 +4.0.2-SNAPSHOT
[kylin] annotated tag kylin-4.0.1 updated (7558951 -> b98a006)
This is an automated email from the ASF dual-hosted git repository. shaofengshi pushed a change to annotated tag kylin-4.0.1 in repository https://gitbox.apache.org/repos/asf/kylin.git. *** WARNING: tag kylin-4.0.1 was modified! *** from 7558951 (commit) to b98a006 (tag) tagging 75589511cb64bf76c2f5ca6018f09712e033476e (commit) replaces kylin-4.0.0-beta by nichunen on Mon Dec 27 06:19:56 2021 + - Log - [maven-release-plugin] copy for tag kylin-4.0.1 --- No new revisions were added by this update. Summary of changes:
[kylin] branch v4.0.1-release updated: [maven-release-plugin] prepare release kylin-4.0.1
This is an automated email from the ASF dual-hosted git repository. shaofengshi pushed a commit to branch v4.0.1-release in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/v4.0.1-release by this push: new 7558951 [maven-release-plugin] prepare release kylin-4.0.1 7558951 is described below commit 75589511cb64bf76c2f5ca6018f09712e033476e Author: nichunen AuthorDate: Mon Dec 27 06:19:45 2021 + [maven-release-plugin] prepare release kylin-4.0.1 --- build-engine/pom.xml| 2 +- cache/pom.xml | 2 +- core-common/pom.xml | 2 +- core-cube/pom.xml | 2 +- core-job/pom.xml| 2 +- core-metadata/pom.xml | 2 +- core-metrics/pom.xml| 2 +- core-storage/pom.xml| 2 +- jdbc/pom.xml| 2 +- kylin-spark-project/kylin-spark-classloader/pom.xml | 4 ++-- kylin-spark-project/kylin-spark-common/pom.xml | 7 +++ kylin-spark-project/kylin-spark-engine/pom.xml | 2 +- kylin-spark-project/kylin-spark-metadata/pom.xml| 2 +- kylin-spark-project/kylin-spark-query/pom.xml | 2 +- kylin-spark-project/kylin-spark-test/pom.xml| 2 +- kylin-spark-project/pom.xml | 2 +- metastore-hbase/pom.xml | 2 +- metrics-reporter-hive/pom.xml | 2 +- metrics-reporter-kafka/pom.xml | 2 +- parquet-assembly/pom.xml| 2 +- pom.xml | 6 +++--- query/pom.xml | 5 ++--- server-base/pom.xml | 6 +++--- server/pom.xml | 4 ++-- source-hive/pom.xml | 2 +- tool-assembly/pom.xml | 2 +- tool/pom.xml| 2 +- 27 files changed, 36 insertions(+), 38 deletions(-) diff --git a/build-engine/pom.xml b/build-engine/pom.xml index a23ec18..7a0685a 100644 --- a/build-engine/pom.xml +++ b/build-engine/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -4.0.0-SNAPSHOT +4.0.1 diff --git a/cache/pom.xml b/cache/pom.xml index 8d5c1b6..bbc05f4 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -26,7 +26,7 @@ org.apache.kylin kylin -4.0.0-SNAPSHOT +4.0.1 diff --git a/core-common/pom.xml b/core-common/pom.xml index 4680d4d..1824f5b 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -4.0.0-SNAPSHOT +4.0.1 diff --git a/core-cube/pom.xml b/core-cube/pom.xml index 91be01b..c005350 100644 --- a/core-cube/pom.xml +++ b/core-cube/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -4.0.0-SNAPSHOT +4.0.1 diff --git a/core-job/pom.xml b/core-job/pom.xml index 7a71ed3..7481f55 100644 --- a/core-job/pom.xml +++ b/core-job/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -4.0.0-SNAPSHOT +4.0.1 diff --git a/core-metadata/pom.xml b/core-metadata/pom.xml index ddb975c..3ec8836 100644 --- a/core-metadata/pom.xml +++ b/core-metadata/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -4.0.0-SNAPSHOT +4.0.1 diff --git a/core-metrics/pom.xml b/core-metrics/pom.xml index b01acdb..12a205c 100644 --- a/core-metrics/pom.xml +++ b/core-metrics/pom.xml @@ -28,7 +28,7 @@ kylin org.apache.kylin -4.0.0-SNAPSHOT +4.0.1 diff --git a/core-storage/pom.xml b/core-storage/pom.xml index 5ae52d8..6346aaa 100644 --- a/core-storage/pom.xml +++ b/core-storage/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -4.0.0-SNAPSHOT +4.0.1 diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 1478578..bd3bbd0 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -28,7 +28,7 @@ org.apache.kylin kylin -4.0.0-SNAPSHOT +4.0.1 diff --git a/kylin-spark-project/kylin-spark-classloader/pom.xml b/kylin-spark-project/kylin-spark-classloader/pom.xml index a3961d1..13ac1f8 100644 --- a/kylin-spark-project/kylin-spark-classloader/pom.xml +++ b/kylin-spark-project/kylin-spark-classloader/pom.xml @@ -23,12 +23,12 @@ Apache Kylin 4.X - Classloader jar kylin-spark-classloader -4.0.0-SNAPSHOT +4.0.1 kylin-spark-project org.apache.kylin -4.0.0-SNAPSHOT +4.0.1 ../pom.xml diff
[kylin] branch v4.0.1-release created (now b5eec8c)
This is an automated email from the ASF dual-hosted git repository. nic pushed a change to branch v4.0.1-release in repository https://gitbox.apache.org/repos/asf/kylin.git. at b5eec8c Modify shaded-guava version for release kylin4.0.1 This branch includes the following new commits: new b5eec8c Modify shaded-guava version for release kylin4.0.1 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: Modify shaded-guava version for release kylin4.0.1
This is an automated email from the ASF dual-hosted git repository. nic pushed a commit to branch v4.0.1-release in repository https://gitbox.apache.org/repos/asf/kylin.git commit b5eec8c7c155295177bc21a716def6bdb314989a Author: nichunen AuthorDate: Mon Dec 27 06:12:48 2021 + Modify shaded-guava version for release kylin4.0.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8b5ae85..ba02797 100644 --- a/pom.xml +++ b/pom.xml @@ -257,7 +257,7 @@ org.apache.kylin kylin-shaded-guava -${project.version} +3.1.0 org.apache.kylin @@ -1527,7 +1527,7 @@ -external + core-common core-metadata
[kylin] 02/02: test fix
This is an automated email from the ASF dual-hosted git repository. yaqian pushed a commit to branch kylin3-hadoop3 in repository https://gitbox.apache.org/repos/asf/kylin.git commit 6766e0d7c5dcc3d5f2c577ab88d78fdaaf81743a Author: yaqian.zhang <598593...@qq.com> AuthorDate: Tue Dec 7 16:59:42 2021 +0800 test fix --- .../main/java/org/apache/kylin/common/KylinConfigBase.java | 3 +++ .../main/java/org/apache/kylin/common/util/EncryptUtil.java | 3 ++- .../java/org/apache/kylin/common/util/EncryptUtilTest.java | 13 - server/src/main/webapp/WEB-INF/web.xml | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java index 707848f..947cc24 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java @@ -2740,4 +2740,7 @@ public abstract class KylinConfigBase implements Serializable { return getOptional("kylin.jdbc.url.allowed.sqlserver.schema", DEFAULT_JDBC_URL_ALLOWED_SQLSERVER_SCHEMA); } +public String getEncryptCipherIvSpec() { +return getOptional("kylin.security.encrypt.cipher.ivSpec", ""); +} } diff --git a/core-common/src/main/java/org/apache/kylin/common/util/EncryptUtil.java b/core-common/src/main/java/org/apache/kylin/common/util/EncryptUtil.java index b9b4ddb..224c9e8 100644 --- a/core-common/src/main/java/org/apache/kylin/common/util/EncryptUtil.java +++ b/core-common/src/main/java/org/apache/kylin/common/util/EncryptUtil.java @@ -25,6 +25,7 @@ import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import org.apache.commons.codec.binary.Base64; +import org.apache.kylin.common.KylinConfig; import javax.crypto.Cipher; import javax.crypto.NoSuchPaddingException; @@ -42,7 +43,7 @@ public class EncryptUtil { InvalidKeyException, NoSuchPaddingException, NoSuchAlgorithmException, UnsupportedEncodingException { Cipher cipher = Cipher.getInstance("AES/CFB/PKCS5Padding"); final SecretKeySpec secretKey = new SecretKeySpec(key, "AES"); -IvParameterSpec ivSpec = new IvParameterSpec("".getBytes("UTF-8")); +IvParameterSpec ivSpec = new IvParameterSpec(KylinConfig.getInstanceFromEnv().getEncryptCipherIvSpec().getBytes("UTF-8")); cipher.init(cipherMode, secretKey, ivSpec); return cipher; } diff --git a/core-common/src/test/java/org/apache/kylin/common/util/EncryptUtilTest.java b/core-common/src/test/java/org/apache/kylin/common/util/EncryptUtilTest.java index da985ca..5cb8899 100644 --- a/core-common/src/test/java/org/apache/kylin/common/util/EncryptUtilTest.java +++ b/core-common/src/test/java/org/apache/kylin/common/util/EncryptUtilTest.java @@ -18,10 +18,21 @@ package org.apache.kylin.common.util; +import org.junit.After; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; -public class EncryptUtilTest { +public class EncryptUtilTest extends LocalFileMetadataTestCase { +@Before +public void setUp() throws Exception { +this.createTestMetadata(); +} + +@After +public void after() throws Exception { +this.cleanupTestMetadata(); +} @Test public void testAESEncrypt(){ diff --git a/server/src/main/webapp/WEB-INF/web.xml b/server/src/main/webapp/WEB-INF/web.xml index 8602c71..f9849b8 100644 --- a/server/src/main/webapp/WEB-INF/web.xml +++ b/server/src/main/webapp/WEB-INF/web.xml @@ -75,7 +75,7 @@ cors.supportsCredentials - true + false
[kylin] branch kylin3-hadoop3 updated (f2d1640 -> 6766e0d)
This is an automated email from the ASF dual-hosted git repository. yaqian pushed a change to branch kylin3-hadoop3 in repository https://gitbox.apache.org/repos/asf/kylin.git. discard f2d1640 test fix discard 79cbd08 configurable hive dict table format discard a8f7875 [maven-release-plugin] prepare release kylin-3.1.3 discard 312f374 Modify shaded-guava for release kylin3.1.3 new 162a819 configurable hive dict table format new 6766e0d test fix 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 (f2d1640) \ N -- N -- N refs/heads/kylin3-hadoop3 (6766e0d) 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 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 +- cache/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 +- cube-migration/pom.xml | 2 +- datasource-sdk/pom.xml | 2 +- engine-flink/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| 20 ++-- query/pom.xml | 2 +- server-base/pom.xml| 2 +- server/pom.xml | 2 +- source-hive/pom.xml| 2 +- source-jdbc/pom.xml| 2 +- source-kafka/pom.xml | 2 +- storage-hbase/pom.xml | 2 +- storage-stream/pom.xml | 2 +- stream-coordinator/pom.xml | 2 +- stream-core/pom.xml| 2 +- stream-receiver/pom.xml| 2 +- stream-source-kafka/pom.xml| 2 +- tomcat-ext/pom.xml | 2 +- tool-assembly/pom.xml | 2 +- tool/pom.xml | 2 +- 34 files changed, 43 insertions(+), 43 deletions(-)
[kylin] 01/02: configurable hive dict table format
This is an automated email from the ASF dual-hosted git repository. yaqian pushed a commit to branch kylin3-hadoop3 in repository https://gitbox.apache.org/repos/asf/kylin.git commit 162a8195f564ff456373aee8464bb221ace6 Author: fengpod AuthorDate: Wed Dec 8 20:23:14 2021 +0800 configurable hive dict table format --- .../org/apache/kylin/common/KylinConfigBase.java | 4 ++ .../apache/kylin/source/hive/HiveInputBase.java| 4 +- .../apache/kylin/source/hive/MRHiveDictUtil.java | 50 ++ 3 files changed, 38 insertions(+), 20 deletions(-) diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java index 4d24fd0..707848f 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java @@ -708,6 +708,10 @@ public abstract class KylinConfigBase implements Serializable { return getOptional("kylin.dictionary.mr-hive.intermediate.table.suffix", "_distinct_value"); } +public String getMrHiveDictTableFormat() { +return getOptional("kylin.dictionary.mr-hive.table.format", "TEXTFILE"); +} + // // CUBE // diff --git a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveInputBase.java b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveInputBase.java index 193990d..90239d9 100644 --- a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveInputBase.java +++ b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveInputBase.java @@ -168,11 +168,11 @@ public class HiveInputBase { final String distinctValueTable = MRHiveDictUtil.distinctValueTable(flatDesc); final String segmentLevelDictTableName = MRHiveDictUtil.segmentLevelDictTableName(flatDesc); -final String createGlobalDictTableHql = MRHiveDictUtil.generateDictionaryDdl(globalDictDatabase, globalDictTable); +final String createGlobalDictTableHql = MRHiveDictUtil.generateDictionaryDdl(flatDesc, globalDictDatabase, globalDictTable); final String dropDistinctValueTableHql = MRHiveDictUtil.generateDropTableStatement(distinctValueTable); final String createDistinctValueTableHql = MRHiveDictUtil.generateDistinctValueTableStatement(flatDesc); final String dropSegmentLevelDictTableHql = MRHiveDictUtil.generateDropTableStatement(segmentLevelDictTableName); -final String createSegmentLevelDictTableHql = MRHiveDictUtil.generateDictTableStatement(segmentLevelDictTableName); +final String createSegmentLevelDictTableHql = MRHiveDictUtil.generateDictTableStatement(flatDesc, segmentLevelDictTableName); String maxAndDistinctCountSql = MRHiveDictUtil.generateDictStatisticsSql(distinctValueTable, globalDictTable, globalDictDatabase); diff --git a/source-hive/src/main/java/org/apache/kylin/source/hive/MRHiveDictUtil.java b/source-hive/src/main/java/org/apache/kylin/source/hive/MRHiveDictUtil.java index 5fe8a97..62bf03d 100644 --- a/source-hive/src/main/java/org/apache/kylin/source/hive/MRHiveDictUtil.java +++ b/source-hive/src/main/java/org/apache/kylin/source/hive/MRHiveDictUtil.java @@ -96,15 +96,23 @@ public class MRHiveDictUtil { return cubeName + flatDesc.getSegment().getConfig().getMrHiveDictTableSuffix(); } -public static String generateDictionaryDdl(String db, String tbl) { -return "CREATE TABLE IF NOT EXISTS " + db + "." + tbl + "\n" -+ " ( dict_key STRING COMMENT '', \n" -+ " dict_val INT COMMENT '' \n" -+ ") \n" -+ "COMMENT 'Hive Global Dictionary' \n" -+ "PARTITIONED BY (dict_column string) \n" -+ "ROW FORMAT DELIMITED FIELDS TERMINATED BY '\\t' \n" -+ "STORED AS TEXTFILE; \n"; +public static String generateDictionaryDdl(IJoinedFlatTableDesc flatDesc, String db, String tbl) { +KylinConfig config = flatDesc.getSegment().getConfig(); +String tableFormat = config.getMrHiveDictTableFormat(); +StringBuilder ddl = new StringBuilder(); +ddl.append("CREATE TABLE IF NOT EXISTS " + db + "." + tbl + "\n"); +ddl.append(" ( dict_key STRING COMMENT '', \n"); +ddl.append(" dict_val INT COMMENT '' \n"); +ddl.append(") \n"); +ddl.append("COMMENT 'Hive Global Dictionary' \n"); +ddl.append("PARTITIONED BY (dict_column string) \n"); +if ("TEXTFILE".equalsIgnoreCase(tableFormat)) { +ddl.append("ROW FORMAT DELIMITED FIELDS TERMINATED BY '\\t' \n"); +ddl.append("STORED AS TEXTFILE; \n"); +} else { +ddl.append("STORED AS "
[kylin] 02/02: test fix
This is an automated email from the ASF dual-hosted git repository. yaqian pushed a commit to branch kylin3-hadoop3 in repository https://gitbox.apache.org/repos/asf/kylin.git commit f2d1640dc4f98a9caedfe5ee7a9a875f03cdbe90 Author: yaqian.zhang <598593...@qq.com> AuthorDate: Tue Dec 7 16:59:42 2021 +0800 test fix --- .../main/java/org/apache/kylin/common/KylinConfigBase.java | 3 +++ .../main/java/org/apache/kylin/common/util/EncryptUtil.java | 3 ++- .../java/org/apache/kylin/common/util/EncryptUtilTest.java | 13 - server/src/main/webapp/WEB-INF/web.xml | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java index 707848f..947cc24 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java @@ -2740,4 +2740,7 @@ public abstract class KylinConfigBase implements Serializable { return getOptional("kylin.jdbc.url.allowed.sqlserver.schema", DEFAULT_JDBC_URL_ALLOWED_SQLSERVER_SCHEMA); } +public String getEncryptCipherIvSpec() { +return getOptional("kylin.security.encrypt.cipher.ivSpec", ""); +} } diff --git a/core-common/src/main/java/org/apache/kylin/common/util/EncryptUtil.java b/core-common/src/main/java/org/apache/kylin/common/util/EncryptUtil.java index b9b4ddb..224c9e8 100644 --- a/core-common/src/main/java/org/apache/kylin/common/util/EncryptUtil.java +++ b/core-common/src/main/java/org/apache/kylin/common/util/EncryptUtil.java @@ -25,6 +25,7 @@ import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import org.apache.commons.codec.binary.Base64; +import org.apache.kylin.common.KylinConfig; import javax.crypto.Cipher; import javax.crypto.NoSuchPaddingException; @@ -42,7 +43,7 @@ public class EncryptUtil { InvalidKeyException, NoSuchPaddingException, NoSuchAlgorithmException, UnsupportedEncodingException { Cipher cipher = Cipher.getInstance("AES/CFB/PKCS5Padding"); final SecretKeySpec secretKey = new SecretKeySpec(key, "AES"); -IvParameterSpec ivSpec = new IvParameterSpec("".getBytes("UTF-8")); +IvParameterSpec ivSpec = new IvParameterSpec(KylinConfig.getInstanceFromEnv().getEncryptCipherIvSpec().getBytes("UTF-8")); cipher.init(cipherMode, secretKey, ivSpec); return cipher; } diff --git a/core-common/src/test/java/org/apache/kylin/common/util/EncryptUtilTest.java b/core-common/src/test/java/org/apache/kylin/common/util/EncryptUtilTest.java index da985ca..5cb8899 100644 --- a/core-common/src/test/java/org/apache/kylin/common/util/EncryptUtilTest.java +++ b/core-common/src/test/java/org/apache/kylin/common/util/EncryptUtilTest.java @@ -18,10 +18,21 @@ package org.apache.kylin.common.util; +import org.junit.After; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; -public class EncryptUtilTest { +public class EncryptUtilTest extends LocalFileMetadataTestCase { +@Before +public void setUp() throws Exception { +this.createTestMetadata(); +} + +@After +public void after() throws Exception { +this.cleanupTestMetadata(); +} @Test public void testAESEncrypt(){ diff --git a/server/src/main/webapp/WEB-INF/web.xml b/server/src/main/webapp/WEB-INF/web.xml index 8602c71..f9849b8 100644 --- a/server/src/main/webapp/WEB-INF/web.xml +++ b/server/src/main/webapp/WEB-INF/web.xml @@ -75,7 +75,7 @@ cors.supportsCredentials - true + false
[kylin] branch kylin3-hadoop3 updated (a8f7875 -> f2d1640)
This is an automated email from the ASF dual-hosted git repository. yaqian pushed a change to branch kylin3-hadoop3 in repository https://gitbox.apache.org/repos/asf/kylin.git. from a8f7875 [maven-release-plugin] prepare release kylin-3.1.3 new 79cbd08 configurable hive dict table format new f2d1640 test fix 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/common/KylinConfigBase.java | 7 +++ .../org/apache/kylin/common/util/EncryptUtil.java | 3 +- .../apache/kylin/common/util/EncryptUtilTest.java | 13 +- server/src/main/webapp/WEB-INF/web.xml | 2 +- .../apache/kylin/source/hive/HiveInputBase.java| 4 +- .../apache/kylin/source/hive/MRHiveDictUtil.java | 50 ++ 6 files changed, 56 insertions(+), 23 deletions(-)
[kylin] 01/02: configurable hive dict table format
This is an automated email from the ASF dual-hosted git repository. yaqian pushed a commit to branch kylin3-hadoop3 in repository https://gitbox.apache.org/repos/asf/kylin.git commit 79cbd08599b655f2cc64e2c8621ffebca0e44baa Author: fengpod AuthorDate: Wed Dec 8 20:23:14 2021 +0800 configurable hive dict table format --- .../org/apache/kylin/common/KylinConfigBase.java | 4 ++ .../apache/kylin/source/hive/HiveInputBase.java| 4 +- .../apache/kylin/source/hive/MRHiveDictUtil.java | 50 ++ 3 files changed, 38 insertions(+), 20 deletions(-) diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java index 4d24fd0..707848f 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java @@ -708,6 +708,10 @@ public abstract class KylinConfigBase implements Serializable { return getOptional("kylin.dictionary.mr-hive.intermediate.table.suffix", "_distinct_value"); } +public String getMrHiveDictTableFormat() { +return getOptional("kylin.dictionary.mr-hive.table.format", "TEXTFILE"); +} + // // CUBE // diff --git a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveInputBase.java b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveInputBase.java index 193990d..90239d9 100644 --- a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveInputBase.java +++ b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveInputBase.java @@ -168,11 +168,11 @@ public class HiveInputBase { final String distinctValueTable = MRHiveDictUtil.distinctValueTable(flatDesc); final String segmentLevelDictTableName = MRHiveDictUtil.segmentLevelDictTableName(flatDesc); -final String createGlobalDictTableHql = MRHiveDictUtil.generateDictionaryDdl(globalDictDatabase, globalDictTable); +final String createGlobalDictTableHql = MRHiveDictUtil.generateDictionaryDdl(flatDesc, globalDictDatabase, globalDictTable); final String dropDistinctValueTableHql = MRHiveDictUtil.generateDropTableStatement(distinctValueTable); final String createDistinctValueTableHql = MRHiveDictUtil.generateDistinctValueTableStatement(flatDesc); final String dropSegmentLevelDictTableHql = MRHiveDictUtil.generateDropTableStatement(segmentLevelDictTableName); -final String createSegmentLevelDictTableHql = MRHiveDictUtil.generateDictTableStatement(segmentLevelDictTableName); +final String createSegmentLevelDictTableHql = MRHiveDictUtil.generateDictTableStatement(flatDesc, segmentLevelDictTableName); String maxAndDistinctCountSql = MRHiveDictUtil.generateDictStatisticsSql(distinctValueTable, globalDictTable, globalDictDatabase); diff --git a/source-hive/src/main/java/org/apache/kylin/source/hive/MRHiveDictUtil.java b/source-hive/src/main/java/org/apache/kylin/source/hive/MRHiveDictUtil.java index 5fe8a97..62bf03d 100644 --- a/source-hive/src/main/java/org/apache/kylin/source/hive/MRHiveDictUtil.java +++ b/source-hive/src/main/java/org/apache/kylin/source/hive/MRHiveDictUtil.java @@ -96,15 +96,23 @@ public class MRHiveDictUtil { return cubeName + flatDesc.getSegment().getConfig().getMrHiveDictTableSuffix(); } -public static String generateDictionaryDdl(String db, String tbl) { -return "CREATE TABLE IF NOT EXISTS " + db + "." + tbl + "\n" -+ " ( dict_key STRING COMMENT '', \n" -+ " dict_val INT COMMENT '' \n" -+ ") \n" -+ "COMMENT 'Hive Global Dictionary' \n" -+ "PARTITIONED BY (dict_column string) \n" -+ "ROW FORMAT DELIMITED FIELDS TERMINATED BY '\\t' \n" -+ "STORED AS TEXTFILE; \n"; +public static String generateDictionaryDdl(IJoinedFlatTableDesc flatDesc, String db, String tbl) { +KylinConfig config = flatDesc.getSegment().getConfig(); +String tableFormat = config.getMrHiveDictTableFormat(); +StringBuilder ddl = new StringBuilder(); +ddl.append("CREATE TABLE IF NOT EXISTS " + db + "." + tbl + "\n"); +ddl.append(" ( dict_key STRING COMMENT '', \n"); +ddl.append(" dict_val INT COMMENT '' \n"); +ddl.append(") \n"); +ddl.append("COMMENT 'Hive Global Dictionary' \n"); +ddl.append("PARTITIONED BY (dict_column string) \n"); +if ("TEXTFILE".equalsIgnoreCase(tableFormat)) { +ddl.append("ROW FORMAT DELIMITED FIELDS TERMINATED BY '\\t' \n"); +ddl.append("STORED AS TEXTFILE; \n"); +} else { +ddl.append("STORED AS "
[kylin] branch kylin3 updated: test fix
This is an automated email from the ASF dual-hosted git repository. xxyu pushed a commit to branch kylin3 in repository https://gitbox.apache.org/repos/asf/kylin.git The following commit(s) were added to refs/heads/kylin3 by this push: new 694d94b test fix 694d94b is described below commit 694d94b270b3f2722e590cb552816d0b2d3dda3c Author: yaqian.zhang <598593...@qq.com> AuthorDate: Tue Dec 7 16:59:42 2021 +0800 test fix --- .../main/java/org/apache/kylin/common/KylinConfigBase.java | 3 +++ .../main/java/org/apache/kylin/common/util/EncryptUtil.java | 3 ++- .../java/org/apache/kylin/common/util/EncryptUtilTest.java | 13 - server/src/main/webapp/WEB-INF/web.xml | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java index 707848f..947cc24 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java @@ -2740,4 +2740,7 @@ public abstract class KylinConfigBase implements Serializable { return getOptional("kylin.jdbc.url.allowed.sqlserver.schema", DEFAULT_JDBC_URL_ALLOWED_SQLSERVER_SCHEMA); } +public String getEncryptCipherIvSpec() { +return getOptional("kylin.security.encrypt.cipher.ivSpec", ""); +} } diff --git a/core-common/src/main/java/org/apache/kylin/common/util/EncryptUtil.java b/core-common/src/main/java/org/apache/kylin/common/util/EncryptUtil.java index b9b4ddb..224c9e8 100644 --- a/core-common/src/main/java/org/apache/kylin/common/util/EncryptUtil.java +++ b/core-common/src/main/java/org/apache/kylin/common/util/EncryptUtil.java @@ -25,6 +25,7 @@ import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import org.apache.commons.codec.binary.Base64; +import org.apache.kylin.common.KylinConfig; import javax.crypto.Cipher; import javax.crypto.NoSuchPaddingException; @@ -42,7 +43,7 @@ public class EncryptUtil { InvalidKeyException, NoSuchPaddingException, NoSuchAlgorithmException, UnsupportedEncodingException { Cipher cipher = Cipher.getInstance("AES/CFB/PKCS5Padding"); final SecretKeySpec secretKey = new SecretKeySpec(key, "AES"); -IvParameterSpec ivSpec = new IvParameterSpec("".getBytes("UTF-8")); +IvParameterSpec ivSpec = new IvParameterSpec(KylinConfig.getInstanceFromEnv().getEncryptCipherIvSpec().getBytes("UTF-8")); cipher.init(cipherMode, secretKey, ivSpec); return cipher; } diff --git a/core-common/src/test/java/org/apache/kylin/common/util/EncryptUtilTest.java b/core-common/src/test/java/org/apache/kylin/common/util/EncryptUtilTest.java index da985ca..5cb8899 100644 --- a/core-common/src/test/java/org/apache/kylin/common/util/EncryptUtilTest.java +++ b/core-common/src/test/java/org/apache/kylin/common/util/EncryptUtilTest.java @@ -18,10 +18,21 @@ package org.apache.kylin.common.util; +import org.junit.After; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; -public class EncryptUtilTest { +public class EncryptUtilTest extends LocalFileMetadataTestCase { +@Before +public void setUp() throws Exception { +this.createTestMetadata(); +} + +@After +public void after() throws Exception { +this.cleanupTestMetadata(); +} @Test public void testAESEncrypt(){ diff --git a/server/src/main/webapp/WEB-INF/web.xml b/server/src/main/webapp/WEB-INF/web.xml index 8602c71..f9849b8 100644 --- a/server/src/main/webapp/WEB-INF/web.xml +++ b/server/src/main/webapp/WEB-INF/web.xml @@ -75,7 +75,7 @@ cors.supportsCredentials - true + false