Skip to content

Commit 4ad3215

Browse files
jt2594838jt2594838
committed
Merge branch 'master' into force_ci/alter_column_datatype
# Conflicts: # iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AlignedWritableMemChunk.java
2 parents 2b69da1 + edbf08e commit 4ad3215

File tree

415 files changed

+10771
-4775
lines changed

Some content is hidden

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

415 files changed

+10771
-4775
lines changed

‎.asf.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ github:
3131
features:
3232
wiki: true
3333
issues: true
34+
discussions: true
3435
enabled_merge_buttons:
3536
# enable squash button:
3637
squash: true
@@ -48,3 +49,5 @@ github:
4849
- Wei-hao-Li
4950
- Colinleeo
5051
- Caideyipi
52+
notifications:
53+
discussions: [email protected]

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
fail-fast: false
4646
max-parallel: 15
4747
matrix:
48-
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, windows-2019, windows-2022, macos-latest]
48+
os: [ubuntu-22.04, ubuntu-24.04, windows-2019, windows-2022, macos-latest]
4949
runs-on: ${{ matrix.os}}
5050

5151
steps:
@@ -97,7 +97,7 @@ jobs:
9797
./mvnw clean verify -P with-cpp -pl iotdb-client/client-cpp,example/client-cpp-example -am -Diotdb-tools-thrift.version=0.14.1.1-glibc223-SNAPSHOT
9898
elif [[ "${{ matrix.os }}" == "windows-2019" ]]; then
9999
./mvnw clean verify -P with-cpp -pl iotdb-client/client-cpp,example/client-cpp-example -am -Diotdb-tools-thrift.version=0.14.1.1-msvc142-SNAPSHOT -Dcmake.generator="Visual Studio 16 2019"
100-
else
100+
else
101101
./mvnw clean verify -P with-cpp -pl iotdb-client/client-cpp,example/client-cpp-example -am
102102
fi
103103
- name: Upload Artifact
@@ -127,18 +127,18 @@ jobs:
127127
- name: Integration test
128128
shell: bash
129129
run: |
130-
cd iotdb-client
131-
git clone https://github.com/apache/iotdb-client-go.git
132-
cd iotdb-client-go
130+
cd iotdb-client
131+
git clone https://github.com/apache/iotdb-client-go.git
132+
cd iotdb-client-go
133133
make e2e_test_for_parent_git_repo e2e_test_clean_for_parent_git_repo
134134
135135
python:
136136
strategy:
137137
fail-fast: false
138138
max-parallel: 15
139139
matrix:
140-
python: [ '3.6', '3.x' ]
141-
runs-on: ${{ (matrix.python == '3.6' && 'ubuntu-20.04') || 'ubuntu-latest' }}
140+
python: ['3.x']
141+
runs-on: ${{ 'ubuntu-latest' }}
142142

143143
steps:
144144
- uses: actions/setup-python@v5

