From d8bac9f40e2987a727e04b7bfed987f147a3007c Mon Sep 17 00:00:00 2001 From: githubzilla Date: Fri, 5 Dec 2025 14:08:17 +0800 Subject: [PATCH 1/3] Update data_substrate --- data_substrate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data_substrate b/data_substrate index 213ff3a99fe..aecb88866f9 160000 --- a/data_substrate +++ b/data_substrate @@ -1 +1 @@ -Subproject commit 213ff3a99fe2074b137e58c4e8f4f13f25cf0b5e +Subproject commit aecb88866f91ce693f76accc4d46a6aa11ec974d From 4274ba8ecc8b3f5dd01ce6e84680a94db13d6efd Mon Sep 17 00:00:00 2001 From: githubzilla Date: Mon, 9 Feb 2026 11:28:04 +0800 Subject: [PATCH 2/3] chore: update data_substrate: extend log retention --- data_substrate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data_substrate b/data_substrate index 444082871e6..d70a2639d23 160000 --- a/data_substrate +++ b/data_substrate @@ -1 +1 @@ -Subproject commit 444082871e6a4e42634c01f6e1da845530248c95 +Subproject commit d70a2639d23eff3af370a702fdf00b750b6d614c From f7058cb9f06ff2277eac6c52261ac1e9b30f7eac Mon Sep 17 00:00:00 2001 From: githubzilla Date: Wed, 11 Feb 2026 12:33:22 +0800 Subject: [PATCH 3/3] Fix libboost_context mismatch when both asan and normal libs coexists --- sql/CMakeLists.txt | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 9c9c58b4495..34d3a49df71 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -104,10 +104,6 @@ else() remove_definitions(-DIOURING_ENABLED) endif() -IF(COROUTINE_ENABLED) - find_package(Boost REQUIRED COMPONENTS context) -ENDIF() - IF(ELOQ_MODULE_ENABLED) find_path(BRPC_INCLUDE_PATH NAMES brpc/stream.h) find_library(BRPC_LIB NAMES brpc) @@ -283,12 +279,28 @@ SET(SQL_DEP_LIBS ) IF(COROUTINE_ENABLED) - SET(SQL_DEP_LIBS ${SQL_DEP_LIBS} Boost::context) set(SQL_INCLUDE_DIR ${Boost_INCLUDE_DIRS}) if (WITH_ASAN) # Boost stackful contexts need to switch to the ucontext backend when # ASAN is enabled, otherwise fcontext symbols are missing at link time. set(SQL_USE_ASAN_UCONTEXT ON) + find_library(Boost_CONTEXT_ASAN_LIBRARY + NAMES boost_context-asan + ) + if (NOT Boost_CONTEXT_ASAN_LIBRARY) + message(FATAL_ERROR + "libboost_context-asan not found in system library paths") + endif () + message("Boost_CONTEXT_ASAN_LIBRARY: ${Boost_CONTEXT_ASAN_LIBRARY}") + SET(SQL_DEP_LIBS ${SQL_DEP_LIBS} ${Boost_CONTEXT_ASAN_LIBRARY}) + else() + find_library(Boost_CONTEXT_LIBRARY NAMES boost_context) + if (NOT Boost_CONTEXT_LIBRARY) + message(FATAL_ERROR + "libboost_context not found in system library paths") + endif () + message("Boost_CONTEXT_LIBRARY: ${Boost_CONTEXT_LIBRARY}") + SET(SQL_DEP_LIBS ${SQL_DEP_LIBS} ${Boost_CONTEXT_LIBRARY}) endif() ENDIF()