ci(client-cpp): fix glibc217 toolchain; replace glibc224 with glibc228 packages

Use manylinux image default gcc/g++ without GLIBCXX macros. glibc228 builds on manylinux_2_28 (glibc max 2.28). Remove IOTDB_EXTRA_CXX_FLAGS wiring.

Author: hongzhi-gao

.github/scripts/package-client-cpp-manylinux-glibc217.sh

@@ -14,11 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Legacy libstdc++ ABI (_GLIBCXX_USE_CXX11_ABI=0) on manylinux2014; max glibc 2.17.
+# manylinux2014 baseline package; image default toolchain; max glibc 2.17.
 set -euxo pipefail
 
 MAX_GLIBC=2.17
-IOTDB_EXTRA_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0
 
 MACHINE=$(uname -m)
 case "${MACHINE}" in
@@ -64,31 +63,18 @@ fi
 export PATH="${CMAKE_DIR}/bin:${JAVA_HOME}/bin:${PATH}"
 export JAVA_HOME
 
-# manylinux images expose gcc under devtoolset paths, not /usr/bin/gcc.
-SYSTEM_GCC=$(command -v gcc)
-SYSTEM_GXX=$(command -v g++)
-if [[ -z "${SYSTEM_GCC}" || ! -x "${SYSTEM_GCC}" ]]; then
-  echo "ERROR: gcc not found on PATH" >&2
-  exit 1
-fi
-if [[ -z "${SYSTEM_GXX}" || ! -x "${SYSTEM_GXX}" ]]; then
-  echo "ERROR: g++ not found on PATH" >&2
-  exit 1
-fi
-
-export CC="${SYSTEM_GCC}"
-export CXX="${SYSTEM_GXX}"
-
-"${SYSTEM_GCC}" --version
-"${SYSTEM_GXX}" --version
+echo "=== Toolchain (image default) ==="
+command -v gcc g++ || true
+gcc --version | head -1
+g++ --version | head -1
+g++ -dM -E -x c++ /dev/null | grep GLIBCXX_USE_CXX11_ABI || true
 cmake --version
 java -version
 
 cd "${GITHUB_WORKSPACE:?GITHUB_WORKSPACE is not set}"
 ./mvnw clean package -P with-cpp -pl iotdb-client/client-cpp -am -DskipTests \
   -Dspotless.skip=true \
-  -Dclient.cpp.package.classifier="${PACKAGE_CLASSIFIER}" \
-  "-Diotdb.extra.cxx.flags=${IOTDB_EXTRA_CXX_FLAGS}"
+  -Dclient.cpp.package.classifier="${PACKAGE_CLASSIFIER}"
 
 SO="iotdb-client/client-cpp/target/install/lib/libiotdb_session.so"
 test -f "${SO}"
@@ -116,7 +102,7 @@ fi
 
 echo "glibc compatibility check passed (max=${max_glibc} <= ${MAX_GLIBC})"
 
-echo "=== Optional example link test (legacy ABI) ==="
+echo "=== Example link test (image default g++) ==="
 INSTALL_ROOT="${GITHUB_WORKSPACE}/iotdb-client/client-cpp/target/install"
 EXAMPLE_SRC="${GITHUB_WORKSPACE}/example/client-cpp-example/src"
 LINKTEST_BUILD="/tmp/client-cpp-example-linktest-glibc217"
@@ -125,8 +111,7 @@ mkdir -p "${LINKTEST_BUILD}"
 unset CC CXX CFLAGS CXXFLAGS
 "${CMAKE_DIR}/bin/cmake" -S "${EXAMPLE_SRC}" -B "${LINKTEST_BUILD}" \
   -DCMAKE_BUILD_TYPE=Release \
-  -DIOTDB_SDK_ROOT="${INSTALL_ROOT}" \
-  -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0
+  -DIOTDB_SDK_ROOT="${INSTALL_ROOT}"
 "${CMAKE_DIR}/bin/cmake" --build "${LINKTEST_BUILD}" --target SessionExample -j"$(nproc)"
 test -x "${LINKTEST_BUILD}/SessionExample"
 echo "Example link test passed"

