mirror of
https://github.com/postgres/postgres.git
synced 2025-07-28 23:42:10 +03:00
Clean up most -Wunused-but-set-variable warnings from gcc 4.6
This warning is new in gcc 4.6 and part of -Wall. This patch cleans up most of the noise, but there are some still warnings that are trickier to remove.
This commit is contained in:
@ -59,7 +59,6 @@ static bool ExecHashJoinNewBatch(HashJoinState *hjstate);
|
||||
TupleTableSlot * /* return: a tuple or NULL */
|
||||
ExecHashJoin(HashJoinState *node)
|
||||
{
|
||||
EState *estate;
|
||||
PlanState *outerNode;
|
||||
HashState *hashNode;
|
||||
List *joinqual;
|
||||
@ -74,7 +73,6 @@ ExecHashJoin(HashJoinState *node)
|
||||
/*
|
||||
* get information from HashJoin node
|
||||
*/
|
||||
estate = node->js.ps.state;
|
||||
joinqual = node->js.joinqual;
|
||||
otherqual = node->js.ps.qual;
|
||||
hashNode = (HashState *) innerPlanState(node);
|
||||
|
@ -639,7 +639,6 @@ ExecMergeTupleDump(MergeJoinState *mergestate)
|
||||
TupleTableSlot *
|
||||
ExecMergeJoin(MergeJoinState *node)
|
||||
{
|
||||
EState *estate;
|
||||
List *joinqual;
|
||||
List *otherqual;
|
||||
bool qualResult;
|
||||
@ -655,7 +654,6 @@ ExecMergeJoin(MergeJoinState *node)
|
||||
/*
|
||||
* get information from node
|
||||
*/
|
||||
estate = node->js.ps.state;
|
||||
innerPlan = innerPlanState(node);
|
||||
outerPlan = outerPlanState(node);
|
||||
econtext = node->js.ps.ps_ExprContext;
|
||||
|
@ -79,7 +79,6 @@ ExecRecursiveUnion(RecursiveUnionState *node)
|
||||
PlanState *innerPlan = innerPlanState(node);
|
||||
RecursiveUnion *plan = (RecursiveUnion *) node->ps.plan;
|
||||
TupleTableSlot *slot;
|
||||
RUHashEntry entry;
|
||||
bool isnew;
|
||||
|
||||
/* 1. Evaluate non-recursive term */
|
||||
@ -93,8 +92,7 @@ ExecRecursiveUnion(RecursiveUnionState *node)
|
||||
if (plan->numCols > 0)
|
||||
{
|
||||
/* Find or build hashtable entry for this tuple's group */
|
||||
entry = (RUHashEntry)
|
||||
LookupTupleHashEntry(node->hashtable, slot, &isnew);
|
||||
LookupTupleHashEntry(node->hashtable, slot, &isnew);
|
||||
/* Must reset temp context after each hashtable lookup */
|
||||
MemoryContextReset(node->tempContext);
|
||||
/* Ignore tuple if already seen */
|
||||
@ -141,8 +139,7 @@ ExecRecursiveUnion(RecursiveUnionState *node)
|
||||
if (plan->numCols > 0)
|
||||
{
|
||||
/* Find or build hashtable entry for this tuple's group */
|
||||
entry = (RUHashEntry)
|
||||
LookupTupleHashEntry(node->hashtable, slot, &isnew);
|
||||
LookupTupleHashEntry(node->hashtable, slot, &isnew);
|
||||
/* Must reset temp context after each hashtable lookup */
|
||||
MemoryContextReset(node->tempContext);
|
||||
/* Ignore tuple if already seen */
|
||||
|
Reference in New Issue
Block a user