mirror of
https://github.com/postgres/postgres.git
synced 2025-12-13 14:22:43 +03:00
Use palloc_object() and palloc_array(), the last change
This is the last batch of changes that have been suggested by the author, this part covering the non-trivial changes. Some of the changes suggested have been discarded as they seem to lead to more instructions generated, leaving the parts that can be qualified as in-place replacements. Similar work has been done in1b105f9472,0c3c5c3b06and31d3847a37. Author: David Geier <geidav.pg@gmail.com> Discussion: https://postgr.es/m/ad0748d4-3080-436e-b0bc-ac8f86a3466a@gmail.com
This commit is contained in:
@@ -633,7 +633,7 @@ postgresGetForeignRelSize(PlannerInfo *root,
|
||||
* We use PgFdwRelationInfo to pass various information to subsequent
|
||||
* functions.
|
||||
*/
|
||||
fpinfo = (PgFdwRelationInfo *) palloc0(sizeof(PgFdwRelationInfo));
|
||||
fpinfo = palloc0_object(PgFdwRelationInfo);
|
||||
baserel->fdw_private = fpinfo;
|
||||
|
||||
/* Base foreign tables need to be pushed down always. */
|
||||
@@ -1517,7 +1517,7 @@ postgresBeginForeignScan(ForeignScanState *node, int eflags)
|
||||
/*
|
||||
* We'll save private state in node->fdw_state.
|
||||
*/
|
||||
fsstate = (PgFdwScanState *) palloc0(sizeof(PgFdwScanState));
|
||||
fsstate = palloc0_object(PgFdwScanState);
|
||||
node->fdw_state = fsstate;
|
||||
|
||||
/*
|
||||
@@ -2663,7 +2663,7 @@ postgresBeginDirectModify(ForeignScanState *node, int eflags)
|
||||
/*
|
||||
* We'll save private state in node->fdw_state.
|
||||
*/
|
||||
dmstate = (PgFdwDirectModifyState *) palloc0(sizeof(PgFdwDirectModifyState));
|
||||
dmstate = palloc0_object(PgFdwDirectModifyState);
|
||||
node->fdw_state = dmstate;
|
||||
|
||||
/*
|
||||
@@ -3977,7 +3977,7 @@ create_foreign_modify(EState *estate,
|
||||
ListCell *lc;
|
||||
|
||||
/* Begin constructing PgFdwModifyState. */
|
||||
fmstate = (PgFdwModifyState *) palloc0(sizeof(PgFdwModifyState));
|
||||
fmstate = palloc0_object(PgFdwModifyState);
|
||||
fmstate->rel = rel;
|
||||
|
||||
/* Identify which user to do the remote access as. */
|
||||
@@ -4014,7 +4014,7 @@ create_foreign_modify(EState *estate,
|
||||
|
||||
/* Prepare for output conversion of parameters used in prepared stmt. */
|
||||
n_params = list_length(fmstate->target_attrs) + 1;
|
||||
fmstate->p_flinfo = (FmgrInfo *) palloc0(sizeof(FmgrInfo) * n_params);
|
||||
fmstate->p_flinfo = palloc0_array(FmgrInfo, n_params);
|
||||
fmstate->p_nums = 0;
|
||||
|
||||
if (operation == CMD_UPDATE || operation == CMD_DELETE)
|
||||
@@ -4814,7 +4814,7 @@ prepare_query_params(PlanState *node,
|
||||
Assert(numParams > 0);
|
||||
|
||||
/* Prepare for output conversion of parameters used in remote query. */
|
||||
*param_flinfo = (FmgrInfo *) palloc0(sizeof(FmgrInfo) * numParams);
|
||||
*param_flinfo = palloc0_array(FmgrInfo, numParams);
|
||||
|
||||
i = 0;
|
||||
foreach(lc, fdw_exprs)
|
||||
@@ -6297,7 +6297,7 @@ postgresGetForeignJoinPaths(PlannerInfo *root,
|
||||
* if found safe. Once we know that this join can be pushed down, we fill
|
||||
* the entry.
|
||||
*/
|
||||
fpinfo = (PgFdwRelationInfo *) palloc0(sizeof(PgFdwRelationInfo));
|
||||
fpinfo = palloc0_object(PgFdwRelationInfo);
|
||||
fpinfo->pushdown_safe = false;
|
||||
joinrel->fdw_private = fpinfo;
|
||||
/* attrs_used is only for base relations. */
|
||||
@@ -6666,7 +6666,7 @@ postgresGetForeignUpperPaths(PlannerInfo *root, UpperRelationKind stage,
|
||||
output_rel->fdw_private)
|
||||
return;
|
||||
|
||||
fpinfo = (PgFdwRelationInfo *) palloc0(sizeof(PgFdwRelationInfo));
|
||||
fpinfo = palloc0_object(PgFdwRelationInfo);
|
||||
fpinfo->pushdown_safe = false;
|
||||
fpinfo->stage = stage;
|
||||
output_rel->fdw_private = fpinfo;
|
||||
@@ -6891,7 +6891,7 @@ add_foreign_ordered_paths(PlannerInfo *root, RelOptInfo *input_rel,
|
||||
fpinfo->pushdown_safe = true;
|
||||
|
||||
/* Construct PgFdwPathExtraData */
|
||||
fpextra = (PgFdwPathExtraData *) palloc0(sizeof(PgFdwPathExtraData));
|
||||
fpextra = palloc0_object(PgFdwPathExtraData);
|
||||
fpextra->target = root->upper_targets[UPPERREL_ORDERED];
|
||||
fpextra->has_final_sort = true;
|
||||
|
||||
@@ -7125,7 +7125,7 @@ add_foreign_final_paths(PlannerInfo *root, RelOptInfo *input_rel,
|
||||
fpinfo->pushdown_safe = true;
|
||||
|
||||
/* Construct PgFdwPathExtraData */
|
||||
fpextra = (PgFdwPathExtraData *) palloc0(sizeof(PgFdwPathExtraData));
|
||||
fpextra = palloc0_object(PgFdwPathExtraData);
|
||||
fpextra->target = root->upper_targets[UPPERREL_FINAL];
|
||||
fpextra->has_final_sort = has_final_sort;
|
||||
fpextra->has_limit = extra->limit_needed;
|
||||
|
||||
Reference in New Issue
Block a user