Skip to content

Commit b82460c

Browse files
author
yangemngqi
committed
Merge branch 'refs/heads/dev' into fixbug
2 parents 2036499 + d33b0da commit b82460c

File tree

1,372 files changed

+30761
-4905
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,372 files changed

+30761
-4905
lines changed

Diff for: .github/workflows/backend.yml

+156-48
Large diffs are not rendered by default.

Diff for: .github/workflows/notify_test_workflow.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
status = 'completed'
8181
const conclusion = 'action_required'
8282
83-
github.rest.checks.create({
83+
await github.rest.checks.create({
8484
owner: context.repo.owner,
8585
repo: context.repo.repo,
8686
name: name,

Diff for: .github/workflows/schedule_backend.yml

+10-121
Original file line numberDiff line numberDiff line change
@@ -18,128 +18,17 @@
1818
name: Schedule Backend
1919
on:
2020
schedule:
21-
- cron: '0 0 03 * *'
21+
- cron: '0 16 * * *'
2222

2323
concurrency:
24-
group: backend-${{ github.event.pull_request.number || github.ref }}
25-
cancel-in-progress: true
24+
group: schedule-backend-${{ github.event.pull_request.number || github.ref }}
25+
cancel-in-progress: false
2626

2727
jobs:
28-
license-header:
29-
if: github.repository == 'apache/seatunnel'
30-
name: License header
31-
runs-on: ubuntu-latest
32-
timeout-minutes: 10
33-
steps:
34-
- uses: actions/checkout@v3
35-
with:
36-
submodules: true
37-
- name: Check license header
38-
uses: apache/skywalking-eyes@985866ce7e324454f61e22eb2db2e998db09d6f3
39-
40-
code-style:
41-
if: github.repository == 'apache/seatunnel'
42-
name: Code style
43-
runs-on: ubuntu-latest
44-
timeout-minutes: 10
45-
steps:
46-
- uses: actions/checkout@v3
47-
with:
48-
submodules: true
49-
- name: Check code style
50-
run: ./mvnw --batch-mode --quiet --no-snapshot-updates clean spotless:check
51-
52-
dead-link:
53-
if: github.repository == 'apache/seatunnel'
54-
name: Dead links
55-
runs-on: ubuntu-latest
56-
timeout-minutes: 30
57-
steps:
58-
- uses: actions/checkout@v2
59-
- run: sudo npm install -g [email protected]
60-
- run: |
61-
for file in $(find . -name "*.md"); do
62-
markdown-link-check -c .dlc.json -q "$file"
63-
done
64-
65-
sanity-check:
66-
if: github.repository == 'apache/seatunnel'
67-
name: Sanity check results
68-
needs: [ license-header, code-style, dead-link ]
69-
runs-on: ubuntu-latest
70-
timeout-minutes: 10
71-
steps:
72-
- name: Check results
73-
run: |
74-
[[ ${{ needs.license-header.result }} == 'success' ]] || exit 1;
75-
[[ ${{ needs.code-style.result }} == 'success' ]] || exit 1;
76-
[[ ${{ needs.dead-link.result }} == 'success' ]] || exit 1;
77-
78-
dependency-license:
79-
name: Dependency licenses
80-
needs: [ sanity-check ]
81-
runs-on: ubuntu-latest
82-
timeout-minutes: 40
83-
steps:
84-
- uses: actions/checkout@v3
85-
with:
86-
submodules: true
87-
- uses: actions/setup-java@v3
88-
with:
89-
distribution: 'temurin'
90-
java-version: '8'
91-
cache: 'maven'
92-
- name: Install
93-
run: >-
94-
./mvnw -B -q install -DskipTests
95-
-D"maven.test.skip"=true
96-
-D"maven.javadoc.skip"=true
97-
-D"scalastyle.skip"=true
98-
-D"license.skipAddThirdParty"
99-
- name: Check Dependencies Licenses
100-
run: tools/dependencies/checkLicense.sh
101-
102-
unit-test:
103-
needs: [ sanity-check ]
104-
runs-on: ${{ matrix.os }}
105-
strategy:
106-
matrix:
107-
java: [ '8', '11' ]
108-
os: [ 'ubuntu-latest', 'windows-latest' ]
109-
timeout-minutes: 90
110-
steps:
111-
- uses: actions/checkout@v2
112-
- name: Set up JDK ${{ matrix.java }}
113-
uses: actions/setup-java@v3
114-
with:
115-
java-version: ${{ matrix.java }}
116-
distribution: 'temurin'
117-
cache: 'maven'
118-
- name: run all modules unit test
119-
run: |
120-
./mvnw -B -T 1C clean verify -D"maven.test.skip"=false -D"scalastyle.skip"=true -D"license.skipAddThirdParty"=true --no-snapshot-updates
121-
env:
122-
MAVEN_OPTS: -Xmx2048m
123-
124-
integration-test:
125-
needs: [ sanity-check ]
126-
runs-on: ${{ matrix.os }}
127-
strategy:
128-
matrix:
129-
java: [ '8', '11' ]
130-
os: [ 'ubuntu-latest' ]
131-
timeout-minutes: 90
132-
steps:
133-
- uses: actions/checkout@v2
134-
- name: Set up JDK ${{ matrix.java }}
135-
uses: actions/setup-java@v3
136-
with:
137-
java-version: ${{ matrix.java }}
138-
distribution: 'temurin'
139-
cache: 'maven'
140-
- name: run all modules integration test
141-
run: |
142-
./mvnw -T 1C -B verify -DskipUT=true -DskipIT=false -D"scalastyle.skip"=true -D"license.skipAddThirdParty"=true --no-snapshot-updates
143-
env:
144-
MAVEN_OPTS: -Xmx2048m
145-
28+
call-build-and-test:
29+
permissions:
30+
packages: write
31+
name: Run
32+
uses: ./.github/workflows/backend.yml
33+
with:
34+
TEST_IN_PR: false

Diff for: README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ Yes, SeaTunnel is available under the Apache 2.0 License, allowing commercial us
144144

145145
Our [Official Documentation](https://seatunnel.apache.org/docs) includes detailed guides and tutorials to help you get started.
146146

147-
### 7. Is there a community or support channel?
147+
### 6. Is there a community or support channel?
148148

149149
Join our Slack community for support and discussions: [SeaTunnel Slack](https://s.apache.org/seatunnel-slack).
150+
More information, please refer to [FAQ](https://seatunnel.apache.org/docs/faq).

Diff for: config/jvm_master_options

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#
1717

1818
# JVM Heap
19-
-Xms2g
20-
-Xmx2g
19+
# -Xms2g
20+
# -Xmx2g
2121

2222
# JVM Dump
2323
-XX:+HeapDumpOnOutOfMemoryError

Diff for: config/jvm_options

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#
1717

1818
# JVM Heap
19-
-Xms2g
20-
-Xmx2g
19+
# -Xms2g
20+
# -Xmx2g
2121

2222
# JVM Dump
2323
-XX:+HeapDumpOnOutOfMemoryError

Diff for: config/jvm_worker_options

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#
1717

1818
# JVM Heap
19-
-Xms2g
20-
-Xmx2g
19+
# -Xms2g
20+
# -Xmx2g
2121

2222
# JVM Dump
2323
-XX:+HeapDumpOnOutOfMemoryError

Diff for: config/seatunnel.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ seatunnel:
3838
telemetry:
3939
metric:
4040
enabled: false
41+
log:
42+
scheduled-deletion-enable: true
4143
http:
4244
enable-http: true
4345
port: 8080

Diff for: config/v2.batch.config.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ source {
2929
# This is a example source plugin **only for test and demonstrate the feature source plugin**
3030
FakeSource {
3131
parallelism = 2
32-
result_table_name = "fake"
32+
plugin_output = "fake"
3333
row.num = 16
3434
schema = {
3535
fields {

Diff for: config/v2.streaming.conf.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ source {
2929
# This is a example source plugin **only for test and demonstrate the feature source plugin**
3030
FakeSource {
3131
parallelism = 2
32-
result_table_name = "fake"
32+
plugin_output = "fake"
3333
row.num = 16
3434
schema = {
3535
fields {

Diff for: docs/en/about.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ SeaTunnel has lots of users. You can find more information about them in [Users]
6464
<br/><br/>
6565
<img src="https://landscape.cncf.io/images/left-logo.svg" width="150" alt=""/>&nbsp;&nbsp;<img src="https://landscape.cncf.io/images/right-logo.svg" width="200" alt=""/>
6666
<br/><br/>
67-
SeaTunnel enriches the <a href="https://landscape.cncf.io/card-mode?category=streaming-messaging&license=apache-license-2-0&grouping=category&selected=sea-tunnal">CNCF CLOUD NATIVE Landscape</a >.
67+
SeaTunnel enriches the <a href="https://landscape.cncf.io/?item=app-definition-and-development--streaming-messaging--seatunnel">CNCF CLOUD NATIVE Landscape</a >.
6868
</p >
6969

7070
## Learn more

Diff for: docs/en/concept/config.md

+29-23
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ config directory.
1919

2020
The config file is similar to the below one:
2121

22+
:::warn
23+
24+
The old configuration name `source_table_name`/`result_table_name` is deprecated, please migrate to the new name `plugin_input`/`plugin_output` as soon as possible.
25+
26+
:::
27+
2228
### hocon
2329

2430
```hocon
@@ -28,7 +34,7 @@ env {
2834
2935
source {
3036
FakeSource {
31-
result_table_name = "fake"
37+
plugin_output = "fake"
3238
row.num = 100
3339
schema = {
3440
fields {
@@ -42,8 +48,8 @@ source {
4248
4349
transform {
4450
Filter {
45-
source_table_name = "fake"
46-
result_table_name = "fake1"
51+
plugin_input = "fake"
52+
plugin_output = "fake1"
4753
fields = [name, card]
4854
}
4955
}
@@ -56,7 +62,7 @@ sink {
5662
fields = ["name", "card"]
5763
username = "default"
5864
password = ""
59-
source_table_name = "fake1"
65+
plugin_input = "fake1"
6066
}
6167
}
6268
```
@@ -80,7 +86,7 @@ Source is used to define where SeaTunnel needs to fetch data, and use the fetche
8086
Multiple sources can be defined at the same time. The supported source can be found
8187
in [Source of SeaTunnel](../connector-v2/source). Each source has its own specific parameters to define how to
8288
fetch data, and SeaTunnel also extracts the parameters that each source will use, such as
83-
the `result_table_name` parameter, which is used to specify the name of the data generated by the current
89+
the `plugin_output` parameter, which is used to specify the name of the data generated by the current
8490
source, which is convenient for follow-up used by other modules.
8591

8692
### transform
@@ -96,7 +102,7 @@ env {
96102
97103
source {
98104
FakeSource {
99-
result_table_name = "fake"
105+
plugin_output = "fake"
100106
row.num = 100
101107
schema = {
102108
fields {
@@ -116,7 +122,7 @@ sink {
116122
fields = ["name", "age", "card"]
117123
username = "default"
118124
password = ""
119-
source_table_name = "fake"
125+
plugin_input = "fake"
120126
}
121127
}
122128
```
@@ -134,11 +140,11 @@ and efficiently. Sink and source are very similar, but the difference is reading
134140
### Other Information
135141

136142
You will find that when multiple sources and multiple sinks are defined, which data is read by each sink, and
137-
which is the data read by each transform? We introduce two key configurations called `result_table_name` and
138-
`source_table_name`. Each source module will be configured with a `result_table_name` to indicate the name of the
139-
data source generated by the data source, and other transform and sink modules can use `source_table_name` to
143+
which is the data read by each transform? We introduce two key configurations called `plugin_output` and
144+
`plugin_input`. Each source module will be configured with a `plugin_output` to indicate the name of the
145+
data source generated by the data source, and other transform and sink modules can use `plugin_input` to
140146
refer to the corresponding data source name, indicating that I want to read the data for processing. Then
141-
transform, as an intermediate processing module, can use both `result_table_name` and `source_table_name`
147+
transform, as an intermediate processing module, can use both `plugin_output` and `plugin_input`
142148
configurations at the same time. But you will find that in the above example config, not every module is
143149
configured with these two parameters, because in SeaTunnel, there is a default convention, if these two
144150
parameters are not configured, then the generated data from the last module of the previous node will be used.
@@ -170,7 +176,7 @@ Before writing the config file, please make sure that the name of the config fil
170176
"source": [
171177
{
172178
"plugin_name": "FakeSource",
173-
"result_table_name": "fake",
179+
"plugin_output": "fake",
174180
"row.num": 100,
175181
"schema": {
176182
"fields": {
@@ -184,8 +190,8 @@ Before writing the config file, please make sure that the name of the config fil
184190
"transform": [
185191
{
186192
"plugin_name": "Filter",
187-
"source_table_name": "fake",
188-
"result_table_name": "fake1",
193+
"plugin_input": "fake",
194+
"plugin_output": "fake1",
189195
"fields": ["name", "card"]
190196
}
191197
],
@@ -198,7 +204,7 @@ Before writing the config file, please make sure that the name of the config fil
198204
"fields": ["name", "card"],
199205
"username": "default",
200206
"password": "",
201-
"source_table_name": "fake1"
207+
"plugin_input": "fake1"
202208
}
203209
]
204210
}
@@ -234,7 +240,7 @@ env {
234240
235241
source {
236242
FakeSource {
237-
result_table_name = "${resName:fake_test}_table"
243+
plugin_output = "${resName:fake_test}_table"
238244
row.num = "${rowNum:50}"
239245
string.template = ${strTemplate}
240246
int.template = [20, 21]
@@ -249,16 +255,16 @@ source {
249255
250256
transform {
251257
sql {
252-
source_table_name = "${resName:fake_test}_table"
253-
result_table_name = "sql"
258+
plugin_input = "${resName:fake_test}_table"
259+
plugin_output = "sql"
254260
query = "select * from ${resName:fake_test}_table where name = '${nameVal}' "
255261
}
256262
257263
}
258264
259265
sink {
260266
Console {
261-
source_table_name = "sql"
267+
plugin_input = "sql"
262268
username = ${username}
263269
password = ${password}
264270
}
@@ -291,7 +297,7 @@ env {
291297
292298
source {
293299
FakeSource {
294-
result_table_name = "fake_test_table"
300+
plugin_output = "fake_test_table"
295301
row.num = 50
296302
string.template = ['abc','d~f','hi']
297303
int.template = [20, 21]
@@ -306,16 +312,16 @@ source {
306312
307313
transform {
308314
sql {
309-
source_table_name = "fake_test_table"
310-
result_table_name = "sql"
315+
plugin_input = "fake_test_table"
316+
plugin_output = "sql"
311317
query = "select * from fake_test_table where name = 'abc' "
312318
}
313319
314320
}
315321
316322
sink {
317323
Console {
318-
source_table_name = "sql"
324+
plugin_input = "sql"
319325
username = "seatunnel=2.3.1"
320326
password = "$a^b%c.d~e0*9("
321327
}

0 commit comments

Comments
 (0)