Skip to content

Commit 3b44ecd

Browse files
zhangwenchao-123my-ship-it
authored andcommitted
Don't support quicklz anymore.
We have decided to discontinue support for the QuickLZ compression type. QuickLZ is no longer maintained and adds unnecessary complexity. Removing it streamlines the codebase. This is a breaking feature. This commit removes all QuickLZ-related code, including: - Configuration options in configure.ac - QuickLZ extension in gpcontrib/quicklz - References in documentation and makefiles Users should migrate to alternative compression methods such as zlib or zstd, which offers better performance and is actively maintained. Authored-by: Zhang Wenchao <zhangwenchao@apache.org>
1 parent 7555993 commit 3b44ecd

25 files changed

+15
-829
lines changed

configure

Lines changed: 0 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,6 @@ GREP
719719
with_apr_config
720720
with_libcurl
721721
with_rt
722-
with_quicklz
723722
with_zstd
724723
with_libbz2
725724
LZ4_LIBS
@@ -937,7 +936,6 @@ with_zlib
937936
with_lz4
938937
with_libbz2
939938
with_zstd
940-
with_quicklz
941939
with_rt
942940
with_libcurl
943941
with_apr_config
@@ -1694,8 +1692,6 @@ Optional Packages:
16941692
--with-lz4 build with LZ4 support
16951693
--without-libbz2 do not use bzip2
16961694
--without-zstd do not build with Zstandard
1697-
--with-quicklz build with QuickLZ support (requires quicklz
1698-
library)
16991695
--without-rt do not use Realtime Library
17001696
--without-libcurl do not use libcurl
17011697
--with-apr-config=PATH path to apr-1-config utility
@@ -10934,31 +10930,6 @@ $as_echo "yes" >&6; }
1093410930
fi
1093510931
fi
1093610932

10937-
#
10938-
# quicklz
10939-
#
10940-
10941-
10942-
10943-
# Check whether --with-quicklz was given.
10944-
if test "${with_quicklz+set}" = set; then :
10945-
withval=$with_quicklz;
10946-
case $withval in
10947-
yes)
10948-
:
10949-
;;
10950-
no)
10951-
:
10952-
;;
10953-
*)
10954-
as_fn_error $? "no argument expected for --with-quicklz option" "$LINENO" 5
10955-
;;
10956-
esac
10957-
10958-
else
10959-
with_quicklz=no
10960-
10961-
fi
1096210933

1096310934

1096410935

@@ -14583,55 +14554,6 @@ fi
1458314554

1458414555
fi
1458514556

14586-
if test "$with_quicklz" = yes; then
14587-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for qlz_compress in -lquicklz" >&5
14588-
$as_echo_n "checking for qlz_compress in -lquicklz... " >&6; }
14589-
if ${ac_cv_lib_quicklz_qlz_compress+:} false; then :
14590-
$as_echo_n "(cached) " >&6
14591-
else
14592-
ac_check_lib_save_LIBS=$LIBS
14593-
LIBS="-lquicklz $LIBS"
14594-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14595-
/* end confdefs.h. */
14596-
14597-
/* Override any GCC internal prototype to avoid an error.
14598-
Use char because int might match the return type of a GCC
14599-
builtin and then its argument prototype would still apply. */
14600-
#ifdef __cplusplus
14601-
extern "C"
14602-
#endif
14603-
char qlz_compress ();
14604-
int
14605-
main ()
14606-
{
14607-
return qlz_compress ();
14608-
;
14609-
return 0;
14610-
}
14611-
_ACEOF
14612-
if ac_fn_c_try_link "$LINENO"; then :
14613-
ac_cv_lib_quicklz_qlz_compress=yes
14614-
else
14615-
ac_cv_lib_quicklz_qlz_compress=no
14616-
fi
14617-
rm -f core conftest.err conftest.$ac_objext \
14618-
conftest$ac_exeext conftest.$ac_ext
14619-
LIBS=$ac_check_lib_save_LIBS
14620-
fi
14621-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_quicklz_qlz_compress" >&5
14622-
$as_echo "$ac_cv_lib_quicklz_qlz_compress" >&6; }
14623-
if test "x$ac_cv_lib_quicklz_qlz_compress" = xyes; then :
14624-
cat >>confdefs.h <<_ACEOF
14625-
#define HAVE_LIBQUICKLZ 1
14626-
_ACEOF
14627-
14628-
LIBS="-lquicklz $LIBS"
14629-
14630-
else
14631-
as_fn_error $? "quicklz library not found." "$LINENO" 5
14632-
fi
14633-
14634-
fi
1463514557

