Skip to content

Commit b2f99f1

Browse files
Alibaba-HZYAlibaba-HZY
committed
Merge branch 'refs/heads/main' into spark-streaming-read
# Conflicts: # fluss-spark/fluss-spark-common/pom.xml # fluss-spark/fluss-spark-common/src/main/java/com/alibaba/fluss/spark/SparkConnectorOptions.java # fluss-spark/fluss-spark-common/src/main/java/com/alibaba/fluss/spark/TableBucketInfo.java # fluss-spark/fluss-spark-common/src/main/scala/com/alibaba/fluss/spark/SparkTable.scala # fluss-test-coverage/pom.xml
2 parents 40cb636 + 133933d commit b2f99f1

File tree

3,129 files changed

+153806
-88553
lines changed

Some content is hidden

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

3,129 files changed

+153806
-88553
lines changed

‎.asf.yaml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with 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,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
# See: https://cwiki.apache.org/confluence/display/INFRA/git+-+.asf.yaml+features
19+
20+
github:
21+
description: "Apache Fluss is a streaming storage built for real-time analytics."
22+
homepage: https://fluss.apache.org/
23+
features:
24+
issues: true
25+
projects: true
26+
discussions: true
27+
wiki: false
28+
labels:
29+
- fluss
30+
- streaming
31+
- real-time-analytics
32+
- lakehouse
33+
enabled_merge_buttons:
34+
squash: true
35+
merge: false
36+
rebase: true
37+
38+
notifications:
39+
commits: [email protected]
40+
issues: [email protected]
41+
pullrequests: [email protected]
42+
jobs: [email protected]
43+
discussions: [email protected]

