database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

psort cleanups.

Browse Source
This commit is contained in:
Bruce Momjian 1997-08-06 05:38:46 +00:00
parent 8fd7db8163
commit cc24b846dd
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/tcop/postgres.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.38 1997/08/06 05:08:37 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.39 1997/08/06 05:38:35 momjian Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
@ -108,7 +108,7 @@ extern int lockingOff;
extern int NBuffers; extern int NBuffers;
int fsyncOff = 0; int fsyncOff = 0;
int SortMem = 512 * 1024; int SortMem = 512;
int dontExecute = 0; int dontExecute = 0;
static int ShowStats; static int ShowStats;
@ -1045,7 +1045,7 @@ PostgresMain(int argc, char *argv[])
* S - amount of sort memory to use in 1k bytes * S - amount of sort memory to use in 1k bytes
* ---------------- * ----------------
*/ */
SortMem = atoi(optarg) * 1024; SortMem = atoi(optarg);
break; break;
#ifdef NOT_USED #ifdef NOT_USED
@ -1292,7 +1292,7 @@ PostgresMain(int argc, char *argv[])
*/ */
if (IsUnderPostmaster == false) { if (IsUnderPostmaster == false) {
puts("\nPOSTGRES backend interactive interface"); puts("\nPOSTGRES backend interactive interface");
puts("$Revision: 1.38 $ $Date: 1997/08/06 05:08:37 $"); puts("$Revision: 1.39 $ $Date: 1997/08/06 05:38:35 $");
} }
/* ---------------- /* ----------------

6
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.7 1997/08/06 04:45:39 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.8 1997/08/06 05:38:38 momjian Exp $
* *
* NOTES * NOTES
* Sorts the first relation into the second relation. * Sorts the first relation into the second relation.
@ -123,10 +123,10 @@ psort_begin(Sort *node, int nkeys, ScanKey key)
PS(node)->BytesRead = 0; PS(node)->BytesRead = 0;
PS(node)->BytesWritten = 0; PS(node)->BytesWritten = 0;
PS(node)->treeContext.tupDesc = PS(node)->treeContext.tupDesc =
ExecGetTupType(outerPlan((Plan *)node)); ExecGetTupType(outerPlan((Plan *)node));
PS(node)->treeContext.nKeys = nkeys; PS(node)->treeContext.nKeys = nkeys;
PS(node)->treeContext.scanKeys = key; PS(node)->treeContext.scanKeys = key;
PS(node)->treeContext.sortMem = SortMem; PS(node)->treeContext.sortMem = SortMem * 1024;
PS(node)->Tuples = NULL; PS(node)->Tuples = NULL;
PS(node)->tupcount = 0; PS(node)->tupcount = 0;

3
src/include/utils/psort.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: psort.h,v 1.4 1997/08/06 03:42:13 momjian Exp $ * $Id: psort.h,v 1.5 1997/08/06 05:38:46 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -18,7 +18,6 @@
#include "utils/lselect.h" #include "utils/lselect.h"
#include "nodes/plannodes.h" #include "nodes/plannodes.h"
#define SORTMEM (1 << 18) /* 1/4 M - any static memory */
#define MAXTAPES 7 /* 7--See Fig. 70, p273 */ #define MAXTAPES 7 /* 7--See Fig. 70, p273 */
#define TAPEEXTLEN strlen("pg_psort.xxxxx.xxx") /* TEMPDIR/TAPEEXT */ #define TAPEEXTLEN strlen("pg_psort.xxxxx.xxx") /* TEMPDIR/TAPEEXT */
#define FREE(x) pfree((char *) x) #define FREE(x) pfree((char *) x)