refactor(thirdparty): Bump s2geometry to 0.10.0 (#1688)

#1604 Upgrade s2geometry to the official 0.10.0 which is the latest release, instead of an older personal one. This patch also update the CMake options of abseil, and link some necessary abseil libraries in the project.
apache · Nov 24, 2023 · 75744cb · 75744cb
1 parent 1409d09
commit 75744cb
Show file tree

Hide file tree

Showing 37 changed files with 78 additions and 65 deletions.
diff --git a/.licenserc.yaml b/.licenserc.yaml
@@ -70,7 +70,7 @@ header:
     - 'thirdparty/fix_libevent_for_macos.patch'
     - 'thirdparty/fix_prometheus-cpp_limits.patch'
     - 'thirdparty/fix_rocksdb-cmake-PORTABLE-option.patch'
-    - 'thirdparty/fix_s2_build_with_cxx17.patch'
+    - 'thirdparty/fix_s2_build_with_absl_and_gtest.patch'
     - 'thirdparty/fix_thrift_for_cpp11.patch'
     # TODO(yingchun): shell/* files are import from thirdparties, we can move them to thirdparty later.
     # Copyright (c) 2016, Adi Shavit

diff --git a/cmake_modules/BaseFunctions.cmake b/cmake_modules/BaseFunctions.cmake
@@ -353,6 +353,9 @@ function(dsn_setup_thirdparty_libs)
   link_libraries(${OPENSSL_CRYPTO_LIBRARY})
   link_libraries(${OPENSSL_SSL_LIBRARY})
 
+  # abseil
+  find_package(absl REQUIRED)
+
   link_directories(${THIRDPARTY_INSTALL_DIR}/lib)
   if (NOT APPLE)
     link_directories(${THIRDPARTY_INSTALL_DIR}/lib64)

diff --git a/src/geo/bench/CMakeLists.txt b/src/geo/bench/CMakeLists.txt
@@ -28,6 +28,8 @@ set(MY_PROJ_SRC "")
 set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
+        absl::flat_hash_set
+        absl::strings
         pegasus_geo_lib
         s2testing
         s2

diff --git a/src/geo/bench/bench.cpp b/src/geo/bench/bench.cpp
@@ -24,7 +24,6 @@
 #include <s2/s2latlng.h>
 #include <s2/s2latlng_rect.h>
 #include <s2/s2testing.h>
-#include <s2/third_party/absl/base/port.h>
 #include <stdint.h>
 #include <atomic>
 #include <iostream>

diff --git a/src/geo/lib/geo_client.h b/src/geo/lib/geo_client.h
@@ -20,7 +20,6 @@
 #pragma once
 
 #include <pegasus/client.h>
-#include <s2/third_party/absl/base/port.h>
 #include <functional>
 #include <list>
 #include <memory>

diff --git a/src/geo/lib/latlng_codec.cpp b/src/geo/lib/latlng_codec.cpp
@@ -22,7 +22,6 @@
 #include <s2/s1angle.h>
 #include <s2/s2latlng.h>
 #include <stddef.h>
-#include <algorithm>
 
 #include "utils/error_code.h"
 #include "utils/errors.h"

diff --git a/src/geo/lib/latlng_codec.h b/src/geo/lib/latlng_codec.h
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <s2/third_party/absl/base/port.h>
 #include <stdint.h>
 #include <string>
 #include <vector>

diff --git a/src/geo/test/CMakeLists.txt b/src/geo/test/CMakeLists.txt
@@ -28,6 +28,8 @@ set(MY_PROJ_SRC "")
 set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
+        absl::flat_hash_set
+        absl::strings
         pegasus_geo_lib
         s2testing
         s2

diff --git a/src/geo/test/geo_test.cpp b/src/geo/test/geo_test.cpp
@@ -27,7 +27,6 @@
 #include <s2/s2earth.h>
 #include <s2/s2latlng.h>
 #include <s2/s2testing.h>
-#include <s2/third_party/absl/base/port.h>
 #include <stdint.h>
 #include <list>
 #include <memory>

diff --git a/src/geo/test/latlng_codec_test.cpp b/src/geo/test/latlng_codec_test.cpp
@@ -19,7 +19,6 @@
 
 #include <s2/s1angle.h>
 #include <s2/s2latlng.h>
-#include <s2/third_party/absl/base/port.h>
 #include <string>
 
 #include "geo/lib/latlng_codec.h"

diff --git a/src/redis_protocol/proxy/CMakeLists.txt b/src/redis_protocol/proxy/CMakeLists.txt
@@ -27,6 +27,8 @@ set(MY_PROJ_SRC "")
 set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS pegasus.rproxylib
+                 absl::flat_hash_set
+                 absl::strings
                  pegasus_geo_lib
                  pegasus_reporter
                  event

diff --git a/src/redis_protocol/proxy/main.cpp b/src/redis_protocol/proxy/main.cpp
@@ -18,7 +18,6 @@
  */
 
 #include <pegasus/version.h>
-#include <s2/third_party/absl/base/port.h>
 #include <signal.h>
 #include <stdio.h>
 #include <unistd.h>

diff --git a/src/redis_protocol/proxy_lib/redis_parser.h b/src/redis_protocol/proxy_lib/redis_parser.h
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <s2/third_party/absl/base/port.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <atomic>

diff --git a/src/redis_protocol/proxy_ut/CMakeLists.txt b/src/redis_protocol/proxy_ut/CMakeLists.txt
@@ -31,6 +31,8 @@ set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
 
 set(MY_PROJ_LIBS pegasus.rproxylib
                 pegasus_base
+                absl::flat_hash_set
+                absl::strings
                 pegasus_geo_lib
                 s2
                 pegasus_client_static

diff --git a/src/redis_protocol/proxy_ut/redis_proxy_test.cpp b/src/redis_protocol/proxy_ut/redis_proxy_test.cpp
@@ -32,7 +32,6 @@
 // IWYU pragma: no_include <boost/asio/socket_base.hpp>
 #include <boost/system/error_code.hpp>
 #include <gtest/gtest_prod.h>
-#include <s2/third_party/absl/base/port.h>
 #include <string.h>
 #include <chrono>
 #include <memory>

diff --git a/src/server/hotspot_partition_calculator.cpp b/src/server/hotspot_partition_calculator.cpp
@@ -84,7 +84,7 @@ void hotspot_partition_calculator::init_perf_counter(int partition_count)
 {
     for (int data_type = 0; data_type <= 1; data_type++) {
         for (int i = 0; i < partition_count; i++) {
-            string partition_desc =
+            std::string partition_desc =
                 _app_name + '.' +
                 (data_type == partition_qps_type::WRITE_HOTSPOT_DATA ? "write." : "read.") +
                 std::to_string(i);
@@ -95,7 +95,7 @@ void hotspot_partition_calculator::init_perf_counter(int partition_count)
                 "app.pegasus", counter_name.c_str(), COUNTER_TYPE_NUMBER, counter_desc.c_str());
         }
 
-        string total_desc =
+        std::string total_desc =
             _app_name + '.' +
             (data_type == partition_qps_type::WRITE_HOTSPOT_DATA ? "write.total" : "read.total");
         std::string counter_name = fmt::format("app.stat.hotspots.{}", total_desc);

diff --git a/src/server/hotspot_partition_calculator.h b/src/server/hotspot_partition_calculator.h
@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include <s2/third_party/absl/base/port.h>
 #include <stdint.h>
 #include <array>
 #include <list>

diff --git a/src/server/info_collector.h b/src/server/info_collector.h
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <s2/third_party/absl/base/port.h>
 #include <stdint.h>
 #include <stdlib.h>
 // IWYU pragma: no_include <bits/std_abs.h>
@@ -233,7 +232,7 @@ class info_collector
     ::dsn::task_ptr _storage_size_stat_timer_task;
     ::dsn::utils::ex_lock_nr _capacity_unit_update_info_lock;
     // mapping 'node address' --> 'last updated timestamp'
-    std::map<std::string, string> _capacity_unit_update_info;
+    std::map<std::string, std::string> _capacity_unit_update_info;
     // _hotspot_calculator_store is to save hotspot_partition_calculator for each table, a
     // hotspot_partition_calculator saves historical hotspot data and alert perf_counters of
     // corresponding table

diff --git a/src/server/info_collector_app.h b/src/server/info_collector_app.h
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <s2/third_party/absl/base/port.h>
 #include <string>
 #include <vector>
 

diff --git a/src/server/main.cpp b/src/server/main.cpp
@@ -19,7 +19,6 @@
 
 #include <pegasus/git_commit.h>
 #include <pegasus/version.h>
-#include <s2/third_party/absl/base/port.h>
 #include <unistd.h>
 #include <cstdio>
 #include <memory>

diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
@@ -51,6 +51,8 @@ set(MY_PROJ_LIBS
     PocoXML
     pegasus_geo_lib
     RocksDB::rocksdb
+    absl::flat_hash_set
+    absl::strings
     s2
     hdfs
     )

diff --git a/src/shell/commands/bulk_load.cpp b/src/shell/commands/bulk_load.cpp
@@ -23,7 +23,6 @@
 // IWYU pragma: no_include <ext/alloc_traits.h>
 #include <fmt/core.h>
 #include <getopt.h>
-#include <s2/third_party/absl/base/port.h>
 #include <stdio.h>
 #include <algorithm>
 #include <cstdint>

diff --git a/src/shell/commands/cold_backup.cpp b/src/shell/commands/cold_backup.cpp
@@ -22,7 +22,6 @@
 #include <boost/lexical_cast.hpp>
 #include <getopt.h>
 #include <inttypes.h>
-#include <s2/third_party/absl/base/port.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <algorithm>

diff --git a/src/shell/commands/data_operations.cpp b/src/shell/commands/data_operations.cpp
@@ -27,7 +27,6 @@
 #include <limits.h>
 #include <pegasus/error.h>
 #include <rocksdb/statistics.h>
-#include <s2/third_party/absl/base/port.h>
 #include <stdio.h>
 #include <algorithm>
 #include <atomic>

diff --git a/src/shell/commands/debugger.cpp b/src/shell/commands/debugger.cpp
@@ -35,7 +35,6 @@
 #include <rocksdb/sst_dump_tool.h>
 #include <rocksdb/status.h>
 #include <rocksdb/utilities/ldb_cmd.h>
-#include <s2/third_party/absl/base/port.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <ctime>

diff --git a/src/shell/commands/detect_hotkey.cpp b/src/shell/commands/detect_hotkey.cpp
@@ -16,7 +16,6 @@
 // under the License.
 
 #include <fmt/core.h>
-#include <s2/third_party/absl/base/port.h>
 #include <stdio.h>
 #include <memory>
 #include <set>

diff --git a/src/shell/commands/duplication.cpp b/src/shell/commands/duplication.cpp
@@ -18,7 +18,6 @@
  */
 
 #include <fmt/core.h>
-#include <s2/third_party/absl/base/port.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <iostream>

diff --git a/src/shell/commands/global_properties.cpp b/src/shell/commands/global_properties.cpp
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-#include <s2/third_party/absl/base/port.h>
 #include <stdio.h>
 #include <string>
 

diff --git a/src/shell/commands/node_management.cpp b/src/shell/commands/node_management.cpp
@@ -19,7 +19,6 @@
 
 // IWYU pragma: no_include <bits/getopt_core.h>
 #include <getopt.h>
-#include <s2/third_party/absl/base/port.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/src/shell/commands/rebalance.cpp b/src/shell/commands/rebalance.cpp
@@ -19,7 +19,6 @@
 
 // IWYU pragma: no_include <bits/getopt_core.h>
 #include <getopt.h>
-#include <s2/third_party/absl/base/port.h>
 #include <stdio.h>
 #include <algorithm>
 #include <iostream>

diff --git a/src/shell/commands/recovery.cpp b/src/shell/commands/recovery.cpp
@@ -20,7 +20,6 @@
 // IWYU pragma: no_include <bits/getopt_core.h>
 #include <boost/algorithm/string/trim.hpp>
 #include <getopt.h>
-#include <s2/third_party/absl/base/port.h>
 #include <stdio.h>
 #include <algorithm>
 #include <fstream>

diff --git a/src/shell/commands/table_management.cpp b/src/shell/commands/table_management.cpp
@@ -21,7 +21,6 @@
 // IWYU pragma: no_include <bits/std_abs.h>
 #include <fmt/core.h>
 #include <getopt.h>
-#include <s2/third_party/absl/base/port.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <algorithm>

diff --git a/src/shell/main.cpp b/src/shell/main.cpp
@@ -19,7 +19,6 @@
 
 #include <ctype.h>
 #include <pegasus/version.h>
-#include <s2/third_party/absl/base/port.h>
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/src/test/function_test/base_api/test_copy.cpp b/src/test/function_test/base_api/test_copy.cpp
@@ -18,7 +18,6 @@
  */
 
 #include <limits.h>
-#include <s2/third_party/absl/base/port.h>
 #include <string.h>
 #include <time.h>
 #include <atomic>

diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
@@ -366,22 +366,29 @@ ExternalProject_Add(nlohmann_json
         DOWNLOAD_NO_PROGRESS true
 )
 
+ExternalProject_Add(abseil
+        URL ${OSS_URL_PREFIX}/abseil-20230802.1.zip
+        https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.1.zip
+        URL_MD5 5c6193dbc82834f8e762c6a28c9cc615
+        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${TP_OUTPUT}
+        -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+        -DABSL_FIND_GOOGLETEST=OFF
+        -DCMAKE_CXX_STANDARD=17
+        DOWNLOAD_EXTRACT_TIMESTAMP true
+        DOWNLOAD_NO_PROGRESS true
+)
+
 ExternalProject_Add(s2geometry
-        URL ${OSS_URL_PREFIX}/s2geometry-e8d16637a467d9f096a92a6d81a50a9b747ca828.zip
-        https://github.com/neverchanje/s2geometry/archive/e8d16637a467d9f096a92a6d81a50a9b747ca828.zip
-        URL_MD5 75cc44c9c31382083d8a2d0e42590788
-        PATCH_COMMAND patch -p1 < ${TP_DIR}/fix_s2_build_with_cxx17.patch
+        URL ${OSS_URL_PREFIX}/s2geometry-0.10.0.tar.gz
+        https://github.com/google/s2geometry/archive/refs/tags/v0.10.0.tar.gz
+        URL_MD5 c68f3c5d326dde9255681b9201393a9f
+        PATCH_COMMAND patch -p1 < ${TP_DIR}/fix_s2_build_with_absl_and_gtest.patch
         CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${TP_OUTPUT}
-        -DGOOGLETEST_VERSION=1.14.0
-        -DGTEST_ROOT=${googletest_SRC}/googletest
         -DBUILD_SHARED_LIBS=OFF
-        -DBUILD_PYTHON=OFF
-        -DBUILD_TESTING=OFF
+        -DGTEST_ROOT=${googletest_SRC}/googletest
+        -DWITH_PYTHON=OFF
         -DBUILD_EXAMPLES=OFF
-        -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-        -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-        -DCMAKE_CXX_STANDARD=17
-        DEPENDS googletest
+        DEPENDS googletest abseil
         DOWNLOAD_EXTRACT_TIMESTAMP true
         DOWNLOAD_NO_PROGRESS true
 )
@@ -453,13 +460,3 @@ ExternalProject_Add(http-parser
         DOWNLOAD_NO_PROGRESS true
 )
 
-ExternalProject_Add(abseil
-        URL ${OSS_URL_PREFIX}/abseil-20230802.1.zip
-        https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.1.zip
-        URL_MD5 5c6193dbc82834f8e762c6a28c9cc615
-        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${TP_OUTPUT}
-        -DABSL_FIND_GOOGLETEST=OFF
-        -DCMAKE_CXX_STANDARD=14
-        DOWNLOAD_EXTRACT_TIMESTAMP true
-        DOWNLOAD_NO_PROGRESS true
-)
diff --git a/thirdparty/fix_s2_build_with_absl_and_gtest.patch b/thirdparty/fix_s2_build_with_absl_and_gtest.patch
@@ -0,0 +1,42 @@
+From 3e3d469e81b5b8934abc4b15cd9e33065b5a489f Mon Sep 17 00:00:00 2001
+From: Yingchun Lai <[email protected]>
+Date: Tue, 21 Nov 2023 23:43:25 +0800
+Subject: [PATCH] Build as thirdparty of Apache Pegasus
+
+---
+ CMakeLists.txt | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f080b4b..8e3471a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,7 +19,7 @@ endif()
+ # undefined symbol errors since ABSL_HAVE_STD_STRING_VIEW etc will
+ # end up defined differently.  There is probably a better way to achieve
+ # this than assuming what absl used.
+-set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ # No compiler-specific extensions, i.e. -std=c++11, not -std=gnu++11.
+ set(CMAKE_CXX_EXTENSIONS OFF)
+@@ -40,6 +40,7 @@ add_feature_info(SHARED_LIBS BUILD_SHARED_LIBS
+                  "builds shared libraries instead of static.")
+
+ option(BUILD_EXAMPLES "Build s2 documentation examples." ON)
++option(BUILD_TESTS "Build s2 tests." OFF)
+
+ option(WITH_PYTHON "Add python interface" OFF)
+ add_feature_info(PYTHON WITH_PYTHON "provides python interface to S2")
+@@ -429,7 +430,7 @@ install(TARGETS ${S2_TARGETS}
+         LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+
+ message("GTEST_ROOT: ${GTEST_ROOT}")
+-if (GTEST_ROOT)
++if (GTEST_ROOT AND BUILD_TESTS)
+   add_subdirectory(${GTEST_ROOT} build_gtest)
+   include_directories(${GTEST_ROOT}/include)
+
+-- 
+2.41.0
+