‎.github/ISSUE_TEMPLATE/bug.yml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
################################################################################
2-
# Copyright (c) 2025 Alibaba Group Holding Ltd.
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
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
79
#
810
# http://www.apache.org/licenses/LICENSE-2.0
911
#
@@ -26,18 +28,19 @@ body:
2628
attributes:
2729
label: Search before asking
2830
description: >
29-
Please search [issues](https://github.com/alibaba/fluss/issues) to check if your issue has already been reported.
31+
Please search [issues](https://github.com/apache/fluss/issues) to check if your issue has already been reported.
3032
options:
3133
- label: >
32-
I searched in the [issues](https://github.com/alibaba/fluss/issues) and found nothing similar.
34+
I searched in the [issues](https://github.com/apache/fluss/issues) and found nothing similar.
3335
required: true
3436
- type: dropdown
3537
attributes:
3638
label: Fluss version
3739
description: What Fluss version are you using?
3840
multiple: false
3941
options:
40-
- "0.6.0 (latest release)"
42+
- "0.7.0 (latest release)"
43+
- "0.6.0"
4144
- "0.5.0"
4245
- "main (development)"
4346
validations:

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
################################################################################
2-
# Copyright (c) 2025 Alibaba Group Holding Ltd.
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
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
79
#
810
# http://www.apache.org/licenses/LICENSE-2.0
911
#

‎.github/ISSUE_TEMPLATE/feature.yml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
################################################################################
2-
# Copyright (c) 2025 Alibaba Group Holding Ltd.
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
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
79
#
810
# http://www.apache.org/licenses/LICENSE-2.0
911
#
@@ -15,7 +17,7 @@
1517
################################################################################
1618

1719
name: Feature Request 🚀
18-
description: Add new feature, improvement, and more
20+
description: User-facing functionality or improvement you’d like to see added
1921
type: "feature"
2022
body:
2123
- type: markdown
@@ -26,10 +28,10 @@ body:
2628
attributes:
2729
label: Search before asking
2830
description: >
29-
Please search [issues](https://github.com/alibaba/fluss/issues) to check if your issue has already been reported.
31+
Please search [issues](https://github.com/apache/fluss/issues) to check if your issue has already been reported.
3032
options:
3133
- label: >
32-
I searched in the [issues](https://github.com/alibaba/fluss/issues) and found nothing similar.
34+
I searched in the [issues](https://github.com/apache/fluss/issues) and found nothing similar.
3335
required: true
3436
- type: textarea
3537
attributes:

‎.github/ISSUE_TEMPLATE/task.yml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
################################################################################
2-
# Copyright (c) 2025 Alibaba Group Holding Ltd.
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
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
79
#
810
# http://www.apache.org/licenses/LICENSE-2.0
911
#
@@ -15,7 +17,7 @@
1517
################################################################################
1618

1719
name: Task 📌
18-
description: A specific piece of work
20+
description: Specific work item - either part of a larger feature or independent project maintenance
1921
type: "task"
2022
body:
2123
- type: markdown
@@ -26,10 +28,10 @@ body:
2628
attributes:
2729
label: Search before asking
2830
description: >
29-
Please search [issues](https://github.com/alibaba/fluss/issues) to check if your issue has already been reported.
31+
Please search [issues](https://github.com/apache/fluss/issues) to check if your issue has already been reported.
3032
options:
3133
- label: >
32-
I searched in the [issues](https://github.com/alibaba/fluss/issues) and found nothing similar.
34+
I searched in the [issues](https://github.com/apache/fluss/issues) and found nothing similar.
3335
required: true
3436
- type: textarea
3537
attributes:

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
## Contribution Checklist
55
6-
- Make sure that the pull request corresponds to a [GitHub issue](https://github.com/alibaba/fluss/issues). Exceptions are made for typos in JavaDoc or documentation files, which need no issue.
6+
- Make sure that the pull request corresponds to a [GitHub issue](https://github.com/apache/fluss/issues). Exceptions are made for typos in JavaDoc or documentation files, which need no issue.
77
88
- Name the pull request in the format "[component] Title of the pull request", where *[component]* should be replaced by the name of the component being changed. Typically, this corresponds to the component label assigned to the issue (e.g., [kv], [log], [client], [flink]). Skip *[component]* if you are unsure about which is the best component.
99

‎.github/workflows/ci-template.yaml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
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+
# .github/workflows/ci-template.yaml
20+
name: CI Template
21+
22+
on:
23+
workflow_call:
24+
inputs:
25+
java-version:
26+
required: true
27+
type: string
28+
maven-parameters:
29+
description: "Any parameters of the Maven command."
30+
required: false
31+
type: string
32+
default: ""
33+
jobs:
34+
build:
35+
runs-on: self-hosted
36+
strategy:
37+
fail-fast: false
38+
matrix:
39+
module: [ core, flink, lake ]
40+
name: "${{ matrix.module }}"
41+
steps:
42+
- name: Checkout code
43+
uses: actions/checkout@v2
44+
- name: Set up JDK
45+
uses: actions/setup-java@v4
46+
with:
47+
java-version: ${{ inputs.java-version }}
48+
distribution: 'temurin'
49+
- name: Build
50+
run: |
51+
mvn -T 1C -B clean install -DskipTests ${{ inputs.maven-parameters }}
52+
- name: Test
53+
timeout-minutes: 60
54+
run: |
55+
TEST_MODULES=$(./.github/workflows/stage.sh ${{ matrix.module }})
56+
echo "github ref: ${{ github.ref }}"
57+
echo "Start testing modules: $TEST_MODULES"
58+
mvn -B verify $TEST_MODULES -Ptest-coverage -Ptest-${{ matrix.module }} -Dlog.dir=${{ runner.temp }}/fluss-logs -Dlog4j.configurationFile=${{ github.workspace }}/tools/ci/log4j.properties ${{ inputs.maven-parameters }}
59+
env:
60+
MAVEN_OPTS: -Xmx4096m
61+
ARTIFACTS_OSS_ENDPOINT: ${{ secrets.ARTIFACTS_OSS_ENDPOINT }}
62+
ARTIFACTS_OSS_REGION: ${{ secrets.ARTIFACTS_OSS_REGION }}
63+
ARTIFACTS_OSS_BUCKET: ${{ secrets.ARTIFACTS_OSS_BUCKET }}
64+
ARTIFACTS_OSS_ACCESS_KEY: ${{ secrets.ARTIFACTS_OSS_ACCESS_KEY }}
65+
ARTIFACTS_OSS_SECRET_KEY: ${{ secrets.ARTIFACTS_OSS_SECRET_KEY }}
66+
ARTIFACTS_OSS_STS_ENDPOINT: ${{ secrets.ARTIFACTS_OSS_STS_ENDPOINT }}
67+
ARTIFACTS_OSS_ROLE_ARN: ${{ secrets.ARTIFACTS_OSS_ROLE_ARN }}
68+
- name: Upload build logs
69+
uses: actions/upload-artifact@v4
70+
if: ${{ failure() }}
71+
with:
72+
name: logs-test-${{ matrix.module }}-${{ github.run_number}}#${{ github.run_attempt }}
73+
path: ${{ runner.temp }}/fluss-logs/*
74+
- name: Upload JaCoCo coverage report
75+
uses: actions/upload-artifact@v4
76+
if: ${{ success() && github.ref == 'refs/heads/main' }}
77+
with:
78+
name: jacoco-report-${{ matrix.module }}-${{ github.run_number}}#${{ github.run_attempt }}
79+
path: ${{ github.workspace }}/fluss-test-coverage/target/site/jacoco-aggregate/*

‎.github/workflows/ci.yaml‎

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
################################################################################
2-
# Copyright (c) 2025 Alibaba Group Holding Ltd.
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
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
79
#
810
# http://www.apache.org/licenses/LICENSE-2.0
911
#
@@ -20,45 +22,36 @@ on:
2022
- main
2123
- release-**
2224
- ci-**
25+
paths-ignore:
26+
- 'website/**'
27+
- '**/*.md'
2328
pull_request:
2429
paths-ignore:
2530
- 'website/**'
2631
- '**/*.md'
32+
2733
concurrency:
2834
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.number || github.run_id }}
2935
cancel-in-progress: true
3036

3137
jobs:
32-
build:
33-
runs-on: self-hosted
34-
strategy:
35-
fail-fast: false
36-
matrix:
37-
module: [ core, flink ]
38+
compile-on-jdk8:
39+
name: "Compile Java 8"
40+
runs-on: ubuntu-latest
3841
steps:
3942
- name: Checkout code
4043
uses: actions/checkout@v2
44+
- name: Set up JDK 8
45+
uses: actions/setup-java@v4
46+
with:
47+
java-version: '8'
48+
distribution: 'temurin'
4149
- name: Build
4250
run: |
43-
mvn -T 1C -B clean install -DskipTests
44-
- name: Test
45-
timeout-minutes: 60
46-
run: |
47-
TEST_MODULES=$(./.github/workflows/stage.sh ${{ matrix.module }})
48-
echo "Start testing modules: $TEST_MODULES"
49-
mvn -B verify $TEST_MODULES -Ptest-coverage -Ptest-${{ matrix.module }} -Dlog.dir=${{ runner.temp }}/fluss-logs -Dlog4j.configurationFile=${{ github.workspace }}/tools/ci/log4j.properties
50-
env:
51-
MAVEN_OPTS: -Xmx4096m
52-
ARTIFACTS_OSS_ENDPOINT: ${{ secrets.ARTIFACTS_OSS_ENDPOINT }}
53-
ARTIFACTS_OSS_REGION: ${{ secrets.ARTIFACTS_OSS_REGION }}
54-
ARTIFACTS_OSS_BUCKET: ${{ secrets.ARTIFACTS_OSS_BUCKET }}
55-
ARTIFACTS_OSS_ACCESS_KEY: ${{ secrets.ARTIFACTS_OSS_ACCESS_KEY }}
56-
ARTIFACTS_OSS_SECRET_KEY: ${{ secrets.ARTIFACTS_OSS_SECRET_KEY }}
57-
ARTIFACTS_OSS_STS_ENDPOINT: ${{ secrets.ARTIFACTS_OSS_STS_ENDPOINT }}
58-
ARTIFACTS_OSS_ROLE_ARN: ${{ secrets.ARTIFACTS_OSS_ROLE_ARN }}
59-
- name: Upload build logs
60-
uses: actions/upload-artifact@v4
61-
if: ${{ failure() }}
62-
with:
63-
name: logs-test-${{ matrix.module }}-${{ github.run_number}}#${{ github.run_attempt }}
64-
path: ${{ runner.temp }}/fluss-logs/*
51+
mvn -T 1C -B clean install -DskipTests -Pjava8
52+
53+
build-on-jdk11:
54+
name: "Java 11"
55+
uses: ./.github/workflows/ci-template.yaml
56+
with:
57+
java-version: "11"

‎.github/workflows/docs-check.yaml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
################################################################################
2-
# Copyright (c) 2025 Alibaba Group Holding Ltd.
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
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
79
#
810
# http://www.apache.org/licenses/LICENSE-2.0
911
#
@@ -15,12 +17,18 @@
1517
################################################################################
1618

1719
# This workflow is meant for checking broken links in the documentation.
18-
name: Checks Documentation
20+
name: Check Documentation
21+
permissions:
22+
contents: read
1923
on:
2024
pull_request:
2125
branches: [main, release-*, ci-*]
2226
paths:
2327
- 'website/**'
28+
push:
29+
branches: [main, release-*, ci-*]
30+
paths:
31+
- 'website/**'
2432

2533
jobs:
2634
test-deploy:

0 commit comments

Comments
 (0)