Commitcc24b84

committed

psort cleanups.

1 parent8fd7db8 commitcc24b84Copy full SHA for cc24b84

File tree

-9

lines changed

-9

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.38 1997/08/06 05:08:37 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.39 1997/08/06 05:38:35 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* this is the "main" module of the postgres backend and`
`@@ -108,7 +108,7 @@ extern int lockingOff;`
`108`	`108`	`externintNBuffers;`
`109`	`109`
`110`	`110`	`intfsyncOff=0;`
`111`		`-intSortMem=512*1024;`
	`111`	`+intSortMem=512;`
`112`	`112`
`113`	`113`	`intdontExecute=0;`
`114`	`114`	`staticintShowStats;`
`@@ -1045,7 +1045,7 @@ PostgresMain(int argc, char *argv[])`
`1045`	`1045`	`* S - amount of sort memory to use in 1k bytes`
`1046`	`1046`	`* ----------------`
`1047`	`1047`	`*/`
`1048`		`-SortMem=atoi(optarg)*1024;`
	`1048`	`+SortMem=atoi(optarg);`
`1049`	`1049`	`break;`
`1050`	`1050`
`1051`	`1051`	`#ifdefNOT_USED`
`@@ -1292,7 +1292,7 @@ PostgresMain(int argc, char *argv[])`
`1292`	`1292`	`*/`
`1293`	`1293`	`if (IsUnderPostmaster== false) {`
`1294`	`1294`	`puts("\nPOSTGRES backend interactive interface");`
`1295`		`-puts("$Revision: 1.38 $ $Date: 1997/08/06 05:08:37 $");`
	`1295`	`+puts("$Revision: 1.39 $ $Date: 1997/08/06 05:38:35 $");`
`1296`	`1296`	`}`
`1297`	`1297`
`1298`	`1298`	`/* ----------------`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.7 1997/08/0604:45:39 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.8 1997/08/0605:38:38 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* Sorts the first relation into the second relation.`
`@@ -123,10 +123,10 @@ psort_begin(Sort *node, int nkeys, ScanKey key)`
`123`	`123`	`PS(node)->BytesRead=0;`
`124`	`124`	`PS(node)->BytesWritten=0;`
`125`	`125`	`PS(node)->treeContext.tupDesc=`
`126`		`-ExecGetTupType(outerPlan((Plan*)node));`
	`126`	`+ExecGetTupType(outerPlan((Plan*)node));`
`127`	`127`	`PS(node)->treeContext.nKeys=nkeys;`
`128`	`128`	`PS(node)->treeContext.scanKeys=key;`
`129`		`-PS(node)->treeContext.sortMem=SortMem;`
	`129`	`+PS(node)->treeContext.sortMem=SortMem*1024;`
`130`	`130`
`131`	`131`	`PS(node)->Tuples=NULL;`
`132`	`132`	`PS(node)->tupcount=0;`

Lines changed: 1 addition & 2 deletions

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/0603:42:13 momjian Exp $`
	`9`	`+ * $Id: psort.h,v 1.5 1997/08/0605: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`		`-#defineSORTMEM(1 << 18)/* 1/4 M - any static memory */`
`22`	`21`	`#defineMAXTAPES7/* 7--See Fig. 70, p273 */`
`23`	`22`	`#defineTAPEEXTLENstrlen("pg_psort.xxxxx.xxx")/* TEMPDIR/TAPEEXT */`
`24`	`23`	`#defineFREE(x)pfree((char *) x)`

Comments

(0)