Changeset: de26e8810c0f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/de26e8810c0f
Modified Files:
common/stream/CMakeLists.txt
common/stream/monetdb-stream.pc.in
common/stream/stream_internal.h
common/utils/mcrypt.c
documentation/source/build-debian.rst
documentation/source/build-fedora.rst
Branch: default
Log Message:
Removed snappy and lz4 from mapi connection challenge: they're not used.
diffs (101 lines):
diff --git a/common/stream/CMakeLists.txt b/common/stream/CMakeLists.txt
--- a/common/stream/CMakeLists.txt
+++ b/common/stream/CMakeLists.txt
@@ -66,7 +66,6 @@ target_link_libraries(stream
$<$<BOOL:${CURL_FOUND}>:CURL::libcurl>
$<$<BOOL:${LIBLZMA_FOUND}>:LibLZMA::LibLZMA>
$<$<BOOL:${LZ4_FOUND}>:LZ4::LZ4>
- $<$<BOOL:${SNAPPY_FOUND}>:SNAPPY::SNAPPY>
$<$<BOOL:${Iconv_FOUND}>:Iconv::Iconv>
matomic
monetdb_config_header
@@ -100,10 +99,6 @@ if (NOT WIN32)
set(PKG_LZMA "liblzma")
endif()
- if(SNAPPY_FOUND)
- set(PKG_SNAPPY "snappy")
- endif()
-
if(ICONV_FOUND AND NOT Iconv_IS_BUILT_IN)
get_filename_component(ICONV_LIBRARIES_PATH
"${ICONV_LIBRARIES}"
diff --git a/common/stream/monetdb-stream.pc.in
b/common/stream/monetdb-stream.pc.in
--- a/common/stream/monetdb-stream.pc.in
+++ b/common/stream/monetdb-stream.pc.in
@@ -14,7 +14,7 @@ Name: monetdb-stream
Description: MonetDB streams libary
URL: https://www.monetdb.org/
Version: @MONETDB_VERSION@
-Requires.private: @PKG_ZLIB@ @PKG_BZIP2@ @PKG_CURL@ @PKG_LZMA@ @PKG_SNAPPY@
+Requires.private: @PKG_ZLIB@ @PKG_BZIP2@ @PKG_CURL@ @PKG_LZMA@
Libs: -L${libdir} -lstream
Libs.private: @SOCKET_LIBS@ @PKG_LIBICONV@
diff --git a/common/stream/stream_internal.h b/common/stream/stream_internal.h
--- a/common/stream/stream_internal.h
+++ b/common/stream/stream_internal.h
@@ -56,9 +56,6 @@
#ifdef HAVE_LIBLZMA
#include <lzma.h>
#endif
-#ifdef HAVE_SNAPPY
-#include <snappy-c.h>
-#endif
#ifdef HAVE_LIBLZ4
#include <lz4.h>
#include <lz4frame.h>
diff --git a/common/utils/mcrypt.c b/common/utils/mcrypt.c
--- a/common/utils/mcrypt.c
+++ b/common/utils/mcrypt.c
@@ -40,12 +40,6 @@ mcrypt_getHashAlgorithms(void)
",SHA256"
",SHA224"
",SHA1"
-#ifdef HAVE_SNAPPY
- ",COMPRESSION_SNAPPY"
-#endif
-#ifdef HAVE_LIBLZ4
- ",COMPRESSION_LZ4"
-#endif
;
return algorithms;
}
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
@@ -39,5 +39,5 @@ zlib1g-dev # optional: read and write .
These packages are optional.
libcfitsio-dev # optional: read FITS files
-liblz4-dev # optional: compression in new (unused) MAPI protocol,
also used to read and write .lz4 compressed files
-libsnappy-dev # optional: compression in new (unused) MAPI protocol
+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
@@ -32,17 +32,17 @@ the command make rpm.
| python3-devel # optional, needed for Python 3 integration
| python3-numpy # optional, needed for Python 3 integration
| R-core-devel # optional, needed for R integration
-| readline-devel # optional, enable editing in mclient
+| readline-devel # optional, enable editing in mclient
| rpm-build # optional, required to create RPMs (make rpm)
| selinux-policy-devel # optional, required to create RPMs (make rpm)
-| unixODBC-devel # optional, needed for ODBC driver
+| unixODBC-devel # optional, needed for ODBC driver
These packages are optional.
| cfitsio-devel # optional: read FITS files
-| libasan # optional: --enable-sanitizer configuration
(debug)
-| lz4-devel # optional: compression in new (unused) MAPI protocol,
also used to read and write .lz4 compressed files
+| libasan # optional: --enable-sanitizer configuration (debug)
+| 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: compression in new (unused) MAPI protocol
-| valgrind-devel # optional: --with-valgrind configuration
(debug)
+| snappy-devel # optional: unused
+| valgrind-devel # optional: --with-valgrind configuration (debug)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
