fix(client-cpp): correct glibc224 CXX11 ABI check and Maven flag wiring

Author: hongzhi-gao

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

@@ -18,7 +18,6 @@
 set -euxo pipefail
 
 MAX_GLIBC=2.24
-IOTDB_EXTRA_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=1
 
 MACHINE=$(uname -m)
 case "${MACHINE}" in
@@ -76,17 +75,29 @@ 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}"
+  -Diotdb.libstdcxx.cxx11.abi=ON
 
 SO="iotdb-client/client-cpp/target/install/lib/libiotdb_session.so"
 test -f "${SO}"
 
-echo "=== libstdc++ ABI check (cxx11: must contain __cxx11) ==="
-if ! nm -C "${SO}" 2>/dev/null | grep -q '__cxx11'; then
-  echo "ERROR: cxx11 ABI build must contain __cxx11 symbols in ${SO}"
-  exit 1
+echo "=== libstdc++ ABI check (cxx11: mangled names must contain __cxx11) ==="
+# Use mangled symbol names: "nm -C" demangles std::__cxx11::basic_string to std::string
+# and hides __cxx11 even when the library was built with the new ABI.
+_abi_has_cxx11() {
+  nm -a "$1" 2>/dev/null | grep -q '__cxx11'
+}
+if _abi_has_cxx11 "${SO}"; then
+  echo "ABI check passed (__cxx11 in ${SO})"
+else
+  SESSION_OBJ=$(find "${GITHUB_WORKSPACE}/iotdb-client/client-cpp/target" \
+    -path '*/iotdb_session.dir/src/session/Session.cpp.o' -print -quit 2>/dev/null || true)
+  if [[ -n "${SESSION_OBJ}" ]] && _abi_has_cxx11 "${SESSION_OBJ}"; then
+    echo "ABI check passed (__cxx11 in ${SESSION_OBJ}; .so has minimal symbol table)"
+  else
+    echo "ERROR: cxx11 ABI build must contain __cxx11 symbols in ${SO} (or Session.cpp.o)"
+    exit 1
+  fi
 fi
-echo "ABI check passed (__cxx11 symbols present)"
 
 echo "=== Build host glibc ==="
 ldd --version 2>&1 | sed -n '1p'

iotdb-client/client-cpp/CMakeLists.txt

@@ -32,8 +32,17 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE)
 endif()
 
+set(IOTDB_EXTRA_CXX_FLAGS ""
+    CACHE STRING "Extra flags appended to CMAKE_CXX_FLAGS")
+option(IOTDB_LIBSTDCXX_CXX11_ABI
+        "Use libstdc++ dual-ABI new layout (_GLIBCXX_USE_CXX11_ABI=1); release glibc224 zips"
+        OFF)
+
 if(NOT MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -O2")
+    if(IOTDB_LIBSTDCXX_CXX11_ABI)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=1")
+    endif()
     if(IOTDB_EXTRA_CXX_FLAGS)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IOTDB_EXTRA_CXX_FLAGS}")
     endif()
@@ -47,8 +56,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)
-set(IOTDB_EXTRA_CXX_FLAGS ""
-    CACHE STRING "Extra flags appended to CMAKE_CXX_FLAGS (e.g. libstdc++ ABI for release zips)")
 
 set(IOTDB_DEPS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third-party"
     CACHE PATH "Local tarball cache for third-party dependencies (lives under client-cpp/)")
@@ -187,3 +194,4 @@ message(STATUS "    THRIFT_INCLUDE_DIR    = ${THRIFT_INCLUDE_DIR}")
 message(STATUS "    THRIFT_STATIC_LIB     = ${THRIFT_STATIC_LIB_PATH}")
 message(STATUS "    THRIFT_EXECUTABLE     = ${THRIFT_EXECUTABLE}")
 message(STATUS "    CMAKE_INSTALL_PREFIX  = ${CMAKE_INSTALL_PREFIX}")
+message(STATUS "    IOTDB_LIBSTDCXX_CXX11_ABI = ${IOTDB_LIBSTDCXX_CXX11_ABI}")

iotdb-client/client-cpp/README.md

@@ -117,7 +117,7 @@ Linux x86_64 (glibc 2.24 + CXX11 ABI — match `manylinux_2_24` release builds):
 ```bash
 mvn -P with-cpp -pl iotdb-client/client-cpp -am -DskipTests \
   -Dclient.cpp.package.classifier=linux-x86_64-glibc224 \
-  -Diotdb.extra.cxx.flags=-D_GLIBCXX_USE_CXX11_ABI=1 package
+  -Diotdb.libstdcxx.cxx11.abi=ON package
 ```
 
 Linux x86_64 (glibc 2.17 + legacy ABI — CentOS 7 / manylinux2014):

iotdb-client/client-cpp/cmake/FetchThrift.cmake

@@ -123,7 +123,9 @@ if(MSVC)
             "-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL")
 else()
     set(_thrift_cxxflags "-fPIC")
-    if(IOTDB_EXTRA_CXX_FLAGS MATCHES "_GLIBCXX_USE_CXX11_ABI=0")
+    if(IOTDB_LIBSTDCXX_CXX11_ABI)
+        set(_thrift_cxxflags "-D_GLIBCXX_USE_CXX11_ABI=1 -fPIC")
+    elseif(IOTDB_EXTRA_CXX_FLAGS MATCHES "_GLIBCXX_USE_CXX11_ABI=0")
         set(_thrift_cxxflags "-D_GLIBCXX_USE_CXX11_ABI=0 -fPIC")
     elseif(IOTDB_EXTRA_CXX_FLAGS MATCHES "_GLIBCXX_USE_CXX11_ABI=1")
         set(_thrift_cxxflags "-D_GLIBCXX_USE_CXX11_ABI=1 -fPIC")

iotdb-client/client-cpp/pom.xml

@@ -55,7 +55,8 @@
         <!-- Optional convenience: when a user still passes -Dboost.include.dir=...
              (legacy CLI from the old build), feed it to CMake as BOOST_INCLUDEDIR. -->
         <boost.include.dir></boost.include.dir>
-        <!-- Release Linux glibc224: -Diotdb.extra.cxx.flags=-D_GLIBCXX_USE_CXX11_ABI=1 -->
+        <!-- Release Linux glibc224: -Diotdb.libstdcxx.cxx11.abi=ON -->
+        <iotdb.libstdcxx.cxx11.abi>OFF</iotdb.libstdcxx.cxx11.abi>
         <iotdb.extra.cxx.flags></iotdb.extra.cxx.flags>
         <!-- Override via -Dclient.cpp.package.classifier=... for per-toolchain release zips. -->
         <client.cpp.package.classifier>${os.classifier}</client.cpp.package.classifier>
@@ -94,6 +95,7 @@
                                 <option>-DIOTDB_DEPS_DIR=${iotdb.deps.dir}</option>
                                 <option>-DBOOST_INCLUDEDIR=${boost.include.dir}</option>
                                 <option>-DCMAKE_POLICY_DEFAULT_CMP0091=NEW</option>
+                                <option>-DIOTDB_LIBSTDCXX_CXX11_ABI=${iotdb.libstdcxx.cxx11.abi}</option>
                                 <option>-DIOTDB_EXTRA_CXX_FLAGS=${iotdb.extra.cxx.flags}</option>
                             </options>
                         </configuration>