Skip to content

Commit 33f2677

Browse files
chenxinweichenxinwei
authored
Merge pull request #4 from chenxinwei/rebase_master
Rebase master
2 parents 588b6e0 + 5dfc597 commit 33f2677

File tree

1,849 files changed

+90201
-22029
lines changed

Some content is hidden

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

1,849 files changed

+90201
-22029
lines changed

‎.github/workflows/publish_snapshot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ jobs:
6464
echo "<password>$ASF_PASSWORD</password>" >> $tmp_settings
6565
echo "</server></servers></settings>" >> $tmp_settings
6666
67-
mvn --settings $tmp_settings clean deploy -Dgpg.skip -Drat.skip -DskipTests -Papache-release
67+
mvn --settings $tmp_settings clean deploy -Dgpg.skip -Drat.skip -DskipTests -Papache-release,spark3
6868
6969
rm $tmp_settings

.github/workflows/unitcase-flink-jdk11.yml renamed to .github/workflows/utitcase-flink-jdk11.yml

File renamed without changes.

.github/workflows/unitcase-jdk11.yml renamed to .github/workflows/utitcase-jdk11.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# limitations under the License.
1717
################################################################################
1818

19-
name: UTCase and ITCase Non Flink on JDK 11
19+
name: UTCase and ITCase Others on JDK 11
2020

2121
on:
2222
issue_comment:
@@ -52,6 +52,11 @@ jobs:
5252
. .github/workflows/utils.sh
5353
jvm_timezone=$(random_timezone)
5454
echo "JVM timezone is set to $jvm_timezone"
55-
mvn -T 1C -B clean install -pl '!paimon-e2e-tests,!org.apache.paimon:paimon-hive-connector-3.1' -Pskip-paimon-flink-tests -Duser.timezone=$jvm_timezone
55+
test_modules="!paimon-e2e-tests,!org.apache.paimon:paimon-hive-connector-3.1,"
56+
for suffix in 3.5 3.4 3.3 3.2 ut; do
57+
test_modules+="!org.apache.paimon:paimon-spark-${suffix},"
58+
done
59+
test_modules="${test_modules%,}"
60+
mvn -T 1C -B clean install -pl "${test_modules}" -Pskip-paimon-flink-tests -Duser.timezone=$jvm_timezone
5661
env:
5762
MAVEN_OPTS: -Xmx4096m

‎.github/workflows/utitcase-spark-3.x.yml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
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+
################################################################################
18+
19+
name: UTCase and ITCase Spark 3.x
20+
21+
on:
22+
push:
23+
pull_request:
24+
paths-ignore:
25+
- 'docs/**'
26+
- '**/*.md'
27+
28+
env:
29+
JDK_VERSION: 8
30+
31+
concurrency:
32+
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.number || github.run_id }}
33+
cancel-in-progress: true
34+
35+
jobs:
36+
build:
37+
runs-on: ubuntu-latest
38+
39+
steps:
40+
- name: Checkout code
41+
uses: actions/checkout@v2
42+
- name: Set up JDK ${{ env.JDK_VERSION }}
43+
uses: actions/setup-java@v2
44+
with:
45+
java-version: ${{ env.JDK_VERSION }}
46+
distribution: 'adopt'
47+
- name: Build Spark
48+
run: mvn -T 1C -B clean install -DskipTests
49+
- name: Test Spark
50+
timeout-minutes: 60
51+
run: |
52+
# run tests with random timezone to find out timezone related bugs
53+
. .github/workflows/utils.sh
54+
jvm_timezone=$(random_timezone)
55+
echo "JVM timezone is set to $jvm_timezone"
56+
test_modules=""
57+
for suffix in ut 3.5 3.4 3.3 3.2; do
58+
test_modules+="org.apache.paimon:paimon-spark-${suffix},"
59+
done
60+
test_modules="${test_modules%,}"
61+
mvn -T 1C -B test -pl "${test_modules}" -Duser.timezone=$jvm_timezone
62+
env:
63+
MAVEN_OPTS: -Xmx4096m

