This is an automated email from the ASF dual-hosted git repository. my-ship-it pushed a commit to branch REL_2_STABLE in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit 1e00e5e5b3edbaf470d2c991e31a754016d4ec41 Author: reshke <[email protected]> AuthorDate: Sun May 31 09:21:37 2026 +0000 Rebase fixes & RAT check fix RAT check expection added for PG16 section as it is effitinely comes from PG16 backport --- pom.xml | 50 ++++++++++++++++++++++++++++++++++++++++++++ src/include/utils/syscache.h | 2 +- 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bc47e76d859..710105b720e 100644 --- a/pom.xml +++ b/pom.xml @@ -1973,6 +1973,56 @@ code or new licensing patterns. --> <exclude>devops/sandbox/configs/multinode-gpinit-hosts</exclude> + <!-- PG16 merge: meson build system files --> + <exclude>config/meson.build</exclude> + + <!-- PG16 merge: LINGUAS translation catalog files (no license headers) --> + <exclude>**/po/LINGUAS</exclude> + + <!-- PG16 merge: Generated/data header files without license headers --> + <exclude>src/include/pg_config_ext.h.meson</exclude> + <exclude>src/include/utils/usercontext.h</exclude> + <exclude>src/include/pch/*.h</exclude> + <exclude>src/include/common/unicode_nonspacing_table.h</exclude> + <exclude>src/include/common/unicode_east_asian_fw_table.h</exclude> + <exclude>src/include/jit/llvmjit_backport.h</exclude> + <exclude>src/include/port/win32/sys/select.h</exclude> + <exclude>src/include/port/win32/sys/un.h</exclude> + <exclude>src/include/port/win32/netinet/tcp.h</exclude> + + <!-- PG16 merge: PG upstream C files with non-standard license headers --> + <exclude>src/backend/backup/basebackup_server.c</exclude> + <exclude>src/backend/optimizer/geqo/geqo_ox1.c</exclude> + <exclude>src/backend/optimizer/geqo/geqo_ox2.c</exclude> + <exclude>src/backend/optimizer/geqo/geqo_pmx.c</exclude> + <exclude>src/backend/optimizer/geqo/geqo_px.c</exclude> + <exclude>src/backend/snowball/snowball_create.pl</exclude> + <exclude>src/backend/utils/sort/qsort_interruptible.c</exclude> + + <!-- PG16 merge: PG tools and scripts --> + <exclude>src/tools/gen_export.pl</exclude> + <exclude>src/tools/testwrap</exclude> + <exclude>src/tools/install_files</exclude> + <exclude>src/tools/darwin_sysroot</exclude> + <exclude>src/tools/rcgen</exclude> + <exclude>src/tools/pgflex</exclude> + <exclude>src/tools/find_meson</exclude> + <exclude>src/tools/ci/**</exclude> + <exclude>src/tools/pg_bsd_indent/tests/**</exclude> + + <!-- PG16 merge: contrib config and spec files without license headers --> + <exclude>contrib/btree_gist/btree_bool.c</exclude> + <exclude>contrib/basic_archive/basic_archive.conf</exclude> + <exclude>contrib/pg_freespacemap/pg_freespacemap.conf</exclude> + <exclude>contrib/pgcrypto/scripts/pgp_session_data.py</exclude> + <exclude>contrib/pg_walinspect/walinspect.conf</exclude> + <exclude>contrib/pgrowlocks/specs/pgrowlocks.spec</exclude> + <exclude>contrib/tcn/specs/tcn.spec</exclude> + <exclude>contrib/test_decoding/specs/catalog_change_snapshot.spec</exclude> + <exclude>contrib/test_decoding/specs/invalidation_distribution.spec</exclude> + <exclude>contrib/test_decoding/specs/skip_snapshot_restore.spec</exclude> + <exclude>contrib/test_decoding/specs/slot_creation_error.spec</exclude> + </excludes> <!-- diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h index fdfda800ed3..369ba38f9f9 100644 --- a/src/include/utils/syscache.h +++ b/src/include/utils/syscache.h @@ -128,7 +128,7 @@ enum SysCacheIdentifier MVTABLESMVRELOID, USERMAPPINGOID, USERMAPPINGUSERSERVER, - ATTENCODINGNUM + ATTENCODINGNUM, /* intentionally out of alphabetical order, to avoid an ABI break: */ EXTENSIONOID --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