‎.github/workflows/pipe-it.yml‎

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,15 @@ jobs:
102102
-am -PMultiClusterIT1 \
103103
-ntp >> ~/run-tests-$attempt.log && return 0
104104
test_output=$(cat ~/run-tests-$attempt.log)
105-
106-
mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/
107105
108106
echo "==================== BEGIN: ~/run-tests-$attempt.log ===================="
109107
echo "$test_output"
110108
echo "==================== END: ~/run-tests-$attempt.log ======================"
111109
110+
if ! mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/ 2>/dev/null; then
111+
echo "Failed to move log file ~/run-tests-$attempt.log to integration-test/target/cluster-logs/. Skipping..."
112+
fi
113+
112114
if echo "$test_output" | grep -q "Could not transfer artifact"; then
113115
if [ $attempt -lt $max_attempts ]; then
114116
echo "Test failed with artifact transfer issue, attempt $attempt. Retrying in $retry_sleep seconds..."
@@ -184,11 +186,13 @@ jobs:
184186
-ntp >> ~/run-tests-$attempt.log && return 0
185187
test_output=$(cat ~/run-tests-$attempt.log)
186188
187-
mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/
188-
189189
echo "==================== BEGIN: ~/run-tests-$attempt.log ===================="
190190
echo "$test_output"
191191
echo "==================== END: ~/run-tests-$attempt.log ======================"
192+
193+
if ! mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/ 2>/dev/null; then
194+
echo "Failed to move log file ~/run-tests-$attempt.log to integration-test/target/cluster-logs/. Skipping..."
195+
fi
192196
193197
if echo "$test_output" | grep -q "Could not transfer artifact"; then
194198
if [ $attempt -lt $max_attempts ]; then
@@ -286,13 +290,15 @@ jobs:
286290
-am -PMultiClusterIT2DualTreeAutoEnhanced \
287291
-ntp >> ~/run-tests-$attempt.log && return 0
288292
test_output=$(cat ~/run-tests-$attempt.log)
289-
290-
mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/
291293
292294
echo "==================== BEGIN: ~/run-tests-$attempt.log ===================="
293295
echo "$test_output"
294296
echo "==================== END: ~/run-tests-$attempt.log ======================"
295297
298+
if ! mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/ 2>/dev/null; then
299+
echo "Failed to move log file ~/run-tests-$attempt.log to integration-test/target/cluster-logs/. Skipping..."
300+
fi
301+
296302
if echo "$test_output" | grep -q "Could not transfer artifact"; then
297303
if [ $attempt -lt $max_attempts ]; then
298304
echo "Test failed with artifact transfer issue, attempt $attempt. Retrying in $retry_sleep seconds..."
@@ -389,13 +395,15 @@ jobs:
389395
-am -PMultiClusterIT2DualTreeManual \
390396
-ntp >> ~/run-tests-$attempt.log && return 0
391397
test_output=$(cat ~/run-tests-$attempt.log)
392-
393-
mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/
394398
395399
echo "==================== BEGIN: ~/run-tests-$attempt.log ===================="
396400
echo "$test_output"
397401
echo "==================== END: ~/run-tests-$attempt.log ======================"
398402
403+
if ! mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/ 2>/dev/null; then
404+
echo "Failed to move log file ~/run-tests-$attempt.log to integration-test/target/cluster-logs/. Skipping..."
405+
fi
406+
399407
if echo "$test_output" | grep -q "Could not transfer artifact"; then
400408
if [ $attempt -lt $max_attempts ]; then
401409
echo "Test failed with artifact transfer issue, attempt $attempt. Retrying in $retry_sleep seconds..."
@@ -472,12 +480,14 @@ jobs:
472480
-ntp >> ~/run-tests-$attempt.log && return 0
473481
test_output=$(cat ~/run-tests-$attempt.log)
474482
475-
mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/
476-
477483
echo "==================== BEGIN: ~/run-tests-$attempt.log ===================="
478484
echo "$test_output"
479485
echo "==================== END: ~/run-tests-$attempt.log ======================"
480486
487+
if ! mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/ 2>/dev/null; then
488+
echo "Failed to move log file ~/run-tests-$attempt.log to integration-test/target/cluster-logs/. Skipping..."
489+
fi
490+
481491
if echo "$test_output" | grep -q "Could not transfer artifact"; then
482492
if [ $attempt -lt $max_attempts ]; then
483493
echo "Test failed with artifact transfer issue, attempt $attempt. Retrying in $retry_sleep seconds..."
@@ -554,12 +564,14 @@ jobs:
554564
-ntp >> ~/run-tests-$attempt.log && return 0
555565
test_output=$(cat ~/run-tests-$attempt.log)
556566
557-
mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/
558-
559567
echo "==================== BEGIN: ~/run-tests-$attempt.log ===================="
560568
echo "$test_output"
561569
echo "==================== END: ~/run-tests-$attempt.log ======================"
562570
571+
if ! mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/ 2>/dev/null; then
572+
echo "Failed to move log file ~/run-tests-$attempt.log to integration-test/target/cluster-logs/. Skipping..."
573+
fi
574+
563575
if echo "$test_output" | grep -q "Could not transfer artifact"; then
564576
if [ $attempt -lt $max_attempts ]; then
565577
echo "Test failed with artifact transfer issue, attempt $attempt. Retrying in $retry_sleep seconds..."
@@ -636,12 +648,14 @@ jobs:
636648
-ntp >> ~/run-tests-$attempt.log && return 0
637649
test_output=$(cat ~/run-tests-$attempt.log)
638650
639-
mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/
640-
641651
echo "==================== BEGIN: ~/run-tests-$attempt.log ===================="
642652
echo "$test_output"
643653
echo "==================== END: ~/run-tests-$attempt.log ======================"
644654
655+
if ! mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/ 2>/dev/null; then
656+
echo "Failed to move log file ~/run-tests-$attempt.log to integration-test/target/cluster-logs/. Skipping..."
657+
fi
658+
645659
if echo "$test_output" | grep -q "Could not transfer artifact"; then
646660
if [ $attempt -lt $max_attempts ]; then
647661
echo "Test failed with artifact transfer issue, attempt $attempt. Retrying in $retry_sleep seconds..."
@@ -717,12 +731,14 @@ jobs:
717731
-ntp >> ~/run-tests-$attempt.log && return 0
718732
test_output=$(cat ~/run-tests-$attempt.log)
719733
720-
mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/
721-
722734
echo "==================== BEGIN: ~/run-tests-$attempt.log ===================="
723735
echo "$test_output"
724736
echo "==================== END: ~/run-tests-$attempt.log ======================"
725737
738+
if ! mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/ 2>/dev/null; then
739+
echo "Failed to move log file ~/run-tests-$attempt.log to integration-test/target/cluster-logs/. Skipping..."
740+
fi
741+
726742
if echo "$test_output" | grep -q "Could not transfer artifact"; then
727743
if [ $attempt -lt $max_attempts ]; then
728744
echo "Test failed with artifact transfer issue, attempt $attempt. Retrying in $retry_sleep seconds..."
@@ -798,12 +814,14 @@ jobs:
798814
-ntp >> ~/run-tests-$attempt.log && return 0
799815
test_output=$(cat ~/run-tests-$attempt.log)
800816
801-
mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/
802-
803817
echo "==================== BEGIN: ~/run-tests-$attempt.log ===================="
804818
echo "$test_output"
805819
echo "==================== END: ~/run-tests-$attempt.log ======================"
806820
821+
if ! mv ~/run-tests-$attempt.log integration-test/target/cluster-logs/ 2>/dev/null; then
822+
echo "Failed to move log file ~/run-tests-$attempt.log to integration-test/target/cluster-logs/. Skipping..."
823+
fi
824+
807825
if echo "$test_output" | grep -q "Could not transfer artifact"; then
808826
if [ $attempt -lt $max_attempts ]; then
809827
echo "Test failed with artifact transfer issue, attempt $attempt. Retrying in $retry_sleep seconds..."

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ see [Frequent Questions when Compiling the Source Code](https://iotdb.apache.org
511511
512512
### Wechat Group
513513
514-
* Add friend: `tietouqiao` or `liutaohua001`, and then we'll invite you to the group.
514+
* Add friend: `apache_iotdb`, and then we'll invite you to the group.
515515
516516
### Slack
517517

‎README_ZH.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ server 可以使用 "ctrl-C" 或者执行下面的脚本:
392392
393393
### Wechat Group
394394
395-
* 添加好友 `tietouqiao` 或者 `liutaohua001`，我们会邀请您进群
395+
* 添加好友 `apache_iotdb`，我们会邀请您进群
396396
397397
### Slack
398398

‎code-coverage/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.iotdb</groupId>
2626
<artifactId>iotdb-parent</artifactId>
27-
<version>2.0.2-SNAPSHOT</version>
27+
<version>2.0.4-SNAPSHOT</version>
2828
</parent>
2929
<artifactId>iotdb-code-coverage</artifactId>
3030
<packaging>pom</packaging>

‎distribution/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.iotdb</groupId>
2626
<artifactId>iotdb-parent</artifactId>
27-
<version>2.0.2-SNAPSHOT</version>
27+
<version>2.0.4-SNAPSHOT</version>
2828
</parent>
2929
<artifactId>iotdb-distribution</artifactId>
3030
<packaging>pom</packaging>
@@ -33,25 +33,25 @@
3333
<dependency>
3434
<groupId>org.apache.iotdb</groupId>
3535
<artifactId>iotdb-server</artifactId>
36-
<version>2.0.2-SNAPSHOT</version>
36+
<version>2.0.4-SNAPSHOT</version>
3737
<type>zip</type>
3838
</dependency>
3939
<dependency>
4040
<groupId>org.apache.iotdb</groupId>
4141
<artifactId>iotdb-cli</artifactId>
42-
<version>2.0.2-SNAPSHOT</version>
42+
<version>2.0.4-SNAPSHOT</version>
4343
<type>zip</type>
4444
</dependency>
4545
<dependency>
4646
<groupId>org.apache.iotdb</groupId>
4747
<artifactId>iotdb-confignode</artifactId>
48-
<version>2.0.2-SNAPSHOT</version>
48+
<version>2.0.4-SNAPSHOT</version>
4949
<type>zip</type>
5050
</dependency>
5151
<dependency>
5252
<groupId>org.apache.iotdb</groupId>
5353
<artifactId>library-udf</artifactId>
54-
<version>2.0.2-SNAPSHOT</version>
54+
<version>2.0.4-SNAPSHOT</version>
5555
</dependency>
5656
</dependencies>
5757
<build>
@@ -174,7 +174,7 @@
174174
<dependency>
175175
<groupId>org.apache.iotdb</groupId>
176176
<artifactId>iotdb-ainode</artifactId>
177-
<version>2.0.2-SNAPSHOT</version>
177+
<version>2.0.4-SNAPSHOT</version>
178178
</dependency>
179179
</dependencies>
180180
<build>

‎example/client-cpp-example/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.iotdb</groupId>
2626
<artifactId>iotdb-examples</artifactId>
27-
<version>2.0.2-SNAPSHOT</version>
27+
<version>2.0.4-SNAPSHOT</version>
2828
</parent>
2929
<artifactId>client-cpp-example</artifactId>
3030
<name>IoTDB: Example: CPP Client</name>

‎example/jdbc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.iotdb</groupId>
2626
<artifactId>iotdb-examples</artifactId>
27-
<version>2.0.2-SNAPSHOT</version>
27+
<version>2.0.4-SNAPSHOT</version>
2828
</parent>
2929
<artifactId>jdbc-example</artifactId>
3030
<name>IoTDB: Example: JDBC</name>

‎example/mqtt-customize/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.iotdb</groupId>
2626
<artifactId>iotdb-examples</artifactId>
27-
<version>2.0.2-SNAPSHOT</version>
27+
<version>2.0.4-SNAPSHOT</version>
2828
</parent>
2929
<artifactId>customize-mqtt-example</artifactId>
3030
<name>IoTDB: Example: Customized MQTT</name>

0 commit comments

Comments
 (0)