From 7282e926a6492046e3189f8ddc0ccbbbab8a470b Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 7 Jun 2021 15:51:37 +0200 Subject: [PATCH v1 03/10] Rename some node support functions for consistency Some node function names didn't match their node type names exactly. Fix those for consistency. --- src/backend/nodes/copyfuncs.c | 16 ++++++++-------- src/backend/nodes/equalfuncs.c | 16 ++++++++-------- src/backend/nodes/outfuncs.c | 8 ++++---- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index 621f7ce068..35a85df442 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -2700,7 +2700,7 @@ _copyCommonTableExpr(const CommonTableExpr *from) } static A_Expr * -_copyAExpr(const A_Expr *from) +_copyA_Expr(const A_Expr *from) { A_Expr *newnode = makeNode(A_Expr); @@ -2736,7 +2736,7 @@ _copyParamRef(const ParamRef *from) } static A_Const * -_copyAConst(const A_Const *from) +_copyA_Const(const A_Const *from) { A_Const *newnode = makeNode(A_Const); @@ -2787,7 +2787,7 @@ _copyFuncCall(const FuncCall *from) } static A_Star * -_copyAStar(const A_Star *from) +_copyA_Star(const A_Star *from) { A_Star *newnode = makeNode(A_Star); @@ -2795,7 +2795,7 @@ _copyAStar(const A_Star *from) } static A_Indices * -_copyAIndices(const A_Indices *from) +_copyA_Indices(const A_Indices *from) { A_Indices *newnode = makeNode(A_Indices); @@ -5711,7 +5711,7 @@ copyObjectImpl(const void *from) retval = _copyDropSubscriptionStmt(from); break; case T_A_Expr: - retval = _copyAExpr(from); + retval = _copyA_Expr(from); break; case T_ColumnRef: retval = _copyColumnRef(from); @@ -5720,16 +5720,16 @@ copyObjectImpl(const void *from) retval = _copyParamRef(from); break; case T_A_Const: - retval = _copyAConst(from); + retval = _copyA_Const(from); break; case T_FuncCall: retval = _copyFuncCall(from); break; case T_A_Star: - retval = _copyAStar(from); + retval = _copyA_Star(from); break; case T_A_Indices: - retval = _copyAIndices(from); + retval = _copyA_Indices(from); break; case T_A_Indirection: retval = _copyA_Indirection(from); diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c index 3033c1934c..e04ec41904 100644 --- a/src/backend/nodes/equalfuncs.c +++ b/src/backend/nodes/equalfuncs.c @@ -2369,7 +2369,7 @@ _equalAlterPolicyStmt(const AlterPolicyStmt *a, const AlterPolicyStmt *b) } static bool -_equalAExpr(const A_Expr *a, const A_Expr *b) +_equalA_Expr(const A_Expr *a, const A_Expr *b) { COMPARE_SCALAR_FIELD(kind); COMPARE_NODE_FIELD(name); @@ -2399,7 +2399,7 @@ _equalParamRef(const ParamRef *a, const ParamRef *b) } static bool -_equalAConst(const A_Const *a, const A_Const *b) +_equalA_Const(const A_Const *a, const A_Const *b) { if (!equal(&a->val, &b->val)) /* hack for in-line Value field */ return false; @@ -2427,13 +2427,13 @@ _equalFuncCall(const FuncCall *a, const FuncCall *b) } static bool -_equalAStar(const A_Star *a, const A_Star *b) +_equalA_Star(const A_Star *a, const A_Star *b) { return true; } static bool -_equalAIndices(const A_Indices *a, const A_Indices *b) +_equalA_Indices(const A_Indices *a, const A_Indices *b) { COMPARE_SCALAR_FIELD(is_slice); COMPARE_NODE_FIELD(lidx); @@ -3702,7 +3702,7 @@ equal(const void *a, const void *b) retval = _equalDropSubscriptionStmt(a, b); break; case T_A_Expr: - retval = _equalAExpr(a, b); + retval = _equalA_Expr(a, b); break; case T_ColumnRef: retval = _equalColumnRef(a, b); @@ -3711,16 +3711,16 @@ equal(const void *a, const void *b) retval = _equalParamRef(a, b); break; case T_A_Const: - retval = _equalAConst(a, b); + retval = _equalA_Const(a, b); break; case T_FuncCall: retval = _equalFuncCall(a, b); break; case T_A_Star: - retval = _equalAStar(a, b); + retval = _equalA_Star(a, b); break; case T_A_Indices: - retval = _equalAIndices(a, b); + retval = _equalA_Indices(a, b); break; case T_A_Indirection: retval = _equalA_Indirection(a, b); diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index b54c57d09f..ed08f5acf4 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -3327,7 +3327,7 @@ _outTableSampleClause(StringInfo str, const TableSampleClause *node) } static void -_outAExpr(StringInfo str, const A_Expr *node) +_outA_Expr(StringInfo str, const A_Expr *node) { WRITE_NODE_TYPE("AEXPR"); @@ -3475,7 +3475,7 @@ _outRawStmt(StringInfo str, const RawStmt *node) } static void -_outAConst(StringInfo str, const A_Const *node) +_outA_Const(StringInfo str, const A_Const *node) { WRITE_NODE_TYPE("A_CONST"); @@ -4416,7 +4416,7 @@ outNode(StringInfo str, const void *obj) _outTableSampleClause(str, obj); break; case T_A_Expr: - _outAExpr(str, obj); + _outA_Expr(str, obj); break; case T_ColumnRef: _outColumnRef(str, obj); @@ -4428,7 +4428,7 @@ outNode(StringInfo str, const void *obj) _outRawStmt(str, obj); break; case T_A_Const: - _outAConst(str, obj); + _outA_Const(str, obj); break; case T_A_Star: _outA_Star(str, obj); -- 2.31.1