This is an automated email from the ASF dual-hosted git repository.
wangdan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/master by this push:
new 6cb3f5e0a refactor(regex): use std::regex instead of boost::regex
(#1697)
6cb3f5e0a is described below
commit 6cb3f5e0a872eb35496ce5275e26515aa4c4fef7
Author: Yingchun Lai <[email protected]>
AuthorDate: Tue Nov 28 12:02:33 2023 +0800
refactor(regex): use std::regex instead of boost::regex (#1697)
This patch removes to build and link Boost::filesystem library, and use
std::regex
instead of boost::regex.
---
cmake_modules/BaseFunctions.cmake | 2 +-
src/aio/test/CMakeLists.txt | 2 +-
src/base/test/CMakeLists.txt | 2 +-
src/block_service/test/CMakeLists.txt | 2 +-
src/client/test/CMakeLists.txt | 2 +-
src/common/test/CMakeLists.txt | 2 +-
src/failure_detector/test/CMakeLists.txt | 2 +-
src/geo/bench/CMakeLists.txt | 2 +-
src/geo/test/CMakeLists.txt | 2 +-
src/http/test/CMakeLists.txt | 2 +-
src/meta/CMakeLists.txt | 2 +-
src/meta/test/CMakeLists.txt | 2 +-
src/meta/test/balancer_simulator/CMakeLists.txt | 2 +-
src/meta/test/meta_state/CMakeLists.txt | 2 +-
src/nfs/test/CMakeLists.txt | 2 +-
src/perf_counter/test/CMakeLists.txt | 2 +-
src/redis_protocol/proxy/CMakeLists.txt | 2 +-
src/redis_protocol/proxy_ut/CMakeLists.txt | 2 +-
src/replica/CMakeLists.txt | 2 +-
src/replica/backup/test/CMakeLists.txt | 2 +-
src/replica/bulk_load/test/CMakeLists.txt | 2 +-
src/replica/duplication/test/CMakeLists.txt | 2 +-
src/replica/split/test/CMakeLists.txt | 2 +-
src/replica/storage/simple_kv/CMakeLists.txt | 2 +-
src/replica/storage/simple_kv/test/CMakeLists.txt | 2 +-
src/replica/test/CMakeLists.txt | 2 +-
src/runtime/test/CMakeLists.txt | 2 +-
src/sample/CMakeLists.txt | 6 +-----
src/server/CMakeLists.txt | 2 +-
src/server/test/CMakeLists.txt | 2 +-
src/shell/CMakeLists.txt | 6 +-----
src/test/bench_test/CMakeLists.txt | 2 +-
.../function_test/backup_restore/CMakeLists.txt | 2 +-
src/test/function_test/base_api/CMakeLists.txt | 2 +-
src/test/function_test/bulk_load/CMakeLists.txt | 2 +-
.../function_test/detect_hotspot/CMakeLists.txt | 2 +-
.../function_test/partition_split/CMakeLists.txt | 2 +-
src/test/function_test/recovery/CMakeLists.txt | 2 +-
src/test/function_test/restore/CMakeLists.txt | 2 +-
src/test/function_test/throttle/CMakeLists.txt | 2 +-
src/test/kill_test/CMakeLists.txt | 2 +-
src/test/pressure_test/CMakeLists.txt | 2 +-
src/utils/CMakeLists.txt | 2 +-
src/utils/fail_point.cpp | 22 ++++++----------------
src/utils/long_adder_bench/CMakeLists.txt | 2 +-
src/utils/test/CMakeLists.txt | 2 +-
src/utils/test/nth_element_bench/CMakeLists.txt | 2 +-
src/zookeeper/test/CMakeLists.txt | 2 +-
thirdparty/CMakeLists.txt | 2 +-
49 files changed, 54 insertions(+), 72 deletions(-)
diff --git a/cmake_modules/BaseFunctions.cmake
b/cmake_modules/BaseFunctions.cmake
index 1c50d630a..b55bd0576 100644
--- a/cmake_modules/BaseFunctions.cmake
+++ b/cmake_modules/BaseFunctions.cmake
@@ -319,7 +319,7 @@ function(dsn_setup_thirdparty_libs)
set(CMAKE_PREFIX_PATH ${THIRDPARTY_INSTALL_DIR};${CMAKE_PREFIX_PATH})
message(STATUS "CMAKE_PREFIX_PATH = ${CMAKE_PREFIX_PATH}")
- find_package(Boost COMPONENTS system filesystem regex REQUIRED)
+ find_package(Boost COMPONENTS system filesystem REQUIRED)
include_directories(${Boost_INCLUDE_DIRS})
find_library(THRIFT_LIB NAMES libthrift.a PATHS
${THIRDPARTY_INSTALL_DIR}/lib NO_DEFAULT_PATH)
diff --git a/src/aio/test/CMakeLists.txt b/src/aio/test/CMakeLists.txt
index 357499a9c..b8d4ad675 100644
--- a/src/aio/test/CMakeLists.txt
+++ b/src/aio/test/CMakeLists.txt
@@ -35,7 +35,7 @@ set(MY_SRC_SEARCH_MODE "GLOB")
set(MY_PROJ_LIBS gtest dsn_runtime dsn_aio test_utils rocksdb)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
# Extra files that will be installed
set(MY_BINPLACES
diff --git a/src/base/test/CMakeLists.txt b/src/base/test/CMakeLists.txt
index 8af554bc5..651e0c055 100644
--- a/src/base/test/CMakeLists.txt
+++ b/src/base/test/CMakeLists.txt
@@ -33,7 +33,7 @@ set(MY_PROJ_LIBS
pegasus_base
gtest)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_BINPLACES config.ini run.sh)
diff --git a/src/block_service/test/CMakeLists.txt
b/src/block_service/test/CMakeLists.txt
index 0a6d66e40..78202667d 100644
--- a/src/block_service/test/CMakeLists.txt
+++ b/src/block_service/test/CMakeLists.txt
@@ -40,7 +40,7 @@ set(MY_PROJ_LIBS
test_utils
rocksdb)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_BINPLACES
config-test.ini
diff --git a/src/client/test/CMakeLists.txt b/src/client/test/CMakeLists.txt
index bcae3897a..cfe591ce0 100644
--- a/src/client/test/CMakeLists.txt
+++ b/src/client/test/CMakeLists.txt
@@ -29,7 +29,7 @@ set(MY_PROJ_LIBS
gtest
rocksdb)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_BINPLACES
"${CMAKE_CURRENT_SOURCE_DIR}/run.sh"
diff --git a/src/common/test/CMakeLists.txt b/src/common/test/CMakeLists.txt
index 1cdf58407..9be225417 100644
--- a/src/common/test/CMakeLists.txt
+++ b/src/common/test/CMakeLists.txt
@@ -32,7 +32,7 @@ set(MY_PROJ_LIBS
gtest
rocksdb)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_BINPLACES
config-test.ini
diff --git a/src/failure_detector/test/CMakeLists.txt
b/src/failure_detector/test/CMakeLists.txt
index ed4a9703d..6bd1e0555 100644
--- a/src/failure_detector/test/CMakeLists.txt
+++ b/src/failure_detector/test/CMakeLists.txt
@@ -43,7 +43,7 @@ set(MY_PROJ_LIBS
hashtable
rocksdb)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
# Extra files that will be installed
set(MY_BINPLACES
diff --git a/src/geo/bench/CMakeLists.txt b/src/geo/bench/CMakeLists.txt
index c55feb512..6df54a6bc 100644
--- a/src/geo/bench/CMakeLists.txt
+++ b/src/geo/bench/CMakeLists.txt
@@ -38,7 +38,7 @@ set(MY_PROJ_LIBS
dsn_utils
)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_BINPLACES "config.ini")
diff --git a/src/geo/test/CMakeLists.txt b/src/geo/test/CMakeLists.txt
index 69435f085..e29d506ae 100644
--- a/src/geo/test/CMakeLists.txt
+++ b/src/geo/test/CMakeLists.txt
@@ -37,7 +37,7 @@ set(MY_PROJ_LIBS
dsn_utils
gtest)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
add_definitions(-Wno-attributes)
diff --git a/src/http/test/CMakeLists.txt b/src/http/test/CMakeLists.txt
index 85f2c3798..5ebc142a5 100644
--- a/src/http/test/CMakeLists.txt
+++ b/src/http/test/CMakeLists.txt
@@ -29,7 +29,7 @@ set(MY_PROJ_LIBS
rocksdb
)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_BINPLACES
"${CMAKE_CURRENT_SOURCE_DIR}/run.sh"
diff --git a/src/meta/CMakeLists.txt b/src/meta/CMakeLists.txt
index 9a8b2c44b..3e4d4d413 100644
--- a/src/meta/CMakeLists.txt
+++ b/src/meta/CMakeLists.txt
@@ -55,7 +55,7 @@ set(MY_PROJ_LIBS
hdfs
rocksdb)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
# Extra files that will be installed
set(MY_BINPLACES "")
diff --git a/src/meta/test/CMakeLists.txt b/src/meta/test/CMakeLists.txt
index 108c11129..60f02c691 100644
--- a/src/meta/test/CMakeLists.txt
+++ b/src/meta/test/CMakeLists.txt
@@ -60,7 +60,7 @@ set(MY_PROJ_LIBS
gtest
hdfs)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
# Extra files that will be installed
set(MY_BINPLACES clear.sh run.sh config-test.ini suite1 suite2)
diff --git a/src/meta/test/balancer_simulator/CMakeLists.txt
b/src/meta/test/balancer_simulator/CMakeLists.txt
index fcf8a1edb..7fe9925da 100644
--- a/src/meta/test/balancer_simulator/CMakeLists.txt
+++ b/src/meta/test/balancer_simulator/CMakeLists.txt
@@ -40,7 +40,7 @@ set(MY_PROJ_LIBS
hashtable
gtest)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
# Extra files that will be installed
set(MY_BINPLACES "")
diff --git a/src/meta/test/meta_state/CMakeLists.txt
b/src/meta/test/meta_state/CMakeLists.txt
index 71c60be22..9f480e780 100644
--- a/src/meta/test/meta_state/CMakeLists.txt
+++ b/src/meta/test/meta_state/CMakeLists.txt
@@ -42,7 +42,7 @@ set(MY_PROJ_LIBS
gtest
)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
# Extra files that will be installed
set(MY_BINPLACES
diff --git a/src/nfs/test/CMakeLists.txt b/src/nfs/test/CMakeLists.txt
index d3f26cc00..016038992 100644
--- a/src/nfs/test/CMakeLists.txt
+++ b/src/nfs/test/CMakeLists.txt
@@ -35,7 +35,7 @@ set(MY_SRC_SEARCH_MODE "GLOB")
set(MY_PROJ_LIBS dsn_nfs dsn_runtime gtest dsn_aio rocksdb test_utils)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
# Extra files that will be installed
set(MY_BINPLACES
diff --git a/src/perf_counter/test/CMakeLists.txt
b/src/perf_counter/test/CMakeLists.txt
index 434d97dc1..2e02cf868 100644
--- a/src/perf_counter/test/CMakeLists.txt
+++ b/src/perf_counter/test/CMakeLists.txt
@@ -35,7 +35,7 @@ set(MY_SRC_SEARCH_MODE "GLOB")
set(MY_PROJ_LIBS gtest dsn_runtime rocksdb)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
# Extra files that will be installed
set(MY_BINPLACES
diff --git a/src/redis_protocol/proxy/CMakeLists.txt
b/src/redis_protocol/proxy/CMakeLists.txt
index f93bc506a..956ccce76 100644
--- a/src/redis_protocol/proxy/CMakeLists.txt
+++ b/src/redis_protocol/proxy/CMakeLists.txt
@@ -38,7 +38,7 @@ set(MY_PROJ_LIBS pegasus.rproxylib
set(MY_BINPLACES "config.ini")
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
# Avoid megabytes of warnings like:
# thirdparty/output/include/s2/s1angle.h:288:28: error:
diff --git a/src/redis_protocol/proxy_ut/CMakeLists.txt
b/src/redis_protocol/proxy_ut/CMakeLists.txt
index 521abddc2..cf7bb1df3 100644
--- a/src/redis_protocol/proxy_ut/CMakeLists.txt
+++ b/src/redis_protocol/proxy_ut/CMakeLists.txt
@@ -27,7 +27,7 @@ set(MY_PROJ_SRC "")
# "GLOB" for non-recursive search
set(MY_SRC_SEARCH_MODE "GLOB")
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_PROJ_LIBS pegasus.rproxylib
pegasus_base
diff --git a/src/replica/CMakeLists.txt b/src/replica/CMakeLists.txt
index d4609d9e5..005967def 100644
--- a/src/replica/CMakeLists.txt
+++ b/src/replica/CMakeLists.txt
@@ -77,7 +77,7 @@ set(MY_PROJ_LIBS
PocoJSON
rocksdb)
-set(MY_BOOST_LIBS Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::filesystem)
# Extra files that will be installed
set(MY_BINPLACES "")
diff --git a/src/replica/backup/test/CMakeLists.txt
b/src/replica/backup/test/CMakeLists.txt
index e3dc0ec05..063246df0 100644
--- a/src/replica/backup/test/CMakeLists.txt
+++ b/src/replica/backup/test/CMakeLists.txt
@@ -32,7 +32,7 @@ set(MY_PROJ_LIBS dsn_meta_server
gtest
rocksdb)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_BINPLACES
config-test.ini
diff --git a/src/replica/bulk_load/test/CMakeLists.txt
b/src/replica/bulk_load/test/CMakeLists.txt
index 86ca7e8b3..0b0d08385 100644
--- a/src/replica/bulk_load/test/CMakeLists.txt
+++ b/src/replica/bulk_load/test/CMakeLists.txt
@@ -30,7 +30,7 @@ set(MY_PROJ_LIBS dsn_meta_server
test_utils
rocksdb)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex rocksdb
test_utils)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem rocksdb test_utils)
set(MY_BINPLACES
config-test.ini
diff --git a/src/replica/duplication/test/CMakeLists.txt
b/src/replica/duplication/test/CMakeLists.txt
index b0abc3bd9..5cc139f91 100644
--- a/src/replica/duplication/test/CMakeLists.txt
+++ b/src/replica/duplication/test/CMakeLists.txt
@@ -33,7 +33,7 @@ set(MY_PROJ_LIBS dsn_meta_server
test_utils
rocksdb)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_BINPLACES
config-test.ini
diff --git a/src/replica/split/test/CMakeLists.txt
b/src/replica/split/test/CMakeLists.txt
index 19961ec6d..7e77ba730 100644
--- a/src/replica/split/test/CMakeLists.txt
+++ b/src/replica/split/test/CMakeLists.txt
@@ -29,7 +29,7 @@ set(MY_PROJ_LIBS dsn_meta_server
gtest
)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_BINPLACES
config-test.ini
diff --git a/src/replica/storage/simple_kv/CMakeLists.txt
b/src/replica/storage/simple_kv/CMakeLists.txt
index 667b4ab86..8584848f1 100644
--- a/src/replica/storage/simple_kv/CMakeLists.txt
+++ b/src/replica/storage/simple_kv/CMakeLists.txt
@@ -39,7 +39,7 @@ set(MY_SRC_SEARCH_MODE "GLOB")
set(MY_PROJ_LIBS dsn_replica_server dsn_meta_server dsn_client dsn_runtime
hashtable rocksdb)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(INI_FILES "")
file(GLOB
diff --git a/src/replica/storage/simple_kv/test/CMakeLists.txt
b/src/replica/storage/simple_kv/test/CMakeLists.txt
index de86358d0..a1e0a69b2 100644
--- a/src/replica/storage/simple_kv/test/CMakeLists.txt
+++ b/src/replica/storage/simple_kv/test/CMakeLists.txt
@@ -42,7 +42,7 @@ set(MY_PROJ_LIBS dsn_replica_server
dsn_utils
rocksdb)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
# Extra files that will be installed
FILE(GLOB CASE_FILES "case-*")
diff --git a/src/replica/test/CMakeLists.txt b/src/replica/test/CMakeLists.txt
index 587826baa..cd309ba2e 100644
--- a/src/replica/test/CMakeLists.txt
+++ b/src/replica/test/CMakeLists.txt
@@ -50,7 +50,7 @@ set(MY_PROJ_LIBS dsn_meta_server
test_utils
rocksdb)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
#Extra files that will be installed
set(MY_BINPLACES clear.sh run.sh config-test.ini)
diff --git a/src/runtime/test/CMakeLists.txt b/src/runtime/test/CMakeLists.txt
index 01f17e8c5..cd5e0daac 100644
--- a/src/runtime/test/CMakeLists.txt
+++ b/src/runtime/test/CMakeLists.txt
@@ -36,7 +36,7 @@ set(MY_PROJ_LIBS gtest
rocksdb
)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
# Extra files that will be installed
set(MY_BINPLACES "${CMAKE_CURRENT_SOURCE_DIR}/config-test-corrupt-message.ini"
diff --git a/src/sample/CMakeLists.txt b/src/sample/CMakeLists.txt
index 788bdfc23..b0618dfca 100644
--- a/src/sample/CMakeLists.txt
+++ b/src/sample/CMakeLists.txt
@@ -23,11 +23,7 @@ set(MY_PROJ_LIBS
pegasus_client_static
)
-set(MY_BOOST_LIBS
- Boost::filesystem
- Boost::system
- Boost::regex
- )
+set(MY_BOOST_LIBS Boost::filesystem Boost::system)
set(MY_BINPLACES config.ini run.sh)
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 8139ffa90..a61b75d36 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -53,7 +53,7 @@ set(MY_PROJ_LIBS
hashtable
)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_BINPLACES "${CMAKE_CURRENT_SOURCE_DIR}/config.ini")
diff --git a/src/server/test/CMakeLists.txt b/src/server/test/CMakeLists.txt
index 836aee476..4c3ea8a83 100644
--- a/src/server/test/CMakeLists.txt
+++ b/src/server/test/CMakeLists.txt
@@ -63,7 +63,7 @@ set(MY_PROJ_LIBS
add_definitions(-DPEGASUS_UNIT_TEST)
add_definitions(-DENABLE_FAIL)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_BINPLACES config.ini run.sh)
diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
index 109df6165..f35ead8e8 100644
--- a/src/shell/CMakeLists.txt
+++ b/src/shell/CMakeLists.txt
@@ -59,11 +59,7 @@ set(MY_PROJ_LIBS
set(MY_BINPLACES "${CMAKE_CURRENT_SOURCE_DIR}/config.ini")
-set(MY_BOOST_LIBS
- Boost::system
- Boost::filesystem
- Boost::regex # dsn_replica_server.so needs
- )
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
SET(CMAKE_INSTALL_RPATH ".")
SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
diff --git a/src/test/bench_test/CMakeLists.txt
b/src/test/bench_test/CMakeLists.txt
index eaf02da84..307d543d0 100644
--- a/src/test/bench_test/CMakeLists.txt
+++ b/src/test/bench_test/CMakeLists.txt
@@ -36,7 +36,7 @@ set(MY_PROJ_LIBS
krb5
)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_BINPLACES "config.ini")
diff --git a/src/test/function_test/backup_restore/CMakeLists.txt
b/src/test/function_test/backup_restore/CMakeLists.txt
index 1d28869f5..51fea317e 100644
--- a/src/test/function_test/backup_restore/CMakeLists.txt
+++ b/src/test/function_test/backup_restore/CMakeLists.txt
@@ -32,7 +32,7 @@ set(MY_PROJ_LIBS
function_test_utils
)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_BINPLACES "../config.ini" "../run.sh")
diff --git a/src/test/function_test/base_api/CMakeLists.txt
b/src/test/function_test/base_api/CMakeLists.txt
index cfac09357..3e688f3a1 100644
--- a/src/test/function_test/base_api/CMakeLists.txt
+++ b/src/test/function_test/base_api/CMakeLists.txt
@@ -40,7 +40,7 @@ set(MY_PROJ_LIBS
test_utils
)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_BINPLACES "../config.ini" "../run.sh")
diff --git a/src/test/function_test/bulk_load/CMakeLists.txt
b/src/test/function_test/bulk_load/CMakeLists.txt
index ea27eed37..f9f197649 100644
--- a/src/test/function_test/bulk_load/CMakeLists.txt
+++ b/src/test/function_test/bulk_load/CMakeLists.txt
@@ -40,7 +40,7 @@ set(MY_PROJ_LIBS
test_utils
rocksdb)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_BINPLACES "../config.ini" "../run.sh")
diff --git a/src/test/function_test/detect_hotspot/CMakeLists.txt
b/src/test/function_test/detect_hotspot/CMakeLists.txt
index 65f7ad2d2..64f5d09d4 100644
--- a/src/test/function_test/detect_hotspot/CMakeLists.txt
+++ b/src/test/function_test/detect_hotspot/CMakeLists.txt
@@ -39,7 +39,7 @@ set(MY_PROJ_LIBS
function_test_utils
)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_BINPLACES "../config.ini" "../run.sh")
diff --git a/src/test/function_test/partition_split/CMakeLists.txt
b/src/test/function_test/partition_split/CMakeLists.txt
index a82e8fe16..b2cff9f60 100644
--- a/src/test/function_test/partition_split/CMakeLists.txt
+++ b/src/test/function_test/partition_split/CMakeLists.txt
@@ -40,7 +40,7 @@ set(MY_PROJ_LIBS
test_utils
)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_BINPLACES "../config.ini" "../run.sh")
diff --git a/src/test/function_test/recovery/CMakeLists.txt
b/src/test/function_test/recovery/CMakeLists.txt
index 7fadd12fc..c83e94324 100644
--- a/src/test/function_test/recovery/CMakeLists.txt
+++ b/src/test/function_test/recovery/CMakeLists.txt
@@ -39,7 +39,7 @@ set(MY_PROJ_LIBS
function_test_utils
)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_BINPLACES "../config.ini" "../run.sh")
diff --git a/src/test/function_test/restore/CMakeLists.txt
b/src/test/function_test/restore/CMakeLists.txt
index 0382b0591..f30f90185 100644
--- a/src/test/function_test/restore/CMakeLists.txt
+++ b/src/test/function_test/restore/CMakeLists.txt
@@ -40,7 +40,7 @@ set(MY_PROJ_LIBS
test_utils
)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_BINPLACES "../config.ini" "../run.sh")
diff --git a/src/test/function_test/throttle/CMakeLists.txt
b/src/test/function_test/throttle/CMakeLists.txt
index 09470bc39..70460d0c5 100644
--- a/src/test/function_test/throttle/CMakeLists.txt
+++ b/src/test/function_test/throttle/CMakeLists.txt
@@ -40,7 +40,7 @@ set(MY_PROJ_LIBS
test_utils
)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_BINPLACES "../config.ini" "../run.sh")
diff --git a/src/test/kill_test/CMakeLists.txt
b/src/test/kill_test/CMakeLists.txt
index 6e2ab5d6c..df9744873 100644
--- a/src/test/kill_test/CMakeLists.txt
+++ b/src/test/kill_test/CMakeLists.txt
@@ -41,7 +41,7 @@ set(MY_PROJ_LIBS
)
set(MY_BINPLACES "${CMAKE_CURRENT_SOURCE_DIR}/config.ini")
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
if (UNIX)
SET(CMAKE_INSTALL_RPATH ".")
diff --git a/src/test/pressure_test/CMakeLists.txt
b/src/test/pressure_test/CMakeLists.txt
index b26cc10b5..42e29b736 100644
--- a/src/test/pressure_test/CMakeLists.txt
+++ b/src/test/pressure_test/CMakeLists.txt
@@ -37,7 +37,7 @@ set(MY_PROJ_LIBS
set(MY_BINPLACES "${CMAKE_CURRENT_SOURCE_DIR}/config-pressure.ini")
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
if (UNIX)
SET(CMAKE_INSTALL_RPATH ".")
diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
index c3cbc3db8..e9129fa51 100644
--- a/src/utils/CMakeLists.txt
+++ b/src/utils/CMakeLists.txt
@@ -29,7 +29,7 @@ set(MY_PROJ_NAME dsn_utils)
# "GLOB" for non-recursive search
set(MY_SRC_SEARCH_MODE "GLOB")
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
set(MY_PROJ_LIBS dsn_http rocksdb)
diff --git a/src/utils/fail_point.cpp b/src/utils/fail_point.cpp
index 75287d6dd..45c809c02 100644
--- a/src/utils/fail_point.cpp
+++ b/src/utils/fail_point.cpp
@@ -28,27 +28,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// IWYU pragma: no_include <boost/regex/v4/basic_regex.hpp>
-// IWYU pragma: no_include <boost/regex/v4/match_flags.hpp>
-// IWYU pragma: no_include <boost/regex/v4/match_results.hpp>
-// IWYU pragma: no_include <boost/regex/v4/perl_matcher_common.hpp>
-// IWYU pragma: no_include <boost/regex/v4/perl_matcher_non_recursive.hpp>
-#include <boost/regex/v4/regex.hpp>
-// IWYU pragma: no_include <boost/regex/v4/regex_fwd.hpp>
-// IWYU pragma: no_include <boost/regex/v4/regex_match.hpp>
-// IWYU pragma: no_include <boost/regex/v4/sub_match.hpp>
#include <stdint.h>
#include <stdio.h>
-#include <algorithm>
-#include <iterator>
+#include <regex>
#include <string>
#include <vector>
+#include "absl/strings/string_view.h"
#include "fail_point_impl.h"
#include "utils/fail_point.h"
#include "utils/fmt_logging.h"
#include "utils/rand.h"
-#include "absl/strings/string_view.h"
namespace dsn {
namespace fail {
@@ -115,13 +105,13 @@ bool fail_point::parse_from_string(absl::string_view
action)
_max_cnt = -1;
_freq = 100;
- boost::regex regex(R"((\d+\%)?(\d+\*)?(\w+)(\((.*)\))?)");
- boost::smatch match;
+ std::regex regex(R"((\d+\%)?(\d+\*)?(\w+)(\((.*)\))?)");
+ std::smatch match;
std::string tmp(action.data(), action.length());
- if (boost::regex_match(tmp, match, regex)) {
+ if (std::regex_match(tmp, match, regex)) {
if (match.size() == 6) {
- boost::ssub_match sub_match = match[1];
+ std::ssub_match sub_match = match[1];
if (!sub_match.str().empty()) {
sscanf(sub_match.str().data(), "%d%%", &_freq);
}
diff --git a/src/utils/long_adder_bench/CMakeLists.txt
b/src/utils/long_adder_bench/CMakeLists.txt
index 480b04807..d5ace78ca 100644
--- a/src/utils/long_adder_bench/CMakeLists.txt
+++ b/src/utils/long_adder_bench/CMakeLists.txt
@@ -29,7 +29,7 @@ set(MY_SRC_SEARCH_MODE "GLOB")
set(MY_PROJ_LIBS dsn_runtime dsn_utils rocksdb)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
# Extra files that will be installed
set(MY_BINPLACES "")
diff --git a/src/utils/test/CMakeLists.txt b/src/utils/test/CMakeLists.txt
index d77464c36..684a5faaf 100644
--- a/src/utils/test/CMakeLists.txt
+++ b/src/utils/test/CMakeLists.txt
@@ -36,7 +36,7 @@ set(MY_PROJ_LIBS dsn_http
test_utils
rocksdb)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
# Extra files that will be installed
set(MY_BINPLACES "${CMAKE_CURRENT_SOURCE_DIR}/config-bad-section.ini"
diff --git a/src/utils/test/nth_element_bench/CMakeLists.txt
b/src/utils/test/nth_element_bench/CMakeLists.txt
index 2bd530690..7bf0af804 100644
--- a/src/utils/test/nth_element_bench/CMakeLists.txt
+++ b/src/utils/test/nth_element_bench/CMakeLists.txt
@@ -29,7 +29,7 @@ set(MY_SRC_SEARCH_MODE "GLOB")
set(MY_PROJ_LIBS dsn_runtime dsn_utils rocksdb)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
# Extra files that will be installed
set(MY_BINPLACES "")
diff --git a/src/zookeeper/test/CMakeLists.txt
b/src/zookeeper/test/CMakeLists.txt
index 5a06fa693..cdb6d4cec 100644
--- a/src/zookeeper/test/CMakeLists.txt
+++ b/src/zookeeper/test/CMakeLists.txt
@@ -41,7 +41,7 @@ set(MY_PROJ_LIBS
gtest
rocksdb)
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS Boost::system Boost::filesystem)
# Extra files that will be installed
set(MY_BINPLACES
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index b8608dc36..bbe99ece7 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -61,7 +61,7 @@ ExternalProject_Add(boost
URL ${OSS_URL_PREFIX}/boost_1_69_0.tar.bz2
https://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.tar.bz2
URL_MD5 a1332494397bf48332cb152abfefcec2
- CONFIGURE_COMMAND ./bootstrap.sh --prefix=.
--with-libraries=system,filesystem,regex --with-toolset=gcc
+ CONFIGURE_COMMAND ./bootstrap.sh --prefix=.
--with-libraries=system,filesystem --with-toolset=gcc
BUILD_COMMAND ./b2 toolset=gcc cxxflags=-fPIC cxxstd=11 install
INSTALL_COMMAND cp -R include/boost ${TP_OUTPUT}/include && cp -R lib
${TP_OUTPUT}/
BUILD_IN_SOURCE 1
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