1463614558
if test "$enable_external_fts" = yes; then
1463714559
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jansson_version_str in -ljansson" >&5
@@ -16889,17 +16811,6 @@ fi
1688916811

1689016812
fi
1689116813

16892-
# Check for quicklz.h
16893-
if test "$with_quicklz" = yes; then
16894-
ac_fn_c_check_header_mongrel "$LINENO" "quicklz.h" "ac_cv_header_quicklz_h" "$ac_includes_default"
16895-
if test "x$ac_cv_header_quicklz_h" = xyes; then :
16896-
16897-
else
16898-
as_fn_error $? "header file <quicklz.h> is required for QuickLZ support" "$LINENO" 5
16899-
fi
16900-
16901-
16902-
fi
1690316814

1690416815
if test "$enable_external_fts" = yes; then
1690516816
# Check for jansson

configure.ac

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1337,13 +1337,6 @@ if test "$with_zstd" = yes; then
13371337
PKG_CHECK_MODULES([ZSTD], [libzstd >= 1.4.0])
13381338
fi
13391339

1340-
#
1341-
# quicklz
1342-
#
1343-
PGAC_ARG_BOOL(with, quicklz, no,
1344-
[build with QuickLZ support (requires quicklz library)])
1345-
AC_SUBST(with_quicklz)
1346-
13471340
#
13481341
# Realtime library
13491342
#
@@ -1594,11 +1587,6 @@ failure. It is possible the compiler isn't looking in the proper directory.
15941587
Use --without-zlib to disable zlib support.])])
15951588
fi
15961589

1597-
if test "$with_quicklz" = yes; then
1598-
AC_CHECK_LIB(quicklz, qlz_compress, [],
1599-
[AC_MSG_ERROR([quicklz library not found.])])
1600-
fi
1601-
16021590
if test "$enable_external_fts" = yes; then
16031591
AC_CHECK_LIB(jansson, jansson_version_str, [],
16041592
[AC_MSG_ERROR([jansson library not found or version is too old, version must >= 2.13])])
@@ -1969,11 +1957,6 @@ if test "$with_libbz2" = yes ; then
19691957
AC_CHECK_HEADER(bzlib.h, [], [AC_MSG_ERROR([header file <bzlib.h> is required for bzip2 support])], [])
19701958
fi
19711959

1972-
# Check for quicklz.h
1973-
if test "$with_quicklz" = yes; then
1974-
AC_CHECK_HEADER(quicklz.h, [], [AC_MSG_ERROR([header file <quicklz.h> is required for QuickLZ support])])
1975-
fi
1976-
19771960
if test "$enable_external_fts" = yes; then
19781961
# Check for jansson
19791962
AC_CHECK_HEADER(jansson.h, [], [AC_MSG_ERROR([header file <jansson.h> is required for ETCD support])])

doc/src/sgml/ref/create_table.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ where storage_parameter is:
8282
APPENDONLY={TRUE|FALSE}
8383
BLOCKSIZE={8192-2097152}
8484
ORIENTATION={COLUMN|ROW}
85-
COMPRESSTYPE={ZLIB|QUICKLZ|RLE_TYPE|NONE}
85+
COMPRESSTYPE={ZLIB|RLE_TYPE|NONE}
8686
COMPRESSLEVEL={0-9}
8787
CHECKSUM={TRUE|FALSE}
8888
FILLFACTOR={10-100}
@@ -173,7 +173,7 @@ and subpartition_element is:
173173
[ TABLESPACE tablespace ]
174174

