database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-13 16:22:44 +03:00
Code Activity

Change error messages to oids come out as %u and not %d. Change has no

Browse Source 
real affect now.
This commit is contained in:
Bruce Momjian
1999-05-10 00:46:32 +00:00
parent b7332c9243
commit 4853495e03
66 changed files with 241 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/utils/adt/arrayfuncs.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.41 1999/05/05 21:38:37 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.42 1999/05/10 00:45:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1475,7 +1475,7 @@ system_cache_lookup(Oid element_type,
if (!HeapTupleIsValid(typeTuple))
{
elog(ERROR, "array_out: Cache lookup failed for type %d\n",
elog(ERROR, "array_out: Cache lookup failed for type %u\n",
element_type);
return;
}
@@ -1882,7 +1882,7 @@ _array_newLO(int *fd, int flag)
char saveName[NAME_LEN];
p = (char *) palloc(NAME_LEN);
sprintf(p, "/Arry.%d", newoid());
sprintf(p, "/Arry.%u", newoid());
strcpy(saveName, p);
#ifdef LOARRAY
if ((*fd = LOcreat(saveName, 0600, flag)) < 0)

4
src/backend/utils/adt/oid.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.22 1999/02/13 23:19:29 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.23 1999/05/10 00:45:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -38,7 +38,7 @@ oid8in(char *oidString)
return NULL;
result = (Oid *) palloc(sizeof(Oid[8]));
if ((nums = sscanf(oidString, "%d%d%d%d%d%d%d%d",
if ((nums = sscanf(oidString, "%u%u%u%u%u%u%u%u",
&result[0],
&result[1],
&result[2],

4
src/backend/utils/adt/regproc.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.35 1999/02/15 16:29:32 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.36 1999/05/10 00:45:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -229,7 +229,7 @@ regprocout(RegProcedure proid)
if (!isnull)
StrNCpy(result, s, NAMEDATALEN);
else
elog(FATAL, "regprocout: null procedure %d", proid);
elog(FATAL, "regprocout: null procedure %u", proid);
}
else
{

26
src/backend/utils/adt/ruleutils.c
View File

@@ -3,7 +3,7 @@
* out of it's tuple
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.10 1999/05/03 19:10:01 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.11 1999/05/10 00:45:59 momjian Exp $
*
* This software is copyrighted by Jan Wieck - Hamburg.
*
@@ -373,7 +373,7 @@ pg_get_indexdef(Oid indexrelid)
ht_idx = SearchSysCacheTuple(INDEXRELID,
ObjectIdGetDatum(indexrelid), 0, 0, 0);
if (!HeapTupleIsValid(ht_idx))
elog(ERROR, "syscache lookup for index %d failed", indexrelid);
elog(ERROR, "syscache lookup for index %u failed", indexrelid);
idxrec = (Form_pg_index)GETSTRUCT(ht_idx);
/* ----------
@@ -383,7 +383,7 @@ pg_get_indexdef(Oid indexrelid)
ht_idxrel = SearchSysCacheTuple(RELOID,
ObjectIdGetDatum(idxrec->indexrelid), 0, 0, 0);
if (!HeapTupleIsValid(ht_idxrel))
elog(ERROR, "syscache lookup for relid %d failed", idxrec->indexrelid);
elog(ERROR, "syscache lookup for relid %u failed", idxrec->indexrelid);
idxrelrec = (Form_pg_class)GETSTRUCT(ht_idxrel);
/* ----------
@@ -393,7 +393,7 @@ pg_get_indexdef(Oid indexrelid)
ht_indrel = SearchSysCacheTuple(RELOID,
ObjectIdGetDatum(idxrec->indrelid), 0, 0, 0);
if (!HeapTupleIsValid(ht_indrel))
elog(ERROR, "syscache lookup for relid %d failed", idxrec->indrelid);
elog(ERROR, "syscache lookup for relid %u failed", idxrec->indrelid);
indrelrec = (Form_pg_class)GETSTRUCT(ht_indrel);
/* ----------
@@ -459,9 +459,9 @@ pg_get_indexdef(Oid indexrelid)
spi_nulls[1] = '\0';
spirc = SPI_execp(plan_getopclass, spi_args, spi_nulls, 1);
if (spirc != SPI_OK_SELECT)
elog(ERROR, "failed to get pg_opclass tuple %d", idxrec->indclass[keyno]);
elog(ERROR, "failed to get pg_opclass tuple %u", idxrec->indclass[keyno]);
if (SPI_processed != 1)
elog(ERROR, "failed to get pg_opclass tuple %d", idxrec->indclass[keyno]);
elog(ERROR, "failed to get pg_opclass tuple %u", idxrec->indclass[keyno]);
spi_tup = SPI_tuptable->vals[0];
spi_ttc = SPI_tuptable->tupdesc;
spi_fno = SPI_fnumber(spi_ttc, "opcname");
@@ -483,7 +483,7 @@ pg_get_indexdef(Oid indexrelid)
proctup = SearchSysCacheTuple(PROOID,
ObjectIdGetDatum(idxrec->indproc), 0, 0, 0);
if (!HeapTupleIsValid(proctup))
elog(ERROR, "cache lookup for proc %d failed", idxrec->indproc);
elog(ERROR, "cache lookup for proc %u failed", idxrec->indproc);
procStruct = (Form_pg_proc) GETSTRUCT(proctup);
strcat(buf, "\"");
@@ -497,9 +497,9 @@ pg_get_indexdef(Oid indexrelid)
spi_nulls[1] = '\0';
spirc = SPI_execp(plan_getopclass, spi_args, spi_nulls, 1);
if (spirc != SPI_OK_SELECT)
elog(ERROR, "failed to get pg_opclass tuple %d", idxrec->indclass[0]);
elog(ERROR, "failed to get pg_opclass tuple %u", idxrec->indclass[0]);
if (SPI_processed != 1)
elog(ERROR, "failed to get pg_opclass tuple %d", idxrec->indclass[0]);
elog(ERROR, "failed to get pg_opclass tuple %u", idxrec->indclass[0]);
spi_tup = SPI_tuptable->vals[0];
spi_ttc = SPI_tuptable->tupdesc;
spi_fno = SPI_fnumber(spi_ttc, "opcname");
@@ -1424,7 +1424,7 @@ get_func_expr(QryHier *qh, int rt_index, Expr *expr, bool varprefix)
proctup = SearchSysCacheTuple(PROOID,
ObjectIdGetDatum(func->funcid), 0, 0, 0);
if (!HeapTupleIsValid(proctup))
elog(ERROR, "cache lookup for proc %d failed", func->funcid);
elog(ERROR, "cache lookup for proc %u failed", func->funcid);
procStruct = (Form_pg_proc) GETSTRUCT(proctup);
proname = nameout(&(procStruct->proname));
@@ -1516,7 +1516,7 @@ get_tle_expr(QryHier *qh, int rt_index, TargetEntry *tle, bool varprefix)
proctup = SearchSysCacheTuple(PROOID,
ObjectIdGetDatum(func->funcid), 0, 0, 0);
if (!HeapTupleIsValid(proctup))
elog(ERROR, "cache lookup for proc %d failed", func->funcid);
elog(ERROR, "cache lookup for proc %u failed", func->funcid);
procStruct = (Form_pg_proc) GETSTRUCT(proctup);
@@ -1676,7 +1676,7 @@ get_relation_name(Oid relid)
classtup = SearchSysCacheTuple(RELOID,
ObjectIdGetDatum(relid), 0, 0, 0);
if (!HeapTupleIsValid(classtup))
elog(ERROR, "cache lookup of relation %d failed", relid);
elog(ERROR, "cache lookup of relation %u failed", relid);
classStruct = (Form_pg_class) GETSTRUCT(classtup);
return nameout(&(classStruct->relname));
@@ -1697,7 +1697,7 @@ get_attribute_name(Oid relid, int2 attnum)
atttup = SearchSysCacheTuple(ATTNUM,
ObjectIdGetDatum(relid), (Datum) attnum, 0, 0);
if (!HeapTupleIsValid(atttup))
elog(ERROR, "cache lookup of attribute %d in relation %d failed",
elog(ERROR, "cache lookup of attribute %d in relation %u failed",
attnum, relid);
attStruct = (Form_pg_attribute) GETSTRUCT(atttup);

12
src/backend/utils/adt/selfuncs.c
View File

@@ -12,7 +12,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.26 1999/03/18 19:59:55 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.27 1999/05/10 00:46:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -286,7 +286,7 @@ getattdisbursion(Oid relid, AttrNumber attnum)
0, 0);
if (!HeapTupleIsValid(atp))
{
elog(ERROR, "getattdisbursion: no attribute tuple %d %d",
elog(ERROR, "getattdisbursion: no attribute tuple %u %d",
relid, attnum);
return 0;
}
@@ -304,7 +304,7 @@ getattdisbursion(Oid relid, AttrNumber attnum)
*/
if (!HeapTupleIsValid(atp))
{
elog(ERROR, "getattdisbursion: no relation tuple %d", relid);
elog(ERROR, "getattdisbursion: no relation tuple %u", relid);
return 0;
}
ntuples = ((Form_pg_class) GETSTRUCT(atp))->reltuples;
@@ -460,7 +460,7 @@ btreenpage(Oid operatorObjectId,
0, 0, 0);
if (!HeapTupleIsValid(atp))
{
elog(ERROR, "btreenpage: no index tuple %d", indexrelid);
elog(ERROR, "btreenpage: no index tuple %u", indexrelid);
return 0;
}
@@ -499,7 +499,7 @@ hashsel(Oid operatorObjectId,
0, 0, 0);
if (!HeapTupleIsValid(atp))
{
elog(ERROR, "hashsel: no index tuple %d", indexrelid);
elog(ERROR, "hashsel: no index tuple %u", indexrelid);
return 0;
}
ntuples = ((Form_pg_class) GETSTRUCT(atp))->reltuples;
@@ -552,7 +552,7 @@ hashnpage(Oid operatorObjectId,
0, 0, 0);
if (!HeapTupleIsValid(atp))
{
elog(ERROR, "hashsel: no index tuple %d", indexrelid);
elog(ERROR, "hashsel: no index tuple %u", indexrelid);
return 0;
}

6
src/backend/utils/cache/catcache.c vendored
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.39 1999/02/13 23:19:39 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.40 1999/05/10 00:46:03 momjian Exp $
*
* Notes:
* XXX This needs to use exception.h to handle recovery when
@@ -183,7 +183,7 @@ CatalogCacheInitializeCache(struct catcache * cache,
cache->relationId = RelationGetRelid(relation);
tupdesc = cache->cc_tupdesc = RelationGetDescr(relation);
CACHE3_elog(DEBUG, "CatalogCacheInitializeCache: relid %d, %d keys",
CACHE3_elog(DEBUG, "CatalogCacheInitializeCache: relid %u, %d keys",
cache->relationId, cache->cc_nkeys);
/* ----------------
@@ -650,7 +650,7 @@ SystemCacheRelationFlushed(Oid relId)
#ifdef CACHEDEBUG
#define InitSysCache_DEBUG1 \
do { \
elog(DEBUG, "InitSysCache: rid=%d id=%d nkeys=%d size=%d\n", \
elog(DEBUG, "InitSysCache: rid=%u id=%d nkeys=%d size=%d\n", \
cp->relationId, cp->id, cp->cc_nkeys, cp->cc_size); \
for (i = 0; i < nkeys; i += 1) \
{ \

6
src/backend/utils/cache/fcache.c vendored
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.21 1999/02/13 23:19:40 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.22 1999/05/10 00:46:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -109,7 +109,7 @@ init_fcache(Oid foid,
if (!HeapTupleIsValid(procedureTuple))
elog(ERROR,
"init_fcache: %s %d",
"init_fcache: %s %u",
"Cache lookup failed for procedure", foid);
/* ----------------
@@ -130,7 +130,7 @@ init_fcache(Oid foid,
if (!HeapTupleIsValid(typeTuple))
elog(ERROR,
"init_fcache: %s %d",
"init_fcache: %s %u",
"Cache lookup failed for type",
(procedureStruct)->prorettype);

8
src/backend/utils/cache/inval.c vendored
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.21 1999/02/13 23:19:41 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.22 1999/05/10 00:46:07 momjian Exp $
*
* Note - this code is real crufty...
*
@@ -215,7 +215,7 @@ RelationIdRegisterLocalInvalid(Oid relationId, Oid objectId)
* ----------------
*/
#ifdef INVALIDDEBUG
elog(DEBUG, "RelationRegisterLocalInvalid(%d, %d)", relationId,
elog(DEBUG, "RelationRegisterLocalInvalid(%u, %u)", relationId,
objectId);
#endif /* defined(INVALIDDEBUG) */
@@ -359,7 +359,7 @@ elog(DEBUG,\
ItemPointerGetOffsetNumber(&message->any.catalog.pointerData))
#define InvalidationMessageRegisterSharedInvalid_DEBUG2 \
elog(DEBUG, \
"InvalidationMessageRegisterSharedInvalid(r, %d, %d)", \
"InvalidationMessageRegisterSharedInvalid(r, %u, %u)", \
message->any.relation.relationId, \
message->any.relation.objectId)
#else
@@ -409,7 +409,7 @@ elog(DEBUG, "InvalidationMessageCacheInvalidate(c, %d, %d, [%d, %d])",\
ItemPointerGetBlockNumber(&message->any.catalog.pointerData),\
ItemPointerGetOffsetNumber(&message->any.catalog.pointerData))
#define InvalidationMessageCacheInvalidate_DEBUG2 \
elog(DEBUG, "InvalidationMessageCacheInvalidate(r, %d, %d)", \
elog(DEBUG, "InvalidationMessageCacheInvalidate(r, %u, %u)", \
message->any.relation.relationId, \
message->any.relation.objectId)
#else

6
src/backend/utils/cache/lsyscache.c vendored
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.25 1999/02/21 03:49:33 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.26 1999/05/10 00:46:07 momjian Exp $
*
* NOTES
* Eventually, the index information should go through here, too.
@@ -140,7 +140,7 @@ get_attisset(Oid relid, char *attname)
PointerGetDatum(attname),
0, 0);
if (!HeapTupleIsValid(tuple))
elog(ERROR, "get_attisset: no attribute %s in relation %d",
elog(ERROR, "get_attisset: no attribute %s in relation %u",
attname, relid);
if (heap_attisnull(tuple, attno))
return false;
@@ -218,7 +218,7 @@ get_opname(Oid opno)
{
/* don't throw an error anymore; we want to continue... */
#ifdef NOT_USED
elog(ERROR, "can't look up operator %d\n", opno);
elog(ERROR, "can't look up operator %u\n", opno);
#endif
return NULL;
}

6
src/backend/utils/cache/relcache.c vendored
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.60 1999/05/01 19:09:44 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.61 1999/05/10 00:46:08 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -280,7 +280,7 @@ BuildDescInfoError(RelationBuildDescInfo buildinfo)
switch (buildinfo.infotype)
{
case INFO_RELID:
sprintf(errBuf, "(relation id %d)", buildinfo.i.info_id);
sprintf(errBuf, "(relation id %u)", buildinfo.i.info_id);
break;
case INFO_RELNAME:
sprintf(errBuf, "(relation name %s)", buildinfo.i.info_name);
@@ -545,7 +545,7 @@ build_tupdesc_seq(RelationBuildDescInfo buildinfo,
}
if (need > 0)
elog(ERROR, "catalog is missing %d attribute%s for relid %d",
elog(ERROR, "catalog is missing %d attribute%s for relid %u",
need, (need == 1 ? "" : "s"), RelationGetRelid(relation));
/* ----------------

5
src/backend/utils/error/elog.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.43 1999/04/25 21:50:57 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.44 1999/05/10 00:46:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -302,8 +302,7 @@ DebugFileOpen(void)
fd = fileno(stderr);
if (fcntl(fd, F_GETFD, 0) < 0)
{
sprintf(OutputFileName, "%s/pg.errors.%d",
DataDir, (int) MyProcPid);
sprintf(OutputFileName, "%s/pg.errors.%d", DataDir, (int) MyProcPid);
fd = open(OutputFileName, O_CREAT | O_APPEND | O_WRONLY, 0666);
}
if (fd < 0)

6
src/backend/utils/fmgr/dfmgr.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.23 1999/02/13 23:19:51 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.24 1999/05/10 00:46:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -74,7 +74,7 @@ fmgr_dynamic(Oid procedureId, int *pronargs)
0, 0, 0);
if (!HeapTupleIsValid(procedureTuple))
{
elog(ERROR, "fmgr: Cache lookup failed for procedure %d\n",
elog(ERROR, "fmgr: Cache lookup failed for procedure %u\n",
procedureId);
return (func_ptr) NULL;
}
@@ -104,7 +104,7 @@ fmgr_dynamic(Oid procedureId, int *pronargs)
if (!PointerIsValid(probinattr) /* || isnull */ )
{
heap_close(rel);
elog(ERROR, "fmgr: Could not extract probin for %d from %s",
elog(ERROR, "fmgr: Could not extract probin for %u from %s",
procedureId, ProcedureRelationName);
return (func_ptr) NULL;
}

20
src/backend/utils/fmgr/fmgr.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.25 1999/04/09 22:35:42 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.26 1999/05/10 00:46:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -57,7 +57,7 @@ fmgr_pl(char *arg0,...)
if (n_arguments > 1)
{
if (n_arguments > MAXFMGRARGS)
elog(ERROR, "fmgr_pl: function %d: too many arguments (%d > %d)",
elog(ERROR, "fmgr_pl: function %u: too many arguments (%d > %d)",
fmgr_pl_finfo->fn_oid, n_arguments, MAXFMGRARGS);
va_start(pvar, arg0);
for (i = 1; i < n_arguments; i++)
@@ -187,7 +187,7 @@ fmgr_c(FmgrInfo *finfo,
values->data[8]);
break;
default:
elog(ERROR, "fmgr_c: function %d: too many arguments (%d > %d)",
elog(ERROR, "fmgr_c: function %u: too many arguments (%d > %d)",
finfo->fn_oid, n_arguments, MAXFMGRARGS);
break;
}
@@ -226,7 +226,7 @@ fmgr_info(Oid procedureId, FmgrInfo *finfo)
0, 0, 0);
if (!HeapTupleIsValid(procedureTuple))
{
elog(ERROR, "fmgr_info: function %d: cache lookup failed",
elog(ERROR, "fmgr_info: function %u: cache lookup failed",
procedureId);
}
procedureStruct = (FormData_pg_proc *) GETSTRUCT(procedureTuple);
@@ -277,9 +277,9 @@ fmgr_info(Oid procedureId, FmgrInfo *finfo)
0, 0, 0);
if (!HeapTupleIsValid(languageTuple))
{
elog(ERROR, "fmgr_info: %s %ld",
"Cache lookup for language %d failed",
ObjectIdGetDatum(procedureStruct->prolang));
elog(ERROR, "fmgr_info: %u",
"Cache lookup for language failed",
DatumGetObjectId(procedureStruct->prolang));
}
languageStruct = (Form_pg_language) GETSTRUCT(languageTuple);
if (languageStruct->lanispl)
@@ -293,7 +293,7 @@ fmgr_info(Oid procedureId, FmgrInfo *finfo)
}
else
{
elog(ERROR, "fmgr_info: function %d: unknown language %d",
elog(ERROR, "fmgr_info: function %u: unknown language %d",
procedureId, language);
}
break;
@@ -326,7 +326,7 @@ fmgr(Oid procedureId,...)
pronargs = finfo.fn_nargs;
if (pronargs > MAXFMGRARGS)
elog(ERROR, "fmgr: function %d: too many arguments (%d > %d)",
elog(ERROR, "fmgr: function %u: too many arguments (%d > %d)",
procedureId, pronargs, MAXFMGRARGS);
va_start(pvar, procedureId);
@@ -368,7 +368,7 @@ fmgr_ptr(FmgrInfo *finfo,...)
local_finfo->fn_nargs = n_arguments;
if (n_arguments > MAXFMGRARGS)
{
elog(ERROR, "fmgr_ptr: function %d: too many arguments (%d > %d)",
elog(ERROR, "fmgr_ptr: function %u: too many arguments (%d > %d)",
func_id, n_arguments, MAXFMGRARGS);
}
for (i = 0; i < n_arguments; ++i)