From 33b7afc1b45e0a493f4139dae14025e4e3613c29 Mon Sep 17 00:00:00 2001
From: Robert Schulze <robert@clickhouse.com>
Date: Thu, 4 Jul 2024 09:02:33 +0000
Subject: [PATCH] Bump vectorscan to 5.4.11

---
 contrib/icu-cmake/CMakeLists.txt             |  2 +-
 contrib/vectorscan                           |  2 +-
 contrib/vectorscan-cmake/CMakeLists.txt      | 27 +++++---------------
 contrib/vectorscan-cmake/common/hs_version.h |  6 ++++-
 4 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/contrib/icu-cmake/CMakeLists.txt b/contrib/icu-cmake/CMakeLists.txt
index a54bd8c1de2..0a650f2bcc0 100644
--- a/contrib/icu-cmake/CMakeLists.txt
+++ b/contrib/icu-cmake/CMakeLists.txt
@@ -5,7 +5,7 @@ else ()
 endif ()
 
 if (NOT ENABLE_ICU)
-    message(STATUS "Not using icu")
+    message(STATUS "Not using ICU")
     return()
 endif()
 
diff --git a/contrib/vectorscan b/contrib/vectorscan
index 4918f81ea3d..d29730e1cb9 160000
--- a/contrib/vectorscan
+++ b/contrib/vectorscan
@@ -1 +1 @@
-Subproject commit 4918f81ea3d1abd18905bac9876d4a1fe2ebdf07
+Subproject commit d29730e1cb9daaa66bda63426cdce83505d2c809
diff --git a/contrib/vectorscan-cmake/CMakeLists.txt b/contrib/vectorscan-cmake/CMakeLists.txt
index d6c626c1612..35d5fd3dc82 100644
--- a/contrib/vectorscan-cmake/CMakeLists.txt
+++ b/contrib/vectorscan-cmake/CMakeLists.txt
@@ -1,11 +1,8 @@
-# We use vectorscan, a portable and API/ABI-compatible drop-in replacement for hyperscan.
-
+# Vectorscan is drop-in replacement for Hyperscan.
 if ((ARCH_AMD64 AND NOT NO_SSE3_OR_HIGHER) OR ARCH_AARCH64)
-    option (ENABLE_VECTORSCAN "Enable vectorscan library" ${ENABLE_LIBRARIES})
+    option (ENABLE_VECTORSCAN "Enable vectorscan" ${ENABLE_LIBRARIES})
 endif()
 
-# TODO PPC should generally work but needs manual generation of ppc/config.h file on a PPC machine
-
 if (NOT ENABLE_VECTORSCAN)
     message (STATUS "Not using vectorscan")
     return()
@@ -272,34 +269,24 @@ if (ARCH_AARCH64)
     )
 endif()
 
-# TODO
-# if (ARCH_PPC64LE)
-#     list(APPEND SRCS
-#         "${LIBRARY_DIR}/src/util/supervector/arch/ppc64el/impl.cpp"
-#     )
-# endif()
-
 add_library (_vectorscan ${SRCS})
 
-target_compile_options (_vectorscan PRIVATE
-    -fno-sanitize=undefined # assume the library takes care of itself
-    -O2 -fno-strict-aliasing -fno-omit-frame-pointer -fvisibility=hidden # options from original build system
-)
 # library has too much debug information
 if (OMIT_HEAVY_DEBUG_SYMBOLS)
     target_compile_options (_vectorscan PRIVATE -g0)
 endif()
 
-# Include version header manually generated by running the original build system
-target_include_directories (_vectorscan SYSTEM PRIVATE common)
+target_include_directories (_vectorscan SYSTEM PUBLIC "${LIBRARY_DIR}/src")
+
+# Makes the version header visible. It was generated by running the native build system manually.
+# Please update whenever you update vectorscan.
+target_include_directories (_vectorscan SYSTEM PUBLIC common)
 
 # vectorscan inherited some patched in-source versions of boost headers to fix a bug in
 # boost 1.69. This bug has been solved long ago but vectorscan's source code still
 # points to the patched versions, so include it here.
 target_include_directories (_vectorscan SYSTEM PRIVATE "${LIBRARY_DIR}/include")
 
-target_include_directories (_vectorscan SYSTEM PUBLIC "${LIBRARY_DIR}/src")
-
 # Include platform-specific config header generated by manually running the original build system
 # Please regenerate these files if you update vectorscan.
 
diff --git a/contrib/vectorscan-cmake/common/hs_version.h b/contrib/vectorscan-cmake/common/hs_version.h
index 8315b44fb2a..3d266484095 100644
--- a/contrib/vectorscan-cmake/common/hs_version.h
+++ b/contrib/vectorscan-cmake/common/hs_version.h
@@ -32,8 +32,12 @@
 /**
  * A version string to identify this release of Hyperscan.
  */
-#define HS_VERSION_STRING "5.4.7 2022-06-20"
+#define HS_VERSION_STRING "5.4.11 2024-07-04"
 
 #define HS_VERSION_32BIT ((5 << 24) | (1 << 16) | (7 << 8) | 0)
 
+#define HS_MAJOR      5
+#define HS_MINOR      4
+#define HS_PATCH      11
+
 #endif /* HS_VERSION_H_C6428FAF8E3713 */