Changeset: d4ee5d1aa4a4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d4ee5d1aa4a4
Removed Files:
cmake/Modules/FindSnappy.cmake
ctest/cmake/detect-snappy.cmake
ctest/cmake/test_detect_snappy.c.in
Modified Files:
MonetDB.spec
cmake/monetdb-defines.cmake
cmake/monetdb-findpackages.cmake
cmake/monetdb-functions.cmake
cmake/monetdb-options.cmake
ctest/cmake/CMakeLists.txt
debian/rules
documentation/source/binary-resultset.rst
documentation/source/build-debian.rst
documentation/source/build-fedora.rst
monetdb_config.h.in
Branch: Dec2023
Log Message:
Remove references to SNAPPY compression library: we do not use it.
diffs (257 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -151,7 +151,6 @@ BuildRequires: pkgconfig(libR)
# BuildRequires: pkgconfig(gdal) # -DSHP=ON
# BuildRequires: pkgconfig(netcdf) # -DNETCDF=ON
# BuildRequires: pkgconfig(proj) # -DWITH_PROJ=ON
-# BuildRequires: pkgconfig(snappy) # -DWITH_SNAPPY=ON
# BuildRequires: pkgconfig(valgrind) # -DWITH_VALGRIND=ON
%if (0%{?fedora} >= 22)
@@ -869,7 +868,6 @@ sed -i 's/1\.2/1.1/' misc/selinux/monetd
-DWITH_PCRE=ON \
-DWITH_PROJ=OFF \
-DWITH_READLINE=ON \
- -DWITH_SNAPPY=OFF \
-DWITH_VALGRIND=OFF \
-DWITH_XML2=ON \
-DWITH_ZLIB=ON
diff --git a/cmake/Modules/FindSnappy.cmake b/cmake/Modules/FindSnappy.cmake
deleted file mode 100644
--- a/cmake/Modules/FindSnappy.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-# - Find snappy
-# Find the native snappy headers and libraries.
-#
-# SNAPPY_INCLUDE_DIR - where to find snappy.h, etc.
-# SNAPPY_LIBRARIES - List of libraries when using snappy.
-# SNAPPY_FOUND - True if snappy found.
-
-find_path(SNAPPY_INCLUDE_DIR NAMES snappy.h)
-find_library(SNAPPY_LIBRARIES NAMES snappy)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Snappy
- DEFAULT_MSG
- SNAPPY_LIBRARIES
- SNAPPY_INCLUDE_DIR)
-
-mark_as_advanced(SNAPPY_INCLUDE_DIR
- SNAPPY_LIBRARIES)
-
-if(SNAPPY_FOUND)
- if(NOT TARGET SNAPPY::SNAPPY AND
- (EXISTS "${SNAPPY_LIBRARIES}"))
- add_library(SNAPPY::SNAPPY UNKNOWN IMPORTED)
- set_target_properties(SNAPPY::SNAPPY
- PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${SNAPPY_INCLUDE_DIR}")
-
- if(EXISTS "${SNAPPY_LIBRARIES}")
- set_target_properties(SNAPPY::SNAPPY
- PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES "C"
- IMPORTED_LOCATION "${SNAPPY_LIBRARIES}")
- endif()
- endif()
-endif()
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -145,7 +145,6 @@ macro(monetdb_macro_variables)
set(HAVE_LIBZ ${ZLIB_FOUND})
set(HAVE_LIBLZ4 ${LZ4_FOUND})
set(HAVE_PROJ ${PROJ_FOUND})
- set(HAVE_SNAPPY ${SNAPPY_FOUND})
set(HAVE_FITS ${CFITSIO_FOUND})
set(HAVE_VALGRIND ${VALGRIND_FOUND})
set(HAVE_NETCDF ${NETCDF_FOUND})
diff --git a/cmake/monetdb-findpackages.cmake b/cmake/monetdb-findpackages.cmake
--- a/cmake/monetdb-findpackages.cmake
+++ b/cmake/monetdb-findpackages.cmake
@@ -65,10 +65,6 @@ if(WITH_PROJ)
find_package(Proj 6.0)
endif()
-if(WITH_SNAPPY)
- find_package(Snappy)
-endif()
-
if(WITH_VALGRIND)
find_package(Valgrind)
endif()
diff --git a/cmake/monetdb-functions.cmake b/cmake/monetdb-functions.cmake
--- a/cmake/monetdb-functions.cmake
+++ b/cmake/monetdb-functions.cmake
@@ -98,7 +98,6 @@ function(monetdb_cmake_summary)
message(STATUS "Zlib library: ${ZLIB_FOUND}")
message(STATUS "Lz4 library: ${LZ4_FOUND}")
message(STATUS "Proj library: ${PROJ_FOUND}")
- message(STATUS "Snappy library: ${SNAPPY_FOUND}")
message(STATUS "Geos library: ${GEOS_FOUND}")
message(STATUS "Gdal library: ${GDAL_FOUND}")
message(STATUS "Fits library: ${CFITSIO_FOUND}")
diff --git a/cmake/monetdb-options.cmake b/cmake/monetdb-options.cmake
--- a/cmake/monetdb-options.cmake
+++ b/cmake/monetdb-options.cmake
@@ -133,10 +133,6 @@ option(WITH_PCRE
"Include pcre support"
ON)
-option(WITH_SNAPPY
- "Include snappy support"
- ON)
-
option(WITH_VALGRIND
"Include valgrind support"
ON)
diff --git a/ctest/cmake/CMakeLists.txt b/ctest/cmake/CMakeLists.txt
--- a/ctest/cmake/CMakeLists.txt
+++ b/ctest/cmake/CMakeLists.txt
@@ -31,7 +31,6 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/dete
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-netcdf.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-readline.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-libr.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/detect-snappy.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-fits.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-valgrind.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-geos.cmake)
diff --git a/ctest/cmake/detect-snappy.cmake b/ctest/cmake/detect-snappy.cmake
deleted file mode 100644
--- a/ctest/cmake/detect-snappy.cmake
+++ /dev/null
@@ -1,53 +0,0 @@
-#[[
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# Copyright 2024 MonetDB Foundation;
-# Copyright August 2008 - 2023 MonetDB B.V.;
-# Copyright 1997 - July 2008 CWI.
-#]]
-
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
- get_os_release_info(LINUX_DISTRO LINUX_DISTRO_VERSION)
-endif()
-
-if (${LINUX_DISTRO} STREQUAL "debian")
- if(${LINUX_DISTRO_VERSION} STREQUAL "9")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_SNAPPY
- variablename SNAPPY_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "10")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_SNAPPY
- variablename SNAPPY_FOUND)
- endif()
-elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
- if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_SNAPPY
- variablename SNAPPY_FOUND)
- endif()
-elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_SNAPPY
- variablename SNAPPY_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "31")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_SNAPPY
- variablename SNAPPY_FOUND)
- endif()
-else()
- message(ERROR "Linux distro: ${LINUX_DISTRO} not known")
- message(ERROR "Linux distro version: ${LINUX_DISTRO_VERSION} not known")
-endif()
diff --git a/ctest/cmake/test_detect_snappy.c.in
b/ctest/cmake/test_detect_snappy.c.in
deleted file mode 100644
--- a/ctest/cmake/test_detect_snappy.c.in
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright 2024 MonetDB Foundation;
- * Copyright August 2008 - 2023 MonetDB B.V.;
- * Copyright 1997 - July 2008 CWI.
- */
-
-#include "monetdb_config.h"
-
-int
-main(void)
-{
-#ifdef HAVE_SNAPPY
- return @DETECT@;
-#else
- return @UNDETECT@;
-#endif
-}
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,6 @@ override_dh_auto_configure:
-DWITH_PCRE=ON \
-DWITH_PROJ=OFF \
-DWITH_READLINE=ON \
- -DWITH_SNAPPY=OFF \
-DWITH_VALGRIND=OFF \
-DWITH_XML2=ON \
-DWITH_ZLIB=ON
diff --git a/documentation/source/binary-resultset.rst
b/documentation/source/binary-resultset.rst
--- a/documentation/source/binary-resultset.rst
+++ b/documentation/source/binary-resultset.rst
@@ -31,7 +31,7 @@ behaves the same but uses a binary forma
The server advertises its support for ``Xexportbin`` in the eighth field of its
connect challenge. For example,
-
bL1sNfkaa:mserver:9:RIPEMD160,SHA512,SHA384,SHA256,SHA224,SHA1,COMPRESSION_SNAPPY,COMPRESSION_LZ4:LIT:SHA512:sql=6:**BINARY=1**:
+
bL1sNfkaa:mserver:9:RIPEMD160,SHA512,SHA384,SHA256,SHA224,SHA1,COMPRESSION_LZ4:LIT:SHA512:sql=6:**BINARY=1**:
Currently it sends ``BINARY=1``. In the future it may send a higher number if
variants are added.
diff --git a/documentation/source/build-debian.rst
b/documentation/source/build-debian.rst
--- a/documentation/source/build-debian.rst
+++ b/documentation/source/build-debian.rst
@@ -42,4 +42,3 @@ These packages are optional.
libcfitsio-dev # optional: read FITS files
liblz4-dev # optional: read and write .lz4 compressed files
-libsnappy-dev # optional: currently unused
diff --git a/documentation/source/build-fedora.rst
b/documentation/source/build-fedora.rst
--- a/documentation/source/build-fedora.rst
+++ b/documentation/source/build-fedora.rst
@@ -46,5 +46,4 @@ These packages are optional.
| lz4-devel # optional: read and write .lz4 compressed files
| netcdf-devel # optional: read NetCDF files
| proj-devel # optional, only optionally used in geom module
-| snappy-devel # optional: unused
| valgrind-devel # optional: --with-valgrind configuration (debug)
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -190,7 +190,6 @@
#cmakedefine HAVE_LIBZ 1
#cmakedefine HAVE_LIBLZ4 1
#cmakedefine HAVE_PROJ 1
-#cmakedefine HAVE_SNAPPY 1
#cmakedefine HAVE_FITS 1
#cmakedefine HAVE_VALGRIND 1
#cmakedefine HAVE_NETCDF 1
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
