merge master

.github/workflows/client-cpp.yml

@@ -31,12 +31,12 @@ env:
   MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3
 
 jobs:
-  build-unix:
+  Test:
     strategy:
       fail-fast: false
       max-parallel: 20
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os}}
 
     steps:
@@ -45,62 +45,41 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
         shell: bash
         run: sudo apt-get update && sudo apt-get install libboost-all-dev
-      - name: Install CPP Dependencies (Mac)`
+      - name: Install CPP Dependencies (Mac)
         if: matrix.os == 'macos-latest'
         shell: bash
         run: |
           brew install boost
           brew install bison
-          echo 'export PATH="/usr/local/opt/bison/bin:$PATH"' >> ~/.bash_profile
-          source ~/.bash_profile && export LDFLAGS="-L/usr/local/opt/bison/lib"
-          brew install openssl
-      - name: Cache Maven packages
-        uses: actions/cache@v4
-        with:
-          path: ~/.m2
-          key: client-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2-
-      - name: Build IoTDB server
-        # Explicitly using mvnw here as the build requires maven 3.9 and the default installation is older
-        # Explicitly using "install" instead of package in order to be sure we're using libs built on this machine
-        # (was causing problems on windows, but could cause problem on linux, when updating the thrift module)
-        run: ./mvnw clean install -P with-cpp -pl distribution,example/client-cpp-example -am -DskipTests
-      - name: Test with Maven
-        # Explicitly using mvnw here as the build requires maven 3.9 and the default installation is older
-        run: ./mvnw clean verify -P with-cpp -pl iotdb-client/client-cpp -am
-      - name: Show test result
-        if: failure()
-        run: cat iotdb-client/client-cpp/target/build/test/Testing/Temporary/LastTest_*.log
-
-  build-win:
-    runs-on: windows-latest
-
-    steps:
-      - uses: actions/checkout@v4
+          echo 'export PATH="/opt/homebrew/opt/bison/bin:$PATH"' >> ~/.bash_profile
+          source ~/.bash_profile && export LDFLAGS="-L/opt/homebrew/opt/bison/lib"
+      - name: Install CPP Dependencies (Windows)
+        if: matrix.os == 'windows-latest'
+        run: |
+          choco install winflexbison3
+          choco install boost-msvc-14.3 --version=1.84.0.1
+          echo C:\\local\\boost_1_84_0 >> $env:GITHUB_PATH
       - name: Cache Maven packages
         uses: actions/cache@v4
         with:
           path: ~/.m2
           key: client-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2-
-      - name: Install Win_Flex_Bison
-        run: choco install winflexbison3
-      - name: Download Boost
-        run: choco install boost-msvc-14.3 --version=1.84.0.1
-      - name: Build IoTDB server
+      - name: Build IoTDB server and client
         shell: bash
         # Explicitly using mvnw here as the build requires maven 3.9 and the default installation is older
         # Explicitly using "install" instead of package in order to be sure we're using libs built on this machine
         # (was causing problems on windows, but could cause problem on linux, when updating the thrift module)
-        run: ./mvnw clean install -P with-cpp -pl distribution,example/client-cpp-example -am -DskipTests -D"boost.include.dir"="C:\local\boost_1_84_0" -D"boost.library.dir"="C:\local\boost_1_84_0\stage\lib"
+        run: ./mvnw clean install -P with-cpp -pl distribution,example/client-cpp-example -am -DskipTests
       - name: Test with Maven
         shell: bash
         # Explicitly using mvnw here as the build requires maven 3.9 and the default installation is older
-        run: ./mvnw clean verify -P with-cpp -pl iotdb-client/client-cpp -am -D"boost.include.dir"="C:\local\boost_1_84_0" -D"boost.library.dir"="C:\local\boost_1_84_0\stage\lib"
+        run: ./mvnw clean verify -P with-cpp -pl iotdb-client/client-cpp -am
       - name: Upload Artifact
         if: failure()
         uses: actions/upload-artifact@v4
         with:
           name: cpp-IT-${{ runner.os }}
           path: iotdb-client/client-cpp/target/build/test/Testing
           retention-days: 1
+

.github/workflows/client-go.yml

@@ -31,10 +31,7 @@ env:
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
 jobs:
-  unix:
-    strategy:
-      fail-fast: false
-      max-parallel: 20
+  Test:
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/client-python.yml

@@ -30,7 +30,7 @@ env:
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
 jobs:
-  unix:
+  Test:
     runs-on: ubuntu-latest
 
     steps:

.mvn/wrapper/maven-wrapper.properties

@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

Jenkinsfile

@@ -169,7 +169,7 @@ pipeline {
             steps {
                 echo 'Deploying'
                 // Deploy the artifacts using the wagon-maven-plugin.
-                sh 'mvn -f jenkins.pom -X -P deploy-snapshots wagon:upload -P get-jar-with-dependencies'
+                sh 'until mvn -f jenkins.pom -X -P deploy-snapshots wagon:upload || (( count++ >= 5 )); do echo "Retrying to deploy"; done'
             }
         }
 

README.md

@@ -40,6 +40,8 @@ IoTDB (Internet of Things Database) is a data management system for time series
 
 [Click for More Information](https://www.timecho.com/archives/shi-xu-shu-ju-ku-iotdb-gong-neng-xiang-jie-yu-xing-ye-ying-yong)
 
+IoTDB depends on [TsFile](https://github.com/apache/tsfile) which is a columnar storage file format designed for time series data. The branch `iotdb` of TsFile project is used to deploy SNAPSHOT version for IoTDB project.
+
 # Main Features
 
 The main features of IoTDB are as follows:

README_ZH.md

@@ -38,6 +38,8 @@
 IoTDB (Internet of Things Database) 是一款时序数据库管理系统，可以为用户提供数据收集、存储和分析等服务。IoTDB由于其轻量级架构、高性能和高可用的特性，以及与 Hadoop 和 Spark 生态的无缝集成，满足了工业 IoT 领域中海量数据存储、高吞吐量数据写入和复杂数据查询分析的需求。
 更多功能请见[时序数据库IoTDB：功能详解与行业应用](https://www.timecho.com/archives/shi-xu-shu-ju-ku-iotdb-gong-neng-xiang-jie-yu-xing-ye-ying-yong)。
 
+IoTDB 依赖 [TsFile](https://github.com/apache/tsfile) 项目，它是一种专门用于时序数据管理的文件格式. TsFile 仓库的 `iotdb` 分支被用来为 IoTDB master 分支部署 SNAPSHOT 版本.
+
 # 主要特点
 
 IoTDB的主要特点如下: