This is an automated email from the ASF dual-hosted git repository. leborchuk pushed a commit to branch PG14_ARCHIVE_REBASED in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit 7136e1e46bf54d630210f65b9e34a0db5bf365fa Merge: 739f6d71dc1 0612130ff56 Author: Leonid <[email protected]> AuthorDate: Mon Jun 29 11:27:37 2026 +0300 Merge branch 'REL_2_STABLE' into PG14_ARCHIVE_REBASED .github/workflows/build-cloudberry-rocky8.yml | 1 + .github/workflows/build-cloudberry.yml | 1 + .github/workflows/build-deb-cloudberry.yml | 1 + .github/workflows/yezzey-ci.yaml | 335 +++++++ .gitmodules | 3 + configure | 52 + configure.ac | 21 + contrib/Makefile | 1 + contrib/pg_aux_catalog/.gitignore | 6 + contrib/pg_aux_catalog/Makefile | 37 + contrib/pg_aux_catalog/README.md | 71 ++ contrib/pg_aux_catalog/expected/pg_aux_catalog.out | 46 + .../isolation2/expected/resgroup_mdb_admin.out | 218 ++++ .../pg_aux_catalog/isolation2/isolation2_schedule | 18 + .../isolation2/sql/resgroup_mdb_admin.sql | 91 ++ contrib/pg_aux_catalog/pg_aux_catalog--1.0.sql | 10 + contrib/pg_aux_catalog/pg_aux_catalog.c | 105 ++ contrib/pg_aux_catalog/pg_aux_catalog.control | 5 + contrib/pg_aux_catalog/sql/pg_aux_catalog.sql | 38 + gpMgmt/bin/gpinitsystem | 1 + gpMgmt/bin/lib/gpconfigurenewsegment | 20 +- gpMgmt/bin/lib/gpcreateseg.sh | 1 + gpcontrib/Makefile | 6 + gpcontrib/yezzey | 1 + src/Makefile.global.in | 2 + src/backend/catalog/oid_dispatch.c | 51 +- src/backend/commands/resgroupcmds.c | 51 +- src/backend/utils/adt/acl.c | 42 - src/backend/utils/resgroup/resgroup_helper.c | 5 +- src/include/access/transam.h | 10 + src/include/catalog/oid_dispatch.h | 7 + src/include/utils/acl.h | 8 + .../expected/gpexpand_archive_restore_conf.out | 1047 ++++++++++++++++++++ .../isolation2/isolation2_expandshrink_schedule | 3 +- .../sql/gpexpand_archive_restore_conf.sql | 48 + src/test/regress/expected/privileges.out | 10 +- src/test/regress/output/misc.source | 2 +- 37 files changed, 2304 insertions(+), 71 deletions(-) diff --cc configure index 6e6ec577476,6c94bce46bd..887f455faec --- a/configure +++ b/configure @@@ -721,10 -721,8 +721,11 @@@ GRE with_apr_config with_libcurl with_rt +PROTOC +with_gp_stats_collector +with_diskquota with_zstd + with_yezzey with_libbz2 LZ4_LIBS LZ4_CFLAGS diff --cc gpMgmt/bin/lib/gpconfigurenewsegment index 4f71348b9a8,a372ad291ec..fa59c3b6695 --- a/gpMgmt/bin/lib/gpconfigurenewsegment +++ b/gpMgmt/bin/lib/gpconfigurenewsegment @@@ -9,8 -9,8 +9,8 @@@ import shuti from optparse import Option, OptionGroup, OptionParser, OptionValueError, SUPPRESS_USAGE from gppylib.gpparseopts import OptParser, OptChecker - from gppylib.commands.gp import ModifyConfSetting, SegmentStart, SegmentStop + from gppylib.commands.gp import GpConfigHelper, ModifyConfSetting, SegmentStart, SegmentStop -from gppylib.commands.pg import PgBaseBackup +from gppylib.commands.pg import PgBaseBackup, ensure_replication_slot_exists from gppylib.db import dbconn from gppylib.commands import unix from gppylib.commands.pg import DbStatus diff --cc gpcontrib/Makefile index 2969194cfac,c62855d3089..79f7b47de18 --- a/gpcontrib/Makefile +++ b/gpcontrib/Makefile @@@ -30,16 -31,16 +30,22 @@@ els 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" recurse_targets += gp_stats_collector endif ++ + ifeq "$(with_yezzey)" "yes" + recurse_targets += yezzey + endif ++ ifeq "$(with_zstd)" "yes" recurse_targets += zstd endif diff --cc src/Makefile.global.in index d413bd86761,457a4a0944e..71a954a3856 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@@ -273,7 -273,8 +273,9 @@@ ZSTD_LIBS = @ZSTD_LIBS EVENT_LIBS = @EVENT_LIBS@ with_diskquota = @with_diskquota@ with_gp_stats_collector = @with_gp_stats_collector@ + with_yezzey = @with_yezzey@ + + ########################################################################## # # Programs and flags --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
