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 7c1a9cc3e55 Resolve rebase conflicts `contrib/bloom`
7c1a9cc3e55 is described below
commit 7c1a9cc3e555729e0951453b06cef83a3af7dfd9
Author: reshke <[email protected]>
AuthorDate: Sun Dec 14 13:04:44 2025 +0000
Resolve rebase conflicts `contrib/bloom`
with respect to ccadf73
---
contrib/bloom/blinsert.c | 30 ------------------------------
1 file changed, 30 deletions(-)
diff --git a/contrib/bloom/blinsert.c b/contrib/bloom/blinsert.c
index c9293b8aafc..b90145148d4 100644
--- a/contrib/bloom/blinsert.c
+++ b/contrib/bloom/blinsert.c
@@ -163,38 +163,8 @@ blbuild(Relation heap, Relation index, IndexInfo
*indexInfo)
void
blbuildempty(Relation index)
{
-<<<<<<< HEAD
- Page metapage;
-
- /* Construct metapage. */
- metapage = (Page) palloc(BLCKSZ);
- BloomFillMetapage(index, metapage);
-
- /*
- * Write the page and log it. It might seem that an immediate sync
would
- * be sufficient to guarantee that the file exists on disk, but recovery
- * itself might remove it while replaying, for example, an
- * XLOG_DBASE_CREATE or XLOG_TBLSPC_CREATE record. Therefore, we need
- * this even when wal_level=minimal.
- */
- PageEncryptInplace(metapage, INIT_FORKNUM,
- BLOOM_METAPAGE_BLKNO);
- PageSetChecksumInplace(metapage, BLOOM_METAPAGE_BLKNO);
- smgrwrite(index->rd_smgr, INIT_FORKNUM, BLOOM_METAPAGE_BLKNO,
- (char *) metapage, true);
- log_newpage(&index->rd_smgr->smgr_rnode.node, INIT_FORKNUM,
- BLOOM_METAPAGE_BLKNO, metapage, true);
-
- /*
- * An immediate sync is required even if we xlog'd the page, because the
- * write did not go through shared_buffers and therefore a concurrent
- * checkpoint may have moved the redo pointer past our xlog record.
- */
- smgrimmedsync(index->rd_smgr, INIT_FORKNUM);
-=======
/* Initialize the meta page */
BloomInitMetapage(index, INIT_FORKNUM);
->>>>>>> REL_16_9
}
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
