Skip to content

Commit baa7c4e

Browse files
committed
Merge branch 'master' of https://github.com/apache/iotdb into show-pipe-memory
# Conflicts: # integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java
2 parents d3b0233 + 0c0116a commit baa7c4e

1,115 files changed

Lines changed: 82788 additions & 29386 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/scripts/test-edge-ops.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,8 +438,6 @@ def test_edge_ops_are_executable_and_only_in_edge_packages(self):
438438
)
439439
for descriptor in (
440440
"distribution/src/assembly/all.xml",
441-
"distribution/src/assembly/datanode.xml",
442-
"distribution/src/assembly/confignode.xml",
443441
"iotdb-core/datanode/src/assembly/server.xml",
444442
"iotdb-core/confignode/src/assembly/confignode.xml",
445443
):

‎.github/workflows/multi-language-client.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- master
77
- "rc/*"
88
paths:
9+
- 'pom.xml'
910
- 'iotdb-client/pom.xml'
1011
- 'iotdb-client/client-py/**'
1112
- 'iotdb-client/client-cpp/**'
@@ -20,6 +21,7 @@ on:
2021
- "rc/*"
2122
- 'force_ci/**'
2223
paths:
24+
- 'pom.xml'
2325
- 'iotdb-client/pom.xml'
2426
- 'iotdb-client/client-py/**'
2527
- 'iotdb-client/client-cpp/**'
@@ -80,7 +82,7 @@ jobs:
8082
go=false
8183
while IFS= read -r file; do
8284
case "$file" in
83-
iotdb-client/pom.xml|iotdb-client/client-cpp/*|iotdb-protocol/thrift-datanode/src/main/thrift/client.thrift|iotdb-protocol/thrift-commons/src/main/thrift/common.thrift|.github/workflows/multi-language-client.yml|.github/workflows/client-cpp-package.yml|.github/scripts/package-client-cpp-*.sh)
85+
pom.xml|iotdb-client/pom.xml|iotdb-client/client-cpp/*|iotdb-protocol/thrift-datanode/src/main/thrift/client.thrift|iotdb-protocol/thrift-commons/src/main/thrift/common.thrift|.github/workflows/multi-language-client.yml|.github/workflows/client-cpp-package.yml|.github/scripts/package-client-cpp-*.sh)
8486
cpp=true
8587
;;
8688
esac
@@ -108,7 +110,7 @@ jobs:
108110
fail-fast: false
109111
max-parallel: 15
110112
matrix:
111-
os: [ubuntu-22.04, ubuntu-24.04, windows-2022, windows-2025-vs2026, macos-latest]
113+
os: [ubuntu-22.04, ubuntu-24.04, ubuntu-22.04-arm, windows-2022, windows-2025-vs2026, macos-latest]
112114
runs-on: ${{ matrix.os}}
113115

114116
steps:
@@ -182,8 +184,8 @@ jobs:
182184
uses: actions/cache@v5
183185
with:
184186
path: ~/.m2
185-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
186-
restore-keys: ${{ runner.os }}-m2-
187+
key: ${{ runner.os }}-${{ runner.arch }}-m2-${{ hashFiles('**/pom.xml') }}
188+
restore-keys: ${{ runner.os }}-${{ runner.arch }}-m2-
187189
- name: Check C++ format (Spotless)
188190
shell: bash
189191
run: |
@@ -209,7 +211,7 @@ jobs:
209211
if: failure()
210212
uses: actions/upload-artifact@v6
211213
with:
212-
name: cpp-IT-${{ runner.os }}
214+
name: cpp-IT-${{ matrix.os }}
213215
path: distribution/target/apache-iotdb-*-all-bin/apache-iotdb-*-all-bin/logs
214216
retention-days: 1
215217

‎.mvn/extensions.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<extension>
2424
<groupId>com.gradle</groupId>
2525
<artifactId>develocity-maven-extension</artifactId>
26-
<version>1.22.2</version>
26+
<version>2.6.0</version>
2727
</extension>
2828
<extension>
2929
<groupId>com.gradle</groupId>

