[Chore](thirdparty) upgrade glog

be/CMakeLists.txt

@@ -68,6 +68,7 @@ endif()
 
 # enable glog custom prefix
 add_definitions(-DGLOG_CUSTOM_PREFIX_SUPPORT)
+add_definitions(-DGLOG_USE_GLOG_EXPORT)
 
 # Options
 option(GLIBC_COMPATIBILITY "Enable compatibility with older glibc libraries." ON)

be/src/common/signal_handler.h

@@ -418,7 +418,7 @@ void FailureSignalHandler(int signal_number, siginfo_t* signal_info, void* ucont
 
     // Flush the logs before we do anything in case 'anything'
     // causes problems.
-    google::FlushLogFilesUnsafe(0);
+    google::FlushLogFilesUnsafe(google::GLOG_INFO);
 
     // Kill ourself by the default signal handler.
     InvokeDefaultSignalHandler(signal_number);

cloud/CMakeLists.txt

@@ -396,6 +396,7 @@ endif()
 
 # enable glog custom prefix
 add_definitions(-DGLOG_CUSTOM_PREFIX_SUPPORT)
+add_definitions(-DGLOG_USE_GLOG_EXPORT)
 
 set(FDB_VERSIONS "7.1.57" "7.3.69")
 set(FDB_DEFAULT_VERSION "7.1.57")

thirdparty/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This file contains version of the third-party dependency libraries in the build-env image. The docker build-env image is apache/doris, and the tag is `build-env-${version}`
 
+## 20260202
+
+- Modified: glog 0.6.0 -> 0.7.1
+
 ## 20151222
 
 - Added: timsort (cpp-TimSort 3.x.y)

thirdparty/build-thirdparty.sh

@@ -493,13 +493,19 @@ build_glog() {
 
         make -j "${PARALLEL}"
         make install
-    elif [[ "${GLOG_SOURCE}" == "glog-0.6.0" ]]; then
+    elif [[ "${GLOG_SOURCE}" == "glog-0.6.0" ]] || [[ "${GLOG_SOURCE}" == "glog-0.7.1" ]]; then
+        if [[ "${GLOG_SOURCE}" == "glog-0.7.1" ]]; then
+            WITH_UNWIND_FLAG="-DWITH_UNWIND=none"
+        else
+            WITH_UNWIND_FLAG="-DWITH_UNWIND=OFF"
+        fi
+
         LDFLAGS="-L${TP_LIB_DIR}" \
-            "${CMAKE_CMD}" -S . -B build -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="${TP_INSTALL_DIR}" \
+        "${CMAKE_CMD}" -S . -B build -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="${TP_INSTALL_DIR}" \
             -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
             -DCMAKE_BUILD_TYPE=Release \
+            ${WITH_UNWIND_FLAG} \
             -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-            -DWITH_UNWIND=OFF \
             -DBUILD_SHARED_LIBS=OFF \
             -DWITH_TLS=OFF
 
@@ -863,7 +869,9 @@ build_brpc() {
     # If glog is compiled before gflags, the above error will not exist, this works in glog 0.4,
     # but glog 0.6 enforces dependency on gflags.
     # glog must be enabled, otherwise error: `flag 'v' was defined more than once` (in files 'glog-0.6.0/src/vlog_is_on.cc' and 'brpc-1.6.0/src/butil/logging.cc')
-    LDFLAGS="${ldflags}" \
+    CFLAGS="-DGLOG_USE_GLOG_EXPORT" \
+        CXXFLAGS="-DGLOG_USE_GLOG_EXPORT" \
+        LDFLAGS="${ldflags}" \
         "${CMAKE_CMD}" -G "${GENERATOR}" -DBUILD_SHARED_LIBS=ON -DWITH_GLOG=ON -DCMAKE_INSTALL_PREFIX="${TP_INSTALL_DIR}" \
         -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
         -DCMAKE_LIBRARY_PATH="${TP_INSTALL_DIR}/lib64" -DCMAKE_INCLUDE_PATH="${TP_INSTALL_DIR}/include" \
@@ -1076,7 +1084,9 @@ build_arrow() {
         ldflags="-L${TP_LIB_DIR}"
     fi
 
-    LDFLAGS="${ldflags}" \
+    CFLAGS="-DGLOG_USE_GLOG_EXPORT" \
+        CXXFLAGS="-DGLOG_USE_GLOG_EXPORT" \
+        LDFLAGS="${ldflags}" \
         "${CMAKE_CMD}" -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
         -G "${GENERATOR}" -DARROW_PARQUET=ON -DARROW_IPC=ON -DARROW_BUILD_SHARED=OFF \
         -DARROW_BUILD_STATIC=ON -DARROW_WITH_BROTLI=ON -DARROW_WITH_LZ4=ON -DARROW_USE_GLOG=ON \
@@ -1160,7 +1170,9 @@ build_s2() {
 
     rm -rf CMakeCache.txt CMakeFiles/
 
-    LDFLAGS="-L${TP_LIB_DIR}" \
+    CFLAGS="-DGLOG_USE_GLOG_EXPORT" \
+        CXXFLAGS="-DGLOG_USE_GLOG_EXPORT" \
+        LDFLAGS="-L${TP_LIB_DIR}" \
         ${CMAKE_CMD} -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
         -G "${GENERATOR}" -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="${TP_INSTALL_DIR}" \
         -DCMAKE_PREFIX_PATH="${TP_INSTALL_DIR}" \

thirdparty/download-thirdparty.sh

@@ -265,6 +265,13 @@ if [[ " ${TP_ARCHIVES[*]} " =~ " GLOG " ]]; then
             touch "${PATCHED_MARK}"
         fi
         cd -
+    elif [[ "${GLOG_SOURCE}" == "glog-0.7.1" ]]; then
+        cd "${TP_SOURCE_DIR}/${GLOG_SOURCE}"
+        if [[ ! -f "${PATCHED_MARK}" ]]; then
+            patch -p1 <"${TP_PATCH_DIR}/glog-0.7.1.patch"
+            touch "${PATCHED_MARK}"
+        fi
+        cd -
     fi
     echo "Finished patching ${GLOG_SOURCE}"
 fi

thirdparty/patches/brpc-1.4.0-cxx14.patch

@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -152,12 +152,12 @@ macro(use_cxx11)
+ if(CMAKE_VERSION VERSION_LESS "3.1.3")
+     if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+     endif()
+     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+     endif()
+ else()
+-    set(CMAKE_CXX_STANDARD 11)
++    set(CMAKE_CXX_STANDARD 14)
+     set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ endif()
+ endmacro(use_cxx11)

thirdparty/patches/brpc-1.4.0-glog-export.patch

@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -141,7 +141,7 @@
+     endif()
+ endif()
+
+-set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} ${DEFINE_CLOCK_GETTIME} -DBRPC_WITH_GLOG=${WITH_GLOG_VAL} -DBRPC_WITH_RDMA=${WITH_RDMA_VAL} -DGFLAGS_NS=${GFLAGS_NS}")
++set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} ${DEFINE_CLOCK_GETTIME} -DBRPC_WITH_GLOG=${WITH_GLOG_VAL} -DBRPC_WITH_RDMA=${WITH_RDMA_VAL} -DGFLAGS_NS=${GFLAGS_NS} -DGLOG_USE_GLOG_EXPORT")
+ if(WITH_MESALINK)
+     set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -DUSE_MESALINK")
+ endif()