aboutsummaryrefslogtreecommitdiff
path: root/src/backend/executor
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/executor')
-rw-r--r--src/backend/executor/execMain.c15
-rw-r--r--src/backend/executor/functions.c9
-rw-r--r--src/backend/executor/nodeAgg.c20
-rw-r--r--src/backend/executor/nodeAppend.c5
-rw-r--r--src/backend/executor/nodeSort.c8
-rw-r--r--src/backend/executor/spi.c9
6 files changed, 21 insertions, 45 deletions
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index efad76fcc1c..e775ae030e0 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -27,7 +27,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.184 2002/11/11 22:19:22 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.185 2002/11/13 00:39:46 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -106,12 +106,8 @@ ExecutorStart(QueryDesc *queryDesc, EState *estate)
Assert(queryDesc != NULL);
if (queryDesc->plantree->nParamExec > 0)
- {
estate->es_param_exec_vals = (ParamExecData *)
- palloc(queryDesc->plantree->nParamExec * sizeof(ParamExecData));
- MemSet(estate->es_param_exec_vals, 0,
- queryDesc->plantree->nParamExec * sizeof(ParamExecData));
- }
+ palloc0(queryDesc->plantree->nParamExec * sizeof(ParamExecData));
/*
* Make our own private copy of the current query snapshot data.
@@ -1792,17 +1788,12 @@ EvalPlanQual(EState *estate, Index rti, ItemPointer tid)
*/
epqstate->es_evTupleNull = (bool *) palloc(rtsize * sizeof(bool));
if (epq == NULL)
- {
/* first PQ stack entry */
epqstate->es_evTuple = (HeapTuple *)
- palloc(rtsize * sizeof(HeapTuple));
- memset(epqstate->es_evTuple, 0, rtsize * sizeof(HeapTuple));
- }
+ palloc0(rtsize * sizeof(HeapTuple));
else
- {
/* later stack entries share the same storage */
epqstate->es_evTuple = epq->estate.es_evTuple;
- }
}
else
{
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index 105784fda4f..71166d9096c 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.59 2002/11/11 03:02:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.60 2002/11/13 00:39:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -121,9 +121,7 @@ init_execution_state(char *src, Oid *argOidVect, int nargs)
int i;
ParamListInfo paramLI;
- paramLI = (ParamListInfo) palloc((nargs + 1) * sizeof(ParamListInfoData));
-
- MemSet(paramLI, 0, (nargs + 1) * sizeof(ParamListInfoData));
+ paramLI = (ParamListInfo) palloc0((nargs + 1) * sizeof(ParamListInfoData));
estate->es_param_list_info = paramLI;
@@ -185,8 +183,7 @@ init_sql_fcache(FmgrInfo *finfo)
typeStruct = (Form_pg_type) GETSTRUCT(typeTuple);
- fcache = (SQLFunctionCachePtr) palloc(sizeof(SQLFunctionCache));
- MemSet(fcache, 0, sizeof(SQLFunctionCache));
+ fcache = (SQLFunctionCachePtr) palloc0(sizeof(SQLFunctionCache));
/*
* get the type length and by-value flag from the type tuple
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 63c5bc20b47..5fa82ee9fad 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -45,7 +45,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeAgg.c,v 1.94 2002/11/11 03:02:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeAgg.c,v 1.95 2002/11/13 00:39:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -651,8 +651,7 @@ lookup_hash_entry(Agg *node, TupleTableSlot *slot)
MemoryContextSwitchTo(aggstate->aggcontext);
entrysize = sizeof(AggHashEntryData) +
(aggstate->numaggs - 1) * sizeof(AggStatePerGroupData);
- entry = (AggHashEntry) palloc(entrysize);
- MemSet(entry, 0, entrysize);
+ entry = (AggHashEntry) palloc0(entrysize);
entry->hashkey = hashkey;
entry->firstTuple = heap_copytuple(tuple);
@@ -888,9 +887,8 @@ agg_retrieve_direct(Agg *node)
Datum *dvalues;
char *dnulls;
- dvalues = (Datum *) palloc(sizeof(Datum) * tupType->natts);
+ dvalues = (Datum *) palloc0(sizeof(Datum) * tupType->natts);
dnulls = (char *) palloc(sizeof(char) * tupType->natts);
- MemSet(dvalues, 0, sizeof(Datum) * tupType->natts);
MemSet(dnulls, 'n', sizeof(char) * tupType->natts);
nullsTuple = heap_formtuple(tupType, dvalues, dnulls);
ExecStoreTuple(nullsTuple,
@@ -1170,13 +1168,10 @@ ExecInitAgg(Agg *node, EState *estate, Plan *parent)
* allocate my private per-agg working storage
*/
econtext = aggstate->csstate.cstate.cs_ExprContext;
- econtext->ecxt_aggvalues = (Datum *) palloc(sizeof(Datum) * numaggs);
- MemSet(econtext->ecxt_aggvalues, 0, sizeof(Datum) * numaggs);
- econtext->ecxt_aggnulls = (bool *) palloc(sizeof(bool) * numaggs);
- MemSet(econtext->ecxt_aggnulls, 0, sizeof(bool) * numaggs);
+ econtext->ecxt_aggvalues = (Datum *) palloc0(sizeof(Datum) * numaggs);
+ econtext->ecxt_aggnulls = (bool *) palloc0(sizeof(bool) * numaggs);
- peragg = (AggStatePerAgg) palloc(sizeof(AggStatePerAggData) * numaggs);
- MemSet(peragg, 0, sizeof(AggStatePerAggData) * numaggs);
+ peragg = (AggStatePerAgg) palloc0(sizeof(AggStatePerAggData) * numaggs);
aggstate->peragg = peragg;
if (node->aggstrategy == AGG_HASHED)
@@ -1188,8 +1183,7 @@ ExecInitAgg(Agg *node, EState *estate, Plan *parent)
{
AggStatePerGroup pergroup;
- pergroup = (AggStatePerGroup) palloc(sizeof(AggStatePerGroupData) * numaggs);
- MemSet(pergroup, 0, sizeof(AggStatePerGroupData) * numaggs);
+ pergroup = (AggStatePerGroup) palloc0(sizeof(AggStatePerGroupData) * numaggs);
aggstate->pergroup = pergroup;
}
diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c
index 970da155f76..9d0e5642229 100644
--- a/src/backend/executor/nodeAppend.c
+++ b/src/backend/executor/nodeAppend.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.49 2002/11/11 03:02:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.50 2002/11/13 00:39:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -166,8 +166,7 @@ ExecInitAppend(Append *node, EState *estate, Plan *parent)
appendplans = node->appendplans;
nplans = length(appendplans);
- initialized = (bool *) palloc(nplans * sizeof(bool));
- MemSet(initialized, 0, nplans * sizeof(bool));
+ initialized = (bool *) palloc0(nplans * sizeof(bool));
/*
* create new AppendState for our append node
diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c
index bed63e03619..05f36427beb 100644
--- a/src/backend/executor/nodeSort.c
+++ b/src/backend/executor/nodeSort.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.39 2002/11/11 03:02:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.40 2002/11/13 00:39:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -50,11 +50,9 @@ ExtractSortKeys(Sort *sortnode,
*/
if (keycount <= 0)
elog(ERROR, "ExtractSortKeys: keycount <= 0");
- sortOps = (Oid *) palloc(keycount * sizeof(Oid));
- MemSet(sortOps, 0, keycount * sizeof(Oid));
+ sortOps = (Oid *) palloc0(keycount * sizeof(Oid));
*sortOperators = sortOps;
- attNos = (AttrNumber *) palloc(keycount * sizeof(AttrNumber));
- MemSet(attNos, 0, keycount * sizeof(AttrNumber));
+ attNos = (AttrNumber *) palloc0(keycount * sizeof(AttrNumber));
*attNums = attNos;
/*
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index eed5a5a0901..6e897e423eb 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/spi.c,v 1.77 2002/11/11 03:02:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/spi.c,v 1.78 2002/11/13 00:39:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -783,9 +783,8 @@ SPI_cursor_open(char *name, void *plan, Datum *Values, char *Nulls)
{
ParamListInfo paramLI;
- paramLI = (ParamListInfo) palloc((spiplan->nargs + 1) *
+ paramLI = (ParamListInfo) palloc0((spiplan->nargs + 1) *
sizeof(ParamListInfoData));
- MemSet(paramLI, 0, (spiplan->nargs + 1) * sizeof(ParamListInfoData));
eState->es_param_list_info = paramLI;
for (k = 0; k < spiplan->nargs; paramLI++, k++)
@@ -1193,9 +1192,7 @@ _SPI_execute_plan(_SPI_plan *plan, Datum *Values, char *Nulls, int tcount)
int k;
paramLI = (ParamListInfo)
- palloc((nargs + 1) * sizeof(ParamListInfoData));
- MemSet(paramLI, 0,
- (nargs + 1) * sizeof(ParamListInfoData));
+ palloc0((nargs + 1) * sizeof(ParamListInfoData));
state->es_param_list_info = paramLI;
for (k = 0; k < plan->nargs; paramLI++, k++)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 15:18:03 +0000