This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 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 de30aa8ef4b Fix conflict for bootstrap
de30aa8ef4b is described below
commit de30aa8ef4b11d681a2bb6e1373ac82fa410b2eb
Author: Jinbao Chen <[email protected]>
AuthorDate: Fri Jul 18 13:19:19 2025 +0800
Fix conflict for bootstrap
---
src/backend/bootstrap/bootparse.y | 4 ----
src/backend/bootstrap/bootscanner.l | 3 ---
src/backend/bootstrap/bootstrap.c | 18 +-----------------
3 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/src/backend/bootstrap/bootparse.y
b/src/backend/bootstrap/bootparse.y
index 7572d8ad3aa..f58b9f68360 100644
--- a/src/backend/bootstrap/bootparse.y
+++ b/src/backend/bootstrap/bootparse.y
@@ -4,13 +4,9 @@
* bootparse.y
* yacc grammar for the "bootstrap" mode (BKI file format)
*
-<<<<<<< HEAD
* Portions Copyright (c) 2006-2009, Greenplum inc
* Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
- * Portions Copyright (c) 1996-2021, PostgreSQL Global Development Group
-=======
* Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
->>>>>>> REL_16_9
* Portions Copyright (c) 1994, Regents of the University of California
*
*
diff --git a/src/backend/bootstrap/bootscanner.l
b/src/backend/bootstrap/bootscanner.l
index a2761736fcc..ed5cc393566 100644
--- a/src/backend/bootstrap/bootscanner.l
+++ b/src/backend/bootstrap/bootscanner.l
@@ -23,7 +23,6 @@
#include "bootparse.h"
#include "utils/guc.h"
-<<<<<<< HEAD
#define unify_version(a,b,c) ((a<<16)+(b<<8)+c)
#if
unify_version(YY_FLEX_MAJOR_VERSION,YY_FLEX_MINOR_VERSION,YY_FLEX_SUBMINOR_VERSION)
< unify_version(2,5,35)
@@ -47,11 +46,9 @@ int boot_yylex_destroy (void);
/* Not needed now that this file is compiled as part of bootparse. */
/* #include "bootparse.h" */
-=======
}
%{
->>>>>>> REL_16_9
/* LCOV_EXCL_START */
diff --git a/src/backend/bootstrap/bootstrap.c
b/src/backend/bootstrap/bootstrap.c
index 3b1784d5247..cbc3b778b04 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -36,15 +36,12 @@
#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "pg_getopt.h"
-<<<<<<< HEAD
#include "pgstat.h"
#include "postmaster/bgwriter.h"
#include "postmaster/postmaster.h" /* TODO: verify we need this still */
#include "postmaster/startup.h"
#include "postmaster/walwriter.h"
#include "replication/walreceiver.h"
-=======
->>>>>>> REL_16_9
#include "storage/bufmgr.h"
#include "storage/bufpage.h"
#include "storage/condition_variable.h"
@@ -235,14 +232,7 @@ BootstrapModeMain(int argc, char *argv[], bool check_only)
argv++;
argc--;
-<<<<<<< HEAD
- /* If no -x argument, we are a CheckerProcess */
- MyAuxProcType = CheckerProcess;
-
- while ((flag = getopt(argc, argv, "B:c:d:D:FkK:r:x:R:u:X:-:")) != -1)
-=======
- while ((flag = getopt(argc, argv, "B:c:d:D:Fkr:X:-:")) != -1)
->>>>>>> REL_16_9
+ while ((flag = getopt(argc, argv, "B:c:d:D:FkK:r:R:u:X:-:")) != -1)
{
switch (flag)
{
@@ -318,18 +308,12 @@ BootstrapModeMain(int argc, char *argv[], bool check_only)
case 'r':
strlcpy(OutputFileName, optarg, MAXPGPATH);
break;
-<<<<<<< HEAD
- case 'x':
- MyAuxProcType = atoi(optarg);
- break;
case 'R':
terminal_fd = atoi(optarg);
break;
case 'u':
bootstrap_old_key_datadir = pstrdup(optarg);
break;
-=======
->>>>>>> REL_16_9
case 'X':
{
int WalSegSz =
strtoul(optarg, NULL, 0);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
