From 2251abe4ee06ec9fb1609e160f5acec9c2e04a14 Mon Sep 17 00:00:00 2001 From: "velox4j-bot[bot]" <199176381+velox4j-bot[bot]@users.noreply.github.com> Date: Thu, 16 Apr 2026 06:01:47 +0000 Subject: [PATCH 1/4] [BOT] Bump Velox version --- src/main/cpp/velox-ref-md5.txt | 2 +- src/main/cpp/velox-ref.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/cpp/velox-ref-md5.txt b/src/main/cpp/velox-ref-md5.txt index 9910302a2..3f72b0162 100644 --- a/src/main/cpp/velox-ref-md5.txt +++ b/src/main/cpp/velox-ref-md5.txt @@ -1 +1 @@ -db3b302b3e465f7c8bdf2b1fd89e081b +ec8bf87e9bea7d28c0be20d758e4cd08 diff --git a/src/main/cpp/velox-ref.txt b/src/main/cpp/velox-ref.txt index 5d6a89850..d1b6587d6 100644 --- a/src/main/cpp/velox-ref.txt +++ b/src/main/cpp/velox-ref.txt @@ -1 +1 @@ -62a76362bcfc296a7c35506ad72b1d625c68f682 +45a03a6a0009c5343ad3421fb9f0c7275e9c8ec6 From 0ee842f272851c62e8b1783323e8d9082d3a070d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 07:36:31 +0000 Subject: [PATCH 2/4] Revert Velox version to fix GCC 7 symbol error on CentOS 7 Agent-Logs-Url: https://github.com/boostscale/velox4j/sessions/ed808636-3a41-4004-8416-059983691f7e Co-authored-by: zhztheplayer <11284395+zhztheplayer@users.noreply.github.com> --- src/main/cpp/velox-ref-md5.txt | 2 +- src/main/cpp/velox-ref.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/cpp/velox-ref-md5.txt b/src/main/cpp/velox-ref-md5.txt index 3f72b0162..9910302a2 100644 --- a/src/main/cpp/velox-ref-md5.txt +++ b/src/main/cpp/velox-ref-md5.txt @@ -1 +1 @@ -ec8bf87e9bea7d28c0be20d758e4cd08 +db3b302b3e465f7c8bdf2b1fd89e081b diff --git a/src/main/cpp/velox-ref.txt b/src/main/cpp/velox-ref.txt index d1b6587d6..5d6a89850 100644 --- a/src/main/cpp/velox-ref.txt +++ b/src/main/cpp/velox-ref.txt @@ -1 +1 @@ -45a03a6a0009c5343ad3421fb9f0c7275e9c8ec6 +62a76362bcfc296a7c35506ad72b1d625c68f682 From 0f1a852e1acfc26b43825013f4c7f8092e753b91 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 09:06:21 +0000 Subject: [PATCH 3/4] Switch Velox to 45ae84bf to fix GCC 11.2 lambda typeinfo symbol error Agent-Logs-Url: https://github.com/boostscale/velox4j/sessions/b04a3e13-bb2f-4d58-9a72-f532c4748bc1 Co-authored-by: zhztheplayer <11284395+zhztheplayer@users.noreply.github.com> --- src/main/cpp/velox-ref-md5.txt | 2 +- src/main/cpp/velox-ref.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/cpp/velox-ref-md5.txt b/src/main/cpp/velox-ref-md5.txt index 9910302a2..fecc7fae1 100644 --- a/src/main/cpp/velox-ref-md5.txt +++ b/src/main/cpp/velox-ref-md5.txt @@ -1 +1 @@ -db3b302b3e465f7c8bdf2b1fd89e081b +cb55aa6b0bccbb3d96b589bcb2c9c888 diff --git a/src/main/cpp/velox-ref.txt b/src/main/cpp/velox-ref.txt index 5d6a89850..9b6a93e30 100644 --- a/src/main/cpp/velox-ref.txt +++ b/src/main/cpp/velox-ref.txt @@ -1 +1 @@ -62a76362bcfc296a7c35506ad72b1d625c68f682 +45ae84bf9304e834e30e32cac3285c47fde925a2 From c89915469d6e6471db8ce9324a0fac6843ea0a2f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 12:08:27 +0000 Subject: [PATCH 4/4] Revert Velox to 45a03a6a and apply GCC bug #103186 fix patch to IConfig.h Agent-Logs-Url: https://github.com/boostscale/velox4j/sessions/391f3fa5-f775-4db5-b50b-6c6aa5434573 Co-authored-by: zhztheplayer <11284395+zhztheplayer@users.noreply.github.com> --- src/main/cpp/CMakeLists.txt | 4 +- .../velox/iconfig-gcc-bug-103186.patch | 38 +++++++++++++++++++ src/main/cpp/velox-ref-md5.txt | 2 +- src/main/cpp/velox-ref.txt | 2 +- 4 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 src/main/cpp/cmake/patches/velox/iconfig-gcc-bug-103186.patch diff --git a/src/main/cpp/CMakeLists.txt b/src/main/cpp/CMakeLists.txt index 21b42344d..3f95f2f21 100644 --- a/src/main/cpp/CMakeLists.txt +++ b/src/main/cpp/CMakeLists.txt @@ -78,7 +78,9 @@ set(VELOX_SOURCE_URL FetchContent_Declare( velox URL ${VELOX_SOURCE_URL} - URL_HASH MD5=${VELOX_SOURCE_URL_MD5}) + URL_HASH MD5=${VELOX_SOURCE_URL_MD5} + PATCH_COMMAND ${CMAKE_COMMAND} -E chdir patch -p1 -i + "${VELOX_PATCH_DIR}/iconfig-gcc-bug-103186.patch") FetchContent_MakeAvailable(velox) # Import JniHelpers. diff --git a/src/main/cpp/cmake/patches/velox/iconfig-gcc-bug-103186.patch b/src/main/cpp/cmake/patches/velox/iconfig-gcc-bug-103186.patch new file mode 100644 index 000000000..4ff619f85 --- /dev/null +++ b/src/main/cpp/cmake/patches/velox/iconfig-gcc-bug-103186.patch @@ -0,0 +1,38 @@ +--- a/velox/common/config/IConfig.h ++++ b/velox/common/config/IConfig.h +@@ -35,9 +35,7 @@ + std::optional get( + const std::string& key, + const std::function& toT = +- [](auto /* unused */, auto value) { +- return folly::to(value); +- }) const { ++ defaultToT) const { + if (auto val = access(key)) { + return toT(key, *val); + } +@@ -49,9 +47,7 @@ + const std::string& key, + const T& defaultValue, + const std::function& toT = +- [](auto /* unused */, auto value) { +- return folly::to(value); +- }) const { ++ defaultToT) const { + if (auto val = access(key)) { + return toT(key, *val); + } +@@ -65,6 +61,13 @@ + + private: + virtual std::optional access(const std::string& key) const = 0; ++ // Do not inline this member function as lambda. Otherwise, a GCC bug ++ // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103186 might be triggered ++ // with GCC 11.1 and 11.2. ++ template ++ static T defaultToT(std::string /* unused */, std::string value) { ++ return folly::to(value); ++ } + }; + + } // namespace facebook::velox::config diff --git a/src/main/cpp/velox-ref-md5.txt b/src/main/cpp/velox-ref-md5.txt index fecc7fae1..3f72b0162 100644 --- a/src/main/cpp/velox-ref-md5.txt +++ b/src/main/cpp/velox-ref-md5.txt @@ -1 +1 @@ -cb55aa6b0bccbb3d96b589bcb2c9c888 +ec8bf87e9bea7d28c0be20d758e4cd08 diff --git a/src/main/cpp/velox-ref.txt b/src/main/cpp/velox-ref.txt index 9b6a93e30..d1b6587d6 100644 --- a/src/main/cpp/velox-ref.txt +++ b/src/main/cpp/velox-ref.txt @@ -1 +1 @@ -45ae84bf9304e834e30e32cac3285c47fde925a2 +45a03a6a0009c5343ad3421fb9f0c7275e9c8ec6