mirror of
https://github.com/postgres/postgres.git
synced 2025-11-12 05:01:15 +03:00
New file naming. Database OID is used as "tablespace" id and
relation OID is used as file node on creation but may be changed later if required. Regression Tests Approved (c) -:)))
This commit is contained in:
Vadim B. Mikheev
@@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* 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 MdfdVec *_mdfd_openseg(Relation reln, int segno, int oflags);
|
||||
static MdfdVec *_mdfd_getseg(Relation reln, int blkno);
|
||||
|
||||
#ifdef OLD_FILE_NAMING
|
||||
static int _mdfd_blind_getseg(char *dbname, char *relname,
|
||||
Oid dbid, Oid relid, int blkno);
|
||||
#else
|
||||
static int _mdfd_blind_getseg(RelFileNode rnode, int blkno);
|
||||
#endif
|
||||
|
||||
static int _fdvec_alloc(void);
|
||||
static void _fdvec_free(int);
|
||||
static BlockNumber _mdnblocks(File file, Size blcksz);
|
||||
@@ -128,7 +134,11 @@ mdcreate(Relation reln)
|
||||
|
||||
Assert(reln->rd_unlinked && reln->rd_fd < 0);
|
||||
|
||||
#ifdef OLD_FILE_NAMING
|
||||
path = relpath(RelationGetPhysicalRelationName(reln));
|
||||
#else
|
||||
path = relpath(reln->rd_node);
|
||||
#endif
|
||||
fd = FileNameOpenFile(path, O_RDWR | O_CREAT | O_EXCL | PG_BINARY, 0600);
|
||||
|
||||
/*
|
||||
@@ -326,7 +336,11 @@ mdopen(Relation reln)
|
||||
int vfd;
|
||||
|
||||
Assert(reln->rd_fd < 0);
|
||||
#ifdef OLD_FILE_NAMING
|
||||
path = relpath(RelationGetPhysicalRelationName(reln));
|
||||
#else
|
||||
path = relpath(reln->rd_node);
|
||||
#endif
|
||||
|
||||
fd = FileNameOpenFile(path, O_RDWR | PG_BINARY, 0600);
|
||||
if (fd < 0)
|
||||
@@ -565,6 +579,7 @@ mdflush(Relation reln, BlockNumber blocknum, char *buffer)
|
||||
* the file, making it more like mdflush().
|
||||
*/
|
||||
int
|
||||
#ifdef OLD_FILE_NAMING
|
||||
mdblindwrt(char *dbname,
|
||||
char *relname,
|
||||
Oid dbid,
|
||||
@@ -572,12 +587,22 @@ mdblindwrt(char *dbname,
|
||||
BlockNumber blkno,
|
||||
char *buffer,
|
||||
bool dofsync)
|
||||
#else
|
||||
mdblindwrt(RelFileNode rnode,
|
||||
BlockNumber blkno,
|
||||
char *buffer,
|
||||
bool dofsync)
|
||||
#endif
|
||||
{
|
||||
int status;
|
||||
long seekpos;
|
||||
int fd;
|
||||
|
||||
#ifdef OLD_FILE_NAMING
|
||||
fd = _mdfd_blind_getseg(dbname, relname, dbid, relid, blkno);
|
||||
#else
|
||||
fd = _mdfd_blind_getseg(rnode, blkno);
|
||||
#endif
|
||||
|
||||
if (fd < 0)
|
||||
return SM_FAIL;
|
||||
@@ -651,16 +676,25 @@ mdmarkdirty(Relation reln, BlockNumber blkno)
|
||||
* rather than building md/fd datastructures to postpone it till later.
|
||||
*/
|
||||
int
|
||||
#ifdef OLD_FILE_NAMING
|
||||
mdblindmarkdirty(char *dbname,
|
||||
char *relname,
|
||||
Oid dbid,
|
||||
Oid relid,
|
||||
BlockNumber blkno)
|
||||
#else
|
||||
mdblindmarkdirty(RelFileNode rnode,
|
||||
BlockNumber blkno)
|
||||
#endif
|
||||
{
|
||||
int status;
|
||||
int fd;
|
||||
|
||||
#ifdef OLD_FILE_NAMING
|
||||
fd = _mdfd_blind_getseg(dbname, relname, dbid, relid, blkno);
|
||||
#else
|
||||
fd = _mdfd_blind_getseg(rnode, blkno);
|
||||
#endif
|
||||
|
||||
if (fd < 0)
|
||||
return SM_FAIL;
|
||||
@@ -969,7 +1003,11 @@ _mdfd_openseg(Relation reln, int segno, int oflags)
|
||||
*fullpath;
|
||||
|
||||
/* be sure we have enough space for the '.segno', if any */
|
||||
#ifdef OLD_FILE_NAMING
|
||||
path = relpath(RelationGetPhysicalRelationName(reln));
|
||||
#else
|
||||
path = relpath(reln->rd_node);
|
||||
#endif
|
||||
|
||||
if (segno > 0)
|
||||
{
|
||||
@@ -1084,8 +1122,12 @@ _mdfd_getseg(Relation reln, int blkno)
|
||||
*/
|
||||
|
||||
static int
|
||||
#ifdef OLD_FILE_NAMING
|
||||
_mdfd_blind_getseg(char *dbname, char *relname, Oid dbid, Oid relid,
|
||||
int blkno)
|
||||
#else
|
||||
_mdfd_blind_getseg(RelFileNode rnode, int blkno)
|
||||
#endif
|
||||
{
|
||||
char *path;
|
||||
int fd;
|
||||
@@ -1095,8 +1137,12 @@ _mdfd_blind_getseg(char *dbname, char *relname, Oid dbid, Oid relid,
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef OLD_FILE_NAMING
|
||||
/* construct the path to the relation */
|
||||
path = relpath_blind(dbname, relname, dbid, relid);
|
||||
#else
|
||||
path = relpath(rnode);
|
||||
#endif
|
||||
|
||||
#ifndef LET_OS_MANAGE_FILESIZE
|
||||
/* append the '.segno', if needed */
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
*
|
||||
*
|
||||
* 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);
|
||||
int (*smgr_flush) (Relation reln, BlockNumber blocknum,
|
||||
char *buffer);
|
||||
#ifdef OLD_FILE_NAMING
|
||||
int (*smgr_blindwrt) (char *dbname, char *relname,
|
||||
Oid dbid, Oid relid,
|
||||
BlockNumber blkno, char *buffer,
|
||||
bool dofsync);
|
||||
#else
|
||||
int (*smgr_blindwrt) (RelFileNode rnode, BlockNumber blkno,
|
||||
char *buffer, bool dofsync);
|
||||
#endif
|
||||
int (*smgr_markdirty) (Relation reln, BlockNumber blkno);
|
||||
#ifdef OLD_FILE_NAMING
|
||||
int (*smgr_blindmarkdirty) (char *dbname, char *relname,
|
||||
Oid dbid, Oid relid,
|
||||
BlockNumber blkno);
|
||||
#else
|
||||
int (*smgr_blindmarkdirty) (RelFileNode, BlockNumber blkno);
|
||||
#endif
|
||||
int (*smgr_nblocks) (Relation reln);
|
||||
int (*smgr_truncate) (Relation reln, int nblocks);
|
||||
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
|
||||
* write should be synchronous if dofsync is true.
|
||||
*/
|
||||
#ifdef OLD_FILE_NAMING
|
||||
int
|
||||
smgrblindwrt(int16 which,
|
||||
char *dbname,
|
||||
@@ -332,6 +342,27 @@ smgrblindwrt(int16 which,
|
||||
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).
|
||||
*
|
||||
@@ -363,6 +394,7 @@ smgrmarkdirty(int16 which,
|
||||
*
|
||||
* Just like smgrmarkdirty, except we don't have a reldesc.
|
||||
*/
|
||||
#ifdef OLD_FILE_NAMING
|
||||
int
|
||||
smgrblindmarkdirty(int16 which,
|
||||
char *dbname,
|
||||
@@ -393,6 +425,25 @@ smgrblindmarkdirty(int16 which,
|
||||
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
|
||||
* supplied relation.
|
||||
|
||||
Reference in New Issue
Block a user