This is an automated email from the ASF dual-hosted git repository.
reshke pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new eacf2a75f25 Fix `contrib/amcheck` and `contrib/pg_surgery` compile
issues. (#1477)
eacf2a75f25 is described below
commit eacf2a75f251d895bfcff376a7ca025c1c502a69
Author: reshke <[email protected]>
AuthorDate: Sat Dec 6 14:25:24 2025 +0500
Fix `contrib/amcheck` and `contrib/pg_surgery` compile issues. (#1477)
Remove rebase mark, resulving with respect to
https://git.postgresql.org/cgit/postgresql.git/commit/?id=2ed532ee8c474e9767e76e1f3251cc3a0224358c
---
contrib/amcheck/verify_heapam.c | 23 -----------------------
contrib/pg_surgery/heap_surgery.c | 32 --------------------------------
2 files changed, 55 deletions(-)
diff --git a/contrib/amcheck/verify_heapam.c b/contrib/amcheck/verify_heapam.c
index f1ed142500f..22a05578273 100644
--- a/contrib/amcheck/verify_heapam.c
+++ b/contrib/amcheck/verify_heapam.c
@@ -830,29 +830,6 @@ verify_heapam(PG_FUNCTION_ARGS)
}
/*
-<<<<<<< HEAD
- * Check that a relation's relkind and access method are both supported.
- */
-static void
-sanity_check_relation(Relation rel)
-{
- if (rel->rd_rel->relkind != RELKIND_RELATION &&
- rel->rd_rel->relkind != RELKIND_MATVIEW &&
- rel->rd_rel->relkind != RELKIND_TOASTVALUE &&
- rel->rd_rel->relkind != RELKIND_DIRECTORY_TABLE)
- ereport(ERROR,
- (errcode(ERRCODE_WRONG_OBJECT_TYPE),
- errmsg("\"%s\" is not a table, directory
table, materialized view, or TOAST table",
- RelationGetRelationName(rel))));
- if (rel->rd_rel->relam != HEAP_TABLE_AM_OID)
- ereport(ERROR,
- (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
- errmsg("only heap AM is supported")));
-}
-
-/*
-=======
->>>>>>> REL_16_9
* Shared internal implementation for report_corruption and
* report_toast_corruption.
*/
diff --git a/contrib/pg_surgery/heap_surgery.c
b/contrib/pg_surgery/heap_surgery.c
index b5e1dac96c8..88a40ab7d39 100644
--- a/contrib/pg_surgery/heap_surgery.c
+++ b/contrib/pg_surgery/heap_surgery.c
@@ -383,38 +383,6 @@ sanity_check_tid_array(ArrayType *ta, int *ntids)
}
/*-------------------------------------------------------------------------
- * sanity_check_relation()
- *
- * Perform sanity checks on the given relation.
- * ------------------------------------------------------------------------
- */
-static void
-sanity_check_relation(Relation rel)
-{
- if (rel->rd_rel->relkind != RELKIND_RELATION &&
- rel->rd_rel->relkind != RELKIND_MATVIEW &&
- rel->rd_rel->relkind != RELKIND_TOASTVALUE &&
- rel->rd_rel->relkind != RELKIND_DIRECTORY_TABLE)
- ereport(ERROR,
- (errcode(ERRCODE_WRONG_OBJECT_TYPE),
- errmsg("\"%s\" is not a table, materialized
view, or TOAST table",
- RelationGetRelationName(rel))));
-
- if (rel->rd_rel->relam != HEAP_TABLE_AM_OID)
- ereport(ERROR,
- (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
- errmsg("only heap AM is supported")));
-
- /* Must be owner of the table or superuser. */
- if (!object_ownercheck(RelationRelationId, RelationGetRelid(rel),
GetUserId()))
- aclcheck_error(ACLCHECK_NOT_OWNER,
-
get_relkind_objtype(rel->rd_rel->relkind),
- RelationGetRelationName(rel));
-}
-
-/*-------------------------------------------------------------------------
-=======
->>>>>>> REL_16_9
* find_tids_one_page()
*
* Find all the tids residing in the same page as tids[next_start_ptr], and
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
