Merge pull request #156 from t20100/downgrade-snappy

Downgraded snappy to 1.1.8

CHANGELOG.rst

@@ -1,7 +1,7 @@
-3.2.0: 2021/10/14
+3.2.0: 2021/10/15
 -----------------
 
-- Updated libraries: blosc v1.21.1 (lz4 v1.9.3, zlib v1.2.11, zstd v1.5.0), snappy v1.1.9 (PR #152)
+- Updated libraries: blosc v1.21.1 (lz4 v1.9.3, zlib v1.2.11, zstd v1.5.0), snappy v1.1.8 (PR #152, #156)
 - Fixed compilation issue occuring on ppc64le in conda-forge (PR #154)
 - Documentation: Added European HDF User Group presentation (PR #150) and updated changelog (PR #155)
 

doc/information.rst

@@ -39,7 +39,7 @@ HDF5 compression filters and compression libraries sources were obtained from:
 
 * LZ4 plugin (v0.1.0) and lz4 (v1.3.0, tag r122): https://github.com/nexusformat/HDF5-External-Filter-Plugins, https://github.com/lz4/lz4
 * bitshuffle plugin (0.3.5): https://github.com/kiyo-masui/bitshuffle
-* hdf5-blosc plugin (v1.0.0), c-blosc (v1.21.1) and snappy (v1.1.9): https://github.com/Blosc/hdf5-blosc, https://github.com/Blosc/c-blosc and https://github.com/google/snappy
+* hdf5-blosc plugin (v1.0.0), c-blosc (v1.21.1) and snappy (v1.1.8): https://github.com/Blosc/hdf5-blosc, https://github.com/Blosc/c-blosc and https://github.com/google/snappy
 * FCIDECOMP plugin (v1.0.2) and CharLS (branch 1.x-master SHA1 ID: 25160a42fb62e71e4b0ce081f5cb3f8bb73938b5):
   ftp://ftp.eumetsat.int/pub/OPS/out/test-data/Test-data-for-External-Users/MTG_FCI_Test-Data/FCI_Decompression_Software_V1.0.2 and
   https://github.com/team-charls/charls

src/snappy/.appveyor.yml

@@ -34,4 +34,3 @@ build_script:
 
 test_script:
   - build\%CONFIGURATION%\snappy_unittest
-  - build\%CONFIGURATION%\snappy_benchmark

src/snappy/.travis.yml

@@ -4,7 +4,7 @@
 
 language: cpp
 dist: bionic
-osx_image: xcode12.2
+osx_image: xcode10.3
 
 compiler:
 - gcc
@@ -19,36 +19,32 @@ env:
 - BUILD_TYPE=RelWithDebInfo CPU_LEVEL=AVX
 - BUILD_TYPE=RelWithDebInfo CPU_LEVEL=AVX2
 
-jobs:
+matrix:
   exclude:
   # Travis OSX servers seem to run on pre-Haswell CPUs. Attempting to use AVX2
   # results in crashes.
   - env: BUILD_TYPE=Debug CPU_LEVEL=AVX2
     os: osx
   - env: BUILD_TYPE=RelWithDebInfo CPU_LEVEL=AVX2
     os: osx
-  allow_failures:
-  # Homebrew's GCC is currently broken on XCode 11.
-  - compiler: gcc
-    os: osx
 
 addons:
   apt:
     sources:
-    - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main'
+    - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main'
       key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
     - sourceline: 'ppa:ubuntu-toolchain-r/test'
     packages:
-    - clang-10
+    - clang-9
     - cmake
-    - gcc-10
-    - g++-10
+    - gcc-9
+    - g++-9
     - ninja-build
   homebrew:
     packages:
     - cmake
-    - gcc@10
-    - llvm@10
+    - gcc@9
+    - llvm@9
     - ninja
     update: true
 
@@ -59,21 +55,20 @@ install:
     export PATH="$(brew --prefix llvm)/bin:$PATH";
   fi
 # Fuzzing is only supported on Clang. Perform fuzzing on Debug builds.
-# LibFuzzer doesn't ship with CommandLineTools on osx.
-- if [ "$CXX" = "clang++" ] && [ "$BUILD_TYPE" = "Debug" ] && [ "$TRAVIS_OS_NAME" != "osx" ]; then
+- if [ "$CXX" = "clang++" ] && [ "$BUILD_TYPE" = "Debug" ]; then
     export FUZZING=1;
   else
     export FUZZING=0;
   fi
 # /usr/bin/gcc points to an older compiler on both Linux and macOS.
-- if [ "$CXX" = "g++" ]; then export CXX="g++-10" CC="gcc-10"; fi
+- if [ "$CXX" = "g++" ]; then export CXX="g++-9" CC="gcc-9"; fi
 # /usr/bin/clang points to an older compiler on both Linux and macOS.
 #
 # Homebrew's llvm package doesn't ship a versioned clang++ binary, so the values
 # below don't work on macOS. Fortunately, the path change above makes the
 # default values (clang and clang++) resolve to the correct compiler on macOS.
 - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-    if [ "$CXX" = "clang++" ]; then export CXX="clang++-10" CC="clang-10"; fi;
+    if [ "$CXX" = "clang++" ]; then export CXX="clang++-9" CC="clang-9"; fi;
   fi
 - echo ${CC}
 - echo ${CXX}
@@ -90,7 +85,6 @@ before_script:
 
 script:
 - build/snappy_unittest
-- build/snappy_benchmark
 - if [ -f build/snappy_compress_fuzzer ]; then
     build/snappy_compress_fuzzer -runs=1000 -close_fd_mask=3;
   fi

src/snappy/CMakeLists.txt

@@ -27,7 +27,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 cmake_minimum_required(VERSION 3.1)
-project(Snappy VERSION 1.1.9 LANGUAGES C CXX)
+project(Snappy VERSION 1.1.8 LANGUAGES C CXX)
 
 # C++ standard can be overridden when this is used as a sub-project.
 if(NOT CMAKE_CXX_STANDARD)
@@ -37,59 +37,12 @@ if(NOT CMAKE_CXX_STANDARD)
   set(CMAKE_CXX_EXTENSIONS OFF)
 endif(NOT CMAKE_CXX_STANDARD)
 
-# https://github.com/izenecloud/cmake/blob/master/SetCompilerWarningAll.cmake
-if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-  # Use the highest warning level for Visual Studio.
-  set(CMAKE_CXX_WARNING_LEVEL 4)
-  if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-    string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-  else(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
-  endif(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-
-  # Disable C++ exceptions.
-  string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHs-c-")
-  add_definitions(-D_HAS_EXCEPTIONS=0)
-
-  # Disable RTTI.
-  string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-")
-else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-  # Use -Wall for clang and gcc.
-  if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-  endif(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
-
-  # Use -Wextra for clang and gcc.
-  if(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
-  endif(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
-
-  # Use -Werror for clang only.
-  if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    if(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-    endif(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
-  endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
-  # Disable C++ exceptions.
-  string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
-
-  # Disable RTTI.
-  string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
-endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-
 # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make
 # it prominent in the GUI.
 option(BUILD_SHARED_LIBS "Build shared libraries(DLLs)." OFF)
 
 option(SNAPPY_BUILD_TESTS "Build Snappy's own tests." ON)
 
-option(SNAPPY_BUILD_BENCHMARKS "Build Snappy's benchmarks" ON)
-
 option(SNAPPY_FUZZING_BUILD "Build Snappy for fuzzing." OFF)
 
 option(SNAPPY_REQUIRE_AVX "Target processors with AVX support." OFF)
@@ -102,6 +55,8 @@ include(TestBigEndian)
 test_big_endian(SNAPPY_IS_BIG_ENDIAN)
 
 include(CheckIncludeFile)
+check_include_file("byteswap.h" HAVE_BYTESWAP_H)
+check_include_file("sys/endian.h" HAVE_SYS_ENDIAN_H)
 check_include_file("sys/mman.h" HAVE_SYS_MMAN_H)
 check_include_file("sys/resource.h" HAVE_SYS_RESOURCE_H)
 check_include_file("sys/time.h" HAVE_SYS_TIME_H)
@@ -112,7 +67,6 @@ check_include_file("windows.h" HAVE_WINDOWS_H)
 include(CheckLibraryExists)
 check_library_exists(z zlibVersion "" HAVE_LIBZ)
 check_library_exists(lzo2 lzo1x_1_15_compress "" HAVE_LIBLZO2)
-check_library_exists(lz4 LZ4_compress_default "" HAVE_LIBLZ4)
 
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("/arch:AVX" HAVE_VISUAL_STUDIO_ARCH_AVX)
@@ -138,10 +92,6 @@ elseif (SNAPPY_REQUIRE_AVX)
   endif(HAVE_CLANG_MAVX)
 endif(SNAPPY_REQUIRE_AVX2)
 
-# Used by googletest.
-check_cxx_compiler_flag(-Wno-missing-field-initializers
-                        SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS)
-
 include(CheckCXXSourceCompiles)
 check_cxx_source_compiles("
 int main() {
@@ -153,13 +103,6 @@ int main() {
   return __builtin_ctzll(0);
 }" HAVE_BUILTIN_CTZ)
 
-check_cxx_source_compiles("
-__attribute__((always_inline)) int zero() { return 0; }
-
-int main() {
-  return zero();
-}" HAVE_ATTRIBUTE_ALWAYS_INLINE)
-
 check_cxx_source_compiles("
 #include <tmmintrin.h>
 
@@ -182,6 +125,16 @@ include(CheckSymbolExists)
 check_symbol_exists("mmap" "sys/mman.h" HAVE_FUNC_MMAP)
 check_symbol_exists("sysconf" "unistd.h" HAVE_FUNC_SYSCONF)
 
+find_package(GTest QUIET)
+if(GTEST_FOUND)
+  set(HAVE_GTEST 1)
+endif(GTEST_FOUND)
+
+find_package(Gflags QUIET)
+if(GFLAGS_FOUND)
+  set(HAVE_GFLAGS 1)
+endif(GFLAGS_FOUND)
+
 configure_file(
   "cmake/config.h.in"
   "${PROJECT_BINARY_DIR}/config.h"
@@ -249,92 +202,38 @@ if(BUILD_SHARED_LIBS)
   set_target_properties(snappy PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
 endif(BUILD_SHARED_LIBS)
 
-if(SNAPPY_BUILD_TESTS OR SNAPPY_BUILD_BENCHMARKS)
-  add_library(snappy_test_support "")
-  target_sources(snappy_test_support
+if(SNAPPY_BUILD_TESTS)
+  enable_testing()
+
+  add_executable(snappy_unittest "")
+  target_sources(snappy_unittest
     PRIVATE
+      "snappy_unittest.cc"
       "snappy-test.cc"
-      "snappy-test.h"
-      "snappy_test_data.cc"
-      "snappy_test_data.h"
-      "${PROJECT_BINARY_DIR}/config.h"
   )
-
-  # Test files include snappy-test.h, HAVE_CONFIG_H must be defined.
-  target_compile_definitions(snappy_test_support PUBLIC -DHAVE_CONFIG_H)
-
-  target_link_libraries(snappy_test_support snappy)
+  target_compile_definitions(snappy_unittest PRIVATE -DHAVE_CONFIG_H)
+  target_link_libraries(snappy_unittest snappy ${GFLAGS_LIBRARIES})
 
   if(HAVE_LIBZ)
-    target_link_libraries(snappy_test_support z)
+    target_link_libraries(snappy_unittest z)
   endif(HAVE_LIBZ)
   if(HAVE_LIBLZO2)
-    target_link_libraries(snappy_test_support lzo2)
+    target_link_libraries(snappy_unittest lzo2)
   endif(HAVE_LIBLZO2)
-  if(HAVE_LIBLZ4)
-    target_link_libraries(snappy_test_support lz4)
-  endif(HAVE_LIBLZ4)
 
-  target_include_directories(snappy_test_support
-    BEFORE PUBLIC
+  target_include_directories(snappy_unittest
+    BEFORE PRIVATE
       "${PROJECT_SOURCE_DIR}"
+      "${GTEST_INCLUDE_DIRS}"
+      "${GFLAGS_INCLUDE_DIRS}"
   )
-endif(SNAPPY_BUILD_TESTS OR SNAPPY_BUILD_BENCHMARKS)
-
-if(SNAPPY_BUILD_TESTS)
-  enable_testing()
-
-  # Prevent overriding the parent project's compiler/linker settings on Windows.
-  set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-  set(install_gtest OFF)
-  set(install_gmock OFF)
-  set(build_gmock ON)
-
-  # This project is tested using GoogleTest.
-  add_subdirectory("third_party/googletest")
-
-  # GoogleTest triggers a missing field initializers warning.
-  if(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS)
-    set_property(TARGET gtest
-        APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
-    set_property(TARGET gmock
-        APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
-  endif(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS)
-
-  add_executable(snappy_unittest "")
-  target_sources(snappy_unittest
-    PRIVATE
-      "snappy_unittest.cc"
-  )
-  target_link_libraries(snappy_unittest snappy_test_support gmock_main gtest)
 
   add_test(
     NAME snappy_unittest
     WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
     COMMAND "${PROJECT_BINARY_DIR}/snappy_unittest")
-
-  add_executable(snappy_test_tool "")
-  target_sources(snappy_test_tool
-    PRIVATE
-      "snappy_test_tool.cc"
-  )
-  target_link_libraries(snappy_test_tool snappy_test_support)
 endif(SNAPPY_BUILD_TESTS)
 
-if(SNAPPY_BUILD_BENCHMARKS)
-  add_executable(snappy_benchmark "")
-  target_sources(snappy_benchmark
-    PRIVATE
-      "snappy_benchmark.cc"
-  )
-  target_link_libraries(snappy_benchmark snappy_test_support benchmark_main)
-
-  # This project uses Google benchmark for benchmarking.
-  set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "" FORCE)
-  set(BENCHMARK_ENABLE_EXCEPTIONS OFF CACHE BOOL "" FORCE)
-  add_subdirectory("third_party/benchmark")
-endif(SNAPPY_BUILD_BENCHMARKS)
-
 if(SNAPPY_FUZZING_BUILD)
   add_executable(snappy_compress_fuzzer "")
   target_sources(snappy_compress_fuzzer

src/snappy/CONTRIBUTING.md

@@ -3,26 +3,6 @@
 We'd love to accept your patches and contributions to this project. There are
 just a few small guidelines you need to follow.
 
-## Project Goals
-
-In addition to the aims listed at the top of the [README](README.md) Snappy
-explicitly supports the following:
-
-1. C++11
-2. Clang (gcc and MSVC are best-effort).
-3. Low level optimizations (e.g. assembly or equivalent intrinsics) for:
-  1. [x86](https://en.wikipedia.org/wiki/X86)
-  2. [x86-64](https://en.wikipedia.org/wiki/X86-64)
-  3. ARMv7 (32-bit)
-  4. ARMv8 (AArch64)
-4. Supports only the Snappy compression scheme as described in
-  [format_description.txt](format_description.txt).
-5. CMake for building
-
-Changes adding features or dependencies outside of the core area of focus listed
-above might not be accepted. If in doubt post a message to the
-[Snappy discussion mailing list](https://groups.google.com/g/snappy-compression).
-
 ## Contributor License Agreement
 
 Contributions to this project must be accompanied by a Contributor License

src/snappy/NEWS

@@ -1,9 +1,3 @@
-Snappy v1.1.9, May 4th 2021:
-
-  * Performance improvements.
-
-  * Google Test and Google Benchmark are now bundled in third_party/.
-
 Snappy v1.1.8, January 15th 2020:
 
   * Small performance improvements.