psort cleanups.

bmomjian · bmomjian · commit cc24b846dd0a · 1997-08-06T05:38:46.000Z
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
@@ -7,7 +7,7 @@
  *
  *
  * 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
  *    this is the "main" module of the postgres backend and
@@ -108,7 +108,7 @@ extern int      lockingOff;
 extern int      NBuffers;
 
 int     fsyncOff = 0;
-int	SortMem = 512 * 1024;
+int	SortMem = 512;
 
 int     dontExecute = 0;
 static int      ShowStats;
@@ -1045,7 +1045,7 @@ PostgresMain(int argc, char *argv[])
              *  S - amount of sort memory to use in 1k bytes
              * ----------------
              */
-            SortMem = atoi(optarg) * 1024;
+            SortMem = atoi(optarg);
             break;
 
 #ifdef NOT_USED
@@ -1292,7 +1292,7 @@ PostgresMain(int argc, char *argv[])
      */
     if (IsUnderPostmaster == false) {
         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 $");
     }
     
     /* ----------------
diff --git a/src/backend/utils/sort/psort.c b/src/backend/utils/sort/psort.c
@@ -7,7 +7,7 @@
  *
  *
  * 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
  *      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)->BytesWritten = 0;
     PS(node)->treeContext.tupDesc =
-	ExecGetTupType(outerPlan((Plan *)node));
+    ExecGetTupType(outerPlan((Plan *)node));
     PS(node)->treeContext.nKeys = nkeys;
     PS(node)->treeContext.scanKeys = key;
-    PS(node)->treeContext.sortMem = SortMem;
+    PS(node)->treeContext.sortMem = SortMem * 1024;
 
     PS(node)->Tuples = NULL;
     PS(node)->tupcount = 0;
diff --git a/src/include/utils/psort.h b/src/include/utils/psort.h
@@ -6,7 +6,7 @@
  *
  * 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 "nodes/plannodes.h"
 
-#define	SORTMEM		(1 << 18)		/* 1/4 M - any static memory */
 #define	MAXTAPES	7			/* 7--See Fig. 70, p273 */
 #define	TAPEEXTLEN	strlen("pg_psort.xxxxx.xxx")	/* TEMPDIR/TAPEEXT */
 #define	FREE(x)		pfree((char *) x)

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: psort.h,v 1.4 1997/08/06 03:42:13 momjian Exp $`
	`9`	`+ * $Id: psort.h,v 1.5 1997/08/06 05:38:46 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -18,7 +18,6 @@`
`18`	`18`	`#include "utils/lselect.h"`
`19`	`19`	`#include "nodes/plannodes.h"`
`20`	`20`
`21`		`-#define SORTMEM (1 << 18) /* 1/4 M - any static memory */`
`22`	`21`	`#define MAXTAPES 7 /* 7--See Fig. 70, p273 */`
`23`	`22`	`#define TAPEEXTLEN strlen("pg_psort.xxxxx.xxx") /* TEMPDIR/TAPEEXT */`
`24`	`23`	`#define FREE(x) pfree((char *) x)`