Change memory-space accounting mechanism in tuplesort.c and tuplestore.c

[postgresql] / src / backend / utils / init / globals.c

diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index 43331badc7aab5432857263ca34169738f0af516..51a729c49c6920e7cd513802fa0b7b14f5bbcea7 100644 (file)
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -3,12 +3,12 @@
  * globals.c
  *       global variable declarations
  *
- * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.54 2001/03/13 01:17:06 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.66 2002/08/12 00:36:11 tgl Exp $
  *
  * NOTES
  *       Globals used all over the place should be declared here and not
@@ -18,22 +18,14 @@
  */
 #include "postgres.h"
 
-#include <fcntl.h>
-#include <sys/file.h>
-#include <sys/types.h>
-#include <math.h>
-#include <unistd.h>
-
-#include "catalog/catname.h"
-#include "catalog/indexing.h"
 #include "libpq/pqcomm.h"
 #include "miscadmin.h"
 #include "storage/backendid.h"
 
+
 ProtocolVersion FrontendProtocol = PG_PROTOCOL_LATEST;
 
 bool           Noversion = false;
-bool           Quiet = false;
 
 volatile bool InterruptPending = false;
 volatile bool QueryCancelPending = false;
@@ -47,15 +39,15 @@ struct Port *MyProcPort;
 long           MyCancelKey;
 
 char      *DataDir = NULL;
-
  /*
   * The PGDATA directory user says to use, or defaults to via environment
   * variable.  NULL if no option given and no environment variable set
   */
 
-Relation       reldesc;                        /* current relation descriptor */
+char           OutputFileName[MAXPGPATH];
 
-char           OutputFileName[MAXPGPATH] = "";
+char           pg_pathname[MAXPGPATH];         /* full path to postgres
+                                                                                * executable */
 
 BackendId      MyBackendId;
 
@@ -66,8 +58,6 @@ Oid                   MyDatabaseId = InvalidOid;
 
 bool           IsUnderPostmaster = false;
 
-int                    DebugLvl = 0;
-
 int                    DateStyle = USE_ISO_DATES;
 bool           EuroDates = false;
 bool           HasCTZSet = false;
@@ -79,43 +69,8 @@ char         DateFormat[20] = "%d-%m-%Y";            /* mjl: sizes! or better
                                                                                                 * malloc? XXX */
 char           FloatFormat[20] = "%f";
 
-bool        enableFsync = true;
+bool           enableFsync = true;
 bool           allowSystemTableMods = false;
-int                    SortMem = 512;
+int                    SortMem = 1024;
+int                    VacuumMem = 8192;
 int                    NBuffers = DEF_NBUFFERS;
-
-
-char      *IndexedCatalogNames[] = {
-       AttributeRelationName,
-       ProcedureRelationName,
-       TypeRelationName,
-       RelationRelationName,
-       0
-};
-
-
-/* ----------------
- * we just do a linear search now so there's no requirement that the list
- * be ordered. The list is so small it shouldn't make much difference.
- * make sure the list is null-terminated
- *                             - jolly 8/19/95
- *
- * OLD COMMENT
- *             WARNING  WARNING  WARNING  WARNING      WARNING  WARNING
- *
- *             keep SharedSystemRelationNames[] in SORTED order!  A binary search
- *             is done on it in catalog.c!
- *
- *             XXX this is a serious hack which should be fixed -cim 1/26/90
- * ----------------
- */
-char      *SharedSystemRelationNames[] = {
-       DatabaseRelationName,
-       GroupRelationName,
-       GroupNameIndex,
-       GroupSysidIndex,
-       LogRelationName,
-       ShadowRelationName,
-       VariableRelationName,
-       0
-};