…package-client-cpp-manylinux-glibc224.sh …package-client-cpp-manylinux-glibc228.sh.github/scripts/package-client-cpp-manylinux-glibc224.sh renamed to .github/scripts/package-client-cpp-manylinux-glibc228.sh .github/scripts/package-client-cpp-manylinux-glibc224.sh renamed to .github/scripts/package-client-cpp-manylinux-glibc228.sh

@@ -14,23 +14,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# cxx11 libstdc++ ABI on manylinux_2_24; max glibc 2.24.
+# manylinux_2_28 baseline package; image default toolchain; max glibc 2.28.
 set -euxo pipefail
 
-MAX_GLIBC=2.24
-IOTDB_EXTRA_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=1
+MAX_GLIBC=2.28
 
 MACHINE=$(uname -m)
 case "${MACHINE}" in
   x86_64)
     CMAKE_PKG_ARCH=linux-x86_64
     JDK_API_ARCH=linux/x64
-    DEFAULT_CLASSIFIER=linux-x86_64-glibc224
+    DEFAULT_CLASSIFIER=linux-x86_64-glibc228
     ;;
   aarch64)
     CMAKE_PKG_ARCH=linux-aarch64
     JDK_API_ARCH=linux/aarch64
-    DEFAULT_CLASSIFIER=linux-aarch64-glibc224
+    DEFAULT_CLASSIFIER=linux-aarch64-glibc228
     ;;
   *)
     echo "Unsupported architecture: ${MACHINE}" >&2
@@ -64,30 +63,18 @@ fi
 export PATH="${CMAKE_DIR}/bin:${JAVA_HOME}/bin:${PATH}"
 export JAVA_HOME
 
-SYSTEM_GCC=$(command -v gcc)
-SYSTEM_GXX=$(command -v g++)
-if [[ -z "${SYSTEM_GCC}" || ! -x "${SYSTEM_GCC}" ]]; then
-  echo "ERROR: gcc not found on PATH" >&2
-  exit 1
-fi
-if [[ -z "${SYSTEM_GXX}" || ! -x "${SYSTEM_GXX}" ]]; then
-  echo "ERROR: g++ not found on PATH" >&2
-  exit 1
-fi
-
-export CC="${SYSTEM_GCC}"
-export CXX="${SYSTEM_GXX}"
-
-"${SYSTEM_GCC}" --version
-"${SYSTEM_GXX}" --version
+echo "=== Toolchain (image default) ==="
+command -v gcc g++ || true
+gcc --version | head -1
+g++ --version | head -1
+g++ -dM -E -x c++ /dev/null | grep GLIBCXX_USE_CXX11_ABI || true
 cmake --version
 java -version
 
 cd "${GITHUB_WORKSPACE:?GITHUB_WORKSPACE is not set}"
 ./mvnw clean package -P with-cpp -pl iotdb-client/client-cpp -am -DskipTests \
   -Dspotless.skip=true \
-  -Dclient.cpp.package.classifier="${PACKAGE_CLASSIFIER}" \
-  "-Diotdb.extra.cxx.flags=${IOTDB_EXTRA_CXX_FLAGS}"
+  -Dclient.cpp.package.classifier="${PACKAGE_CLASSIFIER}"
 
 SO="iotdb-client/client-cpp/target/install/lib/libiotdb_session.so"
 test -f "${SO}"
@@ -115,17 +102,16 @@ fi
 
 echo "glibc compatibility check passed (max=${max_glibc} <= ${MAX_GLIBC})"
 
-echo "=== Optional example link test (cxx11 ABI) ==="
+echo "=== Example link test (image default g++) ==="
 INSTALL_ROOT="${GITHUB_WORKSPACE}/iotdb-client/client-cpp/target/install"
 EXAMPLE_SRC="${GITHUB_WORKSPACE}/example/client-cpp-example/src"
