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

No more SortTuplesInTree...

Browse Source
This commit is contained in:
Vadim B. Mikheev 1997-09-18 14:33:46 +00:00
parent 4948a51d74
commit 8f1e1b4551
2 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.47 1997/09/18 05:19:17 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.48 1997/09/18 14:33:33 vadim Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
@ -1120,31 +1120,15 @@ PostgresMain(int argc, char *argv[])
case 'S': case 'S':
/* ---------------- /* ----------------
* S - amount of sort memory to use in 1k bytes and * S - amount of sort memory to use in 1k bytes
* (optional) max number of tuples in leftist tree
* ---------------- * ----------------
*/ */
{ {
int S; int S;
char *p = strchr (optarg, ',');
if ( p != NULL ) S = atoi(optarg);
{ if ( S >= 4*MAXBLCKSZ/1024 )
*p = 0; SortMem = S;
S = atoi(optarg);
if ( S >= 4*MAXBLCKSZ/1024 )
SortMem = S;
S = atoi (p + 1);
if ( S >= 32 )
SortTuplesInTree = S;
*p = ',';
}
else
{
S = atoi(optarg);
if ( S >= 4*MAXBLCKSZ/1024 )
SortMem = S;
}
} }
break; break;
@ -1407,7 +1391,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.47 $ $Date: 1997/09/18 05:19:17 $"); puts("$Revision: 1.48 $ $Date: 1997/09/18 14:33:33 $");
} }
/* ---------------- /* ----------------

3
src/backend/utils/init/globals.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.13 1997/09/18 05:23:58 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.14 1997/09/18 14:33:46 vadim Exp $
* *
* NOTES * NOTES
* Globals used all over the place should be declared here and not * Globals used all over the place should be declared here and not
@ -80,7 +80,6 @@ char FloatFormat[20] = "%f";
int fsyncOff = 0; int fsyncOff = 0;
int SortMem = 512; int SortMem = 512;
int SortTuplesInTree = 2560;
char *IndexedCatalogNames[] = { char *IndexedCatalogNames[] = {
AttributeRelationName, AttributeRelationName,