This is an automated email from the ASF dual-hosted git repository.
djwang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/main by this push:
new 9a02e6bb1bc Build: make diskquota installation opt-in
9a02e6bb1bc is described below
commit 9a02e6bb1bc36d88daf620b40a1a0cd574a2dd0a
Author: Dianjin Wang <[email protected]>
AuthorDate: Tue Apr 7 11:40:07 2026 +0800
Build: make diskquota installation opt-in
diskquota is currently built and installed by default from gpcontrib,
which makes it available in all standard builds without an explicit
decision to enable it.
Change diskquota to an opt-in installation model by adding a dedicated
`--with-diskquota` configure option that defaults to `no`. Only build,
install, and run installcheck for diskquota when that option is
explicitly enabled.
This makes diskquota adoption an explicit choice and avoids shipping the
extension by default.
---
configure | 32 ++++++++++++++++++++++
configure.ac | 7 +++++
.../cloudberry/scripts/configure-cloudberry.sh | 1 +
gpcontrib/Makefile | 12 ++++----
src/Makefile.global.in | 1 +
5 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index b3844c6e309..04e1a1ff94d 100755
--- a/configure
+++ b/configure
@@ -723,6 +723,7 @@ with_libcurl
with_rt
PROTOC
with_gp_stats_collector
+with_diskquota
with_zstd
with_libbz2
LZ4_LIBS
@@ -944,6 +945,7 @@ with_zlib
with_lz4
with_libbz2
with_zstd
+with_diskquota
with_gp_stats_collector
with_rt
with_libcurl
@@ -1694,6 +1696,7 @@ Optional Packages:
--with-lz4 build with LZ4 support
--without-libbz2 do not use bzip2
--without-zstd do not build with Zstandard
+ --with-diskquota build with diskquota extension
--with-gp_stats_collector
build with stats collector extension
--without-rt do not use Realtime Library
@@ -11062,6 +11065,35 @@ fi
$as_echo "$with_zstd" >&6; }
+#
+# diskquota
+#
+
+
+
+# Check whether --with-diskquota was given.
+if test "${with_diskquota+set}" = set; then :
+ withval=$with_diskquota;
+ case $withval in
+ yes)
+ :
+ ;;
+ no)
+ :
+ ;;
+ *)
+ as_fn_error $? "no argument expected for --with-diskquota option"
"$LINENO" 5
+ ;;
+ esac
+
+else
+ with_diskquota=no
+
+fi
+
+
+
+
#
# gp_stats_collector
#
diff --git a/configure.ac b/configure.ac
index 1db73a39a78..177fa461708 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1365,6 +1365,13 @@ PGAC_ARG_BOOL(with, zstd, yes, [do not build with
Zstandard],
AC_MSG_RESULT([$with_zstd])
AC_SUBST(with_zstd)
+#
+# diskquota
+#
+PGAC_ARG_BOOL(with, diskquota, no,
+ [build with diskquota extension])
+AC_SUBST(with_diskquota)
+
#
# gp_stats_collector
#
diff --git a/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh
b/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh
index 90f0614bfe8..80575309092 100755
--- a/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh
+++ b/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh
@@ -162,6 +162,7 @@ execute_cmd ./configure --prefix=${BUILD_DESTINATION} \
--disable-pxf \
--enable-tap-tests \
${CONFIGURE_DEBUG_OPTS} \
+ --with-diskquota \
--with-gp-stats-collector \
--with-gssapi \
--with-ldap \
diff --git a/gpcontrib/Makefile b/gpcontrib/Makefile
index 956cb470477..2969194cfac 100644
--- a/gpcontrib/Makefile
+++ b/gpcontrib/Makefile
@@ -22,8 +22,7 @@ ifeq "$(enable_debug_extensions)" "yes"
gp_legacy_string_agg \
gp_replica_check \
gp_toolkit \
- pg_hint_plan \
- diskquota
+ pg_hint_plan
else
recurse_targets = gp_sparse_vector \
gp_distribution_policy \
@@ -31,8 +30,11 @@ else
gp_legacy_string_agg \
gp_exttable_fdw \
gp_toolkit \
- pg_hint_plan \
- diskquota
+ pg_hint_plan
+endif
+
+ifeq "$(with_diskquota)" "yes"
+ recurse_targets += diskquota
endif
ifeq "$(with_gp_stats_collector)" "yes"
@@ -102,4 +104,4 @@ installcheck:
$(MAKE) -C gp_sparse_vector installcheck
$(MAKE) -C gp_toolkit installcheck
$(MAKE) -C gp_exttable_fdw installcheck
- $(MAKE) -C diskquota installcheck
+ if [ "$(with_diskquota)" = "yes" ]; then $(MAKE) -C diskquota
installcheck; fi
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 234d09a56b2..f11e6091618 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -271,6 +271,7 @@ with_zstd = @with_zstd@
ZSTD_CFLAGS = @ZSTD_CFLAGS@
ZSTD_LIBS = @ZSTD_LIBS@
EVENT_LIBS = @EVENT_LIBS@
+with_diskquota = @with_diskquota@
with_gp_stats_collector = @with_gp_stats_collector@
##########################################################################
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
