Skip to content

Commit 6d5fb38

Browse files
committed
Merge branch 'master' into feat/Statistical-Aggregate-Functions
# Conflicts: # integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationIT.java # iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AccumulatorFactory.java # iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/TableBuiltinAggregationFunction.java # iotdb-protocol/thrift-commons/src/main/thrift/common.thrift
2 parents f99d8b4 + 0e209e7 commit 6d5fb38

2,165 files changed

Lines changed: 107221 additions & 27338 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.

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

Lines changed: 16 additions & 15 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,16 +35,18 @@ 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:
4242
- uses: actions/checkout@v4
4343
- name: Set up JDK
4444
uses: actions/setup-java@v4
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
4951
uses: actions/cache@v4
5052
with:
@@ -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
@@ -85,4 +87,3 @@ jobs:
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ 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:
4343
- uses: actions/checkout@v4
@@ -48,16 +48,16 @@ jobs:
4848
shell: bash
4949
run: |
5050
mvn clean verify \
51-
-P with-integration-tests \
51+
-P with-integration-tests,with-ainode \
5252
-DskipUTs \
53-
-DintegrationTest.forkCount=2 \
54-
-pl integration-test \
53+
-DintegrationTest.forkCount=1 \
54+
-pl integration-test,iotdb-core/ainode \
5555
-am \
5656
-PAIClusterIT
5757
- name: Upload Artifact
5858
if: failure()
5959
uses: actions/upload-artifact@v4
6060
with:
6161
name: cluster-log-ainode-${{ matrix.os }}
62-
path: integration-test/target/ainode-logs
62+
path: integration-test/target/*-logs
6363
retention-days: 30

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

Lines changed: 15 additions & 13 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:
4444
- uses: actions/checkout@v4
4545
- name: Set up JDK ${{ matrix.java }}
4646
uses: actions/setup-java@v4
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

.github/workflows/compile-check.yml

Lines changed: 13 additions & 11 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:
4444
- uses: actions/checkout@v4
4545
- name: Set up JDK ${{ matrix.java }}
4646
uses: actions/setup-java@v4
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)