175175
where storage_directive is:
176-
COMPRESSTYPE={ZLIB | QUICKLZ | RLE_TYPE | NONE}
176+
COMPRESSTYPE={ZLIB | RLE_TYPE | NONE}
177177
| COMPRESSLEVEL={0-9}
178178
| BLOCKSIZE={8192-2097152}
179179

doc/src/sgml/ref/create_table_as.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ where storage_parameter is:
3434
APPENDONLY={TRUE|FALSE}
3535
BLOCKSIZE={8192-2097152}
3636
ORIENTATION={COLUMN|ROW}
37-
COMPRESSTYPE={ZLIB|QUICKLZ|RLE_TYPE|NONE}
37+
COMPRESSTYPE={ZLIB|RLE_TYPE|NONE}
3838
COMPRESSLEVEL={0-9}
3939
CHECKSUM={TRUE|FALSE}
4040
FILLFACTOR={10-100}

gpAux/Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ DEFPORT=5432
124124

125125
ORCA_CONFIG=--enable-orca
126126

127-
rhel6_x86_64_CONFIGFLAGS=--with-quicklz --with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
128-
rhel7_x86_64_CONFIGFLAGS=--with-quicklz --with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
129-
rhel8_x86_64_CONFIGFLAGS=--with-quicklz --with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
130-
ubuntu18.04_x86_64_CONFIGFLAGS=--with-quicklz --with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
131-
sles12_x86_64_CONFIGFLAGS=--with-quicklz --with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
132-
rhel7_aarch64_CONFIGFLAGS=--with-quicklz --with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
133-
common_CONFIGFLAGS=--with-quicklz --with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
127+
rhel6_x86_64_CONFIGFLAGS=--with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
128+
rhel7_x86_64_CONFIGFLAGS=--with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
129+
rhel8_x86_64_CONFIGFLAGS=--with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
130+
ubuntu18.04_x86_64_CONFIGFLAGS=--with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
131+
sles12_x86_64_CONFIGFLAGS=--with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
132+
rhel7_aarch64_CONFIGFLAGS=--with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
133+
common_CONFIGFLAGS=--with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
134134
#BLD_CONFIGFLAGS=$($(BLD_ARCH)_CONFIGFLAGS)
135135
BLD_CONFIGFLAGS=$(common_CONFIGFLAGS)
136136

gpcontrib/Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ endif
3636
ifeq "$(with_zstd)" "yes"
3737
recurse_targets += zstd
3838
endif
39-
ifeq "$(with_quicklz)" "yes"
40-
recurse_targets += quicklz
41-
endif
4239
$(call recurse,all install clean distclean, $(recurse_targets))
4340

4441
all: gpcloud pxf mapreduce orafce
@@ -97,7 +94,6 @@ installcheck:
9794
if [ "$(enable_orafce)" = "yes" ]; then $(MAKE) -C orafce installcheck; fi
9895
if [ "$(enable_pxf)" = "yes" ]; then $(MAKE) -C pxf_fdw installcheck; fi
9996
if [ "$(with_zstd)" = "yes" ]; then $(MAKE) -C zstd installcheck; fi
100-
if [ "$(with_quicklz)" = "yes" ]; then $(MAKE) -C quicklz installcheck; fi
10197
$(MAKE) -C gp_sparse_vector installcheck
10298
$(MAKE) -C gp_toolkit installcheck
10399
$(MAKE) -C gp_exttable_fdw installcheck

gpcontrib/quicklz/.gitignore

Lines changed: 0 additions & 10 deletions
This file was deleted.

gpcontrib/quicklz/Makefile

Lines changed: 0 additions & 37 deletions
This file was deleted.

gpcontrib/quicklz/expected/AOCO_quicklz.out

Lines changed: 0 additions & 24 deletions
This file was deleted.

gpcontrib/quicklz/expected/AORO_quicklz.out

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)