Skip to content

Commit cecf4d0

Browse files
committed
Merge branch 'refs/heads/main' into flink-support-patition-pushdown
# Conflicts: # fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/row/FlinkAsFlussRow.java # fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/FlinkSource.java # fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/FlinkTableSource.java # fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/PredicateConverter.java # fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/enumerator/FlinkSourceEnumerator.java # fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/source/enumerator/FlinkSourceEnumeratorTest.java
2 parents 1dbb0ad + 434a4f4 commit cecf4d0

File tree

2,043 files changed

+32087
-17014
lines changed

Some content is hidden

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

2,043 files changed

+32087
-17014
lines changed

.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ body:
2828
attributes:
2929
label: Search before asking
3030
description: >
31-
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.
3232
options:
3333
- label: >
34-
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.
3535
required: true
3636
- type: dropdown
3737
attributes:

.github/ISSUE_TEMPLATE/feature.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ body:
2828
attributes:
2929
label: Search before asking
3030
description: >
31-
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.
3232
options:
3333
- label: >
34-
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.
3535
required: true
3636
- type: textarea
3737
attributes:

.github/ISSUE_TEMPLATE/task.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ body:
2828
attributes:
2929
label: Search before asking
3030
description: >
31-
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.
3232
options:
3333
- label: >
34-
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.
3535
required: true
3636
- type: textarea
3737
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: 19 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -22,52 +22,36 @@ on:
2222
- main
2323
- release-**
2424
- ci-**
25+
paths-ignore:
26+
- 'website/**'
27+
- '**/*.md'
2528
pull_request:
2629
paths-ignore:
2730
- 'website/**'
2831
- '**/*.md'
32+
2933
concurrency:
3034
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.number || github.run_id }}
3135
cancel-in-progress: true
3236

3337
jobs:
34-
build:
35-
runs-on: self-hosted
36-
strategy:
37-
fail-fast: false
38-
matrix:
39-
module: [ core, flink ]
38+
compile-on-jdk8:
39+
name: "Compile Java 8"
40+
runs-on: ubuntu-latest
4041
steps:
4142
- name: Checkout code
4243
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'
4349
- name: Build
4450
run: |
45-
mvn -T 1C -B clean install -DskipTests
46-
- name: Test
47-
timeout-minutes: 60
48-
run: |
49-
TEST_MODULES=$(./.github/workflows/stage.sh ${{ matrix.module }})
50-
echo "github ref: ${{ github.ref }}"
51-
echo "Start testing modules: $TEST_MODULES"
52-
mvn -B verify $TEST_MODULES -Ptest-coverage -Ptest-${{ matrix.module }} -Dlog.dir=${{ runner.temp }}/fluss-logs -Dlog4j.configurationFile=${{ github.workspace }}/tools/ci/log4j.properties
53-
env:
54-
MAVEN_OPTS: -Xmx4096m
55-
ARTIFACTS_OSS_ENDPOINT: ${{ secrets.ARTIFACTS_OSS_ENDPOINT }}
56-
ARTIFACTS_OSS_REGION: ${{ secrets.ARTIFACTS_OSS_REGION }}
57-
ARTIFACTS_OSS_BUCKET: ${{ secrets.ARTIFACTS_OSS_BUCKET }}
58-
ARTIFACTS_OSS_ACCESS_KEY: ${{ secrets.ARTIFACTS_OSS_ACCESS_KEY }}
59-
ARTIFACTS_OSS_SECRET_KEY: ${{ secrets.ARTIFACTS_OSS_SECRET_KEY }}
60-
ARTIFACTS_OSS_STS_ENDPOINT: ${{ secrets.ARTIFACTS_OSS_STS_ENDPOINT }}
61-
ARTIFACTS_OSS_ROLE_ARN: ${{ secrets.ARTIFACTS_OSS_ROLE_ARN }}
62-
- name: Upload build logs
63-
uses: actions/upload-artifact@v4
64-
if: ${{ failure() }}
65-
with:
66-
name: logs-test-${{ matrix.module }}-${{ github.run_number}}#${{ github.run_attempt }}
67-
path: ${{ runner.temp }}/fluss-logs/*
68-
- name: Upload JaCoCo coverage report
69-
uses: actions/upload-artifact@v4
70-
if: ${{ success() && github.ref == 'refs/heads/main' }}
71-
with:
72-
name: jacoco-report-${{ matrix.module }}-${{ github.run_number}}#${{ github.run_attempt }}
73-
path: ${{ github.workspace }}/fluss-test-coverage/target/site/jacoco-aggregate/*
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/license-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Set JDK
3838
uses: actions/setup-java@v4
3939
with:
40-
java-version: 8
40+
java-version: 11
4141
distribution: 'temurin'
4242

4343
- name: Build

.github/workflows/nightly.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
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+
name: Nightly
19+
on:
20+
schedule:
21+
# Run at 20:00 UTC daily which is the lowest traffic time for Fluss project.
22+
- cron: "0 20 * * *"
23+
24+
concurrency:
25+
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.number || github.run_id }}
26+
cancel-in-progress: true
27+
28+
jobs:
29+
build-on-jdk8:
30+
name: "Java 8"
31+
uses: ./.github/workflows/ci-template.yaml
32+
with:
33+
java-version: "8"
34+
maven-parameters: "-Pjava8"

.github/workflows/stage.sh

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,17 @@
1919

2020
STAGE_CORE="core"
2121
STAGE_FLINK="flink"
22+
STAGE_LAKE="lake"
2223

2324
MODULES_FLINK="\
2425
fluss-flink,\
2526
fluss-flink/fluss-flink-common,\
27+
fluss-flink/fluss-flink-2.1,\
2628
fluss-flink/fluss-flink-1.20,\
29+
"
30+
31+
# we move Flink legacy version tests to "lake" module for balancing testing time
32+
MODULES_LAKE="\
2733
fluss-flink/fluss-flink-1.19,\
2834
fluss-flink/fluss-flink-1.18,\
2935
fluss-lake,\
@@ -36,7 +42,10 @@ function get_test_modules_for_stage() {
3642
local stage=$1
3743

3844
local modules_flink=$MODULES_FLINK
39-
local modules_core=\!${MODULES_FLINK//,/,\!}
45+
local modules_lake=$MODULES_LAKE
46+
local negated_flink=\!${MODULES_FLINK//,/,\!}
47+
local negated_lake=\!${MODULES_LAKE//,/,\!}
48+
local modules_core="$negated_flink,$negated_lake"
4049

4150
case ${stage} in
4251
(${STAGE_CORE})
@@ -45,6 +54,9 @@ function get_test_modules_for_stage() {
4554
(${STAGE_FLINK})
4655
echo "-pl fluss-test-coverage,$modules_flink"
4756
;;
57+
(${STAGE_LAKE})
58+
echo "-pl fluss-test-coverage,$modules_lake"
59+
;;
4860
esac
4961
}
5062

0 commit comments

Comments
 (0)