open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New file naming. Database OID is used as "tablespace" id and

Browse Source 
relation OID is used as file node on creation but may be changed later
if required. Regression Tests Approved (c) -:)))
REL7_1_STABLE
Vadim B. Mikheev 25 years ago
parent 07a55ebf64
commit 2c7de17b07
19 changed files with 488 additions and 154 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 57
      src/backend/catalog/catalog.c
  2. 63
      src/backend/catalog/heap.c
  3. 24
      src/backend/commands/dbcommands.c
  4. 4
      src/backend/commands/rename.c
  5. 9
      src/backend/postmaster/postmaster.c
  6. 34
      src/backend/storage/buffer/bufmgr.c
  7. 48
      src/backend/storage/smgr/md.c
  8. 53
      src/backend/storage/smgr/smgr.c
  9. 17
      src/backend/utils/cache/relcache.c
  10. 15
      src/backend/utils/init/postinit.c
  11. 12
      src/backend/utils/misc/database.c
  12. 25
      src/bin/initdb/initdb.sh
  13. 11
      src/include/catalog/catalog.h
  14. 72
      src/include/catalog/pg_attribute.h
  15. 68
      src/include/catalog/pg_class.h
  16. 8
      src/include/catalog/pg_database.h
  17. 14
      src/include/storage/buf_internals.h
  18. 12
      src/include/storage/relfilenode.h
  19. 20
      src/include/storage/smgr.h

