You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ca...@apache.org on 2025/03/10 09:10:10 UTC
(kylin) 01/01: fix checkstyle
This is an automated email from the ASF dual-hosted git repository.
caolu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 006edc22e6d09b187e0d0424e025c1d7b4489a3a
Author: lionelcao <wh...@gmail.com>
AuthorDate: Mon Mar 10 17:03:04 2025 +0800
fix checkstyle
Minor fix file check
fix (#2327)
---
dev-support/checkstyle-apache.xml | 13 ++-
...pache-header.txt => checkstyle-java-header.txt} | 0
dev-support/checkstyle-prop-header.txt | 16 ++++
dev-support/checkstyle-xml-header.txt | 16 ++++
pom.xml | 23 +----
.../src/main/resources/config/init_min.properties | 1 +
.../persistence/metadata/JdbcAuditLogStore.java | 4 +-
.../metadata/JdbcPartialAuditLogStore.java | 2 -
.../metadata/MetadataMapperFactory.java | 6 +-
.../common/persistence/metadata/MetadataStore.java | 6 +-
.../persistence/metadata/mapper/AclMapper.java | 3 -
.../metadata/mapper/CcModelRelationMapper.java | 3 -
.../metadata/mapper/ComputeColumnMapper.java | 3 -
.../metadata/mapper/DataParserMapper.java | 3 -
.../metadata/mapper/DataflowMapper.java | 3 -
.../mapper/FusionModelDynamicSqlSupport.java | 4 -
.../metadata/mapper/FusionModelMapper.java | 4 -
.../metadata/mapper/HistorySourceUsageMapper.java | 3 -
.../metadata/mapper/IndexPlanMapper.java | 3 -
.../persistence/metadata/mapper/JarInfoMapper.java | 3 -
.../metadata/mapper/JobStatsMapper.java | 3 -
.../persistence/metadata/mapper/LayoutMapper.java | 3 -
.../persistence/metadata/mapper/ModelMapper.java | 3 -
.../metadata/mapper/ObjectAclMapper.java | 3 -
.../persistence/metadata/mapper/ProjectMapper.java | 3 -
.../metadata/mapper/QueryRecordMapper.java | 3 -
.../metadata/mapper/ResourceGroupMapper.java | 3 -
.../persistence/metadata/mapper/SegmentMapper.java | 3 -
.../metadata/mapper/SqlBlacklistMapper.java | 3 -
.../persistence/metadata/mapper/SystemMapper.java | 3 -
.../metadata/mapper/TableExdMapper.java | 3 -
.../metadata/mapper/TableModelRelationMapper.java | 3 -
.../metadata/mapper/UserGlobalAclMapper.java | 3 -
.../metadata/mapper/UserGroupMapper.java | 3 -
.../metadata/mapper/UserInfoMapper.java | 3 -
.../kylin/metadata/epoch/EpochOrchestrator.java | 0
.../metadata/epoch/EpochUpdateLockManager.java | 0
.../metadata/favorite/QueryHistoryTimeOffset.java | 0
.../favorite/QueryHistoryTimeOffsetManager.java | 0
.../apache/kylin/metadata/job/JobTokenMapper.java | 17 ++++
src/jdbc/src/main/resources/kylin-jdbc.properties | 15 ++-
.../resources/org-apache-kylin-jdbc.properties | 15 ++-
.../src/main/resources/config/init.properties | 34 +++----
.../src/main/resources/config/init_min.properties | 34 +++----
.../datasources/json/QueryRecHistorySchema.scala | 103 ---------------------
45 files changed, 120 insertions(+), 262 deletions(-)
diff --git a/dev-support/checkstyle-apache.xml b/dev-support/checkstyle-apache.xml
index d1c0032962..6909f02ef5 100644
--- a/dev-support/checkstyle-apache.xml
+++ b/dev-support/checkstyle-apache.xml
@@ -28,10 +28,17 @@
</module>
<module name="Header">
- <property name="headerFile" value="dev-support/checkstyle-apache-header.txt"/>
- <property name="fileExtensions" value="java"/>
+ <property name="headerFile" value="dev-support/checkstyle-java-header.txt"/>
+ <property name="fileExtensions" value="java, scala"/>
+ </module>
+ <module name="Header">
+ <property name="headerFile" value="dev-support/checkstyle-prop-header.txt"/>
+ <property name="fileExtensions" value="properties"/>
+ </module>
+ <module name="Header">
+ <property name="headerFile" value="dev-support/checkstyle-xml-header.txt"/>
+ <property name="fileExtensions" value="xml"/>
</module>
-
<module name="FileTabCharacter"/>
<module name="SuppressWarningsFilter"/>
<module name="NewlineAtEndOfFile"/>
diff --git a/dev-support/checkstyle-apache-header.txt b/dev-support/checkstyle-java-header.txt
similarity index 100%
rename from dev-support/checkstyle-apache-header.txt
rename to dev-support/checkstyle-java-header.txt
diff --git a/dev-support/checkstyle-prop-header.txt b/dev-support/checkstyle-prop-header.txt
new file mode 100644
index 0000000000..cce3acad34
--- /dev/null
+++ b/dev-support/checkstyle-prop-header.txt
@@ -0,0 +1,16 @@
+#
+# 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.
+#
diff --git a/dev-support/checkstyle-xml-header.txt b/dev-support/checkstyle-xml-header.txt
new file mode 100644
index 0000000000..9af6e8733c
--- /dev/null
+++ b/dev-support/checkstyle-xml-header.txt
@@ -0,0 +1,16 @@
+<!--
+ 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.
+-->
diff --git a/pom.xml b/pom.xml
index 8ad6215186..3071825103 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="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/maven-v4_0_0.xsd">
+<project xmlns="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/maven-v4_0_0.xsd">
<parent>
<!-- https://infra.apache.org/publishing-maven-artifacts.html -->
@@ -3390,6 +3391,9 @@
<configLocation>dev-support/checkstyle-apache.xml</configLocation>
<suppressionsLocation>dev-support/checkstyle-apache-suppressions.xml
</suppressionsLocation>
+ <includes>
+ src/main/java/**/*.java,src/main/scala/**/*.scala,src/main/scala/**/*.java,src/test/java/**/*.java,src/test/scala/**/*.scala,src/test/scala/**/*.java
+ </includes>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
@@ -3972,23 +3976,6 @@
<exclude>**/*.bmp</exclude>
<exclude>src/main/codegen/javacc/org/apache/kylin/query/util/CommentParser.jj</exclude>
-
- <!-- protobuf generated -->
- <exclude>
- src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/generated/IIProtos.java
- </exclude>
- <exclude>
- src/main/java/org/apache/kylin/storage/hbase/cube/v1/filter/generated/FilterProtosExt.java
- </exclude>
- <exclude>
- src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/generated/CubeVisitProtos.java
- </exclude>
- <exclude>
- storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/generated/CubeVisitProtos.java
- </exclude>
- <exclude>
- examples/test_case_data/sample_local/UUID
- </exclude>
</excludes>
</configuration>
<executions>
diff --git a/src/common-booter/src/main/resources/config/init_min.properties b/src/common-booter/src/main/resources/config/init_min.properties
index b96d781a51..1f10abe807 100644
--- a/src/common-booter/src/main/resources/config/init_min.properties
+++ b/src/common-booter/src/main/resources/config/init_min.properties
@@ -14,6 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
kylin.metadata.url=${KYLIN_METADATA_URL}
kylin.metadata.audit-log.max-size=3000000
kylin.metadata.ops-cron=0 0 0 * * *
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/JdbcAuditLogStore.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/JdbcAuditLogStore.java
index 924202af5d..7cab1efaf3 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/JdbcAuditLogStore.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/JdbcAuditLogStore.java
@@ -228,8 +228,8 @@ public class JdbcAuditLogStore implements AuditLogStore {
try {
val bs = Objects.isNull(x.getByteSource()) ? null : x.getByteSource().read();
return new Object[] { x.getResPath(), CompressionUtils.compress(bs), x.getTimestamp(),
- x.getMvcc(), x.getUnitId(), x.getModelUuid(), x.getOperator(), x.getInstance(), x.getProject(),
- x.isDiffFlag() };
+ x.getMvcc(), x.getUnitId(), x.getModelUuid(), x.getOperator(), x.getInstance(),
+ x.getProject(), x.isDiffFlag() };
} catch (IOException e) {
return null;
}
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/JdbcPartialAuditLogStore.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/JdbcPartialAuditLogStore.java
index d2aecd0a89..3b23b71129 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/JdbcPartialAuditLogStore.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/JdbcPartialAuditLogStore.java
@@ -17,8 +17,6 @@
*/
package org.apache.kylin.common.persistence.metadata;
-import java.util.function.Predicate;
-
import org.apache.kylin.common.KylinConfig;
import lombok.extern.slf4j.Slf4j;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/MetadataMapperFactory.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/MetadataMapperFactory.java
index 1bd8d5cca8..706d9b2327 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/MetadataMapperFactory.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/MetadataMapperFactory.java
@@ -43,6 +43,7 @@ import org.apache.kylin.common.persistence.RawResource;
import org.apache.kylin.common.persistence.RawResourceFilter;
import org.apache.kylin.common.persistence.metadata.mapper.BasicMapper;
import org.apache.kylin.common.persistence.metadata.mapper.BasicSqlTable;
+import org.apache.kylin.guava30.shaded.common.base.Preconditions;
import org.mybatis.dynamic.sql.BasicColumn;
import org.mybatis.dynamic.sql.BindableColumn;
import org.mybatis.dynamic.sql.SqlBuilder;
@@ -50,15 +51,10 @@ import org.mybatis.dynamic.sql.VisitableCondition;
import org.mybatis.dynamic.sql.select.SelectDSLCompleter;
import org.mybatis.spring.transaction.SpringManagedTransactionFactory;
-import com.google.common.base.Preconditions;
-
import lombok.val;
import lombok.var;
import lombok.extern.slf4j.Slf4j;
-/**
- * 15/11/2023 hellozepp(lisheng.zhanglin@163.com)
- */
@Slf4j
public class MetadataMapperFactory {
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/MetadataStore.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/MetadataStore.java
index 442d0a0333..72821a0a98 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/MetadataStore.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/MetadataStore.java
@@ -95,8 +95,10 @@ public abstract class MetadataStore implements ITransactionManager {
}
/**
- * upload local files to snapshot, will not change resource store synchronized, perhaps should call ResourceStore.clearCache() manually
- * @param folder local directory contains snapshot, ${folder}/events contains event store, ${folder}/kylin.properties etc.
+ * upload local files to snapshot, will not change resource store synchronized,
+ * perhaps should call ResourceStore.clearCache() manually
+ * @param folder local directory contains snapshot, ${folder}/events contains event store,
+ * ${folder}/kylin.properties etc.
*/
public void uploadFromFile(File folder) {
foreachFile(folder, res -> {
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/AclMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/AclMapper.java
index b2e787fac3..ab729387db 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/AclMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/AclMapper.java
@@ -22,17 +22,14 @@ import static org.apache.kylin.common.persistence.metadata.mapper.AclDynamicSqlS
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.AclRawResource;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/CcModelRelationMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/CcModelRelationMapper.java
index f4621443a6..83e0e377c9 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/CcModelRelationMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/CcModelRelationMapper.java
@@ -22,18 +22,15 @@ import static org.apache.kylin.common.persistence.metadata.mapper.CcModelRelatio
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.CcModelRelationRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ComputeColumnMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ComputeColumnMapper.java
index 4fd1e6bc6e..099a3782d9 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ComputeColumnMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ComputeColumnMapper.java
@@ -24,11 +24,9 @@ import java.util.Collection;
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
@@ -36,7 +34,6 @@ import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProvid
import org.apache.kylin.common.persistence.resources.ComputeColumnRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
import org.mybatis.dynamic.sql.SqlColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/DataParserMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/DataParserMapper.java
index 9b2d539b9b..2c353ec4ec 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/DataParserMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/DataParserMapper.java
@@ -22,18 +22,15 @@ import static org.apache.kylin.common.persistence.metadata.mapper.DataParserDyna
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.DataParserRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/DataflowMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/DataflowMapper.java
index 1e9a74f236..fefa1f5ecf 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/DataflowMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/DataflowMapper.java
@@ -22,17 +22,14 @@ import static org.apache.kylin.common.persistence.metadata.mapper.DataFlowDynami
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.DataflowRawResource;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/FusionModelDynamicSqlSupport.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/FusionModelDynamicSqlSupport.java
index 76c30d62e1..b7469940c9 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/FusionModelDynamicSqlSupport.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/FusionModelDynamicSqlSupport.java
@@ -17,10 +17,6 @@
*/
package org.apache.kylin.common.persistence.metadata.mapper;
-import java.sql.JDBCType;
-
-import org.mybatis.dynamic.sql.SqlColumn;
-
public final class FusionModelDynamicSqlSupport {
public static final FusionModel sqlTable = new FusionModel();
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/FusionModelMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/FusionModelMapper.java
index 69c39af557..136d20b7dc 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/FusionModelMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/FusionModelMapper.java
@@ -30,11 +30,7 @@ import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.FusionModelRawResource;
-import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
-import org.mybatis.dynamic.sql.update.UpdateDSL;
-import org.mybatis.dynamic.sql.update.UpdateModel;
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
public interface FusionModelMapper extends BasicMapper<FusionModelRawResource> {
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/HistorySourceUsageMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/HistorySourceUsageMapper.java
index 61b26a7a8c..403c95ecef 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/HistorySourceUsageMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/HistorySourceUsageMapper.java
@@ -22,18 +22,15 @@ import static org.apache.kylin.common.persistence.metadata.mapper.HistorySourceU
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.HistorySourceUsageRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/IndexPlanMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/IndexPlanMapper.java
index 40d60049d3..20f55de13f 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/IndexPlanMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/IndexPlanMapper.java
@@ -22,17 +22,14 @@ import static org.apache.kylin.common.persistence.metadata.mapper.IndexPlanDynam
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.IndexPlanRawResource;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/JarInfoMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/JarInfoMapper.java
index a3d16c3aea..8a75043c2d 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/JarInfoMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/JarInfoMapper.java
@@ -22,18 +22,15 @@ import static org.apache.kylin.common.persistence.metadata.mapper.JarInfoDynamic
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.JarInfoRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/JobStatsMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/JobStatsMapper.java
index 4dbe9d16bb..90d8b04cae 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/JobStatsMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/JobStatsMapper.java
@@ -22,18 +22,15 @@ import static org.apache.kylin.common.persistence.metadata.mapper.JobStatsDynami
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.JobStatsRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/LayoutMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/LayoutMapper.java
index 27a517de43..8e085a06a1 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/LayoutMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/LayoutMapper.java
@@ -22,18 +22,15 @@ import static org.apache.kylin.common.persistence.metadata.mapper.LayoutDynamicS
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.LayoutRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ModelMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ModelMapper.java
index a441bc9328..90aeef9e9f 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ModelMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ModelMapper.java
@@ -22,18 +22,15 @@ import static org.apache.kylin.common.persistence.metadata.mapper.ModelDynamicSq
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.ModelRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ObjectAclMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ObjectAclMapper.java
index 4d8fe18b40..3484014a4b 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ObjectAclMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ObjectAclMapper.java
@@ -22,17 +22,14 @@ import static org.apache.kylin.common.persistence.metadata.mapper.ObjectAclDynam
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.ObjectAclRawResource;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ProjectMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ProjectMapper.java
index 16365c667c..1b13979868 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ProjectMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ProjectMapper.java
@@ -22,18 +22,15 @@ import static org.apache.kylin.common.persistence.metadata.mapper.ProjectDynamic
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.ProjectRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/QueryRecordMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/QueryRecordMapper.java
index 84f74f2dfe..9f13530d17 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/QueryRecordMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/QueryRecordMapper.java
@@ -22,17 +22,14 @@ import static org.apache.kylin.common.persistence.metadata.mapper.QueryRecordDyn
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.QueryRecordRawResource;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ResourceGroupMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ResourceGroupMapper.java
index 8622ff0eb6..468dbf00a3 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ResourceGroupMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ResourceGroupMapper.java
@@ -22,17 +22,14 @@ import static org.apache.kylin.common.persistence.metadata.mapper.ResourceGroupD
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.ResourceGroupRawResource;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SegmentMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SegmentMapper.java
index 4cf2a50ca3..eaccfce4a0 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SegmentMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SegmentMapper.java
@@ -22,18 +22,15 @@ import static org.apache.kylin.common.persistence.metadata.mapper.SegmentDynamic
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.SegmentRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SqlBlacklistMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SqlBlacklistMapper.java
index feaf857c89..d66d1d96f7 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SqlBlacklistMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SqlBlacklistMapper.java
@@ -22,17 +22,14 @@ import static org.apache.kylin.common.persistence.metadata.mapper.SqlBlacklistDy
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.SqlBlacklistRawResource;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SystemMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SystemMapper.java
index 3a6762cd23..8ac8599c4d 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SystemMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SystemMapper.java
@@ -22,18 +22,15 @@ import static org.apache.kylin.common.persistence.metadata.mapper.SystemDynamicS
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.SystemRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/TableExdMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/TableExdMapper.java
index e745710388..64f58b8b76 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/TableExdMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/TableExdMapper.java
@@ -22,18 +22,15 @@ import static org.apache.kylin.common.persistence.metadata.mapper.TableExdDynami
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.TableExdRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/TableModelRelationMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/TableModelRelationMapper.java
index c90696bdda..f09523bedd 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/TableModelRelationMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/TableModelRelationMapper.java
@@ -22,18 +22,15 @@ import static org.apache.kylin.common.persistence.metadata.mapper.TableModelRela
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.TableModelRelationRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserGlobalAclMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserGlobalAclMapper.java
index a1b5166595..b11eb171c1 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserGlobalAclMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserGlobalAclMapper.java
@@ -22,18 +22,15 @@ import static org.apache.kylin.common.persistence.metadata.mapper.UserGlobalAclD
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.UserGlobalAclRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserGroupMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserGroupMapper.java
index cfcbe3ca59..2f30311590 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserGroupMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserGroupMapper.java
@@ -22,18 +22,15 @@ import static org.apache.kylin.common.persistence.metadata.mapper.UserGroupDynam
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.UserGroupRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserInfoMapper.java b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserInfoMapper.java
index 29729fbc2e..7eda92a1e2 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserInfoMapper.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserInfoMapper.java
@@ -22,18 +22,15 @@ import static org.apache.kylin.common.persistence.metadata.mapper.UserInfoDynami
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.UserInfoRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git a/src/core-metadata/src/main/java/org/apache/kylin/metadata/epoch/EpochOrchestrator.java b/src/core-metadata/src/main/java/org/apache/kylin/metadata/epoch/EpochOrchestrator.java
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/core-metadata/src/main/java/org/apache/kylin/metadata/epoch/EpochUpdateLockManager.java b/src/core-metadata/src/main/java/org/apache/kylin/metadata/epoch/EpochUpdateLockManager.java
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/core-metadata/src/main/java/org/apache/kylin/metadata/favorite/QueryHistoryTimeOffset.java b/src/core-metadata/src/main/java/org/apache/kylin/metadata/favorite/QueryHistoryTimeOffset.java
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/core-metadata/src/main/java/org/apache/kylin/metadata/favorite/QueryHistoryTimeOffsetManager.java b/src/core-metadata/src/main/java/org/apache/kylin/metadata/favorite/QueryHistoryTimeOffsetManager.java
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/core-metadata/src/main/java/org/apache/kylin/metadata/job/JobTokenMapper.java b/src/core-metadata/src/main/java/org/apache/kylin/metadata/job/JobTokenMapper.java
index b00f2879f9..872b9931d2 100644
--- a/src/core-metadata/src/main/java/org/apache/kylin/metadata/job/JobTokenMapper.java
+++ b/src/core-metadata/src/main/java/org/apache/kylin/metadata/job/JobTokenMapper.java
@@ -1,3 +1,20 @@
+/*
+ * 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.job;
import org.apache.ibatis.annotations.DeleteProvider;
diff --git a/src/jdbc/src/main/resources/kylin-jdbc.properties b/src/jdbc/src/main/resources/kylin-jdbc.properties
index 006f204282..e656ed8954 100644
--- a/src/jdbc/src/main/resources/kylin-jdbc.properties
+++ b/src/jdbc/src/main/resources/kylin-jdbc.properties
@@ -1,13 +1,12 @@
#
-# 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
+# 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
+# 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,
diff --git a/src/jdbc/src/main/resources/org-apache-kylin-jdbc.properties b/src/jdbc/src/main/resources/org-apache-kylin-jdbc.properties
index 6bf75836fe..51f0b9d58e 100644
--- a/src/jdbc/src/main/resources/org-apache-kylin-jdbc.properties
+++ b/src/jdbc/src/main/resources/org-apache-kylin-jdbc.properties
@@ -1,13 +1,12 @@
#
-# 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
+# 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
+# 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,
diff --git a/src/rec-booter/src/main/resources/config/init.properties b/src/rec-booter/src/main/resources/config/init.properties
index 6b200e7a36..6f966e92b7 100644
--- a/src/rec-booter/src/main/resources/config/init.properties
+++ b/src/rec-booter/src/main/resources/config/init.properties
@@ -1,20 +1,20 @@
-##
-## 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.
-##
+#
+# 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.metadata.url=${KYLIN_METADATA_URL}
kylin.metadata.audit-log.max-size=3000000
kylin.metadata.ops-cron=0 0 0 * * *
diff --git a/src/rec-booter/src/main/resources/config/init_min.properties b/src/rec-booter/src/main/resources/config/init_min.properties
index 653ae24db3..a41dbd9a2f 100644
--- a/src/rec-booter/src/main/resources/config/init_min.properties
+++ b/src/rec-booter/src/main/resources/config/init_min.properties
@@ -1,20 +1,20 @@
-##
-## 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.
-##
+#
+# 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.metadata.url=${KYLIN_METADATA_URL}
kylin.metadata.audit-log.max-size=3000000
kylin.metadata.ops-cron=0 0 0 * * *
diff --git a/src/spark-project/engine-spark/src/main/scala/org/apache/spark/sql/execution/datasources/json/QueryRecHistorySchema.scala b/src/spark-project/engine-spark/src/main/scala/org/apache/spark/sql/execution/datasources/json/QueryRecHistorySchema.scala
deleted file mode 100644
index cf0edc6683..0000000000
--- a/src/spark-project/engine-spark/src/main/scala/org/apache/spark/sql/execution/datasources/json/QueryRecHistorySchema.scala
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-* Copyright (C) 2016 Kyligence Inc. All rights reserved.
-*
-* http://kyligence.io
-*
-* This software is the confidential and proprietary information of
-* Kyligence Inc. ("Confidential Information"). You shall not disclose
-* such Confidential Information and shall use it only in accordance
-* with the terms of the license agreement you entered into with
-* Kyligence Inc.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package org.apache.spark.sql.execution.datasources.json
-
-import org.apache.spark.sql.types._
-
-object QueryRecHistorySchema {
- def queryRecHistorySchema(): StructType = {
- val recDetailInfoMeta = Array(
- StructField("modelId", StringType, nullable = false),
- StructField("semanticVersion", IntegerType, nullable = false),
- StructField("layouts", ArrayType(layoutRecInfoSchema())),
- StructField("layoutRecs", ArrayType(layoutRecInfoSchema()))
- )
-
- StructType(Array(
- StructField("queryTime", LongType),
- StructField("cpuTime", LongType),
- StructField("duration", LongType),
- StructField("recDetailMap", MapType(StringType, DataTypes.createStructType(recDetailInfoMeta)))
- ))
- }
-
- def layoutRecInfoSchema(): StructType = {
- val recMeasureMeta = Array(
- StructField("name", StringType),
- StructField("function", DataTypes.createStructType(
- Array(
- StructField("expression", StringType),
- StructField("parameters", ArrayType(DataTypes.createStructType(
- Array(
- StructField("type", StringType),
- StructField("value", StringType)
- ),
- )
- )
- ))
- )
- ),
- StructField("column", StringType)
- )
- DataTypes.createStructType(Array(
- StructField("uniqueId", StringType, nullable = false),
- StructField("columns", ArrayType(StringType)),
- StructField("dimensions", ArrayType(StringType)),
- StructField("shardBy", ArrayType(StringType)),
- StructField("sortBy", ArrayType(StringType)),
- StructField("measures", ArrayType(DataTypes.createStructType(recMeasureMeta))),
- StructField("ccExpression", DataTypes.createMapType(StringType, StringType)),
- StructField("ccType", DataTypes.createMapType(StringType, StringType))
- ))
- }
-
- def flatRecInfoSchema(): StructType = {
- StructType(Array(
- StructField("recId", StringType, nullable = false),
- StructField("day", StringType, nullable = false),
- StructField("cpuTime", LongType, nullable = false),
- StructField("detailInfo", layoutRecInfoSchema(), nullable = false)
- ))
- }
-
- def flatRecInfoSchema2(): StructType = {
- StructType(Array(
- StructField("recId", StringType, nullable = false),
- StructField("cpuTime", LongType, nullable = false),
- StructField("recInfo", layoutRecInfoSchema(), nullable = false)
- ))
- }
-
- def dailyStatsSchema(): StructType = {
- StructType(Array(
- StructField("recId", StringType, nullable = false),
- StructField("countNum", LongType, nullable = false),
- StructField("sumCpuTime", LongType, nullable = false),
- StructField("day", StringType, nullable = false),
- StructField("detailInfo", layoutRecInfoSchema(), nullable = false)
- ))
- }
-
-}