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

Fix for psort again.

Browse Source
This commit is contained in:
Bruce Momjian 1997-08-06 17:11:20 +00:00
parent 677efc7679
commit dc374505fa
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/backend/utils/sort/psort.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.10 1997/08/06 07:39:20 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.11 1997/08/06 17:11:20 momjian Exp $
* *
* NOTES * NOTES
* Sorts the first relation into the second relation. * Sorts the first relation into the second relation.
@ -281,8 +281,14 @@ initialrun(Sort *node, bool *empty)
inittapes(node); inittapes(node);
extrapasses = 0; extrapasses = 0;
} }
else else {
return; /* if rows fit in memory, we never access tape stuff */ /* if empty or rows fit in memory, we never access tape stuff */
if (*empty || ! PS(node)->using_tape_files)
return;
if (! PS(node)->using_tape_files)
inittapes(node);
extrapasses = 1 + (PS(node)->Tuples != NULL); /* (T != N) ? 2 : 1 */
}
for ( ; ; ) { for ( ; ; ) {
tp->tp_dummy--; tp->tp_dummy--;
@ -362,7 +368,8 @@ createrun(Sort *node, FILE *file, bool *empty)
&PS(node)->treeContext); &PS(node)->treeContext);
if (! PS(node)->using_tape_files) { if (! PS(node)->using_tape_files) {
inittapes(node); inittapes(node);
file = PS(node)->Tape->tp_file; /* was NULL */ if (! file)
file = PS(node)->Tape->tp_file; /* was NULL */
} }
PUTTUP(node, tup, file); PUTTUP(node, tup, file);
TRACEOUT(createrun, tup); TRACEOUT(createrun, tup);