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 9a86bf8526a Fix compile error for makefuncs.c
9a86bf8526a is described below
commit 9a86bf8526a008e69a8d497c7a0fdc55f910b5ef
Author: Jinbao Chen <[email protected]>
AuthorDate: Tue Sep 23 10:14:11 2025 +0800
Fix compile error for makefuncs.c
---
src/backend/nodes/makefuncs.c | 1 -
src/include/nodes/nodeFuncs.h | 2 --
src/include/nodes/nodes.h | 14 ++++++++++++++
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/backend/nodes/makefuncs.c b/src/backend/nodes/makefuncs.c
index d4c1c31eb6b..69e0c5c2ed4 100644
--- a/src/backend/nodes/makefuncs.c
+++ b/src/backend/nodes/makefuncs.c
@@ -980,5 +980,4 @@ makeJsonIsPredicate(Node *expr, JsonFormat *format,
JsonValueType item_type,
n->location = location;
return (Node *) n;
->>>>>>> REL_16_9
}
diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h
index 93bc7e2cdf7..b0cd16cace7 100644
--- a/src/include/nodes/nodeFuncs.h
+++ b/src/include/nodes/nodeFuncs.h
@@ -223,8 +223,6 @@ extern bool planstate_tree_walker_impl(struct PlanState
*planstate,
void
*context);
struct PlanState;
-extern bool planstate_tree_walker(struct PlanState *planstate, bool (*walker)
(),
- void
*context);
extern bool query_or_expression_tree_walker_wrapper(Node *node,
bool (*walker) (Node *, void *),
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index cffdce09d3d..3a2c2e2fc1e 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -245,6 +245,11 @@ typedef enum NodeTag
T_MinMaxExpr,
T_SQLValueFunction,
T_XmlExpr,
+ T_JsonFormat,
+ T_JsonReturning,
+ T_JsonValueExpr,
+ T_JsonConstructorExpr,
+ T_JsonIsPredicate,
T_NullTest,
T_BooleanTest,
T_CoerceToDomain,
@@ -392,6 +397,7 @@ typedef enum NodeTag
T_List,
T_IntList,
T_OidList,
+ T_XidList,
/*
* TAGS FOR EXTENSIBLE NODES (extensible.h)
@@ -628,6 +634,14 @@ typedef enum NodeTag
T_DistributionKeyElem,
T_RoleSpec,
T_TriggerTransition,
+ T_JsonOutput,
+ T_JsonKeyValue,
+ T_JsonObjectConstructor,
+ T_JsonArrayConstructor,
+ T_JsonArrayQueryConstructor,
+ T_JsonAggConstructor,
+ T_JsonObjectAgg,
+ T_JsonArrayAgg,
T_PartitionElem,
T_PartitionSpec,
T_PartitionBoundSpec,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
