1

acelyc111 · Nov 20, 2023 · 370dd69 · 370dd69
1 parent ef14b9e
commit 370dd69
Show file tree

Hide file tree

Showing 27 changed files with 13 additions and 29 deletions.
diff --git a/src/geo/bench/CMakeLists.txt b/src/geo/bench/CMakeLists.txt
@@ -29,7 +29,8 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
         pegasus_geo_lib
-        s2testing
+        absl_log_internal_message
+        absl_log_internal_check_op
         s2
         pegasus_client_static
         RocksDB::rocksdb

diff --git a/src/geo/bench/bench.cpp b/src/geo/bench/bench.cpp
@@ -23,8 +23,6 @@
 #include <s2/s1angle.h>
 #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>
@@ -95,7 +93,7 @@ int main(int argc, char **argv)
         const pegasus::geo::latlng_codec &codec = my_geo.get_codec();
         for (int i = 0; i < data_count; ++i) {
             std::string value;
-            S2LatLng latlng(S2Testing::SamplePoint(rect));
+            S2LatLng latlng;//(S2Testing::SamplePoint(rect));
             bool ok = codec.encode_to_value(latlng.lat().degrees(), latlng.lng().degrees(), value);
             CHECK(ok, "");
             int ret = my_geo.set(std::to_string(i), "", value, 1000);
@@ -118,7 +116,7 @@ int main(int argc, char **argv)
 
     // test search_radial by lat & lng
     for (int i = 0; i < test_count; ++i) {
-        S2LatLng latlng(S2Testing::SamplePoint(rect));
+        S2LatLng latlng;//(S2Testing::SamplePoint(rect));
 
         uint64_t start_nanos = env->NowNanos();
         my_geo.async_search_radial(

diff --git a/src/geo/test/CMakeLists.txt b/src/geo/test/CMakeLists.txt
@@ -29,7 +29,8 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
         pegasus_geo_lib
-        s2testing
+        absl_log_internal_message
+        absl_log_internal_check_op
         s2
         pegasus_client_static
         dsn_utils

diff --git a/src/geo/test/geo_test.cpp b/src/geo/test/geo_test.cpp
@@ -30,8 +30,6 @@
 #include <s2/s2cell_id.h>
 #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>
@@ -584,7 +582,7 @@ TEST_F(geo_client_test, large_cap)
     S2Cap cap;
     gen_search_cap(S2LatLng::FromDegrees(lat_degrees, lng_degrees), radius_m, cap);
     for (int i = 0; i < test_data_count; ++i) {
-        S2LatLng latlng(S2Testing::SamplePoint(cap));
+        S2LatLng latlng;//(S2Testing::SamplePoint(cap));
         ASSERT_TRUE(cap.Contains(latlng.ToPoint()));
         std::string id = std::to_string(i);
         std::string value = id + "|2018-06-05 12:00:00|2018-06-05 13:00:00|abcdefg|" +

diff --git a/src/geo/test/latlng_codec_test.cpp b/src/geo/test/latlng_codec_test.cpp
@@ -22,7 +22,6 @@
 #include <gtest/gtest.h>
 #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
@@ -30,6 +30,8 @@ set(MY_PROJ_LIBS pegasus.rproxylib
                  pegasus_geo_lib
                  pegasus_reporter
                  event
+                 absl_log_internal_message
+                 absl_log_internal_check_op
                  s2
                  pegasus_client_static
                  )

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_ut/CMakeLists.txt b/src/redis_protocol/proxy_ut/CMakeLists.txt
@@ -32,6 +32,8 @@ set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
 set(MY_PROJ_LIBS pegasus.rproxylib
                 pegasus_base
                 pegasus_geo_lib
+                absl_log_internal_message
+                absl_log_internal_check_op
                 s2
                 pegasus_client_static
                 gtest

diff --git a/src/redis_protocol/proxy_ut/redis_proxy_test.cpp b/src/redis_protocol/proxy_ut/redis_proxy_test.cpp
@@ -35,7 +35,6 @@
 // IWYU pragma: no_include <gtest/gtest-test-part.h>
 #include <gtest/gtest.h>
 #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.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>

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_log_internal_message
+    absl_log_internal_check_op
     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
@@ -21,7 +21,6 @@
 // IWYU pragma: no_include <gtest/gtest-test-part.h>
 #include <gtest/gtest.h>
 #include <limits.h>
-#include <s2/third_party/absl/base/port.h>
 #include <string.h>
 #include <time.h>
 #include <algorithm>