-LINKTEST_BUILD="/tmp/client-cpp-example-linktest-glibc224"
+LINKTEST_BUILD="/tmp/client-cpp-example-linktest-glibc228"
 rm -rf "${LINKTEST_BUILD}"
 mkdir -p "${LINKTEST_BUILD}"
 unset CC CXX CFLAGS CXXFLAGS
 "${CMAKE_DIR}/bin/cmake" -S "${EXAMPLE_SRC}" -B "${LINKTEST_BUILD}" \
   -DCMAKE_BUILD_TYPE=Release \
-  -DIOTDB_SDK_ROOT="${INSTALL_ROOT}" \
-  -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=1
+  -DIOTDB_SDK_ROOT="${INSTALL_ROOT}"
 "${CMAKE_DIR}/bin/cmake" --build "${LINKTEST_BUILD}" --target SessionExample -j"$(nproc)"
 test -x "${LINKTEST_BUILD}/SessionExample"
 echo "Example link test passed"

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

@@ -257,33 +257,33 @@ jobs:
           path: ${{ steps.pkg.outputs.path }}
           if-no-files-found: error
 
-  package-linux-glibc224:
-    name: Package (linux-x86_64-glibc224)
+  package-linux-glibc228:
+    name: Package (linux-x86_64-glibc228)
     needs: [should-package, resolve-matrix]
     if: needs.should-package.outputs.run == 'true' && needs.resolve-matrix.outputs.run_linux == 'true'
-    # Checkout/cache on host; build in manylinux_2_24 via docker run (glibc 2.24 baseline, cxx11 ABI).
+    # Checkout/cache on host; build in manylinux_2_28 via docker run (glibc 2.28 baseline).
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
       - name: Cache Maven packages
         uses: actions/cache@v5
         with:
           path: ~/.m2
-          key: linux-glibc224-m2-${{ hashFiles('**/pom.xml') }}
+          key: linux-glibc228-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            linux-glibc224-m2-
-      - name: Package client-cpp (glibc 2.24 baseline, cxx11 ABI)
+            linux-glibc228-m2-
+      - name: Package client-cpp (glibc 2.28 baseline)
         shell: bash
         run: |
           set -euxo pipefail
-          chmod +x .github/scripts/package-client-cpp-manylinux-glibc224.sh
+          chmod +x .github/scripts/package-client-cpp-manylinux-glibc228.sh
           docker run --rm \
             -v "${{ github.workspace }}:/workspace" \
             -v "${HOME}/.m2:/root/.m2" \
             -w /workspace \
             -e GITHUB_WORKSPACE=/workspace \
-            quay.io/pypa/manylinux_2_24_x86_64 \
-            bash .github/scripts/package-client-cpp-manylinux-glibc224.sh
+            quay.io/pypa/manylinux_2_28_x86_64 \
+            bash .github/scripts/package-client-cpp-manylinux-glibc228.sh
       - name: Restore workspace ownership after container build
         if: always()
         run: sudo chown -R "$(id -u):$(id -g)" "${{ github.workspace }}"
@@ -293,7 +293,7 @@ jobs:
         run: |
           set -euo pipefail
           shopt -s nullglob
-          zips=(iotdb-client/client-cpp/target/client-cpp-*-linux-x86_64-glibc224.zip)
+          zips=(iotdb-client/client-cpp/target/client-cpp-*-linux-x86_64-glibc228.zip)
           if [ "${#zips[@]}" -ne 1 ]; then
             echo "Expected exactly one package zip, got: ${zips[*]:-(none)}"
             exit 1
@@ -307,33 +307,33 @@ jobs:
           path: ${{ steps.pkg.outputs.path }}
           if-no-files-found: error
 
-  package-linux-aarch64-glibc224:
-    name: Package (linux-aarch64-glibc224)
+  package-linux-aarch64-glibc228:
+    name: Package (linux-aarch64-glibc228)
     needs: [should-package, resolve-matrix]
     if: needs.should-package.outputs.run == 'true' && needs.resolve-matrix.outputs.run_linux == 'true'
