Skip to content

Commit 667298a

Browse files
pfzhanpfzhan
authored
fix (#2327)
1 parent 0bfd584 commit 667298a

File tree

11 files changed

+96
-174
lines changed

11 files changed

+96
-174
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/jdbc/src/main/resources/kylin-jdbc.properties

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
#
2-
# Licensed to the Apache Software Foundation (ASF) under one
3-
# or more contributor license agreements. See the NOTICE file
4-
# distributed with this work for additional information
5-
# regarding copyright ownership. The ASF licenses this file
6-
# to you under the Apache License, Version 2.0 (the
7-
# "License"); you may not use this file except in compliance
8-
# with the License. You may obtain a copy of the License at
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
98
#
10-
# http://www.apache.org/licenses/LICENSE-2.0
9+
# http://www.apache.org/licenses/LICENSE-2.0
1110
#
1211
# Unless required by applicable law or agreed to in writing, software
1312
# distributed under the License is distributed on an "AS IS" BASIS,

‎src/jdbc/src/main/resources/org-apache-kylin-jdbc.properties

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
#
2-
# Licensed to the Apache Software Foundation (ASF) under one
3-
# or more contributor license agreements. See the NOTICE file
4-
# distributed with this work for additional information
5-
# regarding copyright ownership. The ASF licenses this file
6-
# to you under the Apache License, Version 2.0 (the
7-
# "License"); you may not use this file except in compliance
8-
# with the License. You may obtain a copy of the License at
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
98
#
10-
# http://www.apache.org/licenses/LICENSE-2.0
9+
# http://www.apache.org/licenses/LICENSE-2.0
1110
#
1211
# Unless required by applicable law or agreed to in writing, software
1312
# distributed under the License is distributed on an "AS IS" BASIS,

‎src/rec-booter/src/main/resources/config/init.properties

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

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

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

‎src/spark-project/engine-spark/src/main/scala/org/apache/spark/sql/execution/datasources/json/QueryRecHistorySchema.scala

-103
This file was deleted.

0 commit comments

Comments
 (0)