Skip to content

Commit 006edc2

Browse files
lionelcaolionelcao
committed
fix checkstyle
Minor fix file check fix (#2327)
1 parent ebd80ad commit 006edc2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+120
-262
lines changed

‎dev-support/checkstyle-apache.xml

+10-3
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,17 @@
2828
</module>
2929

3030
<module name="Header">
31-
<property name="headerFile" value="dev-support/checkstyle-apache-header.txt"/>
32-
<property name="fileExtensions" value="java"/>
31+
<property name="headerFile" value="dev-support/checkstyle-java-header.txt"/>
32+
<property name="fileExtensions" value="java, scala"/>
33+
</module>
34+
<module name="Header">
35+
<property name="headerFile" value="dev-support/checkstyle-prop-header.txt"/>
36+
<property name="fileExtensions" value="properties"/>
37+
</module>
38+
<module name="Header">
39+
<property name="headerFile" value="dev-support/checkstyle-xml-header.txt"/>
40+
<property name="fileExtensions" value="xml"/>
3341
</module>
34-
3542
<module name="FileTabCharacter"/>
3643
<module name="SuppressWarningsFilter"/>
3744
<module name="NewlineAtEndOfFile"/>

‎dev-support/checkstyle-apache-header.txt ‎dev-support/checkstyle-java-header.txt

File renamed without changes.

‎dev-support/checkstyle-prop-header.txt

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one or more
3+
# contributor license agreements. See the NOTICE file distributed with
4+
# this work for additional information regarding copyright ownership.
5+
# The ASF licenses this file to You under the Apache License, Version 2.0
6+
# (the "License"); you may not use this file except in compliance with
7+
# the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#

‎dev-support/checkstyle-xml-header.txt

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one or more
3+
contributor license agreements. See the NOTICE file distributed with
4+
this work for additional information regarding copyright ownership.
5+
The ASF licenses this file to You under the Apache License, Version 2.0
6+
(the "License"); you may not use this file except in compliance with
7+
the License. You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->

‎pom.xml

+5-18
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17-
<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">
17+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1819

1920
<parent>
2021
<!-- https://infra.apache.org/publishing-maven-artifacts.html -->
@@ -3390,6 +3391,9 @@
33903391
<configLocation>dev-support/checkstyle-apache.xml</configLocation>
33913392
<suppressionsLocation>dev-support/checkstyle-apache-suppressions.xml
33923393
</suppressionsLocation>
3394+
<includes>
3395+
src/main/java/**/*.java,src/main/scala/**/*.scala,src/main/scala/**/*.java,src/test/java/**/*.java,src/test/scala/**/*.scala,src/test/scala/**/*.java
3396+
</includes>
33933397
<includeTestSourceDirectory>true</includeTestSourceDirectory>
33943398
<consoleOutput>true</consoleOutput>
33953399
<failsOnError>true</failsOnError>
@@ -3972,23 +3976,6 @@
39723976
<exclude>**/*.bmp</exclude>
39733977

39743978
<exclude>src/main/codegen/javacc/org/apache/kylin/query/util/CommentParser.jj</exclude>
3975-
3976-
<!-- protobuf generated -->
3977-
<exclude>
3978-
src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/generated/IIProtos.java
3979-
</exclude>
3980-
<exclude>
3981-
src/main/java/org/apache/kylin/storage/hbase/cube/v1/filter/generated/FilterProtosExt.java
3982-
</exclude>
3983-
<exclude>
3984-
src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/generated/CubeVisitProtos.java
3985-
</exclude>
3986-
<exclude>
3987-
storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/generated/CubeVisitProtos.java
3988-
</exclude>
3989-
<exclude>
3990-
examples/test_case_data/sample_local/UUID
3991-
</exclude>
39923979
</excludes>
39933980
</configuration>
39943981
<executions>

‎src/common-booter/src/main/resources/config/init_min.properties

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616
#
17+
1718
kylin.metadata.url=${KYLIN_METADATA_URL}
1819
kylin.metadata.audit-log.max-size=3000000
1920
kylin.metadata.ops-cron=0 0 0 * * *

‎src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/JdbcAuditLogStore.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ public void batchInsert(List<AuditLog> auditLogs) {
228228
try {
229229
val bs = Objects.isNull(x.getByteSource()) ? null : x.getByteSource().read();
230230
return new Object[] { x.getResPath(), CompressionUtils.compress(bs), x.getTimestamp(),
231-
x.getMvcc(), x.getUnitId(), x.getModelUuid(), x.getOperator(), x.getInstance(), x.getProject(),
232-
x.isDiffFlag() };
231+
x.getMvcc(), x.getUnitId(), x.getModelUuid(), x.getOperator(), x.getInstance(),
232+
x.getProject(), x.isDiffFlag() };
233233
} catch (IOException e) {
234234
return null;
235235
}

‎src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/JdbcPartialAuditLogStore.java

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
*/
1818
package org.apache.kylin.common.persistence.metadata;
1919

20-
import java.util.function.Predicate;
21-
2220
import org.apache.kylin.common.KylinConfig;
2321

2422
import lombok.extern.slf4j.Slf4j;

‎src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/MetadataMapperFactory.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,18 @@
4343
import org.apache.kylin.common.persistence.RawResourceFilter;
4444
import org.apache.kylin.common.persistence.metadata.mapper.BasicMapper;
4545
import org.apache.kylin.common.persistence.metadata.mapper.BasicSqlTable;
46+
import org.apache.kylin.guava30.shaded.common.base.Preconditions;
4647
import org.mybatis.dynamic.sql.BasicColumn;
4748
import org.mybatis.dynamic.sql.BindableColumn;
4849
import org.mybatis.dynamic.sql.SqlBuilder;
4950
import org.mybatis.dynamic.sql.VisitableCondition;
5051
import org.mybatis.dynamic.sql.select.SelectDSLCompleter;
5152
import org.mybatis.spring.transaction.SpringManagedTransactionFactory;
5253

53-
import com.google.common.base.Preconditions;
54-
5554
import lombok.val;
5655
import lombok.var;
5756
import lombok.extern.slf4j.Slf4j;
5857

59-
/**
60-
* 15/11/2023 hellozepp([email protected])
61-
*/
6258
@Slf4j
6359
public class MetadataMapperFactory {
6460

‎src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/MetadataStore.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,10 @@ public void dump(ResourceStore store, Collection<String> resources) throws Excep
9595
}
9696

9797
/**
98-
* upload local files to snapshot, will not change resource store synchronized, perhaps should call ResourceStore.clearCache() manually
99-
* @param folder local directory contains snapshot, ${folder}/events contains event store, ${folder}/kylin.properties etc.
98+
* upload local files to snapshot, will not change resource store synchronized,
99+
* perhaps should call ResourceStore.clearCache() manually
100+
* @param folder local directory contains snapshot, ${folder}/events contains event store,
101+
* ${folder}/kylin.properties etc.
100102
*/
101103
public void uploadFromFile(File folder) {
102104
foreachFile(folder, res -> {

‎src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/AclMapper.java

-3
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,14 @@
2222
import java.util.List;
2323
import java.util.Optional;
2424

25-
import org.apache.ibatis.annotations.InsertProvider;
2625
import org.apache.ibatis.annotations.Result;
2726
import org.apache.ibatis.annotations.ResultMap;
2827
import org.apache.ibatis.annotations.Results;
29-
import org.apache.ibatis.annotations.SelectKey;
3028
import org.apache.ibatis.annotations.SelectProvider;
3129
import org.apache.ibatis.type.JdbcType;
3230
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
3331
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
3432
import org.apache.kylin.common.persistence.resources.AclRawResource;
35-
import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
3633
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
3734
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
3835

‎src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/CcModelRelationMapper.java

-3
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,15 @@
2222
import java.util.List;
2323
import java.util.Optional;
2424

25-
import org.apache.ibatis.annotations.InsertProvider;
2625
import org.apache.ibatis.annotations.Result;
2726
import org.apache.ibatis.annotations.ResultMap;
2827
import org.apache.ibatis.annotations.Results;
29-
import org.apache.ibatis.annotations.SelectKey;
3028
import org.apache.ibatis.annotations.SelectProvider;
3129
import org.apache.ibatis.type.JdbcType;
3230
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
3331
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
3432
import org.apache.kylin.common.persistence.resources.CcModelRelationRawResource;
3533
import org.mybatis.dynamic.sql.BasicColumn;
36-
import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
3734
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
3835
import org.mybatis.dynamic.sql.update.UpdateDSL;
3936
import org.mybatis.dynamic.sql.update.UpdateModel;

‎src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ComputeColumnMapper.java

-3
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,16 @@
2424
import java.util.List;
2525
import java.util.Optional;
2626

27-
import org.apache.ibatis.annotations.InsertProvider;
2827
import org.apache.ibatis.annotations.Result;
2928
import org.apache.ibatis.annotations.ResultMap;
3029
import org.apache.ibatis.annotations.Results;
31-
import org.apache.ibatis.annotations.SelectKey;
3230
import org.apache.ibatis.annotations.SelectProvider;
3331
import org.apache.ibatis.type.JdbcType;
3432
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
3533
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
3634
import org.apache.kylin.common.persistence.resources.ComputeColumnRawResource;
3735
import org.mybatis.dynamic.sql.BasicColumn;
3836
import org.mybatis.dynamic.sql.SqlColumn;
39-
import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
4037
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
4138
import org.mybatis.dynamic.sql.update.UpdateDSL;
4239
import org.mybatis.dynamic.sql.update.UpdateModel;

‎src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/DataParserMapper.java

-3
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,15 @@
2222
import java.util.List;
2323
import java.util.Optional;
2424

25-
import org.apache.ibatis.annotations.InsertProvider;
2625
import org.apache.ibatis.annotations.Result;
2726
import org.apache.ibatis.annotations.ResultMap;
2827
import org.apache.ibatis.annotations.Results;
29-
import org.apache.ibatis.annotations.SelectKey;
3028
import org.apache.ibatis.annotations.SelectProvider;
3129
import org.apache.ibatis.type.JdbcType;
3230
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
3331
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
3432
import org.apache.kylin.common.persistence.resources.DataParserRawResource;
3533
import org.mybatis.dynamic.sql.BasicColumn;
36-
import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
3734
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
3835
import org.mybatis.dynamic.sql.update.UpdateDSL;
3936
import org.mybatis.dynamic.sql.update.UpdateModel;

‎src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/DataflowMapper.java

-3
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,14 @@
2222
import java.util.List;
2323
import java.util.Optional;
2424

25-
import org.apache.ibatis.annotations.InsertProvider;
2625
import org.apache.ibatis.annotations.Result;
2726
import org.apache.ibatis.annotations.ResultMap;
2827
import org.apache.ibatis.annotations.Results;
29-
import org.apache.ibatis.annotations.SelectKey;
3028
import org.apache.ibatis.annotations.SelectProvider;
3129
import org.apache.ibatis.type.JdbcType;
3230
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
3331
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
3432
import org.apache.kylin.common.persistence.resources.DataflowRawResource;
35-
import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
3633
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
3734
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
3835

‎src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/FusionModelDynamicSqlSupport.java

-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
*/
1818
package org.apache.kylin.common.persistence.metadata.mapper;
1919

20-
import java.sql.JDBCType;
21-
22-
import org.mybatis.dynamic.sql.SqlColumn;
23-
2420
public final class FusionModelDynamicSqlSupport {
2521

2622
public static final FusionModel sqlTable = new FusionModel();

‎src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/FusionModelMapper.java

-4
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@
3030
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
3131
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
3232
import org.apache.kylin.common.persistence.resources.FusionModelRawResource;
33-
import org.mybatis.dynamic.sql.BasicColumn;
34-
import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
3533
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
36-
import org.mybatis.dynamic.sql.update.UpdateDSL;
37-
import org.mybatis.dynamic.sql.update.UpdateModel;
3834
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
3935

4036
public interface FusionModelMapper extends BasicMapper<FusionModelRawResource> {

‎src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/HistorySourceUsageMapper.java

-3
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,15 @@
2222
import java.util.List;
2323
import java.util.Optional;
2424

25-
import org.apache.ibatis.annotations.InsertProvider;
2625
import org.apache.ibatis.annotations.Result;
2726
import org.apache.ibatis.annotations.ResultMap;
2827
import org.apache.ibatis.annotations.Results;
29-
import org.apache.ibatis.annotations.SelectKey;
3028
import org.apache.ibatis.annotations.SelectProvider;
3129
import org.apache.ibatis.type.JdbcType;
3230
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
3331
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
3432
import org.apache.kylin.common.persistence.resources.HistorySourceUsageRawResource;
3533
import org.mybatis.dynamic.sql.BasicColumn;
36-
import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
3734
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
3835
import org.mybatis.dynamic.sql.update.UpdateDSL;
3936
import org.mybatis.dynamic.sql.update.UpdateModel;

‎src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/IndexPlanMapper.java

-3
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,14 @@
2222
import java.util.List;
2323
import java.util.Optional;
2424

25-
import org.apache.ibatis.annotations.InsertProvider;
2625
import org.apache.ibatis.annotations.Result;
2726
import org.apache.ibatis.annotations.ResultMap;
2827
import org.apache.ibatis.annotations.Results;
29-
import org.apache.ibatis.annotations.SelectKey;
3028
import org.apache.ibatis.annotations.SelectProvider;
3129
import org.apache.ibatis.type.JdbcType;
3230
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
3331
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
3432
import org.apache.kylin.common.persistence.resources.IndexPlanRawResource;
35-
import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
3633
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
3734
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
3835

‎src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/JarInfoMapper.java

-3
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,15 @@
2222
import java.util.List;
2323
import java.util.Optional;
2424

25-
import org.apache.ibatis.annotations.InsertProvider;
2625
import org.apache.ibatis.annotations.Result;
2726
import org.apache.ibatis.annotations.ResultMap;
2827
import org.apache.ibatis.annotations.Results;
29-
import org.apache.ibatis.annotations.SelectKey;
3028
import org.apache.ibatis.annotations.SelectProvider;
3129
import org.apache.ibatis.type.JdbcType;
3230
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
3331
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
3432
import org.apache.kylin.common.persistence.resources.JarInfoRawResource;
3533
import org.mybatis.dynamic.sql.BasicColumn;
36-
import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
3734
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
3835
import org.mybatis.dynamic.sql.update.UpdateDSL;
3936
import org.mybatis.dynamic.sql.update.UpdateModel;

‎src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/JobStatsMapper.java

-3
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,15 @@
2222
import java.util.List;
2323
import java.util.Optional;
2424

25-
import org.apache.ibatis.annotations.InsertProvider;
2625
import org.apache.ibatis.annotations.Result;
2726
import org.apache.ibatis.annotations.ResultMap;
2827
import org.apache.ibatis.annotations.Results;
29-
import org.apache.ibatis.annotations.SelectKey;
3028
import org.apache.ibatis.annotations.SelectProvider;
3129
import org.apache.ibatis.type.JdbcType;
3230
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
3331
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
3432
import org.apache.kylin.common.persistence.resources.JobStatsRawResource;
3533
import org.mybatis.dynamic.sql.BasicColumn;
36-
import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
3734
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
3835
import org.mybatis.dynamic.sql.update.UpdateDSL;
3936
import org.mybatis.dynamic.sql.update.UpdateModel;

‎src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/LayoutMapper.java

-3
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,15 @@
2222
import java.util.List;
2323
import java.util.Optional;
2424

25-
import org.apache.ibatis.annotations.InsertProvider;
2625
import org.apache.ibatis.annotations.Result;
2726
import org.apache.ibatis.annotations.ResultMap;
2827
import org.apache.ibatis.annotations.Results;
29-
import org.apache.ibatis.annotations.SelectKey;
3028
import org.apache.ibatis.annotations.SelectProvider;
3129
import org.apache.ibatis.type.JdbcType;
3230
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
3331
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
3432
import org.apache.kylin.common.persistence.resources.LayoutRawResource;
3533
import org.mybatis.dynamic.sql.BasicColumn;
36-
import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
3734
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
3835
import org.mybatis.dynamic.sql.update.UpdateDSL;
3936
import org.mybatis.dynamic.sql.update.UpdateModel;

‎src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ModelMapper.java

-3
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,15 @@
2222
import java.util.List;
2323
import java.util.Optional;
2424

25-
import org.apache.ibatis.annotations.InsertProvider;
2625
import org.apache.ibatis.annotations.Result;
2726
import org.apache.ibatis.annotations.ResultMap;
2827
import org.apache.ibatis.annotations.Results;
29-
import org.apache.ibatis.annotations.SelectKey;
3028
import org.apache.ibatis.annotations.SelectProvider;
3129
import org.apache.ibatis.type.JdbcType;
3230
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
3331
import org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
3432
import org.apache.kylin.common.persistence.resources.ModelRawResource;
3533
import org.mybatis.dynamic.sql.BasicColumn;
36-
import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
3734
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
3835
import org.mybatis.dynamic.sql.update.UpdateDSL;
3936
import org.mybatis.dynamic.sql.update.UpdateModel;

0 commit comments

Comments
 (0)