From 12be963758d16e7669ea2d7025e5cf6c5e321b13 Mon Sep 17 00:00:00 2001 From: Keith Bostic Date: Thu, 28 Jan 2016 12:44:09 -0500 Subject: WT-2352: Allow build and test without requiring lz4 Remove support for the bzip2 compression engine. --- src/docs/build-posix.dox | 4 ---- src/docs/compression.dox | 31 +------------------------------ src/docs/upgrading.dox | 7 +++++++ src/docs/wtperf.dox | 2 +- src/include/wiredtiger.in | 22 +++++++++++----------- 5 files changed, 20 insertions(+), 46 deletions(-) (limited to 'src') diff --git a/src/docs/build-posix.dox b/src/docs/build-posix.dox index f61b199bff2..4889bf931c9 100644 --- a/src/docs/build-posix.dox +++ b/src/docs/build-posix.dox @@ -116,10 +116,6 @@ The WiredTiger software supports some additional configuration options: Configure WiredTiger to sleep and wait for a debugger to attach on failure. DO NOT configure this option in production environments. -@par \c --enable-bzip2 -Configure WiredTiger for bzip2 -compression; see @ref compression for more information. - @par \c --enable-diagnostic Configure WiredTiger to perform various run-time diagnostic tests. DO NOT configure this option in production environments. diff --git a/src/docs/compression.dox b/src/docs/compression.dox index 56715e20752..0be96835760 100644 --- a/src/docs/compression.dox +++ b/src/docs/compression.dox @@ -1,36 +1,7 @@ /*! @m_page{{c,java},compression,Compressors} This section explains how to configure WiredTiger's builtin support for -the bzip2, lz4, snappy and zlib compression engines. - -@section compression_bzip2 Using bzip2 compression - -To use the builtin support for -Julian Seward's bzip2 -compression, first check that bzip2 is installed in include and library -directories searched by the compiler. Once bzip2 is installed, you can -enable bzip2 using the \c --enable-bzip2 option to configure. - -If bzip2 is installed in a location not normally searched by the -compiler toolchain, you'll need to modify the \c CPPFLAGS and \c LDFLAGS -to indicate these locations. For example, with the bzip2 includes and -libraries installed in \c /usr/local/include and \c /usr/local/lib, you -would run configure with the following additional arguments: - -@code ---enable-bzip2 CPPFLAGS="-I/usr/local/include" LDFLAGS="-L/usr/local/include" -@endcode - -When opening the WiredTiger database, load the bzip2 shared library as -an extension. For example, with the WiredTiger library installed in -\c /usr/local/lib, you would use the following extension: - -@snippet ex_all.c Configure bzip2 extension - -Finally, when creating the WiredTiger object, set \c block_compressor -to \c bzip2: - -@snippet ex_all.c Create a bzip2 compressed table +the lz4, snappy and zlib compression engines. @section compression_lz4 Using LZ4 compression diff --git a/src/docs/upgrading.dox b/src/docs/upgrading.dox index e0239919f0b..e4d85003a1e 100644 --- a/src/docs/upgrading.dox +++ b/src/docs/upgrading.dox @@ -27,6 +27,13 @@ reclaimed when the call returns. The performance of this API may differ from earlier releases. +
Bzip2 compression support
+
+Support for the bzip2 compression/decompression engine has been removed +from the WiredTiger release; remaining compression engines include LZ4, +snappy and zlib. +
+
@section version_270 Upgrading to Version 2.7.0 diff --git a/src/docs/wtperf.dox b/src/docs/wtperf.dox index 64e25978dd8..1f0d1533ac4 100644 --- a/src/docs/wtperf.dox +++ b/src/docs/wtperf.dox @@ -160,7 +160,7 @@ connection configuration string post-populate compact for LSM merging activity @par compression (string, default=none) compression extension. Allowed configuration values are: 'none', -'bzip', 'lz4', 'snappy', 'zlib' +'lz4', 'snappy', 'zlib' @par create (boolean, default=true) do population phase; false to use existing database @par database_count (unsigned int, default=1) diff --git a/src/include/wiredtiger.in b/src/include/wiredtiger.in index 676f95d9b05..2d12abab248 100644 --- a/src/include/wiredtiger.in +++ b/src/include/wiredtiger.in @@ -1006,9 +1006,9 @@ struct __wt_session { * @config{block_compressor, configure a compressor for file blocks. * Permitted values are \c "none" or custom compression engine name * created with WT_CONNECTION::add_compressor. If WiredTiger has - * builtin support for \c "bzip2"\, \c "snappy"\, \c "lz4" or \c "zlib" - * compression\, these names are also available. See @ref compression - * for more information., a string; default \c none.} + * builtin support for \c "snappy"\, \c "lz4" or \c "zlib" compression\, + * these names are also available. See @ref compression for more + * information., a string; default \c none.} * @config{cache_resident, do not ever evict the object's pages from * cache. Not compatible with LSM tables; see @ref * tuning_cache_resident for more information., a boolean flag; default @@ -1839,9 +1839,9 @@ struct __wt_connection { * @config{    compressor, configure a compressor * for log records. Permitted values are \c "none" or custom * compression engine name created with WT_CONNECTION::add_compressor. - * If WiredTiger has builtin support for \c "bzip2"\, \c "snappy"\, \c - * "lz4" or \c "zlib" compression\, these names are also available. See - * @ref compression for more information., a string; default \c none.} + * If WiredTiger has builtin support for \c "snappy"\, \c "lz4" or \c + * "zlib" compression\, these names are also available. See @ref + * compression for more information., a string; default \c none.} * @config{    enabled, enable logging subsystem., a * boolean flag; default \c false.} * @config{    file_max, the maximum size of log @@ -2308,11 +2308,11 @@ struct __wt_connection { * @config{    compressor, configure a compressor for log * records. Permitted values are \c "none" or custom compression engine name * created with WT_CONNECTION::add_compressor. If WiredTiger has builtin - * support for \c "bzip2"\, \c "snappy"\, \c "lz4" or \c "zlib" compression\, - * these names are also available. See @ref compression for more information., - * a string; default \c none.} - * @config{    enabled, enable - * logging subsystem., a boolean flag; default \c false.} + * support for \c "snappy"\, \c "lz4" or \c "zlib" compression\, these names are + * also available. See @ref compression for more information., a string; + * default \c none.} + * @config{    enabled, enable logging + * subsystem., a boolean flag; default \c false.} * @config{    file_max, the maximum size of log files., an * integer between 100KB and 2GB; default \c 100MB.} * @config{    path, the path to a directory into which the -- cgit v1.2.1