database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-12 05:01:15 +03:00
Code Activity

Now that names are null terminated, no need to do all that NAMEDATALEN stuff.

Browse Source
This commit is contained in:
Bruce Momjian
1997-08-18 20:53:48 +00:00
parent 022903f22e
commit b99c63cfc0
26 changed files with 207 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/storage/buffer/bufmgr.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.17 1997/08/18 02:14:49 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.18 1997/08/18 20:53:08 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1419,9 +1419,9 @@ PrintBufferDescs()
if (IsUnderPostmaster) {
SpinAcquire(BufMgrLock);
for (i = 0; i < NBuffers; ++i, ++buf) {
elog(NOTICE, "[%02d] (freeNext=%d, freePrev=%d, relname=%.*s, \
elog(NOTICE, "[%02d] (freeNext=%d, freePrev=%d, relname=%s, \
blockNum=%d, flags=0x%x, refcount=%d %d)",
i, buf->freeNext, buf->freePrev, NAMEDATALEN,
i, buf->freeNext, buf->freePrev,
buf->sb_relname, buf->tag.blockNum, buf->flags,
buf->refcount, PrivateRefCount[i]);
}
@@ -1445,9 +1445,9 @@ PrintPinnedBufs()
SpinAcquire(BufMgrLock);
for (i = 0; i < NBuffers; ++i, ++buf) {
if (PrivateRefCount[i] > 0)
elog(NOTICE, "[%02d] (freeNext=%d, freePrev=%d, relname=%.*s, \
elog(NOTICE, "[%02d] (freeNext=%d, freePrev=%d, relname=%s, \
blockNum=%d, flags=0x%x, refcount=%d %d)\n",
i, buf->freeNext, buf->freePrev, NAMEDATALEN, buf->sb_relname,
i, buf->freeNext, buf->freePrev, buf->sb_relname,
buf->tag.blockNum, buf->flags,
buf->refcount, PrivateRefCount[i]);
}

18
src/backend/storage/smgr/md.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.17 1997/08/12 22:54:13 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.18 1997/08/18 20:53:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -468,17 +468,17 @@ mdblindwrt(char *dbstr,
if (dbid == (Oid) 0) {
path = (char *) palloc(strlen(DataDir) + sizeof(NameData) + 2 + nchars);
if (segno == 0)
sprintf(path, "%s/%.*s", DataDir, NAMEDATALEN, relstr);
sprintf(path, "%s/%s", DataDir, relstr);
else
sprintf(path, "%s/%.*s.%d", DataDir, NAMEDATALEN, relstr, segno);
sprintf(path, "%s/%s.%d", DataDir, relstr, segno);
} else {
path = (char *) palloc(strlen(DataDir) + strlen("/base/") + 2 * sizeof(NameData) + 2 + nchars);
if (segno == 0)
sprintf(path, "%s/base/%.*s/%.*s", DataDir, NAMEDATALEN,
dbstr, NAMEDATALEN, relstr);
sprintf(path, "%s/base/%s/%s", DataDir,
dbstr, relstr);
else
sprintf(path, "%s/base/%.*s/%.*s.%d", DataDir, NAMEDATALEN, dbstr,
NAMEDATALEN, relstr, segno);
sprintf(path, "%s/base/%s/%s.%d", DataDir, dbstr,
relstr, segno);
}
if ((fd = open(path, O_RDWR, 0600)) < 0)
@@ -563,8 +563,8 @@ mdtruncate (Relation reln, int nblocks)
curnblk = mdnblocks (reln);
if ( curnblk / RELSEG_SIZE > 0 )
{
elog (NOTICE, "Can't truncate multi-segments relation %.*s",
NAMEDATALEN, &(reln->rd_rel->relname.data[0]));
elog (NOTICE, "Can't truncate multi-segments relation %s",
&(reln->rd_rel->relname.data[0]));
return (curnblk);
}

42
src/backend/storage/smgr/smgr.c
View File

@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.6 1997/05/22 17:08:35 vadim Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.7 1997/08/18 20:53:18 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -125,8 +125,8 @@ smgrcreate(int16 which, Relation reln)
int fd;
if ((fd = (*(smgrsw[which].smgr_create))(reln)) < 0)
elog(WARN, "cannot open %.*s",
NAMEDATALEN, &(reln->rd_rel->relname.data[0]));
elog(WARN, "cannot open %s",
&(reln->rd_rel->relname.data[0]));
return (fd);
}
@@ -142,8 +142,8 @@ smgrunlink(int16 which, Relation reln)
int status;
if ((status = (*(smgrsw[which].smgr_unlink))(reln)) == SM_FAIL)
elog(WARN, "cannot unlink %.*s",
NAMEDATALEN, &(reln->rd_rel->relname.data[0]));
elog(WARN, "cannot unlink %s",
&(reln->rd_rel->relname.data[0]));
return (status);
}
@@ -162,8 +162,8 @@ smgrextend(int16 which, Relation reln, char *buffer)
status = (*(smgrsw[which].smgr_extend))(reln, buffer);
if (status == SM_FAIL)
elog(WARN, "%.*s: cannot extend",
NAMEDATALEN, &(reln->rd_rel->relname.data[0]));
elog(WARN, "%s: cannot extend",
&(reln->rd_rel->relname.data[0]));
return (status);
}
@@ -180,8 +180,8 @@ smgropen(int16 which, Relation reln)
int fd;
if ((fd = (*(smgrsw[which].smgr_open))(reln)) < 0)
elog(WARN, "cannot open %.*s",
NAMEDATALEN, &(reln->rd_rel->relname.data[0]));
elog(WARN, "cannot open %s",
&(reln->rd_rel->relname.data[0]));
return (fd);
}
@@ -202,8 +202,8 @@ int
smgrclose(int16 which, Relation reln)
{
if ((*(smgrsw[which].smgr_close))(reln) == SM_FAIL)
elog(WARN, "cannot close %.*s",
NAMEDATALEN, &(reln->rd_rel->relname.data[0]));
elog(WARN, "cannot close %s",
&(reln->rd_rel->relname.data[0]));
return (SM_SUCCESS);
}
@@ -226,8 +226,8 @@ smgrread(int16 which, Relation reln, BlockNumber blocknum, char *buffer)
status = (*(smgrsw[which].smgr_read))(reln, blocknum, buffer);
if (status == SM_FAIL)
elog(WARN, "cannot read block %d of %.*s",
blocknum, NAMEDATALEN, &(reln->rd_rel->relname.data[0]));
elog(WARN, "cannot read block %d of %s",
blocknum, &(reln->rd_rel->relname.data[0]));
return (status);
}
@@ -248,8 +248,8 @@ smgrwrite(int16 which, Relation reln, BlockNumber blocknum, char *buffer)
status = (*(smgrsw[which].smgr_write))(reln, blocknum, buffer);
if (status == SM_FAIL)
elog(WARN, "cannot write block %d of %.*s",
blocknum, NAMEDATALEN, &(reln->rd_rel->relname.data[0]));
elog(WARN, "cannot write block %d of %s",
blocknum, &(reln->rd_rel->relname.data[0]));
return (status);
}
@@ -265,8 +265,8 @@ smgrflush(int16 which, Relation reln, BlockNumber blocknum, char *buffer)
status = (*(smgrsw[which].smgr_flush))(reln, blocknum, buffer);
if (status == SM_FAIL)
elog(WARN, "cannot flush block %d of %.*s to stable store",
blocknum, NAMEDATALEN, &(reln->rd_rel->relname.data[0]));
elog(WARN, "cannot flush block %d of %s to stable store",
blocknum, &(reln->rd_rel->relname.data[0]));
return (status);
}
@@ -325,8 +325,8 @@ smgrnblocks(int16 which, Relation reln)
int nblocks;
if ((nblocks = (*(smgrsw[which].smgr_nblocks))(reln)) < 0)
elog(WARN, "cannot count blocks for %.*s",
NAMEDATALEN, &(reln->rd_rel->relname.data[0]));
elog(WARN, "cannot count blocks for %s",
&(reln->rd_rel->relname.data[0]));
return (nblocks);
}
@@ -347,8 +347,8 @@ smgrtruncate(int16 which, Relation reln, int nblocks)
if (smgrsw[which].smgr_truncate)
{
if ((newblks = (*(smgrsw[which].smgr_truncate))(reln, nblocks)) < 0)
elog(WARN, "cannot truncate %.*s to %d blocks",
NAMEDATALEN, &(reln->rd_rel->relname.data[0]), nblocks);
elog(WARN, "cannot truncate %s to %d blocks",
&(reln->rd_rel->relname.data[0]), nblocks);
}
return (newblks);