Fix compile issues by leborchuk · Pull Request #1678 · apache/cloudberry

leborchuk · 2026-04-13T16:34:55Z

Here I cherry-picked some PG main branch commits and fix gp_stats_collector to compile cloudberry under rocky linux 10

Fixes #ISSUE_Number

What does this PR do?

Type of Change

Bug fix (non-breaking change)
New feature (non-breaking change)
Breaking change (fix or feature with breaking changes)
Documentation update

Breaking Changes

Test Plan

Unit tests added/updated
Integration tests added/updated
Passed make installcheck
Passed make -C src/test installcheck-cbdb-parallel

Impact

Performance:

User-facing changes:

Dependencies:

Checklist

Followed contribution guide
Added/updated documentation
Reviewed code for security implications
Requested review from cloudberry committers

Additional Context

CI Skip Instructions

leborchuk · 2026-04-13T16:44:46Z

Add tests here after #1676 was merged

tuhaihe

LGTM. I can build Cloudberry successfully on a pure Rocky Linux 10 with these changes.

libxml2 changed the required signature of error handler callbacks to make the passed xmlError struct "const". This is causing build failures on buildfarm member caiman, and no doubt will start showing up in the field quite soon. Add a version check to adjust the declaration of xml_errorHandler() according to LIBXML_VERSION. 2.12.x also produces deprecation warnings for contrib/xml2/xpath.c's assignment to xmlLoadExtDtdDefaultValue. I see no good reason for that to still be there, seeing that we disabled external DTDs (at a lower level) years ago for security reasons. Let's just remove it. Back-patch to all supported branches, since they might all get built with newer libxml2 once it gets a bit more popular. (The back branches produce another deprecation warning about xpath.c's use of xmlSubstituteEntitiesDefault(). We ought to consider whether to back-patch all or part of commit 65c5864d7 to silence that. It's less urgent though, since it won't break the buildfarm.) Discussion: https://postgr.es/m/1389505.1706382262@sss.pgh.pa.us

If we are building with openssl but USE_SSL_ENGINE didn't get set, initialize_SSL's variable "pkey" is declared but used nowhere. Apparently this combination hasn't been exercised in the buildfarm before now, because I've not seen this warning before, even though the code has been like this a long time. Move the declaration to silence the warning (and remove its useless initialization). Per buildfarm member sawshark. Back-patch to all supported branches.

We have two sections in a Makefile - one for CPP_OBJS and one for OBJS. CPP_OBJS use wildcards and src/protos includes bot in CPP_OBJS and in OBJS. So generated gcc string includes multiple items of proto *.o files. That leads to multiple definitions errors in linking time. Do not include proto files in CPP_OBJS macros and use it in OBJS macros.

Some functions are used in the tree and are currently marked as deprecated by upstream. This commit refreshes the code to use the recommended functions, leading to the following changes: - xmlSubstituteEntitiesDefault() is gone, and needs to be replaced with XML_PARSE_NOENT for the paths doing the parsing. - xmlParseMemory() -> xmlReadMemory(). These functions, as well as more functions setting global states, have been officially marked as deprecated by upstream in August 2022. Their replacements exist since the 2001-ish area, as far as I have checked, so that should be safe. Author: Dmitry Koval Discussion: https://postgr.es/m/18274-98d16bc03520665f@postgresql.org

leborchuk · 2026-04-23T10:20:05Z

I think it could be wise to add test workflow in other PR. Here we mainly cherry-pick PF commits and fix minor issues in our own code

Copilot

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

This PR aims to resolve build/compile issues when building Apache Cloudberry (Incubating) on Rocky Linux 10 and with newer dependency versions (notably libxml2), including updates to gp_stats_collector build inputs and XML/libxml2 integration.

Changes:

Adjust OpenSSL client SSL key handling code to fix compilation/scoping issues.
Update libxml2 error handler typing and switch XML parsing calls to xmlReadMemory() with explicit parse options.
Tweak build/automation scripts and gp_stats_collector Makefile for Rocky 10 and to avoid problematic C++ source globbing.

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
src/interfaces/libpq/fe-secure-openssl.c	Moves `EVP_PKEY` declaration to narrower scope to address compile/scoping issues.
src/backend/utils/adt/xml.c	Adds libxml2-version-dependent error pointer type and updates handler signature.
gpcontrib/gp_stats_collector/Makefile	Restricts which `*.cpp` are built to avoid unintended compilation units.
devops/build/automation/cloudberry/scripts/configure-cloudberry.sh	Extends Rocky-specific handling to include Rocky 10.
contrib/xml2/xslt_proc.c	Uses `xmlReadMemory()` with explicit parse flags instead of `xmlParseMemory()`.
contrib/xml2/xpath.c	Removes global libxml2 parser defaults and uses `xmlReadMemory()` with explicit parse flags.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-23T10:26:28Z

 			/* Colon, but not in second character, treat as engine:key */
 			char	   *engine_str = strdup(conn->sslkey);
 			char	   *engine_colon;
+			EVP_PKEY   *pkey;


pkey is now declared without initialization. If any error/cleanup path in this scope frees or checks pkey before it’s assigned (or if assignment is conditional), this becomes undefined behavior. Initialize it to NULL at declaration (and keep cleanup logic consistent).

Suggested change

EVP_PKEY *pkey;

EVP_PKEY *pkey = NULL;

Copilot · 2026-04-23T10:26:28Z

+#define PgXmlErrorPtr const xmlError *
+#else
+#define PgXmlErrorPtr xmlErrorPtr


Using a macro as a type alias can lead to harder-to-debug errors (e.g., unexpected expansion in other macro contexts) and less clear diagnostics. Prefer a conditional typedef (or a guarded typedef block) for PgXmlErrorPtr rather than #define.

Suggested change

#define PgXmlErrorPtr const xmlError *

#else

#define PgXmlErrorPtr xmlErrorPtr

typedef const xmlError *PgXmlErrorPtr;

#else

typedef xmlErrorPtr PgXmlErrorPtr;

Copilot · 2026-04-23T10:26:29Z


 C_OBJS   = $(patsubst %.c,%.o,$(wildcard src/*.c src/*/*.c))
-CPP_OBJS = $(patsubst %.cpp,%.o,$(wildcard src/*.cpp src/*/*.cpp))
+CPP_OBJS = $(patsubst %.cpp,%.o,$(wildcard src/*.cpp src/log/*.cpp src/memory/*.cpp))


Hard-coding specific subdirectories makes the build fragile: adding a new C++ source directory under src/ won’t be picked up, and the omission may silently drop objects. If the intent is to exclude src/protos/*.cpp (to avoid duplicate compilation with PROTO_OBJS), consider keeping a broad wildcard and explicitly filter-out the proto-generated paths instead.

Suggested change

CPP_OBJS = $(patsubst %.cpp,%.o,$(wildcard src/*.cpp src/log/*.cpp src/memory/*.cpp))

CPP_OBJS = $(filter-out $(PROTO_OBJS),$(patsubst %.cpp,%.o,$(wildcard src/*.cpp src/*/*.cpp)))

