This is an automated email from the ASF dual-hosted git repository. oppenheimer01 pushed a commit to branch cbdb-postgres-merge in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit c3c635babad15e29347238c171fbdd5d1cc24aa0 Author: Jinbao Chen <[email protected]> AuthorDate: Sun May 3 20:58:05 2026 -0400 Fix tests after cherry-pick --- src/backend/utils/adt/xml.c | 2 -- src/bin/pg_dump/pg_dump.c | 12 ------------ src/test/regress/expected/gp_tablespace.out | 2 +- src/test/regress/sql/gp_tablespace.sql | 2 +- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index c97b98ac8eb..1537adfb7bf 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -137,8 +137,6 @@ static void xml_errsave(Node *escontext, PgXmlErrorContext *errcxt, int sqlcode, const char *msg); static void xml_errorHandler(void *data, PgXmlErrorPtr error); static int errdetail_for_xml_code(int code); -static void xml_ereport_by_code(int level, int sqlcode, - const char *msg, int errcode); static void chopStringInfoNewlines(StringInfo str); static void appendStringInfoLineSeparator(StringInfo str); diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 1f8f76c26ff..0a728498e59 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -410,9 +410,7 @@ static char *nextToken(register char **stringp, register const char *delim); static void addDistributedBy(Archive *fout, PQExpBuffer q, const TableInfo *tbinfo, int actual_atts); static void addDistributedByOld(Archive *fout, PQExpBuffer q, const TableInfo *tbinfo, int actual_atts); static void addSchedule(Archive *fout, PQExpBuffer q, const TableInfo *tbinfo); -static bool isGPDB(Archive *fout); static bool isMPP(Archive *fout); -static bool isGPDB5000OrLater(Archive *fout); static bool isGPDB6000OrLater(Archive *fout); /* END MPP ADDITION */ @@ -445,16 +443,6 @@ isMPP(Archive *fout) return (value == 1) ? true : false; } -static bool -isGPDB5000OrLater(Archive *fout) -{ - if (!isMPP(fout)) - return false; /* Not GP-based at all. */ - - /* GPDB 5 is based on PostgreSQL 8.3 */ - return fout->remoteVersion >= 80300; -} - static bool isGPDB6000OrLater(Archive *fout) { diff --git a/src/test/regress/expected/gp_tablespace.out b/src/test/regress/expected/gp_tablespace.out index fa53640fa14..0c2a741afe3 100644 --- a/src/test/regress/expected/gp_tablespace.out +++ b/src/test/regress/expected/gp_tablespace.out @@ -493,6 +493,6 @@ DROP TABLE tblspc_otherloc_heap; DROP TABLESPACE testspace_otherloc; CREATE TABLESPACE testspace_dir_empty LOCATION :'testtablespace'; CREATE TABLE t_dir_empty(a int); -\! rm -rf $PG_ABS_SRCDIR/testtablespace +\! rm -rf $PG_ABS_SRCDIR/testtablespace/* DROP TABLE IF EXISTS t_dir_empty; DROP TABLESPACE testspace_dir_empty; diff --git a/src/test/regress/sql/gp_tablespace.sql b/src/test/regress/sql/gp_tablespace.sql index fbfd411201e..42c70875fa2 100644 --- a/src/test/regress/sql/gp_tablespace.sql +++ b/src/test/regress/sql/gp_tablespace.sql @@ -265,7 +265,7 @@ DROP TABLESPACE testspace_otherloc; CREATE TABLESPACE testspace_dir_empty LOCATION :'testtablespace'; CREATE TABLE t_dir_empty(a int); -\! rm -rf $PG_ABS_SRCDIR/testtablespace +\! rm -rf $PG_ABS_SRCDIR/testtablespace/* DROP TABLE IF EXISTS t_dir_empty; DROP TABLESPACE testspace_dir_empty; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
