Skip to content

Commit 39d950d

Browse files
committed
Merge remote-tracking branch 'upstream/master' into feat/Statistical-Aggregate-Functions
2 parents f99d8b4 + 68fc992 commit 39d950d

3,739 files changed

Lines changed: 273578 additions & 88174 deletions

File tree

Some content is hidden

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

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@
2020
*
2121
!distribution
2222
!docker/src/main/DockerCompose/start-1c1d.sh
23+
!docker/src/main/ainode-build-data/
24+
!docker/src/main/ainode-entrypoint.sh

.github/workflows/cluster-it-1c1d.yml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ on:
44
push:
55
branches:
66
- master
7-
- 'rel/*'
8-
- 'rc/*'
7+
- "rel/*"
8+
- "rc/*"
99
paths-ignore:
10-
- 'docs/**'
11-
- 'site/**'
10+
- "docs/**"
11+
- "site/**"
1212
pull_request:
1313
branches:
1414
- master
15-
- 'rel/*'
16-
- 'rc/*'
15+
- "rel/*"
16+
- "rc/*"
1717
paths-ignore:
18-
- 'docs/**'
19-
- 'site/**'
18+
- "docs/**"
19+
- "site/**"
2020
# allow manually run the action:
2121
workflow_dispatch:
2222

@@ -35,18 +35,20 @@ jobs:
3535
fail-fast: false
3636
max-parallel: 15
3737
matrix:
38-
os: [ ubuntu-latest, windows-latest ]
38+
os: [ubuntu-latest, windows-latest]
3939
runs-on: ${{ matrix.os }}
4040

4141
steps:
42-
- uses: actions/checkout@v4
42+
- uses: actions/checkout@v5
4343
- name: Set up JDK
44-
uses: actions/setup-java@v4
44+
uses: actions/setup-java@v5
4545
with:
46-
distribution: liberica
46+
distribution: corretto
4747
java-version: 17
48+
env:
49+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4850
- name: Cache Maven packages
49-
uses: actions/cache@v4
51+
uses: actions/cache@v5
5052
with:
5153
path: ~/.m2
5254
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -63,10 +65,10 @@ jobs:
6365
if: ${{ runner.os == 'Linux' }}
6466
shell: bash
6567
run: sudo sysctl -w net.core.somaxconn=65535
66-
# - name: Adjust Mac kernel somaxconn
67-
# if: ${{ runner.os == 'macOS' }}
68-
# shell: bash
69-
# run: sudo sysctl -w kern.ipc.somaxconn=65535
68+
# - name: Adjust Mac kernel somaxconn
69+
# if: ${{ runner.os == 'macOS' }}
70+
# shell: bash
71+
# run: sudo sysctl -w kern.ipc.somaxconn=65535
7072
- name: IT/UT Test
7173
shell: bash
7274
# we do not compile client-cpp for saving time, it is tested in client.yml
@@ -80,9 +82,8 @@ jobs:
8082
-am
8183
- name: Upload Artifact
8284
if: failure()
83-
uses: actions/upload-artifact@v4
85+
uses: actions/upload-artifact@v6
8486
with:
8587
name: standalone-log-java${{ matrix.java }}-${{ runner.os }}
8688
path: integration-test/target/cluster-logs
8789
retention-days: 1
88-

.github/workflows/cluster-it-1c1d1a.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,30 +34,27 @@ jobs:
3434
AINode:
3535
strategy:
3636
fail-fast: false
37-
max-parallel: 15
37+
max-parallel: 1
3838
matrix:
3939
os: [ ubuntu-latest ]
40-
runs-on: ${{ matrix.os }}
40+
runs-on: [self-hosted, gpu]
4141

