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 82b08cb302e Fix conflict for list.c makefunc.c
82b08cb302e is described below
commit 82b08cb302e0328267937af8b3879cbc1ccc8f74
Author: Jinbao Chen <[email protected]>
AuthorDate: Fri Jul 18 11:24:18 2025 +0800
Fix conflict for list.c makefunc.c
---
src/backend/nodes/list.c | 3 ---
src/backend/nodes/makefuncs.c | 10 ++++------
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/backend/nodes/list.c b/src/backend/nodes/list.c
index 7b6b76d0982..af8a1c1353a 100644
--- a/src/backend/nodes/list.c
+++ b/src/backend/nodes/list.c
@@ -974,12 +974,9 @@ list_delete_last(List *list)
* Delete the first N cells of the list.
*
* The List is pfree'd if the request causes all cells to be deleted.
-<<<<<<< HEAD
-=======
*
* Note that this takes time proportional to the distance to the end of the
* list, since the following entries must be moved.
->>>>>>> REL_16_9
*/
List *
list_delete_first_n(List *list, int n)
diff --git a/src/backend/nodes/makefuncs.c b/src/backend/nodes/makefuncs.c
index 05b76cd6d71..d4c1c31eb6b 100644
--- a/src/backend/nodes/makefuncs.c
+++ b/src/backend/nodes/makefuncs.c
@@ -161,9 +161,6 @@ makeWholeRowVar(RangeTblEntry *rte,
InvalidOid,
varlevelsup);
break;
-<<<<<<< HEAD
- case RTE_TABLEFUNCTION:
-=======
case RTE_SUBQUERY:
@@ -212,7 +209,7 @@ makeWholeRowVar(RangeTblEntry *rte,
varlevelsup);
break;
->>>>>>> REL_16_9
+ case RTE_TABLEFUNCTION:
case RTE_FUNCTION:
/*
@@ -882,7 +879,6 @@ makeVacuumRelation(RangeVar *relation, Oid oid, List
*va_cols)
}
/*
-<<<<<<< HEAD
* makeReindexIndexInfo
* create an ReindexIndexInfo node
*/
@@ -896,7 +892,9 @@ makeReindexIndexInfo(Oid indexId, Oid tableId, Oid amId,
bool safe)
r->amId = amId;
r->safe = safe;
return r;
-=======
+}
+
+/*
* makeJsonFormat -
* creates a JsonFormat node
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
