Skip to content

Commit 085ac9d

Browse files
committed
Merge remote-tracking branch 'upstream/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
2 parents 6d5fb38 + 68fc992 commit 085ac9d

2,216 files changed

Lines changed: 136574 additions & 31218 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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ jobs:
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:
4646
distribution: corretto
4747
java-version: 17
4848
env:
4949
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5050
- name: Cache Maven packages
51-
uses: actions/cache@v4
51+
uses: actions/cache@v5
5252
with:
5353
path: ~/.m2
5454
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -82,7 +82,7 @@ jobs:
8282
-am
8383
- name: Upload Artifact
8484
if: failure()
85-
uses: actions/upload-artifact@v4
85+
uses: actions/upload-artifact@v6
8686
with:
8787
name: standalone-log-java${{ matrix.java }}-${{ runner.os }}
8888
path: integration-test/target/cluster-logs

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,7 @@ jobs:
4040
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: |
@@ -56,7 +53,7 @@ jobs:
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 }}
6259
path: integration-test/target/*-logs

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ jobs:
4141
# group: self-hosted
4242
# 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:
4848
distribution: corretto
4949
java-version: ${{ matrix.java }}
@@ -62,7 +62,7 @@ jobs:
6262
-am -PClusterIT
6363
- name: Upload Artifact
6464
if: failure()
65-
uses: actions/upload-artifact@v4
65+
uses: actions/upload-artifact@v6
6666
with:
6767
name: cluster-log-java${{ matrix.java }}-${{ runner.os }}
6868
path: integration-test/target/cluster-logs

.github/workflows/compile-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ jobs:
4141
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:
4848
distribution: corretto
4949
java-version: ${{ matrix.java }}

0 commit comments

Comments
 (0)