summaryrefslogtreecommitdiff
path: root/src/backend/storage/smgr
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/storage/smgr')
-rw-r--r--src/backend/storage/smgr/md.c8
-rw-r--r--src/backend/storage/smgr/smgr.c26
-rw-r--r--src/backend/storage/smgr/smgrtype.c6
3 files changed, 20 insertions, 20 deletions
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index ff852dc003..49b2956d98 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.25 1998/01/05 03:33:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.26 1998/01/07 21:05:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -568,7 +568,7 @@ mdnblocks(Relation reln)
{
v->mdfd_chain = _mdfd_openseg(reln, segno, O_CREAT);
if (v->mdfd_chain == (MdfdVec *) NULL)
- elog(ABORT, "cannot count blocks for %.16s -- open failed",
+ elog(ERROR, "cannot count blocks for %.16s -- open failed",
RelationGetRelationName(reln));
}
@@ -808,7 +808,7 @@ _mdfd_getseg(Relation reln, int blkno, int oflag)
if (fd < 0)
{
if ((fd = mdopen(reln)) < 0)
- elog(ABORT, "cannot open relation %.16s",
+ elog(ERROR, "cannot open relation %.16s",
RelationGetRelationName(reln));
reln->rd_fd = fd;
}
@@ -823,7 +823,7 @@ _mdfd_getseg(Relation reln, int blkno, int oflag)
v->mdfd_chain = _mdfd_openseg(reln, i, oflag);
if (v->mdfd_chain == (MdfdVec *) NULL)
- elog(ABORT, "cannot open segment %d of relation %.16s",
+ elog(ERROR, "cannot open segment %d of relation %.16s",
i, RelationGetRelationName(reln));
}
v = v->mdfd_chain;
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
index 69be719f24..e7f9d2d831 100644
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.12 1998/01/05 03:33:33 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.13 1998/01/07 21:05:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -132,7 +132,7 @@ smgrcreate(int16 which, Relation reln)
int fd;
if ((fd = (*(smgrsw[which].smgr_create)) (reln)) < 0)
- elog(ABORT, "cannot open %s",
+ elog(ERROR, "cannot open %s",
&(reln->rd_rel->relname.data[0]));
return (fd);
@@ -149,7 +149,7 @@ smgrunlink(int16 which, Relation reln)
int status;
if ((status = (*(smgrsw[which].smgr_unlink)) (reln)) == SM_FAIL)
- elog(ABORT, "cannot unlink %s",
+ elog(ERROR, "cannot unlink %s",
&(reln->rd_rel->relname.data[0]));
return (status);
@@ -169,7 +169,7 @@ smgrextend(int16 which, Relation reln, char *buffer)
status = (*(smgrsw[which].smgr_extend)) (reln, buffer);
if (status == SM_FAIL)
- elog(ABORT, "%s: cannot extend",
+ elog(ERROR, "%s: cannot extend",
&(reln->rd_rel->relname.data[0]));
return (status);
@@ -187,7 +187,7 @@ smgropen(int16 which, Relation reln)
int fd;
if ((fd = (*(smgrsw[which].smgr_open)) (reln)) < 0)
- elog(ABORT, "cannot open %s",
+ elog(ERROR, "cannot open %s",
&(reln->rd_rel->relname.data[0]));
return (fd);
@@ -209,7 +209,7 @@ int
smgrclose(int16 which, Relation reln)
{
if ((*(smgrsw[which].smgr_close)) (reln) == SM_FAIL)
- elog(ABORT, "cannot close %s",
+ elog(ERROR, "cannot close %s",
&(reln->rd_rel->relname.data[0]));
return (SM_SUCCESS);
@@ -233,7 +233,7 @@ smgrread(int16 which, Relation reln, BlockNumber blocknum, char *buffer)
status = (*(smgrsw[which].smgr_read)) (reln, blocknum, buffer);
if (status == SM_FAIL)
- elog(ABORT, "cannot read block %d of %s",
+ elog(ERROR, "cannot read block %d of %s",
blocknum, &(reln->rd_rel->relname.data[0]));
return (status);
@@ -255,7 +255,7 @@ smgrwrite(int16 which, Relation reln, BlockNumber blocknum, char *buffer)
status = (*(smgrsw[which].smgr_write)) (reln, blocknum, buffer);
if (status == SM_FAIL)
- elog(ABORT, "cannot write block %d of %s",
+ elog(ERROR, "cannot write block %d of %s",
blocknum, &(reln->rd_rel->relname.data[0]));
return (status);
@@ -272,7 +272,7 @@ smgrflush(int16 which, Relation reln, BlockNumber blocknum, char *buffer)
status = (*(smgrsw[which].smgr_flush)) (reln, blocknum, buffer);
if (status == SM_FAIL)
- elog(ABORT, "cannot flush block %d of %s to stable store",
+ elog(ERROR, "cannot flush block %d of %s to stable store",
blocknum, &(reln->rd_rel->relname.data[0]));
return (status);
@@ -310,7 +310,7 @@ smgrblindwrt(int16 which,
blkno, buffer);
if (status == SM_FAIL)
- elog(ABORT, "cannot write block %d of %s [%s] blind",
+ elog(ERROR, "cannot write block %d of %s [%s] blind",
blkno, relstr, dbstr);
pfree(dbstr);
@@ -332,7 +332,7 @@ smgrnblocks(int16 which, Relation reln)
int nblocks;
if ((nblocks = (*(smgrsw[which].smgr_nblocks)) (reln)) < 0)
- elog(ABORT, "cannot count blocks for %s",
+ elog(ERROR, "cannot count blocks for %s",
&(reln->rd_rel->relname.data[0]));
return (nblocks);
@@ -354,7 +354,7 @@ smgrtruncate(int16 which, Relation reln, int nblocks)
if (smgrsw[which].smgr_truncate)
{
if ((newblks = (*(smgrsw[which].smgr_truncate)) (reln, nblocks)) < 0)
- elog(ABORT, "cannot truncate %s to %d blocks",
+ elog(ERROR, "cannot truncate %s to %d blocks",
&(reln->rd_rel->relname.data[0]), nblocks);
}
@@ -406,7 +406,7 @@ bool
smgriswo(int16 smgrno)
{
if (smgrno < 0 || smgrno >= NSmgr)
- elog(ABORT, "illegal storage manager number %d", smgrno);
+ elog(ERROR, "illegal storage manager number %d", smgrno);
return (smgrwo[smgrno]);
}
diff --git a/src/backend/storage/smgr/smgrtype.c b/src/backend/storage/smgr/smgrtype.c
index 05fbd5ab27..a2003c18e3 100644
--- a/src/backend/storage/smgr/smgrtype.c
+++ b/src/backend/storage/smgr/smgrtype.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.6 1998/01/05 03:33:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.7 1998/01/07 21:05:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -49,7 +49,7 @@ smgrin(char *s)
if (strcmp(s, StorageManager[i].smgr_name) == 0)
return ((int2) i);
}
- elog(ABORT, "smgrin: illegal storage manager name %s", s);
+ elog(ERROR, "smgrin: illegal storage manager name %s", s);
return 0;
}
@@ -59,7 +59,7 @@ smgrout(int2 i)
char *s;
if (i >= NStorageManagers || i < 0)
- elog(ABORT, "Illegal storage manager id %d", i);
+ elog(ERROR, "Illegal storage manager id %d", i);
s = (char *) palloc(strlen(StorageManager[i].smgr_name) + 1);
strcpy(s, StorageManager[i].smgr_name);
View Lorry Controller Status