‎.github/workflows/utitcase-spark-4.x.yml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
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+
################################################################################
18+
19+
name: UTCase and ITCase Spark 4.x
20+
21+
on:
22+
push:
23+
pull_request:
24+
paths-ignore:
25+
- 'docs/**'
26+
- '**/*.md'
27+
28+
env:
29+
JDK_VERSION: 17
30+
31+
concurrency:
32+
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.number || github.run_id }}
33+
cancel-in-progress: true
34+
35+
jobs:
36+
build:
37+
runs-on: ubuntu-latest
38+
39+
steps:
40+
- name: Checkout code
41+
uses: actions/checkout@v2
42+
- name: Set up JDK ${{ env.JDK_VERSION }}
43+
uses: actions/setup-java@v2
44+
with:
45+
java-version: ${{ env.JDK_VERSION }}
46+
distribution: 'adopt'
47+
- name: Build Spark
48+
run: mvn -T 1C -B clean install -DskipTests -Pspark4
49+
- name: Test Spark
50+
timeout-minutes: 60
51+
run: |
52+
# run tests with random timezone to find out timezone related bugs
53+
. .github/workflows/utils.sh
54+
jvm_timezone=$(random_timezone)
55+
echo "JVM timezone is set to $jvm_timezone"
56+
test_modules=""
57+
for suffix in ut 4.0; do
58+
test_modules+="org.apache.paimon:paimon-spark-${suffix},"
59+
done
60+
test_modules="${test_modules%,}"
61+
mvn -T 1C -B test -pl "${test_modules}" -Duser.timezone=$jvm_timezone -Pspark4
62+
env:
63+
MAVEN_OPTS: -Xmx4096m

‎.github/workflows/utitcase.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# limitations under the License.
1717
################################################################################
1818

19-
name: UTCase and ITCase Non Flink
19+
name: UTCase and ITCase Others
2020

2121
on:
2222
push:
@@ -53,6 +53,11 @@ jobs:
5353
. .github/workflows/utils.sh
5454
jvm_timezone=$(random_timezone)
5555
echo "JVM timezone is set to $jvm_timezone"
56-
mvn -T 1C -B clean install -pl '!paimon-e2e-tests' -Pskip-paimon-flink-tests -Duser.timezone=$jvm_timezone
56+
test_modules="!paimon-e2e-tests,"
57+
for suffix in 3.5 3.4 3.3 3.2 ut; do
58+
test_modules+="!org.apache.paimon:paimon-spark-${suffix},"
59+
done
60+
test_modules="${test_modules%,}"
61+
mvn -T 1C -B clean install -pl "${test_modules}" -Pskip-paimon-flink-tests -Duser.timezone=$jvm_timezone
5762
env:
5863
MAVEN_OPTS: -Xmx4096m

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@ target
1717
.DS_Store
1818
*.ipr
1919
*.iws
20+
.java-version
2021
dependency-reduced-pom.xml

‎LICENSE‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,11 @@ paimon-format/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java
270270
paimon-format/src/main/java/org/apache/parquet/hadoop/ParquetWriter.java
271271
from https://parquet.apache.org/ version 1.14.0
272272

273+
paimon-common/src/main/java/org/apache/paimon/data/variant/GenericVariant.java
274+
paimon-common/src/main/java/org/apache/paimon/data/variant/GenericVariantBuilder.java
275+
paimon-common/src/main/java/org/apache/paimon/data/variant/GenericVariantUtil.java
276+
from https://spark.apache.org/ version 4.0.0-preview2
277+
273278
MIT License
274279
-----------
275280

‎NOTICE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Apache Paimon
2-
Copyright 2023-2024 The Apache Software Foundation
2+
Copyright 2023-2025 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (http://www.apache.org/).

‎docs/config.toml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ pygmentsUseClasses = true
3434
# we change the version for the complete docs when forking of a release branch
3535
# etc.
3636
# The full version string as referenced in Maven (e.g. 1.2.1)
37-
Version = "0.9-SNAPSHOT"
37+
Version = "1.1-SNAPSHOT"
3838

3939
# For stable releases, leave the bugfix version out (e.g. 1.2). For snapshot
4040
# release this should be the same as the regular version
41-
VersionTitle = "0.9-SNAPSHOT"
41+
VersionTitle = "1.1-SNAPSHOT"
4242

4343
# The branch for this version of Apache Paimon
4444
Branch = "master"
@@ -67,15 +67,14 @@ pygmentsUseClasses = true
6767
["JavaDocs", "//paimon.apache.org/docs/master/api/java/"],
6868
]
6969

70-
StableDocs = "https://paimon.apache.org/docs/0.8"
70+
StableDocs = "https://paimon.apache.org/docs/1.0"
7171

7272
PreviousDocs = [
7373
["master", "https://paimon.apache.org/docs/master"],
74-
["stable", "https://paimon.apache.org/docs/0.8"],
74+
["stable", "https://paimon.apache.org/docs/1.0"],
75+
["1.0", "https://paimon.apache.org/docs/1.0"],
76+
["0.9", "https://paimon.apache.org/docs/0.9"],
7577
["0.8", "https://paimon.apache.org/docs/0.8"],
76-
["0.7", "https://paimon.apache.org/docs/0.7"],
77-
["0.6", "https://paimon.apache.org/docs/0.6"],
78-
["0.5", "https://paimon.apache.org/docs/0.5"]
7978
]
8079

8180
BookSection = '/'

0 commit comments

Comments
 (0)