mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dead code in nodeGatherMerge.c.

Browse Source 
Coverity noted that the last line of gather_merge_getnext() was
unreachable, since each arm of the preceding "if" ends in a "return".
Drop it as an oversight.  In passing, improve some nearby comments.
This commit is contained in:
Tom Lane 2017-03-12 15:52:50 -04:00
parent ce38949ba2
commit 5d3f7c57ab
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/backend/executor/nodeGatherMerge.c
View File

@ -423,8 +423,8 @@ reread:
} }
/* /*
* Clear out a slot in the tuple table for each gather merge * Clear out the tuple table slots for each gather merge input,
* slot and return the clear cleared slot. * and return a cleared slot.
*/ */
static TupleTableSlot * static TupleTableSlot *
gather_merge_clear_slots(GatherMergeState *gm_state) gather_merge_clear_slots(GatherMergeState *gm_state)
@ -456,19 +456,21 @@ gather_merge_getnext(GatherMergeState *gm_state)
{ {
int i; int i;
/* if (!gm_state->gm_initialized)
* First time through: pull the first tuple from each participate, and set {
* up the heap. /*
*/ * First time through: pull the first tuple from each participant, and
if (gm_state->gm_initialized == false) * set up the heap.
*/
gather_merge_init(gm_state); gather_merge_init(gm_state);
}
else else
{ {
/* /*
* Otherwise, pull the next tuple from whichever participant we * Otherwise, pull the next tuple from whichever participant we
* returned from last time, and reinsert the index into the heap, * returned from last time, and reinsert that participant's index into
* because it might now compare differently against the existing * the heap, because it might now compare differently against the
* elements of the heap. * other elements of the heap.
*/ */
i = DatumGetInt32(binaryheap_first(gm_state->gm_heap)); i = DatumGetInt32(binaryheap_first(gm_state->gm_heap));
@ -485,11 +487,10 @@ gather_merge_getnext(GatherMergeState *gm_state)
} }
else else
{ {
/* Return next tuple from whichever participant has the leading one */
i = DatumGetInt32(binaryheap_first(gm_state->gm_heap)); i = DatumGetInt32(binaryheap_first(gm_state->gm_heap));
return gm_state->gm_slots[i]; return gm_state->gm_slots[i];
} }
return gather_merge_clear_slots(gm_state);
} }
/* /*