Copilot · 2026-04-23T10:26:29Z

 execute_cmd sudo chmod a+w /usr/local || exit 2
 execute_cmd sudo mkdir -p ${BUILD_DESTINATION}/lib || exit 2
-if [[ "$OS_ID" == "rocky" && "$OS_VERSION" =~ ^(8|9) ]]; then
+if [[ "$OS_ID" == "rocky" && "$OS_VERSION" =~ ^(8|9|10) ]]; then


This regex will also match versions like 100 (because it’s not end-anchored). To make the match precise while still allowing minor versions, consider anchoring (e.g., ^(8|9|10)(\\..*)?$) based on how $OS_VERSION is formatted in your environment.

Suggested change

if [[ "$OS_ID" == "rocky" && "$OS_VERSION" =~ ^(8|9|10) ]]; then

if [[ "$OS_ID" == "rocky" && "$OS_VERSION" =~ ^(8|9|10)(\..*)?$ ]]; then

Copilot · 2026-04-23T10:26:29Z

 	/* Initialize libxml */
 	xmlInitParser();


Removing xmlLoadExtDtdDefaultValue = 1; changes parsing behavior: documents relying on external DTDs for entity declarations may no longer work, while later calls now only pass XML_PARSE_NOENT (entity substitution) without explicitly enabling external DTD loading. If preserving prior behavior is required, consider adding the appropriate xmlReadMemory() options; if the behavior change is intentional (e.g., to avoid deprecated globals / improve security), it should be documented since it can be user-visible for xml2 functions.

leborchuk mentioned this pull request Apr 13, 2026

[Bug] Build Cloudberry in Rockylinux 10 #1432

Open

2 tasks

tuhaihe approved these changes Apr 21, 2026

View reviewed changes

tglsfdc and others added 5 commits April 23, 2026 10:04

Fix copy for rocky linux

d61cbcc

leborchuk force-pushed the FixCompileIssues branch from e246f38 to d61cbcc Compare April 23, 2026 10:10

Merge branch 'main' into FixCompileIssues

8458045

leborchuk marked this pull request as ready for review April 23, 2026 10:18

Copilot AI review requested due to automatic review settings April 23, 2026 10:18

Copilot AI reviewed Apr 23, 2026

View reviewed changes

Copilot started reviewing on behalf of leborchuk April 23, 2026 10:27 View session

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix compile issues#1678

Fix compile issues#1678
leborchuk wants to merge 6 commits intoapache:mainfrom
leborchuk:FixCompileIssues

leborchuk commented Apr 13, 2026

Uh oh!

leborchuk commented Apr 13, 2026

Uh oh!

tuhaihe left a comment

Uh oh!

leborchuk commented Apr 23, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Apr 23, 2026

Uh oh!

Copilot AI Apr 23, 2026

Uh oh!

Copilot AI Apr 23, 2026

Uh oh!

Copilot AI Apr 23, 2026

Uh oh!

Copilot AI Apr 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

	CPP_OBJS = $(patsubst %.cpp,%.o,$(wildcard src/.cpp src/log/.cpp src/memory/*.cpp))
	CPP_OBJS = $(filter-out $(PROTO_OBJS),$(patsubst %.cpp,%.o,$(wildcard src/.cpp src//*.cpp)))

	if [[ "$OS_ID" == "rocky" && "$OS_VERSION" =~ ^(8\|9\|10) ]]; then
	if [[ "$OS_ID" == "rocky" && "$OS_VERSION" =~ ^(8\|9\|10)(\..*)?$ ]]; then

Conversation

leborchuk commented Apr 13, 2026

What does this PR do?

Type of Change

Breaking Changes

Test Plan

Impact

Checklist

Additional Context

CI Skip Instructions

Uh oh!

leborchuk commented Apr 13, 2026

Uh oh!

tuhaihe left a comment

Choose a reason for hiding this comment

Uh oh!

leborchuk commented Apr 23, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Apr 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 23, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants