diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-11-10 07:25:14 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-11-10 07:25:14 +0000 |
| commit | 8fee9615ccdfb7ed99de3dfe0d964952ed45d978 (patch) | |
| tree | b13cf68a8e97d5e89a106fd7da9c3b524ad7a8c2 /src/backend/executor/nodeAgg.c | |
| parent | 78822b328c2907accf590d5473a0508ea3ee07a5 (diff) | |
| download | postgresql-8fee9615ccdfb7ed99de3dfe0d964952ed45d978.tar.gz postgresql-8fee9615ccdfb7ed99de3dfe0d964952ed45d978.zip | |
Merge palloc()/MemSet(0) calls into a single palloc0() call.
Diffstat (limited to 'src/backend/executor/nodeAgg.c')
| -rw-r--r-- | src/backend/executor/nodeAgg.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index 824e0299278..a36d078964a 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.92 2002/11/06 22:31:23 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeAgg.c,v 1.93 2002/11/10 07:25:13 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; } |