‎LICENSE-binary‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,8 @@ Apache License 2.0
218218
commons-cli:commons-cli:1.5.0
219219
com.google.code.gson:gson:2.13.1
220220
com.google.guava.guava:32.1.2-jre
221+
com.google.guava:failureaccess:1.0.3
222+
com.google.guava:guava:33.6.0-jre
221223
com.fasterxml.jackson.core:jackson-annotations:2.16.2
222224
com.fasterxml.jackson.core:jackson-core:2.16.2
223225
com.fasterxml.jackson.core:jackson-databind:2.16.2
@@ -230,7 +232,7 @@ io.swagger.core.v3:swagger-integration-jakarta:2.2.50
230232
io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.50
231233
io.swagger.core.v3:swagger-models-jakarta:2.2.50
232234
jakarta.inject:jakarta.inject-api:2.0.1
233-
at.yawk.lz4:lz4-java:1.11.1
235+
at.yawk.lz4:lz4-java:1.11.4
234236
com.github.ben-manes.caffeine:caffeine:2.9.3
235237
org.eclipse.jetty:jetty-http:12.0.36
236238
org.eclipse.jetty:jetty-io:12.0.36
@@ -241,7 +243,7 @@ org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.36
241243
org.eclipse.jetty:jetty-util:12.0.36
242244
com.google.code.findbugs:jsr305:3.0.2
243245
com.librato.metrics:librato-java:2.1.0
244-
org.apache.thrift:libthrift:0.24.0
246+
org.apache.thrift:libthrift:0.25.0
245247
io.dropwizard.metrics:metrics-core:4.2.19
246248
io.dropwizard.metrics:metrics-jvm:3.2.2
247249
com.librato.metrics:metrics-librato:5.1.0
@@ -257,9 +259,8 @@ io.netty:netty-transport:4.1.137.Final
257259
io.netty:netty-transport-native-epoll:4.1.137.Final:linux-aarch_64
258260
io.netty:netty-transport-native-epoll:4.1.137.Final:linux-x86_64
259261
io.netty:netty-transport-native-unix-common:4.1.137.Final
260-
org.osgi:org.osgi.core:7.0.0
261-
org.osgi:osgi.cmpn:7.0.0
262-
org.ops4j.pax.jdbc:pax-jdbc-common:1.5.6
262+
org.jspecify:jspecify:1.0.0
263+
org.jctools:jctools-core:4.0.5
263264
org.xerial.snappy:snappy-java:1.1.10.5
264265
io.airlift.airline:0.9
265266

@@ -292,8 +293,22 @@ EPL 2.0
292293
------------
293294
ch.qos.logback:logback-classic:1.5.34
294295
ch.qos.logback:logback-core:1.5.34
296+
com.digitalpetri.fsm:strict-machine:1.0.0
297+
com.digitalpetri.netty:netty-channel-fsm:1.0.2
295298
jakarta.annotation:jakarta.annotation-api:3.0.0
296299
jakarta.servlet:jakarta.servlet-api:6.0.0
300+
org.eclipse.milo:milo-guava-dependencies:1.1.6
301+
org.eclipse.milo:milo-sdk-client:1.1.6
302+
org.eclipse.milo:milo-sdk-core:1.1.6
303+
org.eclipse.milo:milo-sdk-server:1.1.6
304+
org.eclipse.milo:milo-stack-core:1.1.6
305+
org.eclipse.milo:milo-transport:1.1.6
306+
307+
Bouncy Castle Licence
308+
------------
309+
org.bouncycastle:bcpkix-jdk18on:1.84
310+
org.bouncycastle:bcprov-jdk18on:1.84
311+
org.bouncycastle:bcutil-jdk18on:1.84
297312

298313
EDL 1.0
299314
------------

0 commit comments

Comments
 (0)