57
src/backend/catalog/catalog.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.33 2000/07/03 20:48:28 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.34 2000/10/16 14:52:02 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -22,6 +22,7 @@
#include "miscadmin.h" #include "miscadmin.h"
#include "utils/syscache.h" #include "utils/syscache.h"
#ifdef OLD_FILE_NAMING
/* /*
* relpath - construct path to a relation's file * relpath - construct path to a relation's file
* *
@ -104,6 +105,60 @@ relpath_blind(const char *dbname, const char *relname,
return path; return path;
} }
#else /* ! OLD_FILE_NAMING */
/*
* relpath - construct path to a relation's file
*
* Result is a palloc'd string.
*/
char *
relpath(RelFileNode rnode)
{
char *path;
if (rnode.tblNode == (Oid) 0) /* "global tablespace" */
{
/* Shared system relations live in {datadir}/global */
path = (char *) palloc(strlen(DataDir) + 8 + sizeof(NameData) + 1);
sprintf(path, "%s%cglobal%c%u", DataDir, SEP_CHAR, SEP_CHAR, rnode.relNode);
}
else
{
path = (char *) palloc(strlen(DataDir) + 6 + 2 * sizeof(NameData) + 3);
sprintf(path, "%s%cbase%c%u%c%u", DataDir, SEP_CHAR, SEP_CHAR,
rnode.tblNode, SEP_CHAR, rnode.relNode);
}
return path;
}
/*
* GetDatabasePath - construct path to a database dir
*
* Result is a palloc'd string.
*/
char *
GetDatabasePath(Oid tblNode)
{
char *path;
if (tblNode == (Oid) 0) /* "global tablespace" */
{
/* Shared system relations live in {datadir}/global */
path = (char *) palloc(strlen(DataDir) + 8);
sprintf(path, "%s%cglobal", DataDir, SEP_CHAR);
}
else
{
path = (char *) palloc(strlen(DataDir) + 6 + sizeof(NameData) + 1);
sprintf(path, "%s%cbase%c%u", DataDir, SEP_CHAR, SEP_CHAR, tblNode);
}
return path;
}
#endif /* OLD_FILE_NAMING */
/* /*
* IsSystemRelationName * IsSystemRelationName

63
src/backend/catalog/heap.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.148 2000/10/11 21:28:18 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.149 2000/10/16 14:52:02 vadim Exp $
* *
* *
* INTERFACE ROUTINES * INTERFACE ROUTINES
@ -183,6 +183,7 @@ heap_create(char *relname,
int natts = tupDesc->natts; int natts = tupDesc->natts;
int i; int i;
MemoryContext oldcxt; MemoryContext oldcxt;
Oid tblNode = MyDatabaseId;
/* ---------------- /* ----------------
* sanity checks * sanity checks
@ -203,25 +204,65 @@ heap_create(char *relname,
* descriptor follows. * descriptor follows.
* ---------------- * ----------------
*/ */
if (relname && strcmp(RelationRelationName, relname) == 0) if (relname && IsSystemRelationName(relname))
{
if (strcmp(TypeRelationName, relname) == 0)
{ {
relid = RelOid_pg_class;
nailme = true; nailme = true;
relid = RelOid_pg_type;
} }
else if (relname && strcmp(AttributeRelationName, relname) == 0) else if (strcmp(AttributeRelationName, relname) == 0)
{ {
relid = RelOid_pg_attribute;
nailme = true; nailme = true;
relid = RelOid_pg_attribute;
} }
else if (relname && strcmp(ProcedureRelationName, relname) == 0) else if (strcmp(ProcedureRelationName, relname) == 0)
{ {
relid = RelOid_pg_proc;
nailme = true; nailme = true;
relid = RelOid_pg_proc;
} }
else if (relname && strcmp(TypeRelationName, relname) == 0) else if (strcmp(RelationRelationName, relname) == 0)
{ {
relid = RelOid_pg_type;
nailme = true; nailme = true;
relid = RelOid_pg_class;
}
else if (strcmp(ShadowRelationName, relname) == 0)
{
tblNode = InvalidOid;
relid = RelOid_pg_shadow;
}
else if (strcmp(GroupRelationName, relname) == 0)
{
tblNode = InvalidOid;
relid = RelOid_pg_group;
}
else if (strcmp(DatabaseRelationName, relname) == 0)
{
tblNode = InvalidOid;
relid = RelOid_pg_database;
}
else if (strcmp(VariableRelationName, relname) == 0)
{
tblNode = InvalidOid;
relid = RelOid_pg_variable;
}
else if (strcmp(LogRelationName, relname) == 0)
{
tblNode = InvalidOid;
relid = RelOid_pg_log;
}
else if (strcmp(AttrDefaultRelationName, relname) == 0)
relid = RelOid_pg_attrdef;
else if (strcmp(RelCheckRelationName, relname) == 0)
relid = RelOid_pg_relcheck;
else if (strcmp(TriggerRelationName, relname) == 0)
relid = RelOid_pg_trigger;
else
{
relid = newoid();
if (IsSharedSystemRelationName(relname))
tblNode = InvalidOid;
}
} }
else else
relid = newoid(); relid = newoid();
@ -290,6 +331,10 @@ heap_create(char *relname,
rel->rd_rel->reltype = relid; rel->rd_rel->reltype = relid;
} }
rel->rd_node.tblNode = tblNode;
rel->rd_node.relNode = relid;
rel->rd_rel->relfilenode = relid;
/* ---------------- /* ----------------
* done building relcache entry. * done building relcache entry.
* ---------------- * ----------------

24
src/backend/commands/dbcommands.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.60 2000/09/06 14:15:16 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.61 2000/10/16 14:52:03 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -25,6 +25,7 @@
#include "access/heapam.h" #include "access/heapam.h"
#include "catalog/catname.h" #include "catalog/catname.h"
#include "catalog/catalog.h"
#include "catalog/pg_database.h" #include "catalog/pg_database.h"
#include "catalog/pg_shadow.h" #include "catalog/pg_shadow.h"
#include "commands/comment.h" #include "commands/comment.h"
@ -76,6 +77,7 @@ createdb(const char *dbname, const char *dbpath, int encoding)
if (IsTransactionBlock()) if (IsTransactionBlock())
elog(ERROR, "CREATE DATABASE: may not be called in a transaction block"); elog(ERROR, "CREATE DATABASE: may not be called in a transaction block");
#ifdef OLD_FILE_NAMING
/* Generate directory name for the new database */ /* Generate directory name for the new database */
if (dbpath == NULL || strcmp(dbpath, dbname) == 0) if (dbpath == NULL || strcmp(dbpath, dbname) == 0)
strcpy(locbuf, dbname); strcpy(locbuf, dbname);
@ -89,6 +91,7 @@ createdb(const char *dbname, const char *dbpath, int encoding)
"The database path '%s' is invalid. " "The database path '%s' is invalid. "
"This may be due to a character that is not allowed or because the chosen " "This may be due to a character that is not allowed or because the chosen "
"path isn't permitted for databases", dbpath); "path isn't permitted for databases", dbpath);
#endif
/* /*
* Insert a new tuple into pg_database * Insert a new tuple into pg_database
@ -111,6 +114,10 @@ createdb(const char *dbname, const char *dbpath, int encoding)
*/ */
heap_insert(pg_database_rel, tuple); heap_insert(pg_database_rel, tuple);
#ifndef OLD_FILE_NAMING
loc = GetDatabasePath(tuple->t_data->t_oid);
#endif
/* /*
* Update indexes (there aren't any currently) * Update indexes (there aren't any currently)
*/ */
@ -140,8 +147,19 @@ createdb(const char *dbname, const char *dbpath, int encoding)
if (mkdir(loc, S_IRWXU) != 0) if (mkdir(loc, S_IRWXU) != 0)
elog(ERROR, "CREATE DATABASE: unable to create database directory '%s': %s", loc, strerror(errno)); elog(ERROR, "CREATE DATABASE: unable to create database directory '%s': %s", loc, strerror(errno));
#ifdef OLD_FILE_NAMING
snprintf(buf, sizeof(buf), "cp %s%cbase%ctemplate1%c* '%s'", snprintf(buf, sizeof(buf), "cp %s%cbase%ctemplate1%c* '%s'",
DataDir, SEP_CHAR, SEP_CHAR, SEP_CHAR, loc); DataDir, SEP_CHAR, SEP_CHAR, SEP_CHAR, loc);
#else
{
char *tmpl = GetDatabasePath(TemplateDbOid);
snprintf(buf, sizeof(buf), "cp %s%c* '%s'",
tmpl, SEP_CHAR, loc);
pfree(tmpl);
}
#endif
ret = system(buf); ret = system(buf);
/* Some versions of SunOS seem to return ECHILD after a system() call */ /* Some versions of SunOS seem to return ECHILD after a system() call */
#if defined(sun) #if defined(sun)
@ -204,12 +222,16 @@ dropdb(const char *dbname)
if (GetUserId() != db_owner && !use_super) if (GetUserId() != db_owner && !use_super)
elog(ERROR, "DROP DATABASE: Permission denied"); elog(ERROR, "DROP DATABASE: Permission denied");
#ifdef OLD_FILE_NAMING
path = ExpandDatabasePath(dbpath); path = ExpandDatabasePath(dbpath);
if (path == NULL) if (path == NULL)
elog(ERROR, elog(ERROR,
"The database path '%s' is invalid. " "The database path '%s' is invalid. "
"This may be due to a character that is not allowed or because the chosen " "This may be due to a character that is not allowed or because the chosen "
"path isn't permitted for databases", path); "path isn't permitted for databases", path);
#else
path = GetDatabasePath(db_id);
#endif
/* /*
* Obtain exclusive lock on pg_database. We need this to ensure that * Obtain exclusive lock on pg_database. We need this to ensure that

4
src/backend/commands/rename.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.47 2000/09/06 14:15:16 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.48 2000/10/16 14:52:03 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -311,6 +311,7 @@ renamerel(const char *oldrelname, const char *newrelname)
if (relkind != RELKIND_INDEX) if (relkind != RELKIND_INDEX)
TypeRename(oldrelname, newrelname); TypeRename(oldrelname, newrelname);
#ifdef OLD_FILE_NAMING
/* /*
* Perform physical rename of files. If this fails, we haven't yet * Perform physical rename of files. If this fails, we haven't yet
* done anything irreversible. NOTE that this MUST be the last step; * done anything irreversible. NOTE that this MUST be the last step;
@ -340,4 +341,5 @@ renamerel(const char *oldrelname, const char *newrelname)
toldpath, tnewpath); toldpath, tnewpath);
} }
} }
#endif
} }

9
src/backend/postmaster/postmaster.c
Unescape View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.171 2000/10/11 17:58:01 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.172 2000/10/16 14:52:08 vadim Exp $
* *
* NOTES * NOTES
* *
@ -60,6 +60,7 @@
#include "getopt.h" #include "getopt.h"
#endif #endif
#include "catalog/pg_database.h"
#include "commands/async.h" #include "commands/async.h"
#include "lib/dllist.h" #include "lib/dllist.h"
#include "libpq/auth.h" #include "libpq/auth.h"
@ -278,8 +279,14 @@ checkDataDir(const char *DataDir)
exit(2); exit(2);
} }
#ifdef OLD_FILE_NAMING
snprintf(path, sizeof(path), "%s%cbase%ctemplate1%cpg_class", snprintf(path, sizeof(path), "%s%cbase%ctemplate1%cpg_class",
DataDir, SEP_CHAR, SEP_CHAR, SEP_CHAR); DataDir, SEP_CHAR, SEP_CHAR, SEP_CHAR);
#else
snprintf(path, sizeof(path), "%s%cbase%c%u%c%u",
DataDir, SEP_CHAR, SEP_CHAR,
TemplateDbOid, SEP_CHAR, RelOid_pg_class);
#endif
fp = AllocateFile(path, PG_BINARY_R); fp = AllocateFile(path, PG_BINARY_R);
if (fp == NULL) if (fp == NULL)

34
src/backend/storage/buffer/bufmgr.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.85 2000/09/29 03:55:45 inoue Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.86 2000/10/16 14:52:09 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -614,6 +614,9 @@ BufferAlloc(Relation reln,
/* record the database name and relation name for this buffer */ /* record the database name and relation name for this buffer */
strcpy(buf->blind.dbname, DatabaseName); strcpy(buf->blind.dbname, DatabaseName);
strcpy(buf->blind.relname, RelationGetPhysicalRelationName(reln)); strcpy(buf->blind.relname, RelationGetPhysicalRelationName(reln));
#ifndef OLD_FILE_NAMING
buf->blind.rnode = reln->rd_node;
#endif
INIT_BUFFERTAG(&(buf->tag), reln, blockNum); INIT_BUFFERTAG(&(buf->tag), reln, blockNum);
if (!BufTableInsert(buf)) if (!BufTableInsert(buf))
@ -779,10 +782,12 @@ FlushBuffer(Buffer buffer, bool release)
Assert(PrivateRefCount[buffer - 1] > 0); /* else caller didn't pin */ Assert(PrivateRefCount[buffer - 1] > 0); /* else caller didn't pin */
bufHdr = &BufferDescriptors[buffer - 1]; bufHdr = &BufferDescriptors[buffer - 1];
bufdb = bufHdr->tag.relId.dbId; bufdb = bufHdr->tag.relId.dbId;
Assert(bufdb == MyDatabaseId || bufdb == (Oid) NULL); Assert(bufdb == MyDatabaseId || bufdb == (Oid) NULL);
bufrel = RelationIdCacheGetRelation(bufHdr->tag.relId.relId); bufrel = RelationIdCacheGetRelation(bufHdr->tag.relId.relId);
Assert(bufrel != (Relation) NULL); Assert(bufrel != (Relation) NULL);
SharedBufferChanged = true; SharedBufferChanged = true;
@ -962,12 +967,18 @@ SetBufferDirtiedByMe(Buffer buffer, BufferDesc *bufHdr)
if (reln == (Relation) NULL) if (reln == (Relation) NULL)
{ {
#ifdef OLD_FILE_NAMING
status = smgrblindmarkdirty(DEFAULT_SMGR, status = smgrblindmarkdirty(DEFAULT_SMGR,
BufferBlindLastDirtied[buffer - 1].dbname, BufferBlindLastDirtied[buffer - 1].dbname,
BufferBlindLastDirtied[buffer - 1].relname, BufferBlindLastDirtied[buffer - 1].relname,
tagLastDirtied->relId.dbId, tagLastDirtied->relId.dbId,
tagLastDirtied->relId.relId, tagLastDirtied->relId.relId,
tagLastDirtied->blockNum); tagLastDirtied->blockNum);
#else
status = smgrblindmarkdirty(DEFAULT_SMGR,
BufferBlindLastDirtied[buffer - 1].rnode,
tagLastDirtied->blockNum);
#endif
} }
else else
{ {
@ -1136,6 +1147,7 @@ BufferSync()
*/ */
if (reln == (Relation) NULL) if (reln == (Relation) NULL)
{ {
#ifdef OLD_FILE_NAMING
status = smgrblindwrt(DEFAULT_SMGR, status = smgrblindwrt(DEFAULT_SMGR,
bufHdr->blind.dbname, bufHdr->blind.dbname,
bufHdr->blind.relname, bufHdr->blind.relname,
@ -1143,6 +1155,13 @@ BufferSync()
bufHdr->tag.blockNum, bufHdr->tag.blockNum,
(char *) MAKE_PTR(bufHdr->data), (char *) MAKE_PTR(bufHdr->data),
true); /* must fsync */ true); /* must fsync */
#else
status = smgrblindwrt(DEFAULT_SMGR,
bufHdr->blind.rnode,
bufHdr->tag.blockNum,
(char *) MAKE_PTR(bufHdr->data),
true); /* must fsync */
#endif
} }
else else
{ {
@ -1202,12 +1221,18 @@ BufferSync()
reln = RelationIdCacheGetRelation(BufferTagLastDirtied[i].relId.relId); reln = RelationIdCacheGetRelation(BufferTagLastDirtied[i].relId.relId);
if (reln == (Relation) NULL) if (reln == (Relation) NULL)
{ {
#ifdef OLD_FILE_NAMING
status = smgrblindmarkdirty(DEFAULT_SMGR, status = smgrblindmarkdirty(DEFAULT_SMGR,
BufferBlindLastDirtied[i].dbname, BufferBlindLastDirtied[i].dbname,
BufferBlindLastDirtied[i].relname, BufferBlindLastDirtied[i].relname,
BufferTagLastDirtied[i].relId.dbId, BufferTagLastDirtied[i].relId.dbId,
BufferTagLastDirtied[i].relId.relId, BufferTagLastDirtied[i].relId.relId,
BufferTagLastDirtied[i].blockNum); BufferTagLastDirtied[i].blockNum);
#else
status = smgrblindmarkdirty(DEFAULT_SMGR,
BufferBlindLastDirtied[i].rnode,
BufferTagLastDirtied[i].blockNum);
#endif
} }
else else
{ {
@ -1556,11 +1581,18 @@ BufferReplace(BufferDesc *bufHdr)
} }
else else
{ {
#ifdef OLD_FILE_NAMING
status = smgrblindwrt(DEFAULT_SMGR, bufHdr->blind.dbname, status = smgrblindwrt(DEFAULT_SMGR, bufHdr->blind.dbname,
bufHdr->blind.relname, bufdb, bufrel, bufHdr->blind.relname, bufdb, bufrel,
bufHdr->tag.blockNum, bufHdr->tag.blockNum,
(char *) MAKE_PTR(bufHdr->data), (char *) MAKE_PTR(bufHdr->data),
false); /* no fsync */ false); /* no fsync */
#else
status = smgrblindwrt(DEFAULT_SMGR, bufHdr->blind.rnode,
bufHdr->tag.blockNum,
(char *) MAKE_PTR(bufHdr->data),
false); /* no fsync */
#endif
} }
LockBuffer(BufferDescriptorGetBuffer(bufHdr), BUFFER_LOCK_UNLOCK); LockBuffer(BufferDescriptorGetBuffer(bufHdr), BUFFER_LOCK_UNLOCK);

48
src/backend/storage/smgr/md.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.74 2000/07/17 03:05:11 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.75 2000/10/16 14:52:12 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -75,8 +75,14 @@ static void mdclose_fd(int fd);
static int _mdfd_getrelnfd(Relation reln); static int _mdfd_getrelnfd(Relation reln);
static MdfdVec *_mdfd_openseg(Relation reln, int segno, int oflags); static MdfdVec *_mdfd_openseg(Relation reln, int segno, int oflags);
static MdfdVec *_mdfd_getseg(Relation reln, int blkno); static MdfdVec *_mdfd_getseg(Relation reln, int blkno);
#ifdef OLD_FILE_NAMING
static int _mdfd_blind_getseg(char *dbname, char *relname, static int _mdfd_blind_getseg(char *dbname, char *relname,
Oid dbid, Oid relid, int blkno); Oid dbid, Oid relid, int blkno);
#else
static int _mdfd_blind_getseg(RelFileNode rnode, int blkno);
#endif
static int _fdvec_alloc(void); static int _fdvec_alloc(void);
static void _fdvec_free(int); static void _fdvec_free(int);
static BlockNumber _mdnblocks(File file, Size blcksz); static BlockNumber _mdnblocks(File file, Size blcksz);
@ -128,7 +134,11 @@ mdcreate(Relation reln)
Assert(reln->rd_unlinked && reln->rd_fd < 0); Assert(reln->rd_unlinked && reln->rd_fd < 0);
#ifdef OLD_FILE_NAMING
path = relpath(RelationGetPhysicalRelationName(reln)); path = relpath(RelationGetPhysicalRelationName(reln));
#else
path = relpath(reln->rd_node);
#endif
fd = FileNameOpenFile(path, O_RDWR | O_CREAT | O_EXCL | PG_BINARY, 0600); fd = FileNameOpenFile(path, O_RDWR | O_CREAT | O_EXCL | PG_BINARY, 0600);
/* /*
@ -326,7 +336,11 @@ mdopen(Relation reln)
int vfd; int vfd;
Assert(reln->rd_fd < 0); Assert(reln->rd_fd < 0);
#ifdef OLD_FILE_NAMING
path = relpath(RelationGetPhysicalRelationName(reln)); path = relpath(RelationGetPhysicalRelationName(reln));
#else
path = relpath(reln->rd_node);
#endif
fd = FileNameOpenFile(path, O_RDWR | PG_BINARY, 0600); fd = FileNameOpenFile(path, O_RDWR | PG_BINARY, 0600);
if (fd < 0) if (fd < 0)
@ -565,6 +579,7 @@ mdflush(Relation reln, BlockNumber blocknum, char *buffer)
* the file, making it more like mdflush(). * the file, making it more like mdflush().
*/ */
int int
#ifdef OLD_FILE_NAMING
mdblindwrt(char *dbname, mdblindwrt(char *dbname,
char *relname, char *relname,
Oid dbid, Oid dbid,
@ -572,12 +587,22 @@ mdblindwrt(char *dbname,
BlockNumber blkno, BlockNumber blkno,
char *buffer, char *buffer,
bool dofsync) bool dofsync)
#else
mdblindwrt(RelFileNode rnode,
BlockNumber blkno,
char *buffer,
bool dofsync)
#endif
{ {
int status; int status;
long seekpos; long seekpos;
int fd; int fd;
#ifdef OLD_FILE_NAMING
fd = _mdfd_blind_getseg(dbname, relname, dbid, relid, blkno); fd = _mdfd_blind_getseg(dbname, relname, dbid, relid, blkno);
#else
fd = _mdfd_blind_getseg(rnode, blkno);
#endif
if (fd < 0) if (fd < 0)
return SM_FAIL; return SM_FAIL;
@ -651,16 +676,25 @@ mdmarkdirty(Relation reln, BlockNumber blkno)
* rather than building md/fd datastructures to postpone it till later. * rather than building md/fd datastructures to postpone it till later.
*/ */
int int
#ifdef OLD_FILE_NAMING
mdblindmarkdirty(char *dbname, mdblindmarkdirty(char *dbname,
char *relname, char *relname,
Oid dbid, Oid dbid,
Oid relid, Oid relid,
BlockNumber blkno) BlockNumber blkno)
#else
mdblindmarkdirty(RelFileNode rnode,
BlockNumber blkno)
#endif
{ {
int status; int status;
int fd; int fd;
#ifdef OLD_FILE_NAMING
fd = _mdfd_blind_getseg(dbname, relname, dbid, relid, blkno); fd = _mdfd_blind_getseg(dbname, relname, dbid, relid, blkno);
#else
fd = _mdfd_blind_getseg(rnode, blkno);
#endif
if (fd < 0) if (fd < 0)
return SM_FAIL; return SM_FAIL;
@ -969,7 +1003,11 @@ _mdfd_openseg(Relation reln, int segno, int oflags)
*fullpath; *fullpath;
/* be sure we have enough space for the '.segno', if any */ /* be sure we have enough space for the '.segno', if any */
#ifdef OLD_FILE_NAMING
path = relpath(RelationGetPhysicalRelationName(reln)); path = relpath(RelationGetPhysicalRelationName(reln));
#else
path = relpath(reln->rd_node);
#endif
if (segno > 0) if (segno > 0)
{ {
@ -1084,8 +1122,12 @@ _mdfd_getseg(Relation reln, int blkno)
*/ */
static int static int
#ifdef OLD_FILE_NAMING
_mdfd_blind_getseg(char *dbname, char *relname, Oid dbid, Oid relid, _mdfd_blind_getseg(char *dbname, char *relname, Oid dbid, Oid relid,
int blkno) int blkno)
#else
_mdfd_blind_getseg(RelFileNode rnode, int blkno)
#endif
{ {
char *path; char *path;
int fd; int fd;
@ -1095,8 +1137,12 @@ _mdfd_blind_getseg(char *dbname, char *relname, Oid dbid, Oid relid,
#endif #endif
#ifdef OLD_FILE_NAMING
/* construct the path to the relation */ /* construct the path to the relation */
path = relpath_blind(dbname, relname, dbid, relid); path = relpath_blind(dbname, relname, dbid, relid);
#else
path = relpath(rnode);
#endif
#ifndef LET_OS_MANAGE_FILESIZE #ifndef LET_OS_MANAGE_FILESIZE
/* append the '.segno', if needed */ /* append the '.segno', if needed */

53
src/backend/storage/smgr/smgr.c
Unescape View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.39 2000/10/02 21:45:33 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.40 2000/10/16 14:52:12 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -36,14 +36,23 @@ typedef struct f_smgr
char *buffer); char *buffer);
int (*smgr_flush) (Relation reln, BlockNumber blocknum, int (*smgr_flush) (Relation reln, BlockNumber blocknum,
char *buffer); char *buffer);
#ifdef OLD_FILE_NAMING
int (*smgr_blindwrt) (char *dbname, char *relname, int (*smgr_blindwrt) (char *dbname, char *relname,
Oid dbid, Oid relid, Oid dbid, Oid relid,
BlockNumber blkno, char *buffer, BlockNumber blkno, char *buffer,
bool dofsync); bool dofsync);
#else
int (*smgr_blindwrt) (RelFileNode rnode, BlockNumber blkno,
char *buffer, bool dofsync);
#endif
int (*smgr_markdirty) (Relation reln, BlockNumber blkno); int (*smgr_markdirty) (Relation reln, BlockNumber blkno);
#ifdef OLD_FILE_NAMING
int (*smgr_blindmarkdirty) (char *dbname, char *relname, int (*smgr_blindmarkdirty) (char *dbname, char *relname,
Oid dbid, Oid relid, Oid dbid, Oid relid,
BlockNumber blkno); BlockNumber blkno);
#else
int (*smgr_blindmarkdirty) (RelFileNode, BlockNumber blkno);
#endif
int (*smgr_nblocks) (Relation reln); int (*smgr_nblocks) (Relation reln);
int (*smgr_truncate) (Relation reln, int nblocks); int (*smgr_truncate) (Relation reln, int nblocks);
int (*smgr_commit) (void); /* may be NULL */ int (*smgr_commit) (void); /* may be NULL */
@ -301,6 +310,7 @@ smgrflush(int16 which, Relation reln, BlockNumber blocknum, char *buffer)
* this page down to stable storage in this circumstance. The * this page down to stable storage in this circumstance. The
* write should be synchronous if dofsync is true. * write should be synchronous if dofsync is true.
*/ */
#ifdef OLD_FILE_NAMING
int int
smgrblindwrt(int16 which, smgrblindwrt(int16 which,
char *dbname, char *dbname,
@ -332,6 +342,27 @@ smgrblindwrt(int16 which,
return status; return status;
} }
#else
int
smgrblindwrt(int16 which,
RelFileNode rnode,
BlockNumber blkno,
char *buffer,
bool dofsync)
{
int status;
status = (*(smgrsw[which].smgr_blindwrt)) (rnode, blkno, buffer, dofsync);
if (status == SM_FAIL)
elog(ERROR, "cannot write block %d of %u/%u blind: %m",
blkno, rnode.tblNode, rnode.relNode);
return status;
}
#endif
/* /*
* smgrmarkdirty() -- Mark a page dirty (needs fsync). * smgrmarkdirty() -- Mark a page dirty (needs fsync).
* *
@ -363,6 +394,7 @@ smgrmarkdirty(int16 which,
* *
* Just like smgrmarkdirty, except we don't have a reldesc. * Just like smgrmarkdirty, except we don't have a reldesc.
*/ */
#ifdef OLD_FILE_NAMING
int int
smgrblindmarkdirty(int16 which, smgrblindmarkdirty(int16 which,
char *dbname, char *dbname,
@ -393,6 +425,25 @@ smgrblindmarkdirty(int16 which,
return status; return status;
} }
#else
int
smgrblindmarkdirty(int16 which,
RelFileNode rnode,
BlockNumber blkno)
{
int status;
status = (*(smgrsw[which].smgr_blindmarkdirty)) (rnode, blkno);
if (status == SM_FAIL)
elog(ERROR, "cannot mark block %d of %u/%u blind: %m",
blkno, rnode.tblNode, rnode.relNode);
return status;
}
#endif
/* /*
* smgrnblocks() -- Calculate the number of POSTGRES blocks in the * smgrnblocks() -- Calculate the number of POSTGRES blocks in the
* supplied relation. * supplied relation.

17
src/backend/utils/cache/relcache.c vendored
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.111 2000/09/12 04:49:13 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.112 2000/10/16 14:52:13 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1017,6 +1017,12 @@ RelationBuildDesc(RelationBuildDescInfo buildinfo,
*/ */
RelationInitLockInfo(relation); /* see lmgr.c */ RelationInitLockInfo(relation); /* see lmgr.c */
if (IsSharedSystemRelationName(NameStr(relation->rd_rel->relname)))
relation->rd_node.tblNode = InvalidOid;
else
relation->rd_node.tblNode = MyDatabaseId;
relation->rd_node.relNode = relation->rd_rel->relfilenode;
/* ---------------- /* ----------------
* open the relation and assign the file descriptor returned * open the relation and assign the file descriptor returned
* by the storage manager code to rd_fd. * by the storage manager code to rd_fd.
@ -1192,6 +1198,13 @@ formrdesc(char *relationName,
*/ */
RelationCacheInsert(relation); RelationCacheInsert(relation);
if (IsSharedSystemRelationName(relationName))
relation->rd_node.tblNode = InvalidOid;
else
relation->rd_node.tblNode = MyDatabaseId;
relation->rd_node.relNode =
relation->rd_rel->relfilenode = RelationGetRelid(relation);
/* /*
* Determining this requires a scan on pg_class, but to do the scan * Determining this requires a scan on pg_class, but to do the scan
* the rdesc for pg_class must already exist. Therefore we must do * the rdesc for pg_class must already exist. Therefore we must do
@ -2438,6 +2451,8 @@ init_irels(void)
/* the file descriptor is not yet opened */ /* the file descriptor is not yet opened */
ird->rd_fd = -1; ird->rd_fd = -1;
ird->rd_node.tblNode = MyDatabaseId;
/* next, read the access method tuple form */ /* next, read the access method tuple form */
if ((nread = FileRead(fd, (char *) &len, sizeof(len))) != sizeof(len)) if ((nread = FileRead(fd, (char *) &len, sizeof(len))) != sizeof(len))
{ {

15
src/backend/utils/init/postinit.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.67 2000/10/02 19:42:54 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.68 2000/10/16 14:52:15 vadim Exp $
* *
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
@ -21,6 +21,10 @@
#include <math.h> #include <math.h>
#include <unistd.h> #include <unistd.h>
#ifndef OLD_FILE_NAMING
#include "catalog/catalog.h"
#endif
#include "access/heapam.h" #include "access/heapam.h"
#include "catalog/catname.h" #include "catalog/catname.h"
#include "catalog/pg_database.h" #include "catalog/pg_database.h"
@ -242,7 +246,12 @@ InitPostgres(const char *dbname, const char *username)
*/ */
if (bootstrap) if (bootstrap)
{ {
MyDatabaseId = TemplateDbOid;
#ifdef OLD_FILE_NAMING
SetDatabasePath(ExpandDatabasePath(dbname)); SetDatabasePath(ExpandDatabasePath(dbname));
#else
SetDatabasePath(GetDatabasePath(MyDatabaseId));
#endif
LockDisable(true); LockDisable(true);
} }
else else
@ -276,9 +285,13 @@ InitPostgres(const char *dbname, const char *username)
"Database \"%s\" does not exist in the system catalog.", "Database \"%s\" does not exist in the system catalog.",
dbname); dbname);
#ifdef OLD_FILE_NAMING
fullpath = ExpandDatabasePath(datpath); fullpath = ExpandDatabasePath(datpath);
if (!fullpath) if (!fullpath)
elog(FATAL, "Database path could not be resolved."); elog(FATAL, "Database path could not be resolved.");
#else
fullpath = GetDatabasePath(MyDatabaseId);
#endif
/* Verify the database path */ /* Verify the database path */

12
src/backend/utils/misc/database.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.39 2000/07/03 20:48:42 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.40 2000/10/16 14:52:19 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -22,6 +22,7 @@
#include "access/xact.h" #include "access/xact.h"
#include "catalog/catname.h" #include "catalog/catname.h"
#include "catalog/catalog.h"
#include "catalog/pg_database.h" #include "catalog/pg_database.h"
#include "miscadmin.h" #include "miscadmin.h"
#include "utils/syscache.h" #include "utils/syscache.h"
@ -143,8 +144,17 @@ GetRawDatabaseInfo(const char *name, Oid *db_id, char *path)
char *dbfname; char *dbfname;
Form_pg_database tup_db; Form_pg_database tup_db;
#ifdef OLD_FILE_NAMING
dbfname = (char *) palloc(strlen(DataDir) + 8 + strlen(DatabaseRelationName) + 2); dbfname = (char *) palloc(strlen(DataDir) + 8 + strlen(DatabaseRelationName) + 2);
sprintf(dbfname, "%s/global/%s", DataDir, DatabaseRelationName); sprintf(dbfname, "%s/global/%s", DataDir, DatabaseRelationName);
#else
{
RelFileNode rnode;
rnode.tblNode = 0;
rnode.relNode = RelOid_pg_database;
dbfname = relpath(rnode);
}
#endif
if ((dbfd = open(dbfname, O_RDONLY | PG_BINARY, 0)) < 0) if ((dbfd = open(dbfname, O_RDONLY | PG_BINARY, 0)) < 0)
elog(FATAL, "cannot open %s: %s", dbfname, strerror(errno)); elog(FATAL, "cannot open %s: %s", dbfname, strerror(errno));

25
src/bin/initdb/initdb.sh
Unescape View File

@ -23,7 +23,7 @@
# #
# Copyright (c) 1994, Regents of the University of California # Copyright (c) 1994, Regents of the University of California
# #
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.104 2000/09/29 13:38:02 petere Exp $ # $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.105 2000/10/16 14:52:21 vadim Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -414,8 +414,8 @@ fi
# #
# CREATE TEMPLATE1 DATABASE # CREATE TEMPLATE1 DATABASE
rm -rf "$PGDATA"/base/template1 || exit_nicely rm -rf "$PGDATA"/base/1 || exit_nicely
mkdir "$PGDATA"/base/template1 || exit_nicely mkdir "$PGDATA"/base/1 || exit_nicely
if [ "$debug" = yes ] if [ "$debug" = yes ]
then then
@ -427,7 +427,7 @@ fi
BACKENDARGS="-boot -C -F -D$PGDATA $BACKEND_TALK_ARG" BACKENDARGS="-boot -C -F -D$PGDATA $BACKEND_TALK_ARG"
FIRSTRUN="-boot -x -C -F -D$PGDATA $BACKEND_TALK_ARG" FIRSTRUN="-boot -x -C -F -D$PGDATA $BACKEND_TALK_ARG"
echo "Creating template database in $PGDATA/base/template1" echo "Creating template database in $PGDATA/base/1"
[ "$debug" = yes ] && echo "Running: $PGPATH/postgres $FIRSTRUN template1" [ "$debug" = yes ] && echo "Running: $PGPATH/postgres $FIRSTRUN template1"
cat "$TEMPLATE1_BKI" \ cat "$TEMPLATE1_BKI" \
@ -435,7 +435,7 @@ cat "$TEMPLATE1_BKI" \
| "$PGPATH"/postgres $FIRSTRUN template1 \ | "$PGPATH"/postgres $FIRSTRUN template1 \
|| exit_nicely || exit_nicely
echo $short_version > "$PGDATA"/base/template1/PG_VERSION || exit_nicely echo $short_version > "$PGDATA"/base/1/PG_VERSION || exit_nicely
########################################################################## ##########################################################################
@ -450,6 +450,7 @@ then
cat "$GLOBAL_BKI" \ cat "$GLOBAL_BKI" \
| sed -e "s/POSTGRES/$POSTGRES_SUPERUSERNAME/g" \ | sed -e "s/POSTGRES/$POSTGRES_SUPERUSERNAME/g" \
-e "s/PGUID/$POSTGRES_SUPERUSERID/g" \ -e "s/PGUID/$POSTGRES_SUPERUSERID/g" \
-e "s/ENCODING/$MULTIBYTEID/g" \
| "$PGPATH"/postgres $BACKENDARGS template1 \ | "$PGPATH"/postgres $BACKENDARGS template1 \
|| exit_nicely || exit_nicely
@ -459,20 +460,6 @@ then
cp "$POSTGRESQL_CONF_SAMPLE" "$PGDATA"/postgresql.conf || exit_nicely cp "$POSTGRESQL_CONF_SAMPLE" "$PGDATA"/postgresql.conf || exit_nicely
chmod 0600 "$PGDATA"/pg_hba.conf "$PGDATA"/postgresql.conf chmod 0600 "$PGDATA"/pg_hba.conf "$PGDATA"/postgresql.conf
echo "Adding template1 database to pg_database"
echo "open pg_database" > "$TEMPFILE"
echo "insert (template1 $POSTGRES_SUPERUSERID $MULTIBYTEID template1)" >> $TEMPFILE
#echo "show" >> "$TEMPFILE"
echo "close pg_database" >> "$TEMPFILE"
[ "$debug" = yes ] && echo "Running: $PGPATH/postgres $BACKENDARGS template1 < $TEMPFILE"
"$PGPATH"/postgres $BACKENDARGS template1 < "$TEMPFILE"
# Gotta remove that temp file before exiting on error.
retval="$?"
rm -f "$TEMPFILE" || exit_nicely
[ "$retval" -ne 0 ] && exit_nicely
fi fi

11
src/include/catalog/catalog.h
Unescape View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: catalog.h,v 1.12 2000/04/12 17:16:27 momjian Exp $ * $Id: catalog.h,v 1.13 2000/10/16 14:52:26 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -16,9 +16,18 @@
#include "access/tupdesc.h" #include "access/tupdesc.h"
#ifdef OLD_FILE_NAMING
extern char *relpath(const char *relname); extern char *relpath(const char *relname);
extern char *relpath_blind(const char *dbname, const char *relname, extern char *relpath_blind(const char *dbname, const char *relname,
Oid dbid, Oid relid); Oid dbid, Oid relid);
#else
#include "storage/relfilenode.h"
extern char *relpath(RelFileNode rnode);
extern char *GetDatabasePath(Oid tblNode);
#endif
extern bool IsSystemRelationName(const char *relname); extern bool IsSystemRelationName(const char *relname);
extern bool IsSharedSystemRelationName(const char *relname); extern bool IsSharedSystemRelationName(const char *relname);
extern Oid newoid(void); extern Oid newoid(void);

72
src/include/catalog/pg_attribute.h
Unescape View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: pg_attribute.h,v 1.64 2000/10/05 19:48:31 momjian Exp $ * $Id: pg_attribute.h,v 1.65 2000/10/16 14:52:26 vadim Exp $
* *
* NOTES * NOTES
* the genbki.sh script reads this file and generates .bki * the genbki.sh script reads this file and generates .bki
@ -426,45 +426,47 @@ DATA(insert OID = 0 ( 1249 tableoid 26 0 4 -7 0 -1 -1 t p f i f f));
{ 1259, {"reltype"}, 26, 0, 4, 2, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \ { 1259, {"reltype"}, 26, 0, 4, 2, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \
{ 1259, {"relowner"}, 23, 0, 4, 3, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \ { 1259, {"relowner"}, 23, 0, 4, 3, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \
{ 1259, {"relam"}, 26, 0, 4, 4, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \ { 1259, {"relam"}, 26, 0, 4, 4, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \
{ 1259, {"relpages"}, 23, 0, 4, 5, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \ { 1259, {"relfilenode"}, 26, 0, 4, 5, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \
{ 1259, {"reltuples"}, 23, 0, 4, 6, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \ { 1259, {"relpages"}, 23, 0, 4, 6, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \
{ 1259, {"reltoastrelid"}, 26, 0, 4, 7, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \ { 1259, {"reltuples"}, 23, 0, 4, 7, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \
{ 1259, {"reltoastidxid"}, 26, 0, 4, 8, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \ { 1259, {"reltoastrelid"}, 26, 0, 4, 8, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \
{ 1259, {"relhasindex"}, 16, 0, 1, 9, 0, -1, -1, '\001', 'p', '\0', 'c', '\0', '\0' }, \ { 1259, {"reltoastidxid"}, 26, 0, 4, 9, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \
{ 1259, {"relisshared"}, 16, 0, 1, 10, 0, -1, -1, '\001', 'p', '\0', 'c', '\0', '\0' }, \ { 1259, {"relhasindex"}, 16, 0, 1, 10, 0, -1, -1, '\001', 'p', '\0', 'c', '\0', '\0' }, \
{ 1259, {"relkind"}, 18, 0, 1, 11, 0, -1, -1, '\001', 'p', '\0', 'c', '\0', '\0' }, \ { 1259, {"relisshared"}, 16, 0, 1, 11, 0, -1, -1, '\001', 'p', '\0', 'c', '\0', '\0' }, \
{ 1259, {"relnatts"}, 21, 0, 2, 12, 0, -1, -1, '\001', 'p', '\0', 's', '\0', '\0' }, \ { 1259, {"relkind"}, 18, 0, 1, 12, 0, -1, -1, '\001', 'p', '\0', 'c', '\0', '\0' }, \
{ 1259, {"relchecks"}, 21, 0, 2, 13, 0, -1, -1, '\001', 'p', '\0', 's', '\0', '\0' }, \ { 1259, {"relnatts"}, 21, 0, 2, 13, 0, -1, -1, '\001', 'p', '\0', 's', '\0', '\0' }, \
{ 1259, {"reltriggers"}, 21, 0, 2, 14, 0, -1, -1, '\001', 'p', '\0', 's', '\0', '\0' }, \ { 1259, {"relchecks"}, 21, 0, 2, 14, 0, -1, -1, '\001', 'p', '\0', 's', '\0', '\0' }, \
{ 1259, {"relukeys"}, 21, 0, 2, 15, 0, -1, -1, '\001', 'p', '\0', 's', '\0', '\0' }, \ { 1259, {"reltriggers"}, 21, 0, 2, 15, 0, -1, -1, '\001', 'p', '\0', 's', '\0', '\0' }, \
{ 1259, {"relfkeys"}, 21, 0, 2, 16, 0, -1, -1, '\001', 'p', '\0', 's', '\0', '\0' }, \ { 1259, {"relukeys"}, 21, 0, 2, 16, 0, -1, -1, '\001', 'p', '\0', 's', '\0', '\0' }, \
{ 1259, {"relrefs"}, 21, 0, 2, 17, 0, -1, -1, '\001', 'p', '\0', 's', '\0', '\0' }, \ { 1259, {"relfkeys"}, 21, 0, 2, 17, 0, -1, -1, '\001', 'p', '\0', 's', '\0', '\0' }, \
{ 1259, {"relhaspkey"}, 16, 0, 1, 18, 0, -1, -1, '\001', 'p', '\0', 'c', '\0', '\0' }, \ { 1259, {"relrefs"}, 21, 0, 2, 18, 0, -1, -1, '\001', 'p', '\0', 's', '\0', '\0' }, \
{ 1259, {"relhasrules"}, 16, 0, 1, 19, 0, -1, -1, '\001', 'p', '\0', 'c', '\0', '\0' }, \ { 1259, {"relhaspkey"}, 16, 0, 1, 19, 0, -1, -1, '\001', 'p', '\0', 'c', '\0', '\0' }, \
{ 1259, {"relhassubclass"},16, 0, 1, 20, 0, -1, -1, '\001', 'p', '\0', 'c', '\0', '\0' }, \ { 1259, {"relhasrules"}, 16, 0, 1, 20, 0, -1, -1, '\001', 'p', '\0', 'c', '\0', '\0' }, \
{ 1259, {"relacl"}, 1034, 0, -1, 21, 0, -1, -1, '\0', 'x', '\0', 'i', '\0', '\0' } { 1259, {"relhassubclass"},16, 0, 1, 21, 0, -1, -1, '\001', 'p', '\0', 'c', '\0', '\0' }, \
{ 1259, {"relacl"}, 1034, 0, -1, 22, 0, -1, -1, '\0', 'x', '\0', 'i', '\0', '\0' }
DATA(insert OID = 0 ( 1259 relname 19 0 NAMEDATALEN 1 0 -1 -1 f p f i f f)); DATA(insert OID = 0 ( 1259 relname 19 0 NAMEDATALEN 1 0 -1 -1 f p f i f f));
DATA(insert OID = 0 ( 1259 reltype 26 0 4 2 0 -1 -1 t p f i f f)); DATA(insert OID = 0 ( 1259 reltype 26 0 4 2 0 -1 -1 t p f i f f));
DATA(insert OID = 0 ( 1259 relowner 23 0 4 3 0 -1 -1 t p f i f f)); DATA(insert OID = 0 ( 1259 relowner 23 0 4 3 0 -1 -1 t p f i f f));
DATA(insert OID = 0 ( 1259 relam 26 0 4 4 0 -1 -1 t p f i f f)); DATA(insert OID = 0 ( 1259 relam 26 0 4 4 0 -1 -1 t p f i f f));
DATA(insert OID = 0 ( 1259 relpages 23 0 4 5 0 -1 -1 t p f i f f)); DATA(insert OID = 0 ( 1259 relfilenode 26 0 4 5 0 -1 -1 t p f i f f));
DATA(insert OID = 0 ( 1259 reltuples 23 0 4 6 0 -1 -1 t p f i f f)); DATA(insert OID = 0 ( 1259 relpages 23 0 4 6 0 -1 -1 t p f i f f));
DATA(insert OID = 0 ( 1259 reltoastrelid 26 0 4 7 0 -1 -1 t p f i f f)); DATA(insert OID = 0 ( 1259 reltuples 23 0 4 7 0 -1 -1 t p f i f f));
DATA(insert OID = 0 ( 1259 reltoastidxid 26 0 4 8 0 -1 -1 t p f i f f)); DATA(insert OID = 0 ( 1259 reltoastrelid 26 0 4 8 0 -1 -1 t p f i f f));
DATA(insert OID = 0 ( 1259 relhasindex 16 0 1 9 0 -1 -1 t p f c f f)); DATA(insert OID = 0 ( 1259 reltoastidxid 26 0 4 9 0 -1 -1 t p f i f f));
DATA(insert OID = 0 ( 1259 relisshared 16 0 1 10 0 -1 -1 t p f c f f)); DATA(insert OID = 0 ( 1259 relhasindex 16 0 1 10 0 -1 -1 t p f c f f));
DATA(insert OID = 0 ( 1259 relkind 18 0 1 11 0 -1 -1 t p f c f f)); DATA(insert OID = 0 ( 1259 relisshared 16 0 1 11 0 -1 -1 t p f c f f));
DATA(insert OID = 0 ( 1259 relnatts 21 0 2 12 0 -1 -1 t p f s f f)); DATA(insert OID = 0 ( 1259 relkind 18 0 1 12 0 -1 -1 t p f c f f));
DATA(insert OID = 0 ( 1259 relchecks 21 0 2 13 0 -1 -1 t p f s f f)); DATA(insert OID = 0 ( 1259 relnatts 21 0 2 13 0 -1 -1 t p f s f f));
DATA(insert OID = 0 ( 1259 reltriggers 21 0 2 14 0 -1 -1 t p f s f f)); DATA(insert OID = 0 ( 1259 relchecks 21 0 2 14 0 -1 -1 t p f s f f));
DATA(insert OID = 0 ( 1259 relukeys 21 0 2 15 0 -1 -1 t p f s f f)); DATA(insert OID = 0 ( 1259 reltriggers 21 0 2 15 0 -1 -1 t p f s f f));
DATA(insert OID = 0 ( 1259 relfkeys 21 0 2 16 0 -1 -1 t p f s f f)); DATA(insert OID = 0 ( 1259 relukeys 21 0 2 16 0 -1 -1 t p f s f f));
DATA(insert OID = 0 ( 1259 relrefs 21 0 2 17 0 -1 -1 t p f s f f)); DATA(insert OID = 0 ( 1259 relfkeys 21 0 2 17 0 -1 -1 t p f s f f));
DATA(insert OID = 0 ( 1259 relhaspkey 16 0 1 18 0 -1 -1 t p f c f f)); DATA(insert OID = 0 ( 1259 relrefs 21 0 2 18 0 -1 -1 t p f s f f));
DATA(insert OID = 0 ( 1259 relhasrules 16 0 1 19 0 -1 -1 t p f c f f)); DATA(insert OID = 0 ( 1259 relhaspkey 16 0 1 19 0 -1 -1 t p f c f f));
DATA(insert OID = 0 ( 1259 relhassubclass 16 0 1 20 0 -1 -1 t p f c f f)); DATA(insert OID = 0 ( 1259 relhasrules 16 0 1 20 0 -1 -1 t p f c f f));
DATA(insert OID = 0 ( 1259 relacl 1034 0 -1 21 0 -1 -1 f x f i f f)); DATA(insert OID = 0 ( 1259 relhassubclass 16 0 1 21 0 -1 -1 t p f c f f));
DATA(insert OID = 0 ( 1259 relacl 1034 0 -1 22 0 -1 -1 f x f i f f));
DATA(insert OID = 0 ( 1259 ctid 27 0 6 -1 0 -1 -1 f p f i f f)); DATA(insert OID = 0 ( 1259 ctid 27 0 6 -1 0 -1 -1 f p f i f f));
DATA(insert OID = 0 ( 1259 oid 26 0 4 -2 0 -1 -1 t p f i f f)); DATA(insert OID = 0 ( 1259 oid 26 0 4 -2 0 -1 -1 t p f i f f));
DATA(insert OID = 0 ( 1259 xmin 28 0 4 -3 0 -1 -1 t p f i f f)); DATA(insert OID = 0 ( 1259 xmin 28 0 4 -3 0 -1 -1 t p f i f f));

68
src/include/catalog/pg_class.h
Unescape View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: pg_class.h,v 1.40 2000/09/12 04:49:15 momjian Exp $ * $Id: pg_class.h,v 1.41 2000/10/16 14:52:26 vadim Exp $
* *
* NOTES * NOTES
* the genbki.sh script reads this file and generates .bki * the genbki.sh script reads this file and generates .bki
@ -50,6 +50,7 @@ CATALOG(pg_class) BOOTSTRAP
Oid reltype; Oid reltype;
int4 relowner; int4 relowner;
Oid relam; Oid relam;
Oid relfilenode;
int4 relpages; int4 relpages;
int4 reltuples; int4 reltuples;
Oid reltoastrelid; Oid reltoastrelid;
@ -99,60 +100,61 @@ typedef FormData_pg_class *Form_pg_class;
* relacl field. * relacl field.
* ---------------- * ----------------
*/ */
#define Natts_pg_class_fixed 20 #define Natts_pg_class_fixed 21
#define Natts_pg_class 21 #define Natts_pg_class 22
#define Anum_pg_class_relname 1 #define Anum_pg_class_relname 1
#define Anum_pg_class_reltype 2 #define Anum_pg_class_reltype 2
#define Anum_pg_class_relowner 3 #define Anum_pg_class_relowner 3
#define Anum_pg_class_relam 4 #define Anum_pg_class_relam 4
#define Anum_pg_class_relpages 5 #define Anum_pg_class_relfilenode 5
#define Anum_pg_class_reltuples 6 #define Anum_pg_class_relpages 6
#define Anum_pg_class_reltoastrelid 7 #define Anum_pg_class_reltuples 7
#define Anum_pg_class_reltoastidxid 8 #define Anum_pg_class_reltoastrelid 8
#define Anum_pg_class_relhasindex 9 #define Anum_pg_class_reltoastidxid 9
#define Anum_pg_class_relisshared 10 #define Anum_pg_class_relhasindex 10
#define Anum_pg_class_relkind 11 #define Anum_pg_class_relisshared 11
#define Anum_pg_class_relnatts 12 #define Anum_pg_class_relkind 12
#define Anum_pg_class_relchecks 13 #define Anum_pg_class_relnatts 13
#define Anum_pg_class_reltriggers 14 #define Anum_pg_class_relchecks 14
#define Anum_pg_class_relukeys 15 #define Anum_pg_class_reltriggers 15
#define Anum_pg_class_relfkeys 16 #define Anum_pg_class_relukeys 16
#define Anum_pg_class_relrefs 17 #define Anum_pg_class_relfkeys 17
#define Anum_pg_class_relhaspkey 18 #define Anum_pg_class_relrefs 18
#define Anum_pg_class_relhasrules 19 #define Anum_pg_class_relhaspkey 19
#define Anum_pg_class_relhassubclass 20 #define Anum_pg_class_relhasrules 20
#define Anum_pg_class_relacl 21 #define Anum_pg_class_relhassubclass 21
#define Anum_pg_class_relacl 22
/* ---------------- /* ----------------
* initial contents of pg_class * initial contents of pg_class
* ---------------- * ----------------
*/ */
DATA(insert OID = 1247 ( pg_type 71 PGUID 0 0 0 0 0 f f r 17 0 0 0 0 0 f f f _null_ )); DATA(insert OID = 1247 ( pg_type 71 PGUID 0 1247 0 0 0 0 f f r 17 0 0 0 0 0 f f f _null_ ));
DESCR(""); DESCR("");
DATA(insert OID = 1249 ( pg_attribute 75 PGUID 0 0 0 0 0 f f r 15 0 0 0 0 0 f f f _null_ )); DATA(insert OID = 1249 ( pg_attribute 75 PGUID 0 1249 0 0 0 0 f f r 15 0 0 0 0 0 f f f _null_ ));
DESCR(""); DESCR("");
DATA(insert OID = 1255 ( pg_proc 81 PGUID 0 0 0 0 0 f f r 17 0 0 0 0 0 f f f _null_ )); DATA(insert OID = 1255 ( pg_proc 81 PGUID 0 1255 0 0 0 0 f f r 17 0 0 0 0 0 f f f _null_ ));
DESCR(""); DESCR("");
DATA(insert OID = 1259 ( pg_class 83 PGUID 0 0 0 0 0 f f r 21 0 0 0 0 0 f f f _null_ )); DATA(insert OID = 1259 ( pg_class 83 PGUID 0 1259 0 0 0 0 f f r 22 0 0 0 0 0 f f f _null_ ));
DESCR(""); DESCR("");
DATA(insert OID = 1260 ( pg_shadow 86 PGUID 0 0 0 0 0 f t r 8 0 0 0 0 0 f f f _null_ )); DATA(insert OID = 1260 ( pg_shadow 86 PGUID 0 1260 0 0 0 0 f t r 8 0 0 0 0 0 f f f _null_ ));
DESCR(""); DESCR("");
DATA(insert OID = 1261 ( pg_group 87 PGUID 0 0 0 0 0 f t r 3 0 0 0 0 0 f f f _null_ )); DATA(insert OID = 1261 ( pg_group 87 PGUID 0 1261 0 0 0 0 f t r 3 0 0 0 0 0 f f f _null_ ));
DESCR(""); DESCR("");
DATA(insert OID = 1262 ( pg_database 88 PGUID 0 0 0 0 0 f t r 4 0 0 0 0 0 f f f _null_ )); DATA(insert OID = 1262 ( pg_database 88 PGUID 0 1262 0 0 0 0 f t r 4 0 0 0 0 0 f f f _null_ ));
DESCR(""); DESCR("");
DATA(insert OID = 1264 ( pg_variable 90 PGUID 0 0 0 0 0 f t s 1 0 0 0 0 0 f f f _null_ )); DATA(insert OID = 1264 ( pg_variable 90 PGUID 0 1264 0 0 0 0 f t s 1 0 0 0 0 0 f f f _null_ ));
DESCR(""); DESCR("");
DATA(insert OID = 1269 ( pg_log 99 PGUID 0 0 0 0 0 f t s 1 0 0 0 0 0 f f f _null_ )); DATA(insert OID = 1269 ( pg_log 99 PGUID 0 1269 0 0 0 0 f t s 1 0 0 0 0 0 f f f _null_ ));
DESCR(""); DESCR("");
DATA(insert OID = 376 ( pg_xactlock 0 PGUID 0 0 0 0 0 f t s 1 0 0 0 0 0 f f f _null_ )); DATA(insert OID = 376 ( pg_xactlock 0 PGUID 0 0 0 0 0 0 f t s 1 0 0 0 0 0 f f f _null_ ));
DESCR(""); DESCR("");
DATA(insert OID = 1215 ( pg_attrdef 109 PGUID 0 0 0 0 0 t t r 4 0 0 0 0 0 f f f _null_ )); DATA(insert OID = 1215 ( pg_attrdef 109 PGUID 0 1215 0 0 0 0 t t r 4 0 0 0 0 0 f f f _null_ ));
DESCR(""); DESCR("");
DATA(insert OID = 1216 ( pg_relcheck 110 PGUID 0 0 0 0 0 t t r 4 0 0 0 0 0 f f f _null_ )); DATA(insert OID = 1216 ( pg_relcheck 110 PGUID 0 1216 0 0 0 0 t t r 4 0 0 0 0 0 f f f _null_ ));
DESCR(""); DESCR("");
DATA(insert OID = 1219 ( pg_trigger 111 PGUID 0 0 0 0 0 t t r 13 0 0 0 0 0 f f f _null_ )); DATA(insert OID = 1219 ( pg_trigger 111 PGUID 0 1219 0 0 0 0 t t r 13 0 0 0 0 0 f f f _null_ ));
DESCR(""); DESCR("");
#define RelOid_pg_type 1247 #define RelOid_pg_type 1247

8
src/include/catalog/pg_database.h
Unescape View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: pg_database.h,v 1.9 2000/01/26 05:57:57 momjian Exp $ * $Id: pg_database.h,v 1.10 2000/10/16 14:52:26 vadim Exp $
* *
* NOTES * NOTES
* the genbki.sh script reads this file and generates .bki * the genbki.sh script reads this file and generates .bki
@ -55,4 +55,10 @@ typedef FormData_pg_database *Form_pg_database;
#define Anum_pg_database_datdba 2 #define Anum_pg_database_datdba 2
#define Anum_pg_database_encoding 3 #define Anum_pg_database_encoding 3
#define Anum_pg_database_datpath 4 #define Anum_pg_database_datpath 4
DATA(insert OID = 1 ( template1 PGUID ENCODING template1 ));
DESCR("");
#define TemplateDbOid 1
#endif /* PG_DATABASE_H */ #endif /* PG_DATABASE_H */

14
src/include/storage/buf_internals.h
Unescape View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: buf_internals.h,v 1.37 2000/04/12 17:16:51 momjian Exp $ * $Id: buf_internals.h,v 1.38 2000/10/16 14:52:28 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -61,6 +61,7 @@ typedef struct buftag
(a)->relId = (xx_reln)->rd_lockInfo.lockRelId \ (a)->relId = (xx_reln)->rd_lockInfo.lockRelId \
) )
#ifdef OLD_FILE_NAMING
/* If we have to write a buffer "blind" (without a relcache entry), /* If we have to write a buffer "blind" (without a relcache entry),
* the BufferTag is not enough information. BufferBlindId carries the * the BufferTag is not enough information. BufferBlindId carries the
* additional information needed. * additional information needed.
@ -71,6 +72,17 @@ typedef struct bufblindid
char relname[NAMEDATALEN]; /* name of reln */ char relname[NAMEDATALEN]; /* name of reln */
} BufferBlindId; } BufferBlindId;
#else
typedef struct bufblindid
{
char dbname[NAMEDATALEN]; /* name of db in which buf belongs */
char relname[NAMEDATALEN]; /* name of reln */
RelFileNode rnode;
} BufferBlindId;
#endif
#define BAD_BUFFER_ID(bid) ((bid) < 1 || (bid) > NBuffers) #define BAD_BUFFER_ID(bid) ((bid) < 1 || (bid) > NBuffers)
#define INVALID_DESCRIPTOR (-3) #define INVALID_DESCRIPTOR (-3)

12
src/include/storage/relfilenode.h
Unescape View File

@ -2,13 +2,17 @@
#define RELFILENODE_H #define RELFILENODE_H
/* /*
* This is temporal place holder for Relation File Node till * This is all what we need to know to find relation file.
* reloid.version/unique_id file naming is not implemented * tblNode is identificator of tablespace and because of
* currently our tablespaces are equal to databases this is
* database OID. relNode is currently relation OID on creation
* but may be changed later if required. relNode is stored in
* pg_class.relfilenode.
*/ */
typedef struct RelFileNode typedef struct RelFileNode
{ {
Oid dbId; /* database */ Oid tblNode; /* tablespace */
Oid relId; /* relation */ Oid relNode; /* relation */
} RelFileNode; } RelFileNode;
#endif /* RELFILENODE_H */ #endif /* RELFILENODE_H */

20
src/include/storage/smgr.h
Unescape View File

@ -7,13 +7,14 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: smgr.h,v 1.21 2000/06/05 07:29:06 tgl Exp $ * $Id: smgr.h,v 1.22 2000/10/16 14:52:28 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#ifndef SMGR_H #ifndef SMGR_H
#define SMGR_H #define SMGR_H
#include "storage/relfilenode.h"
#include "storage/block.h" #include "storage/block.h"
#include "storage/spin.h" #include "storage/spin.h"
#include "utils/rel.h" #include "utils/rel.h"
@ -35,14 +36,21 @@ extern int smgrwrite(int16 which, Relation reln, BlockNumber blocknum,
char *buffer); char *buffer);
extern int smgrflush(int16 which, Relation reln, BlockNumber blocknum, extern int smgrflush(int16 which, Relation reln, BlockNumber blocknum,
char *buffer); char *buffer);
#ifdef OLD_FILE_NAMING
extern int smgrblindwrt(int16 which, char *dbname, char *relname, extern int smgrblindwrt(int16 which, char *dbname, char *relname,
Oid dbid, Oid relid, Oid dbid, Oid relid,
BlockNumber blkno, char *buffer, BlockNumber blkno, char *buffer,
bool dofsync); bool dofsync);
extern int smgrmarkdirty(int16 which, Relation reln, BlockNumber blkno);
extern int smgrblindmarkdirty(int16 which, char *dbname, char *relname, extern int smgrblindmarkdirty(int16 which, char *dbname, char *relname,
Oid dbid, Oid relid, Oid dbid, Oid relid,
BlockNumber blkno); BlockNumber blkno);
#else
extern int smgrblindwrt(int16 which, RelFileNode rnode,
BlockNumber blkno, char *buffer, bool dofsync);
extern int smgrblindmarkdirty(int16 which, RelFileNode rnode,
BlockNumber blkno);
#endif
extern int smgrmarkdirty(int16 which, Relation reln, BlockNumber blkno);
extern int smgrnblocks(int16 which, Relation reln); extern int smgrnblocks(int16 which, Relation reln);
extern int smgrtruncate(int16 which, Relation reln, int nblocks); extern int smgrtruncate(int16 which, Relation reln, int nblocks);
extern int smgrcommit(void); extern int smgrcommit(void);
@ -62,12 +70,18 @@ extern int mdclose(Relation reln);
extern int mdread(Relation reln, BlockNumber blocknum, char *buffer); extern int mdread(Relation reln, BlockNumber blocknum, char *buffer);
extern int mdwrite(Relation reln, BlockNumber blocknum, char *buffer); extern int mdwrite(Relation reln, BlockNumber blocknum, char *buffer);
extern int mdflush(Relation reln, BlockNumber blocknum, char *buffer); extern int mdflush(Relation reln, BlockNumber blocknum, char *buffer);
extern int mdmarkdirty(Relation reln, BlockNumber blkno);
#ifdef OLD_FILE_NAMING
extern int mdblindwrt(char *dbname, char *relname, Oid dbid, Oid relid, extern int mdblindwrt(char *dbname, char *relname, Oid dbid, Oid relid,
BlockNumber blkno, char *buffer, BlockNumber blkno, char *buffer,
bool dofsync); bool dofsync);
extern int mdmarkdirty(Relation reln, BlockNumber blkno);
extern int mdblindmarkdirty(char *dbname, char *relname, Oid dbid, Oid relid, extern int mdblindmarkdirty(char *dbname, char *relname, Oid dbid, Oid relid,
BlockNumber blkno); BlockNumber blkno);
#else
extern int mdblindwrt(RelFileNode rnode, BlockNumber blkno,
char *buffer, bool dofsync);
extern int mdblindmarkdirty(RelFileNode rnode, BlockNumber blkno);
#endif
extern int mdnblocks(Relation reln); extern int mdnblocks(Relation reln);
extern int mdtruncate(Relation reln, int nblocks); extern int mdtruncate(Relation reln, int nblocks);
extern int mdcommit(void); extern int mdcommit(void);

Write Preview
Loading…
Cancel
Save