4242
steps:
43-
- uses: actions/checkout@v4
44-
- name: Build AINode
45-
shell: bash
46-
run: mvn clean package -DskipTests -P with-ainode
43+
- uses: actions/checkout@v5
4744
- name: IT Test
4845
shell: bash
4946
run: |
5047
mvn clean verify \
51-
-P with-integration-tests \
48+
-P with-integration-tests,with-ainode \
5249
-DskipUTs \
53-
-DintegrationTest.forkCount=2 \
54-
-pl integration-test \
50+
-DintegrationTest.forkCount=1 \
51+
-pl integration-test,iotdb-core/ainode \
5552
-am \
5653
-PAIClusterIT
5754
- name: Upload Artifact
5855
if: failure()
59-
uses: actions/upload-artifact@v4
56+
uses: actions/upload-artifact@v6
6057
with:
6158
name: cluster-log-ainode-${{ matrix.os }}
62-
path: integration-test/target/ainode-logs
59+
path: integration-test/target/*-logs
6360
retention-days: 30

.github/workflows/cluster-it-1c3d.yml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ on:
44
push:
55
branches:
66
- master
7-
- 'rel/*'
8-
- 'rc/*'
7+
- "rel/*"
8+
- "rc/*"
99
paths-ignore:
10-
- 'docs/**'
11-
- 'site/**'
10+
- "docs/**"
11+
- "site/**"
1212
pull_request:
1313
branches:
1414
- master
15-
- 'rel/*'
16-
- 'rc/*'
17-
- 'force_ci/**'
15+
- "rel/*"
16+
- "rc/*"
17+
- "force_ci/**"
1818
paths-ignore:
19-
- 'docs/**'
20-
- 'site/**'
19+
- "docs/**"
20+
- "site/**"
2121
# allow manually run the action:
2222
workflow_dispatch:
2323

@@ -36,17 +36,19 @@ jobs:
3636
fail-fast: false
3737
max-parallel: 20
3838
matrix:
39-
java: [ 17 ]
39+
java: [17]
4040
runs-on: [self-hosted, iotdb]
41-
# group: self-hosted
42-
# labels: iotdb
41+
# group: self-hosted
42+
# labels: iotdb
4343
steps:
44-
- uses: actions/checkout@v4
44+
- uses: actions/checkout@v5
4545
- name: Set up JDK ${{ matrix.java }}
46-
uses: actions/setup-java@v4
46+
uses: actions/setup-java@v5
4747
with:
48-
distribution: liberica
48+
distribution: corretto
4949
java-version: ${{ matrix.java }}
50+
env:
51+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5052
- name: IT/UT Test
5153
shell: bash
5254
# we do not compile client-cpp for saving time, it is tested in client.yml
@@ -60,7 +62,7 @@ jobs:
6062
-am -PClusterIT
6163
- name: Upload Artifact
6264
if: failure()
63-
uses: actions/upload-artifact@v4
65+
uses: actions/upload-artifact@v6
6466
with:
6567
name: cluster-log-java${{ matrix.java }}-${{ runner.os }}
6668
path: integration-test/target/cluster-logs

.github/workflows/compile-check.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ on:
66
push:
77
branches:
88
- master
9-
- 'rel/*'
10-
- 'rc/*'
9+
- "rel/*"
10+
- "rc/*"
1111
paths-ignore:
12-
- 'docs/**'
13-
- 'site/**'
12+
- "docs/**"
13+
- "site/**"
1414
pull_request:
1515
branches:
1616
- master
17-
- 'rel/*'
18-
- 'rc/*'
19-
- 'force_ci/**'
17+
- "rel/*"
18+
- "rc/*"
19+
- "force_ci/**"
2020
paths-ignore:
21-
- 'docs/**'
22-
- 'site/**'
21+
- "docs/**"
22+
- "site/**"
2323
# allow manually run the action:
2424
workflow_dispatch:
2525

@@ -38,15 +38,17 @@ jobs:
3838
fail-fast: false
3939
matrix:
4040
java: [8]
41-
os: [ ubuntu-latest ]
41+
os: [ubuntu-latest]
4242
runs-on: ${{ matrix.os }}
4343
steps:
44-
- uses: actions/checkout@v4
44+
- uses: actions/checkout@v5
4545
- name: Set up JDK ${{ matrix.java }}
46-
uses: actions/setup-java@v4
46+
uses: actions/setup-java@v5
4747
with:
48-
distribution: liberica
48+
distribution: corretto
4949
java-version: ${{ matrix.java }}
50+
env:
51+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5052
- name: Compiler Test
5153
shell: bash
5254
run: |

0 commit comments

Comments
 (0)