fix snappy more

apache · Dec 5, 2023 · ba3f524 · ba3f524
1 parent c0dc4af
commit ba3f524
Show file tree

Hide file tree

Showing 35 changed files with 60 additions and 33 deletions.
diff --git a/.licenserc.yaml b/.licenserc.yaml
@@ -69,6 +69,7 @@ header:
     - 'thirdparty/fix_libevent_for_macos.patch'
     - 'thirdparty/fix_prometheus-cpp_limits.patch'
     - 'thirdparty/fix_rocksdb-cmake-PORTABLE-option.patch'
+    - 'thirdparty/fix_snappy-Wsign-compare-warning.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.

diff --git a/src/aio/CMakeLists.txt b/src/aio/CMakeLists.txt
@@ -35,9 +35,9 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
         dsn_runtime
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 #Extra files that will be installed

diff --git a/src/aio/test/CMakeLists.txt b/src/aio/test/CMakeLists.txt
@@ -38,9 +38,9 @@ set(MY_PROJ_LIBS
         dsn_runtime
         dsn_aio
         test_utils
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/src/block_service/hdfs/CMakeLists.txt b/src/block_service/hdfs/CMakeLists.txt
@@ -28,9 +28,9 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
         hdfs
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 #Extra files that will be installed

diff --git a/src/block_service/local/CMakeLists.txt b/src/block_service/local/CMakeLists.txt
@@ -27,9 +27,9 @@ set(MY_PROJ_SRC "")
 set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 #Extra files that will be installed

diff --git a/src/block_service/test/CMakeLists.txt b/src/block_service/test/CMakeLists.txt
@@ -32,9 +32,9 @@ set(MY_PROJ_LIBS
         gtest_main
         hdfs
         test_utils
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/src/client/test/CMakeLists.txt b/src/client/test/CMakeLists.txt
@@ -27,9 +27,9 @@ set(MY_PROJ_LIBS
         dsn_runtime
         dsn_utils
         gtest
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/src/common/test/CMakeLists.txt b/src/common/test/CMakeLists.txt
@@ -30,9 +30,9 @@ set(MY_PROJ_LIBS
         dsn_replication_common
         dsn_runtime
         gtest
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/src/failure_detector/test/CMakeLists.txt b/src/failure_detector/test/CMakeLists.txt
@@ -41,9 +41,9 @@ set(MY_PROJ_LIBS
         dsn.failure_detector
         gtest
         hashtable
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/src/geo/bench/CMakeLists.txt b/src/geo/bench/CMakeLists.txt
@@ -34,9 +34,9 @@ set(MY_PROJ_LIBS
         s2testing
         s2
         pegasus_client_static
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy
         dsn_utils)
 

diff --git a/src/http/test/CMakeLists.txt b/src/http/test/CMakeLists.txt
@@ -26,9 +26,9 @@ set(MY_PROJ_LIBS
         dsn_runtime
         curl
         gtest
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/src/meta/CMakeLists.txt b/src/meta/CMakeLists.txt
@@ -47,9 +47,9 @@ set(MY_PROJ_LIBS
         zookeeper
         hashtable
         hdfs
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/src/nfs/test/CMakeLists.txt b/src/nfs/test/CMakeLists.txt
@@ -38,9 +38,9 @@ set(MY_PROJ_LIBS
         dsn_runtime
         gtest
         dsn_aio
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy
         test_utils)
 

diff --git a/src/perf_counter/test/CMakeLists.txt b/src/perf_counter/test/CMakeLists.txt
@@ -36,9 +36,9 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 set(MY_PROJ_LIBS
         gtest
         dsn_runtime
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/src/replica/CMakeLists.txt b/src/replica/CMakeLists.txt
@@ -69,9 +69,9 @@ set(MY_PROJ_LIBS
         dsn_runtime
         dsn_aio
         dsn_meta_server
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::filesystem)

diff --git a/src/replica/backup/test/CMakeLists.txt b/src/replica/backup/test/CMakeLists.txt
@@ -29,9 +29,9 @@ set(MY_PROJ_LIBS dsn_meta_server
         dsn_utils
         hashtable
         gtest
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/src/replica/bulk_load/test/CMakeLists.txt b/src/replica/bulk_load/test/CMakeLists.txt
@@ -28,9 +28,9 @@ set(MY_PROJ_LIBS dsn_meta_server
         hashtable
         gtest
         test_utils
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/src/replica/duplication/test/CMakeLists.txt b/src/replica/duplication/test/CMakeLists.txt
@@ -31,9 +31,9 @@ set(MY_PROJ_LIBS dsn_meta_server
         hashtable
         gtest
         test_utils
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/src/replica/storage/simple_kv/CMakeLists.txt b/src/replica/storage/simple_kv/CMakeLists.txt
@@ -43,9 +43,9 @@ set(MY_PROJ_LIBS
         dsn_client
         dsn_runtime
         hashtable
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/src/replica/storage/simple_kv/test/CMakeLists.txt b/src/replica/storage/simple_kv/test/CMakeLists.txt
@@ -41,9 +41,9 @@ set(MY_PROJ_LIBS
         hashtable
         gtest
         dsn_utils
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/src/replica/test/CMakeLists.txt b/src/replica/test/CMakeLists.txt
@@ -48,9 +48,9 @@ set(MY_PROJ_LIBS
         hashtable
         gtest
         test_utils
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/src/runtime/test/CMakeLists.txt b/src/runtime/test/CMakeLists.txt
@@ -34,9 +34,9 @@ set(MY_PROJ_LIBS
         dsn_runtime
         dsn_aio
         dsn_meta_server
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
@@ -36,9 +36,9 @@ set(MY_PROJ_LIBS
         dsn.failure_detector
         dsn.replication.zookeeper_provider
         dsn_utils
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy
         pegasus_reporter
         pegasus_base

diff --git a/src/server/test/CMakeLists.txt b/src/server/test/CMakeLists.txt
@@ -46,9 +46,9 @@ set(MY_PROJ_LIBS
         dsn.replication.zookeeper_provider
         dsn_utils
         pegasus_reporter
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy
         pegasus_client_static
         event

diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
@@ -41,9 +41,9 @@ set(MY_PROJ_LIBS
         dsn.failure_detector
         pegasus_client_static
         pegasus_geo_lib
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy
         absl::flat_hash_set
         absl::strings

diff --git a/src/test/bench_test/CMakeLists.txt b/src/test/bench_test/CMakeLists.txt
@@ -30,9 +30,9 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 set(MY_PROJ_LIBS
         pegasus_client_static
         dsn_utils
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy
         sasl2
         gssapi_krb5

diff --git a/src/test/function_test/bulk_load/CMakeLists.txt b/src/test/function_test/bulk_load/CMakeLists.txt
@@ -38,9 +38,9 @@ set(MY_PROJ_LIBS
         krb5
         function_test_utils
         test_utils
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/src/test_util/CMakeLists.txt b/src/test_util/CMakeLists.txt
@@ -24,9 +24,9 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
         gtest
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 dsn_add_static_library()
diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
@@ -33,9 +33,9 @@ set(MY_BOOST_LIBS Boost::system Boost::filesystem)
 
 set(MY_PROJ_LIBS
         dsn_http
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 # Extra files that will be installed

diff --git a/src/utils/long_adder_bench/CMakeLists.txt b/src/utils/long_adder_bench/CMakeLists.txt
@@ -30,9 +30,9 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 set(MY_PROJ_LIBS
         dsn_runtime
         dsn_utils
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/src/utils/test/CMakeLists.txt b/src/utils/test/CMakeLists.txt
@@ -35,9 +35,9 @@ set(MY_PROJ_LIBS
         dsn_utils
         gtest
         test_utils
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/src/utils/test/nth_element_bench/CMakeLists.txt b/src/utils/test/nth_element_bench/CMakeLists.txt
@@ -30,9 +30,9 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 set(MY_PROJ_LIBS
         dsn_runtime
         dsn_utils
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/src/zookeeper/test/CMakeLists.txt b/src/zookeeper/test/CMakeLists.txt
@@ -39,9 +39,9 @@ set(MY_PROJ_LIBS
         zookeeper
         hashtable
         gtest
+        rocksdb
         lz4
         zstd
-        rocksdb
         snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
@@ -381,7 +381,7 @@ ExternalProject_Add(snappy
         URL ${OSS_URL_PREFIX}/snappy-1.1.10.tar.gz
         https://github.com/google/snappy/archive/refs/tags/1.1.10.tar.gz
         URL_MD5 70153395ebe6d72febe2cf2e40026a44
-        PATCH_COMMAND ""
+        PATCH_COMMAND patch -p1 < ${TP_DIR}/fix_snappy-Wsign-compare-warning.patch
         CMAKE_ARGS ${SNAPPY_OPTIONS}
         BUILD_COMMAND make -j${PARALLEL}
         INSTALL_COMMAND make install

diff --git a/thirdparty/fix_snappy-Wsign-compare-warning.patch b/thirdparty/fix_snappy-Wsign-compare-warning.patch
@@ -0,0 +1,26 @@
+From 27f34a580be4a3becf5f8c0cba13433f53c21337 Mon Sep 17 00:00:00 2001
+From: Richard O'Grady <[email protected]>
+Date: Wed, 12 Jul 2023 10:12:01 -0700
+Subject: [PATCH] Fix -Wsign-compare warning
+
+PiperOrigin-RevId: 547529709
+---
+ snappy.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/snappy.cc b/snappy.cc
+index 688065b..6473123 100644
+--- a/snappy.cc
++++ b/snappy.cc
+@@ -1289,7 +1289,7 @@ std::pair<const uint8_t*, ptrdiff_t> DecompressBranchless(
+         DeferMemCopy(&deferred_src, &deferred_length, from, len);
+       }
+     } while (ip < ip_limit_min_slop &&
+-             (op + deferred_length) < op_limit_min_slop);
++             static_cast<ptrdiff_t>(op + deferred_length) < op_limit_min_slop);
+   exit:
+     ip--;
+     assert(ip <= ip_limit);
+-- 
+2.42.1
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,9 +35,9 @@ set(MY_SRC_SEARCH_MODE "GLOB") @@
     set(MY_PROJ_LIBS
             dsn_runtime
+            rocksdb
             lz4
             zstd
-            rocksdb
             snappy)
     #Extra files that will be installed
@@ Expand Down @@