This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch release-pipeline
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 2a1e40be62c8d01361158579fc020f9ac927f7b8
Author: XiaoxiangYu <x...@apache.org>
AuthorDate: Fri Aug 25 17:07:53 2023 +0800
Remove Second Storage, Step2
There are two part of source code, Kylin code and Second Storage code,
Kylin code will refer Second Storage code.
Step1: remove the reference from Kylin code to Second Storage code
Step2: remove the Second Storage in all Kylin code's pom.xml
Step3: just delete all Second Storage modules
Step4: run and passed UT&IT
Step5: remove the commented code in Step1&2
---
pom.xml | 50 +++++++++++++++++++--------------------
src/data-loading-service/pom.xml | 22 ++++++++---------
src/modeling-service/pom.xml | 22 ++++++++---------
src/query-common/pom.xml | 8 +++----
src/server/pom.xml | 24 +++++++++----------
src/spark-project/sparder/pom.xml | 8 +++----
6 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3738f7ff49..83e1cc90fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -394,10 +394,10 @@
<module>src/tool</module>
<module>src/datasource-sdk</module>
<module>src/streaming-sdk</module>
- <module>src/second-storage/core</module>
- <module>src/second-storage/core-ui</module>
- <module>src/second-storage/clickhouse</module>
- <module>src/second-storage/clickhouse-it</module>
+<!-- <module>src/second-storage/core</module>-->
+<!-- <module>src/second-storage/core-ui</module>-->
+<!-- <module>src/second-storage/clickhouse</module>-->
+<!-- <module>src/second-storage/clickhouse-it</module>-->
<module>src/modeling-service</module>
<module>src/query-service</module>
<module>src/datasource-service</module>
@@ -495,21 +495,21 @@
<version>${project.version}</version>
</dependency>
<!-- second storage -->
- <dependency>
- <groupId>org.apache.kylin</groupId>
- <artifactId>kap-second-storage-clickhouse</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kylin</groupId>
- <artifactId>kap-second-storage-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kylin</groupId>
- <artifactId>kap-second-storage-ui</artifactId>
- <version>${project.version}</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.kylin</groupId>-->
+<!-- <artifactId>kap-second-storage-clickhouse</artifactId>-->
+<!-- <version>${project.version}</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.kylin</groupId>-->
+<!-- <artifactId>kap-second-storage-core</artifactId>-->
+<!-- <version>${project.version}</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.kylin</groupId>-->
+<!-- <artifactId>kap-second-storage-ui</artifactId>-->
+<!-- <version>${project.version}</version>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin-common-service</artifactId>
@@ -788,12 +788,12 @@
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.kylin</groupId>
- <artifactId>kap-second-storage-clickhouse</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.kylin</groupId>-->
+<!-- <artifactId>kap-second-storage-clickhouse</artifactId>-->
+<!-- <version>${project.version}</version>-->
+<!-- <type>test-jar</type>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin-core-metadata</artifactId>
diff --git a/src/data-loading-service/pom.xml b/src/data-loading-service/pom.xml
index 1d560ade13..87db77320e 100644
--- a/src/data-loading-service/pom.xml
+++ b/src/data-loading-service/pom.xml
@@ -132,17 +132,17 @@
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.kylin</groupId>
- <artifactId>kap-second-storage-clickhouse</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.kylin</groupId>
- <artifactId>kap-second-storage-clickhouse</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.kylin</groupId>-->
+<!-- <artifactId>kap-second-storage-clickhouse</artifactId>-->
+<!-- <scope>test</scope>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.kylin</groupId>-->
+<!-- <artifactId>kap-second-storage-clickhouse</artifactId>-->
+<!-- <type>test-jar</type>-->
+<!-- <scope>test</scope>-->
+<!-- </dependency>-->
</dependencies>
</project>
diff --git a/src/modeling-service/pom.xml b/src/modeling-service/pom.xml
index aeb41f299f..79cd0b40cb 100644
--- a/src/modeling-service/pom.xml
+++ b/src/modeling-service/pom.xml
@@ -52,17 +52,17 @@
</dependency>
<!-- test -->
- <dependency>
- <groupId>org.apache.kylin</groupId>
- <artifactId>kap-second-storage-clickhouse</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.kylin</groupId>
- <artifactId>kap-second-storage-clickhouse</artifactId>
- <scope>test</scope>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.kylin</groupId>-->
+<!-- <artifactId>kap-second-storage-clickhouse</artifactId>-->
+<!-- <type>test-jar</type>-->
+<!-- <scope>test</scope>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.kylin</groupId>-->
+<!-- <artifactId>kap-second-storage-clickhouse</artifactId>-->
+<!-- <scope>test</scope>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin-core-metadata</artifactId>
diff --git a/src/query-common/pom.xml b/src/query-common/pom.xml
index d6af343c34..841ba7e759 100644
--- a/src/query-common/pom.xml
+++ b/src/query-common/pom.xml
@@ -51,10 +51,10 @@
<groupId>org.apache.kylin</groupId>
<artifactId>kylin-core-storage</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.kylin</groupId>
- <artifactId>kap-second-storage-core</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.kylin</groupId>-->
+<!-- <artifactId>kap-second-storage-core</artifactId>-->
+<!-- </dependency>-->
</dependencies>
<build>
<plugins>
diff --git a/src/server/pom.xml b/src/server/pom.xml
index beeaf65275..0b77edc359 100644
--- a/src/server/pom.xml
+++ b/src/server/pom.xml
@@ -59,18 +59,18 @@
<groupId>org.apache.kylin</groupId>
<artifactId>kylin-tool</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.kylin</groupId>
- <artifactId>kap-second-storage-clickhouse</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.kylin</groupId>
- <artifactId>kap-second-storage-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.kylin</groupId>
- <artifactId>kap-second-storage-ui</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.kylin</groupId>-->
+<!-- <artifactId>kap-second-storage-clickhouse</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.kylin</groupId>-->
+<!-- <artifactId>kap-second-storage-core</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.kylin</groupId>-->
+<!-- <artifactId>kap-second-storage-ui</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.apache.kylin</groupId>
<artifactId>distributed-lock-ext</artifactId>
diff --git a/src/spark-project/sparder/pom.xml
b/src/spark-project/sparder/pom.xml
index e590973c01..0261714fa5 100644
--- a/src/spark-project/sparder/pom.xml
+++ b/src/spark-project/sparder/pom.xml
@@ -48,10 +48,10 @@
<groupId>org.apache.kylin</groupId>
<artifactId>kylin-spark-common</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.kylin</groupId>
- <artifactId>kap-second-storage-core</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.kylin</groupId>-->
+<!-- <artifactId>kap-second-storage-core</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.apache.spark</groupId>