-    # Checkout/cache on host; build in manylinux_2_24 aarch64 via docker run.
+    # Checkout/cache on host; build in manylinux_2_28 aarch64 via docker run.
     runs-on: ubuntu-22.04-arm
     steps:
       - uses: actions/checkout@v5
       - name: Cache Maven packages
         uses: actions/cache@v5
         with:
           path: ~/.m2
-          key: linux-aarch64-glibc224-m2-${{ hashFiles('**/pom.xml') }}
+          key: linux-aarch64-glibc228-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            linux-aarch64-glibc224-m2-
-      - name: Package client-cpp (glibc 2.24 baseline, cxx11 ABI)
+            linux-aarch64-glibc228-m2-
+      - name: Package client-cpp (glibc 2.28 baseline)
         shell: bash
         run: |
           set -euxo pipefail
-          chmod +x .github/scripts/package-client-cpp-manylinux-glibc224.sh
+          chmod +x .github/scripts/package-client-cpp-manylinux-glibc228.sh
           docker run --rm \
             -v "${{ github.workspace }}:/workspace" \
             -v "${HOME}/.m2:/root/.m2" \
             -w /workspace \
             -e GITHUB_WORKSPACE=/workspace \
-            quay.io/pypa/manylinux_2_24_aarch64 \
-            bash .github/scripts/package-client-cpp-manylinux-glibc224.sh
+            quay.io/pypa/manylinux_2_28_aarch64 \
+            bash .github/scripts/package-client-cpp-manylinux-glibc228.sh
       - name: Restore workspace ownership after container build
         if: always()
         run: sudo chown -R "$(id -u):$(id -g)" "${{ github.workspace }}"
@@ -343,7 +343,7 @@ jobs:
         run: |
           set -euo pipefail
           shopt -s nullglob
-          zips=(iotdb-client/client-cpp/target/client-cpp-*-linux-aarch64-glibc224.zip)
+          zips=(iotdb-client/client-cpp/target/client-cpp-*-linux-aarch64-glibc228.zip)
           if [ "${#zips[@]}" -ne 1 ]; then
             echo "Expected exactly one package zip, got: ${zips[*]:-(none)}"
             exit 1

example/client-cpp-example/README.md

@@ -47,20 +47,19 @@ publishes one zip per platform/toolchain:
 
 | Deployment target | Classifier suffix |
 |-------------------|-------------------|
-| Linux x86_64, glibc ≥ 2.24 (default g++, cxx11 ABI) | `linux-x86_64-glibc224` |
-| Linux aarch64, glibc ≥ 2.24 (default g++, cxx11 ABI) | `linux-aarch64-glibc224` |
-| Linux x86_64, glibc ≥ 2.17 (legacy ABI, app needs `-D_GLIBCXX_USE_CXX11_ABI=0`) | `linux-x86_64-glibc217` |
-| Linux aarch64, glibc ≥ 2.17 (legacy ABI) | `linux-aarch64-glibc217` |
+| Linux x86_64, glibc ≥ 2.28 (default g++) | `linux-x86_64-glibc228` |
+| Linux aarch64, glibc ≥ 2.28 (default g++) | `linux-aarch64-glibc228` |
+| Linux x86_64, glibc ≥ 2.17 (legacy libstdc++ ABI) | `linux-x86_64-glibc217` |
+| Linux aarch64, glibc ≥ 2.17 (legacy libstdc++ ABI) | `linux-aarch64-glibc217` |
 | macOS x86_64 | `mac-x86_64` |
 | macOS arm64 | `mac-aarch64` |
 | Windows (match your Visual Studio version) | `windows-x86_64-vs2017` … `vs2026` |
 
 The current build compiles Thrift 0.21 from source at CMake configure time.
 Legacy `-Diotdb-tools-thrift.version=...` flags applied to the **old**
