This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin5-tmp
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 50803c8ff7d174e264b29ff5fd19dfcb8667a64e
Author: XiaoxiangYu <x...@apache.org>
AuthorDate: Tue Sep 19 14:47:35 2023 +0800
Fix for remote debug & code style
---
build/release/download-spark.sh | 1 +
dev-support/sandbox/conf/kylin.properties | 13 ++++++++++---
pom.xml | 2 +-
src/assembly/pom.xml | 6 +++---
.../org/apache/kylin/rest/controller/NAdminController.java | 1 -
.../src/main/java/org/apache/kylin/common/KapConfig.java | 6 ------
.../main/java/org/apache/kylin/common/KylinConfigBase.java | 4 ++--
.../java/org/apache/kylin/common/constant/HttpConstant.java | 4 ----
.../org/apache/kylin/common/hystrix/NCircuitBreaker.java | 8 ++++----
.../main/java/org/apache/kylin/common/msg/CnMessage.java | 1 -
.../src/main/java/org/apache/kylin/common/msg/Message.java | 1 -
.../kylin/common/util/SegmentMergeStorageChecker.java | 2 +-
src/examples/test_case_data/sandbox/kylin.properties | 4 ++--
src/kylin-it/pom.xml | 2 +-
.../kylin/newten/NBitmapFunctionForCalciteExecTest.java | 2 +-
.../kylin/newten/NFlattableJoinWithoutLookupTest.java | 2 +-
.../org/apache/kylin/newten/NManualBuildAndQueryTest.java | 2 +-
.../test/java/org/apache/kylin/newten/TableIndexTest.java | 2 +-
.../src/test/java/org/apache/kylin/util/ExecAndComp.java | 2 +-
.../src/test/resources/query/sql_function/query04.sql | 2 +-
src/kylin-server-it/pom.xml | 4 ++--
.../kylin}/rest/controller/open/OpenModelController.java | 2 +-
.../kylin}/rest/controller/open/OpenSystemController.java | 2 +-
.../rest/controller/open/OpenModelControllerTest.java | 2 +-
.../rest/controller/open/OpenSystemControllerTest.java | 2 +-
.../org/apache/kylin/rest/response/SimplifiedMeasure.java | 1 -
.../java/org/apache/kylin/query/security/RowFilter.java | 2 +-
src/query-server/pom.xml | 2 +-
.../java/org/apache/kylin/query/engine/PlannerFactory.java | 1 -
.../java/org/apache/kylin/query/util/CCOnRealModelTest.java | 1 -
src/server/pom.xml | 6 +++++-
src/server/src/main/resources/META-INF/spring.factories | 3 +--
.../rest/health/SparkSqlContextHealthIndicatorTest.java | 2 +-
src/source-hive/pom.xml | 2 +-
src/spark-project/engine-build-sdk/pom.xml | 2 +-
src/spark-project/engine-spark/pom.xml | 4 ++--
.../kylin/engine/spark/NLocalWithSparkSessionTest.java | 4 ++--
.../kylin/engine/spark/job/NTableSamplingJobTest.java | 2 +-
.../engine/spark/source/NSparkMetadataExplorerTest.java | 2 +-
src/spark-project/kylin-soft-affinity-cache/pom.xml | 4 ++--
src/spark-project/source-jdbc/pom.xml | 2 +-
src/spark-project/sparder/pom.xml | 6 +++---
.../org/apache/kylin/query/runtime/plan/ProjectPlan.scala | 2 +-
.../org/apache/kylin/query/util/SparderDerivedUtil.scala | 2 +-
src/spark-project/spark-it/pom.xml | 2 +-
src/tool/pom.xml | 2 +-
.../java/org/apache/kylin/tool/util/ServerInfoUtil.java | 1 -
47 files changed, 64 insertions(+), 70 deletions(-)
diff --git a/build/release/download-spark.sh b/build/release/download-spark.sh
index b552e5d14c..6d4a21bad0 100755
--- a/build/release/download-spark.sh
+++ b/build/release/download-spark.sh
@@ -25,6 +25,7 @@ source build/release/functions.sh
rm -rf build/spark
spark_version_pom=`mvn -f pom.xml help:evaluate -Dexpression=spark.version |
grep -E '^[0-9]+\.[0-9]+\.[0-9]+' `
+spark_version_pom=3.2.0-kylin-4.6.9.0
spark_pkg_name=spark-newten-"`echo ${spark_version_pom}| sed "s/-kylin//g"`"
spark_pkg_file_name="${spark_pkg_name}.tgz"
diff --git a/dev-support/sandbox/conf/kylin.properties
b/dev-support/sandbox/conf/kylin.properties
index 179af52036..b172f77106 100644
--- a/dev-support/sandbox/conf/kylin.properties
+++ b/dev-support/sandbox/conf/kylin.properties
@@ -19,13 +19,20 @@
# Env DEV|QA|PROD
kylin.env=DEV
+spring.session.store-type=JDBC
+# 3 hours before session force logout
+spring.session.timeout=10800
+
+# do not ask user to change password anymore
+kylin.metadata.random-admin-password.enabled=false
+
kylin.query.cache-enabled=false
kylin.server.leader-race.heart-beat-interval=240
kylin.server.leader-race.heart-beat-timeout=360
kylin.task.jstack-dump-enabled=false
# The metadata store, by default stored in jdbc
-kylin.metadata.url=ke_metadata@jdbc,driverClassName=com.mysql.jdbc.Driver,url=jdbc:mysql://mysql:3306/kylin?useSSL=false,createDatabaseIfNotExist=true,username=root,password=root
+kylin.metadata.url=kylin_metadata@jdbc,driverClassName=com.mysql.jdbc.Driver,url=jdbc:mysql://mysql:3306/kylin?useSSL=false,createDatabaseIfNotExist=true,username=root,password=root
kylin.source.record-source-usage-enabled=false
@@ -82,7 +89,7 @@ kylin.engine.spark-conf.spark.executor.cores=1
kylin.engine.spark-conf.spark.executor.instances=1
kylin.engine.spark-conf.spark.sql.autoBroadcastJoinThreshold=-1
-kylin.engine.spark.job-jar=../assembly/target/kylin-assembly-5.0.0-alpha-SNAPSHOT-job.jar
+kylin.engine.spark.job-jar=../assembly/target/kylin-assembly-5.0.0-SNAPSHOT-job.jar
@@ -198,7 +205,7 @@ kylin.smart.conf.propose-runner-type=in-memory
#streaming
kylin.streaming.spark-conf.spark.sql.hive.metastore.jars=${KYLIN_HOME}/build/spark/hive_1_2_2/*
-kylin.streaming.spark.job-jar=../assembly/target/kylin-assembly-5.0.0-alpha-SNAPSHOT-job.jar
+kylin.streaming.spark.job-jar=../assembly/target/kylin-assembly-5.0.0-SNAPSHOT-job.jar
kylin.query.escape-default-keyword=true
kylin.monitor.enabled=false
diff --git a/pom.xml b/pom.xml
index b4b5b040ff..1c68857e51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<packaging>pom</packaging>
<version>5.0.0-SNAPSHOT</version>
- <name>Apache Kylin</name>
+ <name>Apache Kylin 5</name>
<url>http://kylin.apache.org/5.0</url>
<inceptionYear>2016</inceptionYear>
<description>Apache Kylin 5</description>
diff --git a/src/assembly/pom.xml b/src/assembly/pom.xml
index 9e6a4bc127..aa02f652f1 100644
--- a/src/assembly/pom.xml
+++ b/src/assembly/pom.xml
@@ -26,9 +26,9 @@
<packaging>jar</packaging>
<artifactId>kylin-assembly</artifactId>
- <name>Kylin - Assembly</name>
+ <name>Kylin - Source Assembly</name>
<url>http://kylin.apache.org</url>
- <description>Kylin Assembly</description>
+ <description>Kylin - Source Assembly</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -45,7 +45,7 @@
<scope>compile</scope>
</dependency>
- <!--KAP-->
+ <!-- Kylin -->
<dependency>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin-core-metadata</artifactId>
diff --git
a/src/common-server/src/main/java/org/apache/kylin/rest/controller/NAdminController.java
b/src/common-server/src/main/java/org/apache/kylin/rest/controller/NAdminController.java
index dbf686c7c3..77365f1e9e 100644
---
a/src/common-server/src/main/java/org/apache/kylin/rest/controller/NAdminController.java
+++
b/src/common-server/src/main/java/org/apache/kylin/rest/controller/NAdminController.java
@@ -60,7 +60,6 @@ public class NAdminController extends NBasicController {
propertyKeys.addAll(Arrays.asList(whiteListProperties.split(",")));
}
- // add KAP specific
propertyKeys.add("kylin.env.smart-mode-enabled");
propertyKeys.add("kylin.source.load-hive-tablename-enabled");
propertyKeys.add("kylin.kerberos.project-level-enabled");
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/KapConfig.java
b/src/core-common/src/main/java/org/apache/kylin/common/KapConfig.java
index d073f089a7..73cacef7af 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/KapConfig.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/KapConfig.java
@@ -404,9 +404,6 @@ public class KapConfig {
return
Integer.parseInt(config.getOptional("kylin.metrics.daily-max-retry-times",
"3"));
}
- /**
- * kap monitor
- */
public boolean isMonitorEnabled() {
return
Boolean.parseBoolean(config.getOptional("kylin.monitor.enabled", "false"));
}
@@ -459,9 +456,6 @@ public class KapConfig {
return
Double.parseDouble(config.getOptional("kylin.monitor.cluster-crash-threshold",
"0.8"));
}
- /**
- * kap circuit-breaker
- */
public boolean isCircuitBreakerEnabled() {
return
Boolean.parseBoolean(config.getOptional("kylin.circuit-breaker.enabled",
"true"));
}
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
b/src/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
index 785fa9a048..4da98d0000 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
@@ -2153,9 +2153,9 @@ public abstract class KylinConfigBase implements
Serializable {
}
public boolean isPushdownQueryCacheEnabled() {
- // KAP#12784 disable all push-down caches, even if the pushdown result
is cached, it won't be used
+ // disable all push-down caches, even if the pushdown result is
cached, it won't be used
// Thus this config is set to FALSE by default
- // you may need to change the default value if the pushdown cache
issue KAP#13060 is resolved
+ // you may need to change the default value if the pushdown cache
issue is resolved
return
Boolean.parseBoolean(this.getOptional("kylin.query.pushdown.cache-enabled",
FALSE));
}
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/constant/HttpConstant.java
b/src/core-common/src/main/java/org/apache/kylin/common/constant/HttpConstant.java
index 0df1ec0234..9b6ab59784 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/constant/HttpConstant.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/constant/HttpConstant.java
@@ -26,16 +26,12 @@ public class HttpConstant {
/** kylin api client accept */
public static final String HTTP_VND_APACHE_KYLIN_EARLY_JSON =
"application/json";
- /** KAP 2x and 3x api client accept */
public static final String HTTP_VND_APACHE_KYLIN_V2_JSON =
"application/vnd.apache.kylin-v2+json";
- /** Some dirty compatibility client accept, delete it after KI use v4 api
*/
public static final String HTTP_VND_APACHE_KYLIN_V3_JSON =
"application/vnd.apache.kylin-v3+json";
- /** KAP 4x api client accept */
public static final String HTTP_VND_APACHE_KYLIN_V4_JSON =
"application/vnd.apache.kylin-v4+json";
- /** KAP 4x api client accept */
public static final String HTTP_VND_APACHE_KYLIN_V4_PUBLIC_JSON =
"application/vnd.apache.kylin-v4-public+json";
public static final String HTTP_VND_APACHE_KYLIN_JSON =
HTTP_VND_APACHE_KYLIN_V4_JSON;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/hystrix/NCircuitBreaker.java
b/src/core-common/src/main/java/org/apache/kylin/common/hystrix/NCircuitBreaker.java
index c8057d3367..56a80335a9 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/hystrix/NCircuitBreaker.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/hystrix/NCircuitBreaker.java
@@ -53,9 +53,9 @@ public class NCircuitBreaker {
breakerStarted.set(true);
- logger.info("kap circuit-breaker started");
+ logger.info("circuit-breaker started");
} catch (Exception e) {
- logger.error("kap circuit-breaker start failed", e);
+ logger.error("circuit-breaker start failed", e);
}
}
}
@@ -65,7 +65,7 @@ public class NCircuitBreaker {
public static void stop() {
// Only used in test cases!!!
breakerStarted.set(false);
- logger.info("kap circuit-breaker stopped");
+ logger.info("circuit-breaker stopped");
}
public static void verifyProjectCreation(int current) {
@@ -111,7 +111,7 @@ public class NCircuitBreaker {
private static boolean isEnabled() {
if (!breakerStarted.get()) {
- logger.warn("kap circuit-breaker not started");
+ logger.warn("circuit-breaker not started");
return false;
}
return breakerConfig.isBreakerEnabled();
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/msg/CnMessage.java
b/src/core-common/src/main/java/org/apache/kylin/common/msg/CnMessage.java
index 10ddbb586f..a1685cb587 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/msg/CnMessage.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/msg/CnMessage.java
@@ -1495,7 +1495,6 @@ public class CnMessage extends Message {
}
@Override
- // KAP query sql blacklist
public String getSqlBlacklistItemIdEmpty() {
return "黑名单条目 id 不能为空";
}
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/msg/Message.java
b/src/core-common/src/main/java/org/apache/kylin/common/msg/Message.java
index 6d3aab37de..020b9d0efd 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/msg/Message.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/msg/Message.java
@@ -1424,7 +1424,6 @@ public class Message {
return "The parameter '%s' is too large, maximum %s KB.";
}
- // KAP query sql blacklist
public String getSqlBlacklistItemIdEmpty() {
return "The id of blacklist item can not be empty.";
}
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/util/SegmentMergeStorageChecker.java
b/src/core-common/src/main/java/org/apache/kylin/common/util/SegmentMergeStorageChecker.java
index afa9c8698a..1db797293c 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/util/SegmentMergeStorageChecker.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/util/SegmentMergeStorageChecker.java
@@ -114,7 +114,7 @@ public class SegmentMergeStorageChecker {
public static long recountExpectedSpaceByte(long
originalExpectedSpaceByte, int replication) {
logger.info("Merging segments requires {} B space(original)",
originalExpectedSpaceByte);
- logger.info("Kap replication is {}", replication);
+ logger.info("Replication is {}", replication);
long expectedSpaceByByte = originalExpectedSpaceByte * replication;
logger.info("Merging segments requires {} B space after recount.",
expectedSpaceByByte);
return expectedSpaceByByte;
diff --git a/src/examples/test_case_data/sandbox/kylin.properties
b/src/examples/test_case_data/sandbox/kylin.properties
index d9ac5580ce..5fe04b2fe6 100644
--- a/src/examples/test_case_data/sandbox/kylin.properties
+++ b/src/examples/test_case_data/sandbox/kylin.properties
@@ -70,7 +70,7 @@ kylin.engine.spark-conf.spark.sql.hive.metastore.version=1.2.2
kylin.engine.spark-conf.spark.sql.hive.metastore.jars=${KYLIN_HOME}/build/spark/hive_1_2_2/*
kylin.engine.spark-conf.spark.yarn.dist.files=../../build/conf/spark-executor-log4j.xml
-kylin.engine.spark.job-jar=../assembly/target/kylin-assembly-5.0.0-alpha-SNAPSHOT-job.jar
+kylin.engine.spark.job-jar=../assembly/target/kylin-assembly-5.0.0-SNAPSHOT-job.jar
@@ -186,7 +186,7 @@ kylin.smart.conf.propose-runner-type=in-memory
#streaming
kylin.streaming.spark-conf.spark.yarn.am.extraJavaOptions=-Dhdp.version=current
-Dlog4j.configuration=spark-appmaster-log4j.properties
kylin.streaming.spark-conf.spark.sql.hive.metastore.jars=${KYLIN_HOME}/build/spark/hive_1_2_2/*
-kylin.streaming.spark.job-jar=../assembly/target/kylin-assembly-5.0.0-alpha-SNAPSHOT-job.jar
+kylin.streaming.spark.job-jar=../assembly/target/kylin-assembly-5.0.0-SNAPSHOT-job.jar
kylin.query.escape-default-keyword=true
kylin.monitor.enabled=false
diff --git a/src/kylin-it/pom.xml b/src/kylin-it/pom.xml
index 2221ed2cc4..01282cf457 100644
--- a/src/kylin-it/pom.xml
+++ b/src/kylin-it/pom.xml
@@ -49,7 +49,7 @@
<scope>compile</scope>
</dependency>
- <!--KAP-->
+ <!--Kylin-->
<dependency>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin-core-metadata</artifactId>
diff --git
a/src/kylin-it/src/test/java/org/apache/kylin/newten/NBitmapFunctionForCalciteExecTest.java
b/src/kylin-it/src/test/java/org/apache/kylin/newten/NBitmapFunctionForCalciteExecTest.java
index ea2e21146c..3f3db3f1ad 100644
---
a/src/kylin-it/src/test/java/org/apache/kylin/newten/NBitmapFunctionForCalciteExecTest.java
+++
b/src/kylin-it/src/test/java/org/apache/kylin/newten/NBitmapFunctionForCalciteExecTest.java
@@ -63,7 +63,7 @@ public class NBitmapFunctionForCalciteExecTest extends
NLocalWithSparkSessionTes
public void after() throws Exception {
NDefaultScheduler.destroyInstance();
cleanupTestMetadata();
- FileUtils.deleteQuietly(new File("../kap-it/metastore_db"));
+ FileUtils.deleteQuietly(new File("../kylin-it/metastore_db"));
Unsafe.clearProperty("kylin.query.engine.run-constant-query-locally");
}
diff --git
a/src/kylin-it/src/test/java/org/apache/kylin/newten/NFlattableJoinWithoutLookupTest.java
b/src/kylin-it/src/test/java/org/apache/kylin/newten/NFlattableJoinWithoutLookupTest.java
index 746fda8c99..a0f02257c6 100644
---
a/src/kylin-it/src/test/java/org/apache/kylin/newten/NFlattableJoinWithoutLookupTest.java
+++
b/src/kylin-it/src/test/java/org/apache/kylin/newten/NFlattableJoinWithoutLookupTest.java
@@ -65,7 +65,7 @@ public class NFlattableJoinWithoutLookupTest extends
NLocalWithSparkSessionTest
public void after() throws Exception {
NDefaultScheduler.destroyInstance();
cleanupTestMetadata();
- FileUtils.deleteQuietly(new File("../kap-it/metastore_db"));
+ FileUtils.deleteQuietly(new File("../kylin-it/metastore_db"));
}
@Override
diff --git
a/src/kylin-it/src/test/java/org/apache/kylin/newten/NManualBuildAndQueryTest.java
b/src/kylin-it/src/test/java/org/apache/kylin/newten/NManualBuildAndQueryTest.java
index aa9cac6102..a102d5b540 100644
---
a/src/kylin-it/src/test/java/org/apache/kylin/newten/NManualBuildAndQueryTest.java
+++
b/src/kylin-it/src/test/java/org/apache/kylin/newten/NManualBuildAndQueryTest.java
@@ -52,7 +52,7 @@ import org.apache.kylin.guava30.shaded.common.collect.Maps;
import lombok.val;
-@Ignore("see io.kyligence.kap.ut.TestQueryAndBuild")
+@Ignore("see TestQueryAndBuild")
@SuppressWarnings("serial")
public class NManualBuildAndQueryTest extends NLocalWithSparkSessionTest {
diff --git
a/src/kylin-it/src/test/java/org/apache/kylin/newten/TableIndexTest.java
b/src/kylin-it/src/test/java/org/apache/kylin/newten/TableIndexTest.java
index 1d9200f8d9..54b6e9d173 100644
--- a/src/kylin-it/src/test/java/org/apache/kylin/newten/TableIndexTest.java
+++ b/src/kylin-it/src/test/java/org/apache/kylin/newten/TableIndexTest.java
@@ -56,7 +56,7 @@ public class TableIndexTest extends
NLocalWithSparkSessionTest {
public void after() throws Exception {
NDefaultScheduler.destroyInstance();
cleanupTestMetadata();
- FileUtils.deleteQuietly(new File("../kap-it/metastore_db"));
+ FileUtils.deleteQuietly(new File("../kylin-it/metastore_db"));
}
@Override
diff --git a/src/kylin-it/src/test/java/org/apache/kylin/util/ExecAndComp.java
b/src/kylin-it/src/test/java/org/apache/kylin/util/ExecAndComp.java
index 6ee8b0dd71..34126ab7f4 100644
--- a/src/kylin-it/src/test/java/org/apache/kylin/util/ExecAndComp.java
+++ b/src/kylin-it/src/test/java/org/apache/kylin/util/ExecAndComp.java
@@ -122,7 +122,7 @@ public class ExecAndComp {
"query/sql_timestamp/query27.sql",
// TODO percentile_approx()
"semi_auto/measures/query00.sql" };
- String[] pathArray = fullPath.split("src/kap-it/src/test/resources/");
+ String[] pathArray =
fullPath.split("src/kylin-it/src/test/resources/");
if (pathArray.length < 2)
return false;
String relativePath = pathArray[1];
diff --git a/src/kylin-it/src/test/resources/query/sql_function/query04.sql
b/src/kylin-it/src/test/resources/query/sql_function/query04.sql
index 1573b95760..ee0a91a4ca 100644
--- a/src/kylin-it/src/test/resources/query/sql_function/query04.sql
+++ b/src/kylin-it/src/test/resources/query/sql_function/query04.sql
@@ -16,7 +16,7 @@
-- limitations under the License.
--
--- from
kap-it/src/test/resources/query/sql_not_in_h2_sparder_function/query01.sql \
+-- from
kylin-it/src/test/resources/query/sql_not_in_h2_sparder_function/query01.sql \
-- query/sql_sparder_function/query02.sql
select INITCAP(LSTG_FORMAT_NAME) a
from TEST_KYLIN_FACT
diff --git a/src/kylin-server-it/pom.xml b/src/kylin-server-it/pom.xml
index aec498e29e..9c60c7bb48 100644
--- a/src/kylin-server-it/pom.xml
+++ b/src/kylin-server-it/pom.xml
@@ -25,7 +25,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>kylin-server-it</artifactId>
- <name>Kylin - Server Integration Test</name>
+ <name>Kylin - Integration Test Server</name>
<properties>
<beanutils.version>1.9.4</beanutils.version>
@@ -72,7 +72,7 @@
<groupId>org.apache.kylin</groupId>
<artifactId>kylin-common-server</artifactId>
</dependency>
- <!--KAP-->
+ <!-- Kylin -->
<dependency>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin-core-metadata</artifactId>
diff --git
a/src/metadata-server/src/main/java/io/kyligence/kap/rest/controller/open/OpenModelController.java
b/src/metadata-server/src/main/java/org/apache/kylin/rest/controller/open/OpenModelController.java
similarity index 99%
rename from
src/metadata-server/src/main/java/io/kyligence/kap/rest/controller/open/OpenModelController.java
rename to
src/metadata-server/src/main/java/org/apache/kylin/rest/controller/open/OpenModelController.java
index a115c303b2..69f335329c 100644
---
a/src/metadata-server/src/main/java/io/kyligence/kap/rest/controller/open/OpenModelController.java
+++
b/src/metadata-server/src/main/java/org/apache/kylin/rest/controller/open/OpenModelController.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package io.kyligence.kap.rest.controller.open;
+package org.apache.kylin.rest.controller.open;
import static
org.apache.kylin.common.constant.HttpConstant.HTTP_VND_APACHE_KYLIN_V4_PUBLIC_JSON;
import static
org.apache.kylin.common.exception.ServerErrorCode.FAILED_UPDATE_MODEL;
diff --git
a/src/metadata-server/src/main/java/io/kyligence/kap/rest/controller/open/OpenSystemController.java
b/src/metadata-server/src/main/java/org/apache/kylin/rest/controller/open/OpenSystemController.java
similarity index 97%
rename from
src/metadata-server/src/main/java/io/kyligence/kap/rest/controller/open/OpenSystemController.java
rename to
src/metadata-server/src/main/java/org/apache/kylin/rest/controller/open/OpenSystemController.java
index 3be446dbdd..23e00549cf 100644
---
a/src/metadata-server/src/main/java/io/kyligence/kap/rest/controller/open/OpenSystemController.java
+++
b/src/metadata-server/src/main/java/org/apache/kylin/rest/controller/open/OpenSystemController.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package io.kyligence.kap.rest.controller.open;
+package org.apache.kylin.rest.controller.open;
import static
org.apache.kylin.common.constant.HttpConstant.HTTP_VND_APACHE_KYLIN_V4_PUBLIC_JSON;
diff --git
a/src/metadata-server/src/test/java/io/kyligence/kap/rest/controller/open/OpenModelControllerTest.java
b/src/metadata-server/src/test/java/org/apache/kylin/rest/controller/open/OpenModelControllerTest.java
similarity index 99%
rename from
src/metadata-server/src/test/java/io/kyligence/kap/rest/controller/open/OpenModelControllerTest.java
rename to
src/metadata-server/src/test/java/org/apache/kylin/rest/controller/open/OpenModelControllerTest.java
index caff8bd85a..6c7a215714 100644
---
a/src/metadata-server/src/test/java/io/kyligence/kap/rest/controller/open/OpenModelControllerTest.java
+++
b/src/metadata-server/src/test/java/org/apache/kylin/rest/controller/open/OpenModelControllerTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package io.kyligence.kap.rest.controller.open;
+package org.apache.kylin.rest.controller.open;
import static
org.apache.kylin.common.constant.HttpConstant.HTTP_VND_APACHE_KYLIN_V4_PUBLIC_JSON;
import static
org.apache.kylin.common.exception.code.ErrorCodeServer.INDEX_PARAMETER_INVALID;
diff --git
a/src/metadata-server/src/test/java/io/kyligence/kap/rest/controller/open/OpenSystemControllerTest.java
b/src/metadata-server/src/test/java/org/apache/kylin/rest/controller/open/OpenSystemControllerTest.java
similarity index 98%
rename from
src/metadata-server/src/test/java/io/kyligence/kap/rest/controller/open/OpenSystemControllerTest.java
rename to
src/metadata-server/src/test/java/org/apache/kylin/rest/controller/open/OpenSystemControllerTest.java
index b052f3635e..7b02fcecfa 100644
---
a/src/metadata-server/src/test/java/io/kyligence/kap/rest/controller/open/OpenSystemControllerTest.java
+++
b/src/metadata-server/src/test/java/org/apache/kylin/rest/controller/open/OpenSystemControllerTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package io.kyligence.kap.rest.controller.open;
+package org.apache.kylin.rest.controller.open;
import static
org.apache.kylin.common.constant.HttpConstant.HTTP_VND_APACHE_KYLIN_V4_PUBLIC_JSON;
diff --git
a/src/modeling-service/src/main/java/org/apache/kylin/rest/response/SimplifiedMeasure.java
b/src/modeling-service/src/main/java/org/apache/kylin/rest/response/SimplifiedMeasure.java
index 497039f443..5db85553f0 100644
---
a/src/modeling-service/src/main/java/org/apache/kylin/rest/response/SimplifiedMeasure.java
+++
b/src/modeling-service/src/main/java/org/apache/kylin/rest/response/SimplifiedMeasure.java
@@ -52,7 +52,6 @@ public class SimplifiedMeasure implements Serializable {
@JsonProperty("name")
private String name;
// returnType is concerned in equal comparasion for return type changes in
measure
- // see
io.kyligence.kap.rest.service.ModelServiceSemanticUpdateTest.testUpdateMeasure_ChangeReturnType
@JsonProperty("return_type")
private String returnType;
@JsonProperty("parameter_value")
diff --git
a/src/query-common/src/main/java/org/apache/kylin/query/security/RowFilter.java
b/src/query-common/src/main/java/org/apache/kylin/query/security/RowFilter.java
index f148a0f3d7..7d25829634 100644
---
a/src/query-common/src/main/java/org/apache/kylin/query/security/RowFilter.java
+++
b/src/query-common/src/main/java/org/apache/kylin/query/security/RowFilter.java
@@ -258,7 +258,7 @@ public class RowFilter implements IQueryTransformer,
IPushDownConverter {
}
logger.debug("\nStart to transform SQL with row ACL\n");
- // if origin SQL has where clause, add "()", see KAP#2873
+ // if origin SQL has where clause, add "()"
sql = whereClauseBracketsCompletion(defaultSchema, sql,
getCandidateTables(allWhereCondWithTbls), project);
sql = rowFilter(defaultSchema, sql, allWhereCondWithTbls, project);
diff --git a/src/query-server/pom.xml b/src/query-server/pom.xml
index d533e009c1..7d6e7e6215 100644
--- a/src/query-server/pom.xml
+++ b/src/query-server/pom.xml
@@ -34,7 +34,7 @@
</properties>
<dependencies>
- <!--Add dependencies of KAP extensions-->
+
<dependency>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin-common-server</artifactId>
diff --git
a/src/query/src/main/java/org/apache/kylin/query/engine/PlannerFactory.java
b/src/query/src/main/java/org/apache/kylin/query/engine/PlannerFactory.java
index 4ec215ca78..8616d6e14a 100644
--- a/src/query/src/main/java/org/apache/kylin/query/engine/PlannerFactory.java
+++ b/src/query/src/main/java/org/apache/kylin/query/engine/PlannerFactory.java
@@ -238,7 +238,6 @@ public class PlannerFactory {
// convert all right joins to left join since we only support left
joins in model
planner.addRule(RightJoinToLeftJoinRule.INSTANCE);
// UnionMergeRule may slow volcano planner optimization on large
number of union clause
- // see KAP#16036
planner.removeRule(UnionMergeRule.INSTANCE);
planner.addRule(KapProjectJoinTransposeRule.INSTANCE);
diff --git
a/src/query/src/test/java/org/apache/kylin/query/util/CCOnRealModelTest.java
b/src/query/src/test/java/org/apache/kylin/query/util/CCOnRealModelTest.java
index 658d266530..164810ad51 100644
--- a/src/query/src/test/java/org/apache/kylin/query/util/CCOnRealModelTest.java
+++ b/src/query/src/test/java/org/apache/kylin/query/util/CCOnRealModelTest.java
@@ -112,7 +112,6 @@ public class CCOnRealModelTest extends
NLocalFileMetadataTestCase {
}
}
- // ignored for KAP#16258
@Ignore("historic ignored")
@Test
public void testSubquery() {
diff --git a/src/server/pom.xml b/src/server/pom.xml
index 67fee45608..8a058ed74d 100644
--- a/src/server/pom.xml
+++ b/src/server/pom.xml
@@ -32,7 +32,7 @@
</parent>
<dependencies>
- <!--Add dependencies of KAP extensions-->
+
<dependency>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin-data-loading-server</artifactId>
@@ -503,6 +503,9 @@
</profile>
<profile>
<id>sandbox</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<dependencies>
<!-- for sandbox -->
<dependency>
@@ -523,6 +526,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-exec</artifactId>
+ <scope>provided</scope>
</dependency>
<!--end for sandbox -->
</dependencies>
diff --git a/src/server/src/main/resources/META-INF/spring.factories
b/src/server/src/main/resources/META-INF/spring.factories
index 0d1446ffb4..a4d0ccc2c0 100644
--- a/src/server/src/main/resources/META-INF/spring.factories
+++ b/src/server/src/main/resources/META-INF/spring.factories
@@ -1,2 +1 @@
-org.springframework.boot.env.EnvironmentPostProcessor=org.apache.kylin.rest.KylinPrepareEnvListener
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=io.kyligence.kap.secondstorage.management.ManagementConfig
+org.springframework.boot.env.EnvironmentPostProcessor=org.apache.kylin.rest.KylinPrepareEnvListener
\ No newline at end of file
diff --git
a/src/server/src/test/java/org/apache/kylin/rest/health/SparkSqlContextHealthIndicatorTest.java
b/src/server/src/test/java/org/apache/kylin/rest/health/SparkSqlContextHealthIndicatorTest.java
index 1374320782..96a27b47b5 100644
---
a/src/server/src/test/java/org/apache/kylin/rest/health/SparkSqlContextHealthIndicatorTest.java
+++
b/src/server/src/test/java/org/apache/kylin/rest/health/SparkSqlContextHealthIndicatorTest.java
@@ -67,7 +67,7 @@ public class SparkSqlContextHealthIndicatorTest extends
NLocalFileMetadataTestCa
@AfterClass
public static void afterClass() {
ss.close();
- FileUtils.deleteQuietly(new File("../kap-it/metastore_db"));
+ FileUtils.deleteQuietly(new File("../kylin-it/metastore_db"));
}
@Before
diff --git a/src/source-hive/pom.xml b/src/source-hive/pom.xml
index 3b241631d2..aab0ecb199 100644
--- a/src/source-hive/pom.xml
+++ b/src/source-hive/pom.xml
@@ -22,7 +22,7 @@
<artifactId>kylin-source-hive</artifactId>
<packaging>jar</packaging>
<name>Kylin - Hive Source</name>
- <description>KAP Hive Source</description>
+ <description>Hive Source</description>
<parent>
<groupId>org.apache.kylin</groupId>
diff --git a/src/spark-project/engine-build-sdk/pom.xml
b/src/spark-project/engine-build-sdk/pom.xml
index 71bd33b677..609fe8758d 100644
--- a/src/spark-project/engine-build-sdk/pom.xml
+++ b/src/spark-project/engine-build-sdk/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <name>Kylin - Engine Build SDK</name>
+ <name>Kylin - Build Engine</name>
<artifactId>kylin-engine-build-sdk</artifactId>
<dependencies>
diff --git a/src/spark-project/engine-spark/pom.xml
b/src/spark-project/engine-spark/pom.xml
index a02ddca633..692eca1919 100644
--- a/src/spark-project/engine-spark/pom.xml
+++ b/src/spark-project/engine-spark/pom.xml
@@ -19,9 +19,9 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>kylin-engine-spark</artifactId>
<packaging>jar</packaging>
- <name>Kylin - SPARK Engine</name>
+ <name>Kylin - Build Engine Spark</name>
<url>http://kylin.apache.org</url>
- <description>Kylin Job Engine - SPARK</description>
+ <description>Kylin Build Engine - SPARK</description>
<parent>
<groupId>org.apache.kylin</groupId>
diff --git
a/src/spark-project/engine-spark/src/test/java/org/apache/kylin/engine/spark/NLocalWithSparkSessionTest.java
b/src/spark-project/engine-spark/src/test/java/org/apache/kylin/engine/spark/NLocalWithSparkSessionTest.java
index 8a8c4adf71..5c3c07a358 100644
---
a/src/spark-project/engine-spark/src/test/java/org/apache/kylin/engine/spark/NLocalWithSparkSessionTest.java
+++
b/src/spark-project/engine-spark/src/test/java/org/apache/kylin/engine/spark/NLocalWithSparkSessionTest.java
@@ -135,7 +135,7 @@ public class NLocalWithSparkSessionTest extends
NLocalFileMetadataTestCase imple
if (ss != null) {
ss.close();
}
- FileUtils.deleteQuietly(new File("../kap-it/metastore_db"));
+ FileUtils.deleteQuietly(new File("../kylin-it/metastore_db"));
}
protected IndexDataConstructor indexDataConstructor;
@@ -247,7 +247,7 @@ public class NLocalWithSparkSessionTest extends
NLocalFileMetadataTestCase imple
if (type.isBoolean())
return DataTypes.BooleanType;
- throw new IllegalArgumentException("KAP data type: " + type + " can
not be converted to spark's type.");
+ throw new IllegalArgumentException("Data type: " + type + " can not be
converted to spark's type.");
}
protected void fullBuild(String dfName) throws Exception {
diff --git
a/src/spark-project/engine-spark/src/test/java/org/apache/kylin/engine/spark/job/NTableSamplingJobTest.java
b/src/spark-project/engine-spark/src/test/java/org/apache/kylin/engine/spark/job/NTableSamplingJobTest.java
index 7e058d08f8..4d1c77bfda 100644
---
a/src/spark-project/engine-spark/src/test/java/org/apache/kylin/engine/spark/job/NTableSamplingJobTest.java
+++
b/src/spark-project/engine-spark/src/test/java/org/apache/kylin/engine/spark/job/NTableSamplingJobTest.java
@@ -62,7 +62,7 @@ public class NTableSamplingJobTest extends
NLocalWithSparkSessionTest {
public void after() throws IOException {
NDefaultScheduler.destroyInstance();
super.cleanupTestMetadata();
- FileUtils.deleteQuietly(new File("../kap-it/metastore_db"));
+ FileUtils.deleteQuietly(new File("../kylin-it/metastore_db"));
}
@Test
diff --git
a/src/spark-project/engine-spark/src/test/java/org/apache/kylin/engine/spark/source/NSparkMetadataExplorerTest.java
b/src/spark-project/engine-spark/src/test/java/org/apache/kylin/engine/spark/source/NSparkMetadataExplorerTest.java
index 9a6da1e906..fddfa930a5 100644
---
a/src/spark-project/engine-spark/src/test/java/org/apache/kylin/engine/spark/source/NSparkMetadataExplorerTest.java
+++
b/src/spark-project/engine-spark/src/test/java/org/apache/kylin/engine/spark/source/NSparkMetadataExplorerTest.java
@@ -153,7 +153,7 @@ public class NSparkMetadataExplorerTest extends
NLocalWithSparkSessionTest {
SparkSession sparkSession = Mockito.mock(SparkSession.class,
Mockito.RETURNS_DEEP_STUBS);
Mockito.when(sparkSession.sql("desc formatted " +
"TEST_KYLIN_FACT").where("col_name == 'Location'").head()
.getString(1)).thenReturn(
-
"hdfs://hacluster//KAP/src/spark-project/examples/test_data/27578/spark-warehouse/test_kylin_fact");
+
"hdfs://hacluster//src/spark-project/examples/test_data/27578/spark-warehouse/test_kylin_fact");
Assert.assertTrue(
sparkMetadataExplorer.getLoc(sparkSession, "TEST_KYLIN_FACT",
null).contains("hdfs://hacluster"));
Assert.assertTrue(sparkMetadataExplorer.getLoc(sparkSession,
"TEST_KYLIN_FACT", "hdfs://writecluster")
diff --git a/src/spark-project/kylin-soft-affinity-cache/pom.xml
b/src/spark-project/kylin-soft-affinity-cache/pom.xml
index ba4279965f..97a5f2cd04 100644
--- a/src/spark-project/kylin-soft-affinity-cache/pom.xml
+++ b/src/spark-project/kylin-soft-affinity-cache/pom.xml
@@ -20,8 +20,8 @@
<artifactId>kylin-soft-affinity-cache</artifactId>
<packaging>jar</packaging>
<url>http://kylin.apache.org</url>
- <description>Kylin Soft Affinity Cache</description>
- <name>Kylin - Soft Affinity Local Cache</name>
+ <description>Kylin Local Data Cache</description>
+ <name>Kylin - Local Data Cache</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/spark-project/source-jdbc/pom.xml
b/src/spark-project/source-jdbc/pom.xml
index 7a170c268a..99a5d9ba2e 100644
--- a/src/spark-project/source-jdbc/pom.xml
+++ b/src/spark-project/source-jdbc/pom.xml
@@ -26,7 +26,7 @@
<artifactId>kylin-source-jdbc</artifactId>
<packaging>jar</packaging>
- <name>Kylin - Source JDBC</name>
+ <name>Kylin - JDBC Source</name>
<url>http://kylin.apache.org</url>
<description>Kylin Source for JDBC</description>
diff --git a/src/spark-project/sparder/pom.xml
b/src/spark-project/sparder/pom.xml
index e590973c01..8751afc17e 100644
--- a/src/spark-project/sparder/pom.xml
+++ b/src/spark-project/sparder/pom.xml
@@ -18,9 +18,9 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>kylin-sparder</artifactId>
<packaging>jar</packaging>
- <name>Kylin - Sparder</name>
+ <name>Kylin - Query Engine Spark</name>
<url>http://kylin.apache.org</url>
- <description>Kylin Sparder Query Engine</description>
+ <description>Kylin Query Engine Spark</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -35,7 +35,7 @@
</parent>
<dependencies>
- <!--KAP-->
+ <!-- Kylin -->
<dependency>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin-core-common</artifactId>
diff --git
a/src/spark-project/sparder/src/main/scala/org/apache/kylin/query/runtime/plan/ProjectPlan.scala
b/src/spark-project/sparder/src/main/scala/org/apache/kylin/query/runtime/plan/ProjectPlan.scala
index 48a078b9a4..8f25c2312c 100644
---
a/src/spark-project/sparder/src/main/scala/org/apache/kylin/query/runtime/plan/ProjectPlan.scala
+++
b/src/spark-project/sparder/src/main/scala/org/apache/kylin/query/runtime/plan/ProjectPlan.scala
@@ -51,7 +51,7 @@ object ProjectPlan extends LogEx {
k_lit(c._1._1).as(s"${System.identityHashCode(rel)}_prj${c._2}")
}
})
- .map(c => { // find and rename the duplicated columns KAP#16751
+ .map(c => { // find and rename the duplicated columns
if (!(duplicatedColumnsCount contains c)) {
duplicatedColumnsCount += (c -> 0)
c
diff --git
a/src/spark-project/sparder/src/main/scala/org/apache/kylin/query/util/SparderDerivedUtil.scala
b/src/spark-project/sparder/src/main/scala/org/apache/kylin/query/util/SparderDerivedUtil.scala
index 7167f325be..67834c7d29 100644
---
a/src/spark-project/sparder/src/main/scala/org/apache/kylin/query/util/SparderDerivedUtil.scala
+++
b/src/spark-project/sparder/src/main/scala/org/apache/kylin/query/util/SparderDerivedUtil.scala
@@ -82,7 +82,7 @@ case class SparderDerivedUtil(gtInfoTableName: String,
}
val hostFkIdx = hostFkCols.map(hostCol => indexOnTheGTValues(hostCol))
- // fix for test
src/kap-it/src/test/resources/query/sql_rawtable/query03.sql
+ // fix for test
src/kylin-it/src/test/resources/query/sql_rawtable/query03.sql
if (!hostFkIdx.exists(_ >= 0)) {
return
}
diff --git a/src/spark-project/spark-it/pom.xml
b/src/spark-project/spark-it/pom.xml
index ba5f4e18c2..981e499f42 100644
--- a/src/spark-project/spark-it/pom.xml
+++ b/src/spark-project/spark-it/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>kylin-spark-it</artifactId>
- <name>Kylin - SPARK IT</name>
+ <name>Kylin - Integration Test Spark</name>
<url>http://kylin.apache.org</url>
<description>Kylin Job Engine - SPARK</description>
diff --git a/src/tool/pom.xml b/src/tool/pom.xml
index 558473ff7e..666109e39d 100644
--- a/src/tool/pom.xml
+++ b/src/tool/pom.xml
@@ -22,7 +22,7 @@
<packaging>jar</packaging>
<name>Kylin - Tool</name>
<url>http://kylin.apache.org</url>
- <description>Kylin Tool</description>
+ <description>Kylin Tool</description>
<parent>
<artifactId>kylin</artifactId>
diff --git
a/src/tool/src/main/java/org/apache/kylin/tool/util/ServerInfoUtil.java
b/src/tool/src/main/java/org/apache/kylin/tool/util/ServerInfoUtil.java
index 2047330b68..6b29df4935 100644
--- a/src/tool/src/main/java/org/apache/kylin/tool/util/ServerInfoUtil.java
+++ b/src/tool/src/main/java/org/apache/kylin/tool/util/ServerInfoUtil.java
@@ -43,7 +43,6 @@ public class ServerInfoUtil {
buf.append("kylin.home: ").append(kylinHome == null ? UNKNOWN : new
File(kylinHome).getAbsolutePath())
.append("\n");
- // kap versions
String kapVersion = null;
try {
File versionFile = new File(kylinHome, "VERSION");
