This is an automated email from the ASF dual-hosted git repository. avamingli pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit 6909ec814b6eb33e09a5e14497634d64ae7e33bc Author: Zhang Mingli <[email protected]> AuthorDate: Fri Jan 10 17:00:11 2025 +0800 Fix cherry-pick. Authored-by: Zhang Mingli [email protected] --- src/backend/commands/cluster.c | 2 -- src/backend/commands/tablecmds.c | 4 ---- 2 files changed, 6 deletions(-) diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index c194336b85..2428a74a6a 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -677,8 +677,6 @@ rebuild_relation(Relation OldHeap, Oid indexOid, bool verbose) */ bool is_ao = RelationIsAppendOptimized(OldHeap); - bool is_ao = RelationStorageIsAO(OldHeap); - /* Mark the correct index as clustered */ if (OidIsValid(indexOid)) mark_index_clustered(OldHeap, indexOid, true); diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index f31ffd454e..b32dd59dae 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -1289,11 +1289,7 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId, /* * If this is an append-only relation, create the auxliary tables necessary */ -<<<<<<< HEAD - if (RelationIsAppendOptimized(rel)) -======= if (RelationStorageIsAO(rel)) ->>>>>>> 0c942b968db (Refactor AO macro RelationIsAppendOptimized (#15546)) NewRelationCreateAOAuxTables(RelationGetRelid(rel), stmt->buildAoBlkdir); /* --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
