database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-06 18:42:54 +03:00
Code Activity

Clean up grotty references to CacheCxt (externs inside functions,

Browse Source 
duplicate global declarations, no points for style at all!)
This commit is contained in:
Tom Lane
2000-05-20 23:11:29 +00:00
parent aa387054d2
commit 25a7a7f446
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/catalog/heap.c
View File

@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.126 2000/05/19 03:22:31 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.127 2000/05/20 23:11:29 tgl Exp $
* *
* *
* INTERFACE ROUTINES * INTERFACE ROUTINES
@@ -62,6 +62,7 @@
#include "storage/smgr.h" #include "storage/smgr.h"
#include "tcop/tcopprot.h" #include "tcop/tcopprot.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/catcache.h"
#include "utils/portal.h" #include "utils/portal.h"
#include "utils/relcache.h" #include "utils/relcache.h"
#include "utils/syscache.h" #include "utils/syscache.h"
@@ -184,18 +185,16 @@ heap_create(char *relname,
bool istemp, bool istemp,
bool storage_create) bool storage_create)
{ {
static unsigned int uniqueId = 0;
int i; int i;
Oid relid; Oid relid;
Relation rel; Relation rel;
int len; int len;
bool nailme = false; bool nailme = false;
int natts = tupDesc->natts; int natts = tupDesc->natts;
static unsigned int uniqueId = 0;
extern GlobalMemory CacheCxt;
MemoryContext oldcxt; MemoryContext oldcxt;
/* ---------------- /* ----------------
* sanity checks * sanity checks
* ---------------- * ----------------

5
src/backend/catalog/index.c
View File

@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.109 2000/05/19 03:22:31 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.110 2000/05/20 23:11:28 tgl Exp $
* *
* *
* INTERFACE ROUTINES * INTERFACE ROUTINES
@@ -41,6 +41,7 @@
#include "parser/parse_func.h" #include "parser/parse_func.h"
#include "storage/smgr.h" #include "storage/smgr.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/catcache.h"
#include "utils/relcache.h" #include "utils/relcache.h"
#include "utils/syscache.h" #include "utils/syscache.h"
#include "utils/temprel.h" #include "utils/temprel.h"
@@ -432,7 +433,6 @@ AccessMethodObjectIdGetForm(Oid accessMethodObjectId)
static void static void
ConstructIndexReldesc(Relation indexRelation, Oid amoid) ConstructIndexReldesc(Relation indexRelation, Oid amoid)
{ {
extern GlobalMemory CacheCxt;
MemoryContext oldcxt; MemoryContext oldcxt;
/* ---------------- /* ----------------
@@ -880,7 +880,6 @@ InitIndexStrategy(int numatts,
uint16 amsupport; uint16 amsupport;
Oid attrelid; Oid attrelid;
Size strsize; Size strsize;
extern GlobalMemory CacheCxt;
/* ---------------- /* ----------------
* get information from the index relation descriptor * get information from the index relation descriptor

4
src/backend/utils/cache/temprel.c vendored
View File

@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.21 2000/04/12 17:15:54 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.22 2000/05/20 23:11:29 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@@ -28,9 +28,9 @@
#include "access/xact.h" #include "access/xact.h"
#include "catalog/heap.h" #include "catalog/heap.h"
#include "catalog/index.h" #include "catalog/index.h"
#include "utils/catcache.h"
#include "utils/temprel.h" #include "utils/temprel.h"
GlobalMemory CacheCxt;
/* ---------------- /* ----------------
* global variables * global variables