diff options
Diffstat (limited to 'src/backend/commands')
-rw-r--r-- | src/backend/commands/cluster.c | 10 | ||||
-rw-r--r-- | src/backend/commands/command.c | 18 | ||||
-rw-r--r-- | src/backend/commands/creatinh.c | 4 | ||||
-rw-r--r-- | src/backend/commands/explain.c | 4 | ||||
-rw-r--r-- | src/backend/commands/remove.c | 6 | ||||
-rw-r--r-- | src/backend/commands/rename.c | 46 | ||||
-rw-r--r-- | src/backend/commands/vacuum.c | 74 |
7 files changed, 81 insertions, 81 deletions
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 9b009b4ab6c..0e2a5eea7d1 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.11 1997/08/03 02:34:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.12 1997/08/18 20:52:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -116,15 +116,15 @@ cluster(char oldrelname[], char oldindexname[]) OldHeap = heap_openr(oldrelname); if (!RelationIsValid(OldHeap)) { - elog(WARN, "cluster: unknown relation: \"%-.*s\"", - NAMEDATALEN, oldrelname); + elog(WARN, "cluster: unknown relation: \"%s\"", + oldrelname); } OIDOldHeap = OldHeap->rd_id; /* Get OID for the index scan */ OldIndex=index_openr(oldindexname);/* Open old index relation */ if (!RelationIsValid(OldIndex)) { - elog(WARN, "cluster: unknown index: \"%-.*s\"", - NAMEDATALEN, oldindexname); + elog(WARN, "cluster: unknown index: \"%s\"", + oldindexname); } OIDOldIndex = OldIndex->rd_id; /* OID for the index scan */ diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c index 526adbdda71..74941993e47 100644 --- a/src/backend/commands/command.c +++ b/src/backend/commands/command.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.8 1997/08/12 22:52:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.9 1997/08/18 20:52:11 momjian Exp $ * * NOTES * The PortalExecutorHeapMemory crap needs to be eliminated @@ -117,8 +117,8 @@ PerformPortalFetch(char *name, */ portal = GetPortalByName(name); if (! PortalIsValid(portal)) { - elog(NOTICE, "PerformPortalFetch: portal \"%-.*s\" not found", - NAMEDATALEN, name); + elog(NOTICE, "PerformPortalFetch: portal \"%s\" not found", + name); return; } @@ -202,8 +202,8 @@ PerformPortalClose(char *name, CommandDest dest) */ portal = GetPortalByName(name); if (! PortalIsValid(portal)) { - elog(NOTICE, "PerformPortalClose: portal \"%-.*s\" not found", - NAMEDATALEN, name); + elog(NOTICE, "PerformPortalClose: portal \"%s\" not found", + name); return; } @@ -272,8 +272,8 @@ PerformAddAttribute(char *relationName, * normally, only the owner of a class can change its schema. */ if (IsSystemRelationName(relationName)) - elog(WARN, "PerformAddAttribute: class \"%-.*s\" is a system catalog", - NAMEDATALEN, relationName); + elog(WARN, "PerformAddAttribute: class \"%s\" is a system catalog", + relationName); #ifndef NO_SECURITY if (!pg_ownercheck(userName, relationName, RELNAME)) elog(WARN, "PerformAddAttribute: you do not own class \"%s\"", @@ -296,8 +296,8 @@ PerformAddAttribute(char *relationName, relrdesc = heap_openr(relationName); if (!RelationIsValid(relrdesc)) { - elog(WARN, "PerformAddAttribute: unknown relation: \"%-.*s\"", - NAMEDATALEN, relationName); + elog(WARN, "PerformAddAttribute: unknown relation: \"%s\"", + relationName); } myrelid = relrdesc->rd_id; heap_close(relrdesc); diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c index 3f27ade8885..1113a84e26f 100644 --- a/src/backend/commands/creatinh.c +++ b/src/backend/commands/creatinh.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.10 1997/08/12 22:52:20 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.11 1997/08/18 20:52:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -549,7 +549,7 @@ MakeArchiveName(Oid relationId) * of the relation they archive. Create a string containing * this name and find the reldesc for the archive relation. */ - arch = palloc(NAMEDATALEN); + arch = palloc(NAMEDATALEN); sprintf(arch, "a,%d",relationId); return arch; diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index db852f44780..7d1f34d0327 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.9 1997/04/05 06:42:32 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.10 1997/08/18 20:52:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -177,7 +177,7 @@ explain_outNode(StringInfo str, Plan *plan, int indent, ExplainState *es) case T_IndexScan: if (((Scan*)plan)->scanrelid > 0) { RangeTblEntry *rte = nth(((Scan*)plan)->scanrelid-1, es->rtable); - sprintf(buf, " on %.*s", NAMEDATALEN, rte->refname); + sprintf(buf, " on %s", rte->refname); appendStringInfo(str, buf); } break; diff --git a/src/backend/commands/remove.c b/src/backend/commands/remove.c index 8d2c1ce65da..7f0198a10b7 100644 --- a/src/backend/commands/remove.c +++ b/src/backend/commands/remove.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.9 1997/06/03 06:23:24 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.10 1997/08/18 20:52:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -393,8 +393,8 @@ RemoveFunction(char *functionName, /* function name to be removed */ /* ok, function has been found */ if (the_proc->prolang == INTERNALlanguageId) - elog(WARN, "RemoveFunction: function \"%-.*s\" is built-in", - NAMEDATALEN, functionName); + elog(WARN, "RemoveFunction: function \"%s\" is built-in", + functionName); ItemPointerCopy(&tup->t_ctid, &itemPointerData); heap_delete(relation, &itemPointerData); diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c index 56672659113..5d4e4ab2bb8 100644 --- a/src/backend/commands/rename.c +++ b/src/backend/commands/rename.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.6 1997/08/12 22:52:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.7 1997/08/18 20:52:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -78,13 +78,13 @@ renameatt(char *relname, * normally, only the owner of a class can change its schema. */ if (IsSystemRelationName(relname)) - elog(WARN, "renameatt: class \"%-.*s\" is a system catalog", - NAMEDATALEN, relname); + elog(WARN, "renameatt: class \"%s\" is a system catalog", + relname); #ifndef NO_SECURITY if (!IsBootstrapProcessingMode() && !pg_ownercheck(userName, relname, RELNAME)) - elog(WARN, "renameatt: you do not own class \"%-.*s\"", - NAMEDATALEN, relname); + elog(WARN, "renameatt: you do not own class \"%s\"", + relname); #endif /* @@ -102,8 +102,8 @@ renameatt(char *relname, relrdesc = heap_openr(relname); if (!RelationIsValid(relrdesc)) { - elog(WARN, "renameatt: unknown relation: \"%-.*s\"", - NAMEDATALEN, relname); + elog(WARN, "renameatt: unknown relation: \"%s\"", + relname); } myrelid = relrdesc->rd_id; heap_close(relrdesc); @@ -139,8 +139,8 @@ renameatt(char *relname, reltup = ClassNameIndexScan(relrdesc, relname); if (!PointerIsValid(reltup)) { heap_close(relrdesc); - elog(WARN, "renameatt: relation \"%-.*s\" nonexistent", - NAMEDATALEN, relname); + elog(WARN, "renameatt: relation \"%s\" nonexistent", + relname); return; } heap_close(relrdesc); @@ -149,20 +149,20 @@ renameatt(char *relname, oldatttup = AttributeNameIndexScan(attrdesc, reltup->t_oid, oldattname); if (!PointerIsValid(oldatttup)) { heap_close(attrdesc); - elog(WARN, "renameatt: attribute \"%-.*s\" nonexistent", - NAMEDATALEN, oldattname); + elog(WARN, "renameatt: attribute \"%s\" nonexistent", + oldattname); } if (((AttributeTupleForm ) GETSTRUCT(oldatttup))->attnum < 0) { - elog(WARN, "renameatt: system attribute \"%-.*s\" not renamed", - NAMEDATALEN, oldattname); + elog(WARN, "renameatt: system attribute \"%s\" not renamed", + oldattname); } newatttup = AttributeNameIndexScan(attrdesc, reltup->t_oid, newattname); if (PointerIsValid(newatttup)) { pfree(oldatttup); heap_close(attrdesc); - elog(WARN, "renameatt: attribute \"%-.*s\" exists", - NAMEDATALEN, newattname); + elog(WARN, "renameatt: attribute \"%s\" exists", + newattname); } namestrcpy(&(((AttributeTupleForm)(GETSTRUCT(oldatttup)))->attname), @@ -207,13 +207,13 @@ renamerel(char oldrelname[], char newrelname[]) Relation idescs[Num_pg_class_indices]; if (IsSystemRelationName(oldrelname)) { - elog(WARN, "renamerel: system relation \"%-.*s\" not renamed", - NAMEDATALEN, oldrelname); + elog(WARN, "renamerel: system relation \"%s\" not renamed", + oldrelname); return; } if (IsSystemRelationName(newrelname)) { - elog(WARN, "renamerel: Illegal class name: \"%-.*s\" -- pg_ is reserved for system catalogs", - NAMEDATALEN, newrelname); + elog(WARN, "renamerel: Illegal class name: \"%s\" -- pg_ is reserved for system catalogs", + newrelname); return; } @@ -222,16 +222,16 @@ renamerel(char oldrelname[], char newrelname[]) if (!PointerIsValid(oldreltup)) { heap_close(relrdesc); - elog(WARN, "renamerel: relation \"%-.*s\" does not exist", - NAMEDATALEN, oldrelname); + elog(WARN, "renamerel: relation \"%s\" does not exist", + oldrelname); } newreltup = ClassNameIndexScan(relrdesc, newrelname); if (PointerIsValid(newreltup)) { pfree(oldreltup); heap_close(relrdesc); - elog(WARN, "renamerel: relation \"%-.*s\" exists", - NAMEDATALEN, newrelname); + elog(WARN, "renamerel: relation \"%s\" exists", + newrelname); } /* rename the directory first, so if this fails the rename's not done */ diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index 1b95e9c8026..36fb0948be0 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.38 1997/08/12 22:52:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.39 1997/08/18 20:52:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -318,8 +318,8 @@ vc_getrels(NameData *VacRelP) (rname[3] == 'v' || rname[3] == 'x') && rname[4] >= '0' && rname[4] <= '9') { - elog (NOTICE, "Rel %.*s: can't vacuum LargeObjects now", - NAMEDATALEN, rname); + elog (NOTICE, "Rel %s: can't vacuum LargeObjects now", + rname); ReleaseBuffer(buf); continue; } @@ -446,8 +446,8 @@ vc_vacone (Oid relid, bool analyze, List *va_cols) List *le; if ( length (va_cols) > attr_cnt ) - elog (WARN, "vacuum: too many attributes specified for relation %.*s", - NAMEDATALEN, (RelationGetRelationName(onerel))->data); + elog (WARN, "vacuum: too many attributes specified for relation %s", + (RelationGetRelationName(onerel))->data); attnums = (int*) palloc (attr_cnt * sizeof (int)); foreach (le, va_cols) { @@ -462,8 +462,8 @@ vc_vacone (Oid relid, bool analyze, List *va_cols) attnums[tcnt++] = i; else { - elog (WARN, "vacuum: there is no attribute %s in %.*s", - col, NAMEDATALEN, (RelationGetRelationName(onerel))->data); + elog (WARN, "vacuum: there is no attribute %s in %s", + col, (RelationGetRelationName(onerel))->data); } } attr_cnt = tcnt; @@ -657,8 +657,8 @@ vc_scanheap (VRelStats *vacrelstats, Relation onerel, vpc->vpd_noff = 0; if (PageIsNew(page)) { - elog (NOTICE, "Rel %.*s: Uninitialized page %u - fixing", - NAMEDATALEN, relname, blkno); + elog (NOTICE, "Rel %s: Uninitialized page %u - fixing", + relname, blkno); PageInit (page, BufferGetPageSize (buf), 0); vpc->vpd_free = ((PageHeader)page)->pd_upper - ((PageHeader)page)->pd_lower; frsize += (vpc->vpd_free - sizeof (ItemIdData)); @@ -718,8 +718,8 @@ vc_scanheap (VRelStats *vacrelstats, Relation onerel, } else { - elog (NOTICE, "Rel %.*s: TID %u/%u: InsertTransactionInProgress %u - can't shrink relation", - NAMEDATALEN, relname, blkno, offnum, htup->t_xmin); + elog (NOTICE, "Rel %s: TID %u/%u: InsertTransactionInProgress %u - can't shrink relation", + relname, blkno, offnum, htup->t_xmin); do_shrinking = false; } } @@ -743,8 +743,8 @@ vc_scanheap (VRelStats *vacrelstats, Relation onerel, } else { - elog (NOTICE, "Rel %.*s: TID %u/%u: DeleteTransactionInProgress %u - can't shrink relation", - NAMEDATALEN, relname, blkno, offnum, htup->t_xmax); + elog (NOTICE, "Rel %s: TID %u/%u: DeleteTransactionInProgress %u - can't shrink relation", + relname, blkno, offnum, htup->t_xmax); do_shrinking = false; } } @@ -754,9 +754,9 @@ vc_scanheap (VRelStats *vacrelstats, Relation onerel, */ if ( !TransactionIdIsValid((TransactionId)htup->t_xmin) ) { - elog (NOTICE, "Rel %.*s: TID %u/%u: INSERT_TRANSACTION_ID IS INVALID. \ + elog (NOTICE, "Rel %s: TID %u/%u: INSERT_TRANSACTION_ID IS INVALID. \ DELETE_TRANSACTION_ID_VALID %d, TUPGONE %d.", - NAMEDATALEN, relname, blkno, offnum, + relname, blkno, offnum, TransactionIdIsValid((TransactionId)htup->t_xmax), tupgone); } @@ -769,8 +769,8 @@ DELETE_TRANSACTION_ID_VALID %d, TUPGONE %d.", if ( !ItemPointerIsValid (itemptr) || BlockIdGetBlockNumber(&(itemptr->ip_blkid)) != blkno ) { - elog (NOTICE, "Rel %.*s: TID %u/%u: TID IN TUPLEHEADER %u/%u IS NOT THE SAME. TUPGONE %d.", - NAMEDATALEN, relname, blkno, offnum, + elog (NOTICE, "Rel %s: TID %u/%u: TID IN TUPLEHEADER %u/%u IS NOT THE SAME. TUPGONE %d.", + relname, blkno, offnum, BlockIdGetBlockNumber(&(itemptr->ip_blkid)), itemptr->ip_posid, tupgone); } @@ -780,14 +780,14 @@ DELETE_TRANSACTION_ID_VALID %d, TUPGONE %d.", */ if ( htup->t_len != itemid->lp_len ) { - elog (NOTICE, "Rel %.*s: TID %u/%u: TUPLE_LEN IN PAGEHEADER %u IS NOT THE SAME AS IN TUPLEHEADER %u. TUPGONE %d.", - NAMEDATALEN, relname, blkno, offnum, + elog (NOTICE, "Rel %s: TID %u/%u: TUPLE_LEN IN PAGEHEADER %u IS NOT THE SAME AS IN TUPLEHEADER %u. TUPGONE %d.", + relname, blkno, offnum, itemid->lp_len, htup->t_len, tupgone); } if ( !OidIsValid(htup->t_oid) ) { - elog (NOTICE, "Rel %.*s: TID %u/%u: OID IS INVALID. TUPGONE %d.", - NAMEDATALEN, relname, blkno, offnum, tupgone); + elog (NOTICE, "Rel %s: TID %u/%u: OID IS INVALID. TUPGONE %d.", + relname, blkno, offnum, tupgone); } if (tupgone) { @@ -890,9 +890,9 @@ DELETE_TRANSACTION_ID_VALID %d, TUPGONE %d.", getrusage(RUSAGE_SELF, &ru1); - elog (MESSAGE_LEVEL, "Rel %.*s: Pages %u: Changed %u, Reapped %u, Empty %u, New %u; \ + elog (MESSAGE_LEVEL, "Rel %s: Pages %u: Changed %u, Reapped %u, Empty %u, New %u; \ Tup %u: Vac %u, Crash %u, UnUsed %u, MinLen %u, MaxLen %u; Re-using: Free/Avail. Space %u/%u; EndEmpty/Avail. Pages %u/%u. Elapsed %u/%u sec.", - NAMEDATALEN, relname, + relname, nblocks, nchpg, Vvpl->vpl_npages, nempg, nnepg, ntups, nvac, ncrash, nunused, min_tlen, max_tlen, frsize, frsusf, nemend, Fvpl->vpl_npages, @@ -1246,9 +1246,9 @@ failed to add item with len = %u to page %u (free space %u, nusd %u, noff %u)", getrusage(RUSAGE_SELF, &ru1); - elog (MESSAGE_LEVEL, "Rel %.*s: Pages: %u --> %u; Tuple(s) moved: %u. \ + elog (MESSAGE_LEVEL, "Rel %s: Pages: %u --> %u; Tuple(s) moved: %u. \ Elapsed %u/%u sec.", - NAMEDATALEN, (RelationGetRelationName(onerel))->data, + (RelationGetRelationName(onerel))->data, nblocks, blkno, nmoved, ru1.ru_stime.tv_sec - ru0.ru_stime.tv_sec, ru1.ru_utime.tv_sec - ru0.ru_utime.tv_sec); @@ -1371,8 +1371,8 @@ vc_vacheap (VRelStats *vacrelstats, Relation onerel, VPageList Vvpl) { Assert ( vacrelstats->npages >= Vvpl->vpl_nemend ); nblocks = vacrelstats->npages - Vvpl->vpl_nemend; - elog (MESSAGE_LEVEL, "Rel %.*s: Pages: %u --> %u.", - NAMEDATALEN, (RelationGetRelationName(onerel))->data, + elog (MESSAGE_LEVEL, "Rel %s: Pages: %u --> %u.", + (RelationGetRelationName(onerel))->data, vacrelstats->npages, nblocks); /* @@ -1451,14 +1451,14 @@ vc_scanoneind (Relation indrel, int nhtups) getrusage(RUSAGE_SELF, &ru1); - elog (MESSAGE_LEVEL, "Ind %.*s: Pages %u; Tuples %u. Elapsed %u/%u sec.", - NAMEDATALEN, indrel->rd_rel->relname.data, nipages, nitups, + elog (MESSAGE_LEVEL, "Ind %s: Pages %u; Tuples %u. Elapsed %u/%u sec.", + indrel->rd_rel->relname.data, nipages, nitups, ru1.ru_stime.tv_sec - ru0.ru_stime.tv_sec, ru1.ru_utime.tv_sec - ru0.ru_utime.tv_sec); if ( nitups != nhtups ) - elog (NOTICE, "Ind %.*s: NUMBER OF INDEX' TUPLES (%u) IS NOT THE SAME AS HEAP' (%u)", - NAMEDATALEN, indrel->rd_rel->relname.data, nitups, nhtups); + elog (NOTICE, "Ind %s: NUMBER OF INDEX' TUPLES (%u) IS NOT THE SAME AS HEAP' (%u)", + indrel->rd_rel->relname.data, nitups, nhtups); } /* vc_scanoneind */ @@ -1508,8 +1508,8 @@ vc_vaconeind(VPageList vpl, Relation indrel, int nhtups) #endif if ( vp->vpd_noff == 0 ) { /* this is EmptyPage !!! */ - elog (NOTICE, "Ind %.*s: pointer to EmptyPage (blk %u off %u) - fixing", - NAMEDATALEN, indrel->rd_rel->relname.data, + elog (NOTICE, "Ind %s: pointer to EmptyPage (blk %u off %u) - fixing", + indrel->rd_rel->relname.data, vp->vpd_blkno, ItemPointerGetOffsetNumber(heapptr)); } ++nvac; @@ -1530,14 +1530,14 @@ vc_vaconeind(VPageList vpl, Relation indrel, int nhtups) getrusage(RUSAGE_SELF, &ru1); - elog (MESSAGE_LEVEL, "Ind %.*s: Pages %u; Tuples %u: Deleted %u. Elapsed %u/%u sec.", - NAMEDATALEN, indrel->rd_rel->relname.data, nipages, nitups, nvac, + elog (MESSAGE_LEVEL, "Ind %s: Pages %u; Tuples %u: Deleted %u. Elapsed %u/%u sec.", + indrel->rd_rel->relname.data, nipages, nitups, nvac, ru1.ru_stime.tv_sec - ru0.ru_stime.tv_sec, ru1.ru_utime.tv_sec - ru0.ru_utime.tv_sec); if ( nitups != nhtups ) - elog (NOTICE, "Ind %.*s: NUMBER OF INDEX' TUPLES (%u) IS NOT THE SAME AS HEAP' (%u)", - NAMEDATALEN, indrel->rd_rel->relname.data, nitups, nhtups); + elog (NOTICE, "Ind %s: NUMBER OF INDEX' TUPLES (%u) IS NOT THE SAME AS HEAP' (%u)", + indrel->rd_rel->relname.data, nitups, nhtups); } /* vc_vaconeind */ |