fix_redudant_initialization_tuplesort.patch
application/octet-stream
Filename: fix_redudant_initialization_tuplesort.patch
Type: application/octet-stream
Part: 13
Message:
Re: [PATCH] Redudant initilization
Patch
Format: unified
| File | + | − |
|---|---|---|
| src/backend/utils/sort/tuplesort.c | 2 | 5 |
diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c
index 3c49476483..6984d4d37a 100644
--- a/src/backend/utils/sort/tuplesort.c
+++ b/src/backend/utils/sort/tuplesort.c
@@ -2738,7 +2738,6 @@ mergeruns(Tuplesortstate *state)
svTape,
svRuns,
svDummy;
- int numTapes;
int numInputTapes;
Assert(state->status == TSS_BUILDRUNS);
@@ -2778,7 +2777,7 @@ mergeruns(Tuplesortstate *state)
* If we had fewer runs than tapes, refund the memory that we imagined we
* would need for the tape buffers of the unused tapes.
*
- * numTapes and numInputTapes reflect the actual number of tapes we will
+ * numInputTapes reflect the actual number of tapes we will
* use. Note that the output tape's tape number is maxTapes - 1, so the
* tape numbers of the used tapes are not consecutive, and you cannot just
* loop from 0 to numTapes to visit all used tapes!
@@ -2786,13 +2785,11 @@ mergeruns(Tuplesortstate *state)
if (state->Level == 1)
{
numInputTapes = state->currentRun;
- numTapes = numInputTapes + 1;
- FREEMEM(state, (state->maxTapes - numTapes) * TAPE_BUFFER_OVERHEAD);
+ FREEMEM(state, (state->maxTapes - numInputTapes + 1) * TAPE_BUFFER_OVERHEAD);
}
else
{
numInputTapes = state->tapeRange;
- numTapes = state->maxTapes;
}
/*