ci fix

Author: hongzhi-gao

.github/workflows/client-cpp-package.yml

@@ -88,7 +88,9 @@ jobs:
           set -euxo pipefail
           sudo apt-get update
           sudo apt-get install -y libboost-all-dev openssl libssl-dev clang-format-17
-          clang-format-17 --version
+          sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-17 100
+          sudo update-alternatives --set clang-format /usr/bin/clang-format-17
+          clang-format --version
       - name: Cache Maven packages
         uses: actions/cache@v5
         with:
@@ -133,6 +135,7 @@ jobs:
         run: |
           set -euxo pipefail
           brew install boost openssl llvm@17
+          ln -sf "$(brew --prefix llvm@17)/bin/clang-format" "$(brew --prefix)/bin/clang-format"
           echo "$(brew --prefix llvm@17)/bin" >> "$GITHUB_PATH"
           clang-format --version
       - name: Cache Maven packages
@@ -193,7 +196,7 @@ jobs:
           $sslPath = (Get-ChildItem 'C:\Program Files\OpenSSL*' -Directory | Select-Object -First 1).FullName
           echo "$sslPath\bin" >> $env:GITHUB_PATH
           echo "OPENSSL_ROOT_DIR=$sslPath" >> $env:GITHUB_ENV
-          choco install llvm --version=17.0.6 -y
+          choco install llvm --version=17.0.6 --force -y
           clang-format --version
       - name: Cache Maven packages
         uses: actions/cache@v5

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

@@ -57,14 +57,18 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libboost-all-dev
           sudo apt-get install -y openssl libssl-dev clang-format-17
-          clang-format-17 --version
+          # Align default /usr/bin/clang-format with 17.x (Apache TsFile CI pattern; avoids Spotless picking 18.x)
+          sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-17 100
+          sudo update-alternatives --set clang-format /usr/bin/clang-format-17
+          clang-format --version
       - name: Install CPP Dependencies (Mac)
         # remove some xcode to release disk space
         if: runner.os == 'macOS'
         shell: bash
         run: |
           brew install boost
           brew install openssl llvm@17
+          ln -sf "$(brew --prefix llvm@17)/bin/clang-format" "$(brew --prefix)/bin/clang-format"
           echo "$(brew --prefix llvm@17)/bin" >> "$GITHUB_PATH"
           clang-format --version
           sudo rm -rf /Applications/Xcode_14.3.1.app
@@ -84,7 +88,7 @@ jobs:
           $sslPath = (Get-ChildItem 'C:\Program Files\OpenSSL*' -Directory | Select-Object -First 1).FullName
           echo "$sslPath\bin" >> $env:GITHUB_PATH
           echo "OPENSSL_ROOT_DIR=$sslPath" >> $env:GITHUB_ENV
-          choco install llvm --version=17.0.6 -y
+          choco install llvm --version=17.0.6 --force -y
           clang-format --version
       - name: Cache Maven packages
         uses: actions/cache@v5

CONTRIBUTING.md

@@ -110,7 +110,7 @@ plugin](https://github.com/diffplug/spotless/tree/main/plugin-maven) together wi
 ### C++ formatting
 
 - Formatter: `clang-format` only
-- Version: `17.0.6` (must match CI)
+- Version: pinned as `clang.format.version` in the root `pom.xml` (currently `17.0.6`, aligned with Apache TsFile); CI installs LLVM/clang-format so the default `clang-format` on the runner matches that version
 - Entrypoint: Maven Spotless
 
 Check only:

iotdb-client/client-cpp/README.md

@@ -102,13 +102,19 @@ We use `clang-format` as the only formatter for C++ code and trigger it through
 
 ### Required version
 
-Use `clang-format 17.0.6` locally to keep behavior consistent with CI.
+The version is pinned in the root `pom.xml` as property `clang.format.version` (same approach as Apache TsFile). Use **clang-format 17.0.6** locally so Spotless agrees with CI.
 
 ### Install clang-format 17.0.6
 
-- Linux (Ubuntu): `sudo apt-get install -y clang-format-17`
-- macOS: `brew install llvm@17` and make sure `clang-format` from `llvm@17` is in `PATH`
-- Windows: `choco install llvm --version=17.0.6 -y`
+- Linux (Ubuntu): `sudo apt-get install -y clang-format-17`, then point the default `clang-format` at 17.x (Spotless invokes `clang-format` on `PATH`, and Ubuntu may ship 18.x as the default):
+
+  `sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-17 100`
+
+  `sudo update-alternatives --set clang-format /usr/bin/clang-format-17`
+
+- macOS: `brew install llvm@17`, then e.g. `ln -sf "$(brew --prefix llvm@17)/bin/clang-format" "$(brew --prefix)/bin/clang-format"` and/or put `$(brew --prefix llvm@17)/bin` on your `PATH`.
+
+- Windows: `choco install llvm --version=17.0.6 --force -y` (CI uses `--force` like TsFile so the expected LLVM is selected).
 
 ### Validate only (no changes)
 

pom.xml

@@ -150,6 +150,8 @@
         <!-- Override this to `true`, if you want to disable spotless -->
         <spotless.skip>false</spotless.skip>
         <spotless.version>2.44.5</spotless.version>
+        <!-- C++: same pin as Apache TsFile (Spotless clang-format step). CI should expose this via PATH (see workflows). -->
+        <clang.format.version>17.0.6</clang.format.version>
         <!-- This was the last version to support Java 8 -->
         <swagger.version>1.6.14</swagger.version>
         <thrift.exec-cmd.executable>chmod</thrift.exec-cmd.executable>
@@ -844,7 +846,7 @@
                                 <include>src/**/*.cpp</include>
                             </includes>
                             <clangFormat>
-                                <version>17.0.6</version>
+                                <version>${clang.format.version}</version>
                                 <style>file</style>
                             </clangFormat>
                         </cpp>