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 ae23a0e3488 Revert the fix for shadows local variable
ae23a0e3488 is described below
commit ae23a0e3488f3278858062ad38acace194823351
Author: Jinbao Chen <[email protected]>
AuthorDate: Fri Nov 21 21:57:02 2025 +0800
Revert the fix for shadows local variable
---
src/backend/bootstrap/bootstrap.c | 2 ++
src/backend/catalog/index.c | 3 +++
src/backend/cdb/cdbmutate.c | 2 ++
src/backend/cdb/cdbpath.c | 2 +-
src/backend/cdb/cdbsubselect.c | 2 +-
src/backend/cdb/cdbtargeteddispatch.c | 1 +
src/backend/commands/functioncmds.c | 1 +
src/backend/commands/prepare.c | 3 ++-
src/backend/commands/tablecmds.c | 3 ++-
src/backend/commands/tablecmds_gp.c | 1 +
src/backend/commands/user.c | 1 +
src/backend/executor/nodeMotion.c | 5 +++--
src/backend/executor/spi.c | 2 ++
src/backend/optimizer/path/allpaths.c | 1 +
src/backend/optimizer/plan/planner.c | 7 +++++--
src/backend/replication/syncrep.c | 1 +
src/backend/task/job_metadata.c | 2 +-
src/backend/utils/adt/array_userfuncs.c | 8 +++-----
18 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/src/backend/bootstrap/bootstrap.c
b/src/backend/bootstrap/bootstrap.c
index fe0dc28a70e..d1c67cad83a 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -289,6 +289,8 @@ BootstrapModeMain(int argc, char *argv[], bool check_only)
break;
case 'K':
{
+ int i;
+
/* method 0/disabled cannot be
specified */
for (i = DISABLED_ENCRYPTION_METHOD + 1;
i < NUM_ENCRYPTION_METHODS;
i++)
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 7099a9e2043..62e52e12425 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -3057,6 +3057,9 @@ index_update_stats(Relation rel,
if (reltuples >= 0 && Gp_role != GP_ROLE_DISPATCH)
{
+ BlockNumber relpages;
+ BlockNumber relallvisible;
+
relpages = RelationGetNumberOfBlocks(rel);
/*
diff --git a/src/backend/cdb/cdbmutate.c b/src/backend/cdb/cdbmutate.c
index c8537be4c72..511cfb20309 100644
--- a/src/backend/cdb/cdbmutate.c
+++ b/src/backend/cdb/cdbmutate.c
@@ -1205,6 +1205,7 @@ param_walker(Node *node, ParamWalkerContext *context)
list_length(aggref->args) == 1)
{
TargetEntry *curTarget = (TargetEntry *)
linitial(aggref->args);
+ ListCell *lc;
foreach(lc, root->minmax_aggs)
{
@@ -1228,6 +1229,7 @@ param_walker(Node *node, ParamWalkerContext *context)
case T_SubPlan:
{
+ PlannerInfo *root = (PlannerInfo *)
context->base.node;
SubPlan *spexpr = (SubPlan *) node;
Plan *subplan_plan =
planner_subplan_get_plan(root, spexpr);
PlannerInfo *subplan_root =
planner_subplan_get_root(root, spexpr);
diff --git a/src/backend/cdb/cdbpath.c b/src/backend/cdb/cdbpath.c
index 153851c37d5..17d14c95548 100644
--- a/src/backend/cdb/cdbpath.c
+++ b/src/backend/cdb/cdbpath.c
@@ -2248,7 +2248,7 @@ cdbpath_motion_for_join(PlannerInfo *root,
* only if there is no wts on either rels*/
else if (!outer.has_wts && !inner.has_wts)
{
- numsegments = CdbPathLocus_CommonSegments(outer.locus,
+ int numsegments =
CdbPathLocus_CommonSegments(outer.locus,
inner.locus);
CdbPathLocus_MakeSingleQE(&outer.move_to, numsegments);
CdbPathLocus_MakeSingleQE(&inner.move_to, numsegments);
diff --git a/src/backend/cdb/cdbsubselect.c b/src/backend/cdb/cdbsubselect.c
index 8b8329485f6..4813439de0f 100644
--- a/src/backend/cdb/cdbsubselect.c
+++ b/src/backend/cdb/cdbsubselect.c
@@ -1359,7 +1359,7 @@ fetch_outer_exprs(Node *testexpr)
{
List *exprs = NIL;
ListCell *lc;
- be = (BoolExpr *) expr;
+ BoolExpr *be = (BoolExpr *) expr;
/*
* The following cases should not happen, instead of
diff --git a/src/backend/cdb/cdbtargeteddispatch.c
b/src/backend/cdb/cdbtargeteddispatch.c
index c0367fe522c..b297164e273 100644
--- a/src/backend/cdb/cdbtargeteddispatch.c
+++ b/src/backend/cdb/cdbtargeteddispatch.c
@@ -167,6 +167,7 @@ GetContentIdsFromPlanForSingleRelation(PlannerInfo *root,
Plan *plan, int rangeT
PossibleValueSet pvs_segids;
Node **seg_ids;
int len;
+ int i;
List *contentIds = NULL;
/**
diff --git a/src/backend/commands/functioncmds.c
b/src/backend/commands/functioncmds.c
index 4fd368c4f2d..8d8a0bf33b7 100644
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -1886,6 +1886,7 @@ AlterFunction(ParseState *pstate, AlterFunctionStmt *stmt)
if (set_items)
{
Datum datum;
+ bool isnull;
ArrayType *a;
Datum repl_val[Natts_pg_proc];
bool repl_null[Natts_pg_proc];
diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c
index aa75e17a764..6246a1395a0 100644
--- a/src/backend/commands/prepare.c
+++ b/src/backend/commands/prepare.c
@@ -65,6 +65,7 @@ PrepareQuery(ParseState *pstate, PrepareStmt *stmt,
int nargs;
Query *query;
List *query_list;
+ int i;
NodeTag srctag; /* GPDB */
/*
@@ -124,7 +125,7 @@ PrepareQuery(ParseState *pstate, PrepareStmt *stmt,
/*
* Check that all parameter types were determined.
*/
- for (int i = 0; i < nargs; i++)
+ for (i = 0; i < nargs; i++)
{
Oid argtype = argtypes[i];
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 3077c6d4aa1..c8e3368e187 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -9284,7 +9284,7 @@ ATExecAddColumn(List **wqueue, AlteredTableInfo *tab,
Relation rel,
foreach (lc, all_inheritors)
{
Oid r = lfirst_oid(lc);
- rel = heap_open(r, NoLock);
+ Relation rel = heap_open(r, NoLock);
AlteredTableInfo *childtab;
childtab = ATGetQueueEntry(wqueue, rel);
@@ -16024,6 +16024,7 @@ ATPostAlterTypeParse(Oid oldId, Oid oldRelId, Oid
refRelId, char *cmd,
if (Gp_role == GP_ROLE_EXECUTE && context != NULL)
{
ListCell *lc;
+ Relation rel;
Relation irel = NULL;
AlteredTableInfo *tab;
diff --git a/src/backend/commands/tablecmds_gp.c
b/src/backend/commands/tablecmds_gp.c
index 9b79706571d..1affabbf2a9 100644
--- a/src/backend/commands/tablecmds_gp.c
+++ b/src/backend/commands/tablecmds_gp.c
@@ -1187,6 +1187,7 @@ ATExecGPPartCmds(Relation origrel, AlterTableCmd *cmd)
PartitionSpec *subpart = NULL;
Relation temprel = rel;
PartitionSpec *tempsubpart = NULL;
+ ListCell *l;
List *ancestors =
get_partition_ancestors(RelationGetRelid(rel));
int level
= list_length(ancestors) + 1;
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 04ec5d5f380..ae5f86b4c0c 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -789,6 +789,7 @@ CreateRole(ParseState *pstate, CreateRoleStmt *stmt)
/* Scan the pg_profile relation to be certain the profile
exists. */
Relation pg_profile_rel;
TupleDesc pg_profile_dsc;
+ HeapTuple tuple;
Form_pg_profile profileform;
Oid profileid;
diff --git a/src/backend/executor/nodeMotion.c
b/src/backend/executor/nodeMotion.c
index 957efd12c9d..b6514f2a0ce 100644
--- a/src/backend/executor/nodeMotion.c
+++ b/src/backend/executor/nodeMotion.c
@@ -480,8 +480,9 @@ execMotionSortedReceiver(MotionState *node)
*/
if (!node->tupleheapReady)
{
- hp = node->tupleheap;
- motion = (Motion *) node->ps.plan;
+ MinimalTuple inputTuple;
+ binaryheap *hp = node->tupleheap;
+ Motion *motion = (Motion *) node->ps.plan;
int iSegIdx;
ListCell *lcProcess;
ExecSlice *sendSlice =
&node->ps.state->es_sliceTable->slices[motion->motionID];
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 19eae27ab38..eb38156329e 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -1769,6 +1769,8 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr
plan,
*/
if (read_only)
{
+ ListCell *lc;
+
foreach(lc, stmt_list)
{
PlannedStmt *pstmt = lfirst_node(PlannedStmt, lc);
diff --git a/src/backend/optimizer/path/allpaths.c
b/src/backend/optimizer/path/allpaths.c
index 33d6aa26876..68e6506df19 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -3598,6 +3598,7 @@ set_cte_pathlist(PlannerInfo *root, RelOptInfo *rel,
RangeTblEntry *rte)
foreach(lc, sub_final_rel->pathlist)
{
Path *subpath = (Path *) lfirst(lc);
+ List *pathkeys;
CdbPathLocus locus;
locus = cdbpathlocus_from_subquery(root, rel, subpath);
diff --git a/src/backend/optimizer/plan/planner.c
b/src/backend/optimizer/plan/planner.c
index bae6946da84..d9184c897f0 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -1887,6 +1887,7 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
*/
if (target->sortgrouprefs)
{
+ ListCell *lc;
int idx;
idx = 0;
@@ -5736,12 +5737,10 @@ create_final_distinct_paths(PlannerInfo *root,
RelOptInfo *input_rel,
{
Query *parse = root->parse;
Path *cheapest_input_path = input_rel->cheapest_total_path;
- double numDistinctRows;
bool allow_hash;
double numDistinctRowsTotal;
double numInputRowsTotal;
Path *path;
- ListCell *lc;
if (CdbPathLocus_IsPartitioned(cheapest_input_path->locus))
{
@@ -5783,6 +5782,7 @@ create_final_distinct_paths(PlannerInfo *root, RelOptInfo
*input_rel,
*/
if (grouping_is_sortable(root->processed_distinctClause))
{
+ double numDistinctRows;
/*
* Firstly, if we have any adequately-presorted paths, just
stick a
* Unique node on those. We also, consider doing an explicit
sort of
@@ -5798,6 +5798,7 @@ create_final_distinct_paths(PlannerInfo *root, RelOptInfo
*input_rel,
* the other.)
*/
List *needed_pathkeys;
+ ListCell *lc;
// double limittuples = root->distinct_pathkeys == NIL ?
1.0 : -1.0;
if (parse->hasDistinctOn &&
@@ -5981,6 +5982,7 @@ create_final_distinct_paths(PlannerInfo *root, RelOptInfo
*input_rel,
if (allow_hash && grouping_is_hashable(root->processed_distinctClause))
{
/* Generate hashed aggregate path --- no sort needed */
+ double numDistinctRows;
Size hashentrysize;
path = cdb_prepare_path_for_hashed_agg(root,
@@ -6208,6 +6210,7 @@ create_ordered_paths(PlannerInfo *root,
foreach(lc, input_rel->partial_pathlist)
{
Path *input_path = (Path *) lfirst(lc);
+ Path *sorted_path;
bool is_sorted;
int presorted_keys;
#if 0
diff --git a/src/backend/replication/syncrep.c
b/src/backend/replication/syncrep.c
index 885df814b11..be0e16dcea2 100644
--- a/src/backend/replication/syncrep.c
+++ b/src/backend/replication/syncrep.c
@@ -924,6 +924,7 @@ SyncRepGetCandidateStandbys(SyncRepStandbyData **standbys)
if (IS_QUERY_DISPATCHER())
{
bool syncStandbyPresent;
+ int i;
SyncRepStandbyData *stby;
volatile WalSnd *walsnd; /* Use volatile pointer
to prevent code
* rearrangement */
diff --git a/src/backend/task/job_metadata.c b/src/backend/task/job_metadata.c
index 9344360f392..333fbd892fe 100644
--- a/src/backend/task/job_metadata.c
+++ b/src/backend/task/job_metadata.c
@@ -791,7 +791,7 @@ ParseSchedule(char *scheduleText)
*/
if (TryParseInterval(scheduleText, &secondsInterval))
{
- schedule = (entry *) calloc(sizeof(entry), sizeof(char));
+ entry *schedule = (entry *) calloc(sizeof(entry), sizeof(char));
schedule->secondsInterval = secondsInterval;
return schedule;
}
diff --git a/src/backend/utils/adt/array_userfuncs.c
b/src/backend/utils/adt/array_userfuncs.c
index e906a85daf4..ce4096fdd36 100644
--- a/src/backend/utils/adt/array_userfuncs.c
+++ b/src/backend/utils/adt/array_userfuncs.c
@@ -562,7 +562,6 @@ array_agg_combine(PG_FUNCTION_ARGS)
ArrayBuildState *state2;
MemoryContext agg_context;
MemoryContext old_context;
- int i;
if (!AggCheckCallContext(fcinfo, &agg_context))
elog(ERROR, "aggregate function called in non-aggregate
context");
@@ -589,7 +588,7 @@ array_agg_combine(PG_FUNCTION_ARGS)
old_context = MemoryContextSwitchTo(agg_context);
- for (i = 0; i < state2->nelems; i++)
+ for (int i = 0; i < state2->nelems; i++)
{
if (!state2->dnulls[i])
state1->dvalues[i] =
datumCopy(state2->dvalues[i],
@@ -629,7 +628,7 @@ array_agg_combine(PG_FUNCTION_ARGS)
}
/* Copy in the state2 elements to the end of the state1 arrays
*/
- for (i = 0; i < state2->nelems; i++)
+ for (int i = 0; i < state2->nelems; i++)
{
if (!state2->dnulls[i])
state1->dvalues[i + state1->nelems] =
@@ -707,7 +706,6 @@ array_agg_serialize(PG_FUNCTION_ARGS)
else
{
SerialIOData *iodata;
- int i;
/* Avoid repeat catalog lookups for typsend function */
iodata = (SerialIOData *) fcinfo->flinfo->fn_extra;
@@ -726,7 +724,7 @@ array_agg_serialize(PG_FUNCTION_ARGS)
fcinfo->flinfo->fn_extra = (void *) iodata;
}
- for (i = 0; i < state->nelems; i++)
+ for (int i = 0; i < state->nelems; i++)
{
bytea *outputbytes;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