-pre-built Thrift workflow only. On Linux, prefer **`glibc224`** when your
-distro has glibc ≥ 2.24 and you build with the default compiler ABI. Use
-**`glibc217`** only when the target host cannot run glibc 2.24+ binaries or
-when you must match the legacy libstdc++ ABI (`-D_GLIBCXX_USE_CXX11_ABI=0`).
+pre-built Thrift workflow only. On Linux, prefer **`glibc228`** when your
+distro has glibc ≥ 2.28 and you build with the system default `g++`. Use
+**`glibc217`** only when the target host cannot run glibc 2.28+ binaries.
 See [client-cpp README](../../iotdb-client/client-cpp/README.md).
 
 ## SDK layout (after unpack)

example/client-cpp-example/README_zh.md

@@ -46,19 +46,19 @@ CI 发版（[client-cpp-package.yml](../../.github/workflows/client-cpp-package.
 
 | 目标环境 | classifier 后缀 |
 |----------|-----------------|
-| Linux x86_64，glibc ≥ 2.24（默认 g++，cxx11 ABI） | `linux-x86_64-glibc224` |
-| Linux aarch64，glibc ≥ 2.24（默认 g++，cxx11 ABI） | `linux-aarch64-glibc224` |
-| Linux x86_64，glibc ≥ 2.17（旧 ABI，应用需 `-D_GLIBCXX_USE_CXX11_ABI=0`） | `linux-x86_64-glibc217` |
-| Linux aarch64，glibc ≥ 2.17（旧 ABI） | `linux-aarch64-glibc217` |
+| Linux x86_64，glibc ≥ 2.28（默认 g++） | `linux-x86_64-glibc228` |
+| Linux aarch64，glibc ≥ 2.28（默认 g++） | `linux-aarch64-glibc228` |
+| Linux x86_64，glibc ≥ 2.17（旧 libstdc++ ABI） | `linux-x86_64-glibc217` |
+| Linux aarch64，glibc ≥ 2.17（旧 libstdc++ ABI） | `linux-aarch64-glibc217` |
 | macOS x86_64 | `mac-x86_64` |
 | macOS arm64 | `mac-aarch64` |
 | Windows + 与工程相同的 VS 版本 | `windows-x86_64-vs2017` … `vs2026` |
 
 当前 CMake 构建在配置阶段从源码编译 Thrift 0.21，**不再**通过
 `-Diotdb-tools-thrift.version=0.14.1.1-gcc4-SNAPSHOT` 等旧参数控制 glibc。
-Linux 上若目标机 glibc ≥ 2.24 且使用默认编译器 ABI，请优先选用
-**`glibc224`** 包；仅当目标机无法使用 glibc 2.24+ 二进制，或必须与旧
-libstdc++ ABI（`-D_GLIBCXX_USE_CXX11_ABI=0`）一致时，才选用 **`glibc217`** 包。
+Linux 上若目标机 glibc ≥ 2.28 且使用系统默认 `g++`，请优先选用
+**`glibc228`** 包；仅当目标机无法使用 glibc 2.28+ 二进制时，才选用
+**`glibc217`** 包。应用侧无需设置额外的 ABI 编译宏。
 详见 [client-cpp README](../../iotdb-client/client-cpp/README.md)。
 
 ## SDK 目录结构（解压后）

iotdb-client/client-cpp/CMakeLists.txt

@@ -34,9 +34,6 @@ endif()
 
 if(NOT MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -O2")
-    if(IOTDB_EXTRA_CXX_FLAGS)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IOTDB_EXTRA_CXX_FLAGS}")
-    endif()
 endif()
 
 if(MSVC)
@@ -47,9 +44,6 @@ endif()
 option(WITH_SSL "Build with OpenSSL support" OFF)
 option(BUILD_TESTING "Build IT test executables" OFF)
 option(IOTDB_OFFLINE "Disable all network access during configure" OFF)
-# e.g. -D_GLIBCXX_USE_CXX11_ABI=0 for legacy Linux release zips (Maven: -Diotdb.extra.cxx.flags=...)
-set(IOTDB_EXTRA_CXX_FLAGS ""
-    CACHE STRING "Extra flags appended to CMAKE_CXX_FLAGS (libstdc++ ABI, etc.)")
 
 set(IOTDB_DEPS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third-party"
     CACHE PATH "Local tarball cache for third-party dependencies (lives under client-cpp/)")