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

real affect now.

6 files changed, 23 insertions, 26 deletions

diff --git a/src/backend/optimizer/path/_deadcode/xfunc.c b/src/backend/optimizer/path/_deadcode/xfunc.c
index 8aa7546898..f365cdcd1b 100644
--- a/src/backend/optimizer/path/_deadcode/xfunc.c
+++ b/src/backend/optimizer/path/_deadcode/xfunc.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.1 1999/02/18 00:49:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.2 1999/05/10 00:45:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -497,7 +497,7 @@ xfunc_func_expense(LispValue node, LispValue args)
 							   ObjectIdGetDatum(funcid),
 							   0, 0, 0);
 	if (!HeapTupleIsValid(tupl))
-		elog(ERROR, "Cache lookup failed for procedure %d", funcid);
+		elog(ERROR, "Cache lookup failed for procedure %u", funcid);
 	proc = (Form_pg_proc) GETSTRUCT(tupl);
 
 	/*
@@ -612,7 +612,7 @@ xfunc_width(LispValue clause)
 							 ObjectIdGetDatum(get_vartype((Var) clause)),
 								   0, 0, 0);
 		if (!HeapTupleIsValid(tupl))
-			elog(ERROR, "Cache lookup failed for type %d",
+			elog(ERROR, "Cache lookup failed for type %u",
 				 get_vartype((Var) clause));
 		type = (Form_pg_type) GETSTRUCT(tupl);
 		if (get_varattno((Var) clause) == 0)
@@ -675,7 +675,7 @@ xfunc_width(LispValue clause)
 					   ObjectIdGetDatum(get_opno((Oper) get_op(clause))),
 								   0, 0, 0);
 		if (!HeapTupleIsValid(tupl))
-			elog(ERROR, "Cache lookup failed for procedure %d",
+			elog(ERROR, "Cache lookup failed for procedure %u",
 				 get_opno((Oper) get_op(clause)));
 		return (xfunc_func_width
 		((RegProcedure) (((Form_pg_operator) (GETSTRUCT(tupl)))->oprcode),
@@ -1306,7 +1306,7 @@ xfunc_func_width(RegProcedure funcid, LispValue args)
 							   ObjectIdGetDatum(funcid),
 							   0, 0, 0);
 	if (!HeapTupleIsValid(tupl))
-		elog(ERROR, "Cache lookup failed for procedure %d", funcid);
+		elog(ERROR, "Cache lookup failed for procedure %u", funcid);
 	proc = (Form_pg_proc) GETSTRUCT(tupl);
 
 	/* if function returns a tuple, get the width of that */
@@ -1324,7 +1324,7 @@ xfunc_func_width(RegProcedure funcid, LispValue args)
 								   ObjectIdGetDatum(proc->prorettype),
 								   0, 0, 0);
 		if (!HeapTupleIsValid(tupl))
-			elog(ERROR, "Cache lookup failed for type %d", proc->prorettype);
+			elog(ERROR, "Cache lookup failed for type %u", proc->prorettype);
 		type = (Form_pg_type) GETSTRUCT(tupl);
 		/* if the type length is known, return that */
 		if (type->typlen != -1)
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index abf77b9db6..93d0b82071 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.53 1999/05/06 01:30:58 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.54 1999/05/10 00:45:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -367,8 +367,7 @@ create_indexscan_node(IndexPath *best_path,
 										 ObjectIdGetDatum(lfirsti(ixid)),
 										 0, 0, 0);
 		if (!HeapTupleIsValid(indexTuple))
-			elog(ERROR, "create_plan: index %d not found",
-				 lfirsti(ixid));
+			elog(ERROR, "create_plan: index %u not found", lfirsti(ixid));
 		index = (Form_pg_index) GETSTRUCT(indexTuple);
 		if (index->indislossy)
 			lossy = TRUE;
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 323d2c61b1..50d93942ec 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.49 1999/05/04 00:00:20 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.50 1999/05/10 00:45:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -720,7 +720,7 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList)
 
 	/* by here, the function is declared to return some type */
 	if ((typ = typeidType(rettype)) == NULL)
-		elog(ERROR, "can't find return type %d for function\n", rettype);
+		elog(ERROR, "can't find return type %u for function\n", rettype);
 
 	/*
 	 * test 3:	if the function is declared to return a value, then the
@@ -770,7 +770,7 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList)
 	reln = heap_open(typeTypeRelid(typ));
 
 	if (!RelationIsValid(reln))
-		elog(ERROR, "cannot open relation relid %d", typeTypeRelid(typ));
+		elog(ERROR, "cannot open relation relid %u", typeTypeRelid(typ));
 
 	relid = reln->rd_id;
 	relnatts = reln->rd_rel->relnatts;
@@ -918,7 +918,7 @@ need_sortplan(List *sortcls, Plan *plan)
 	htup = SearchSysCacheTuple(INDEXRELID,
 			ObjectIdGetDatum(indexId), 0, 0, 0);
 	if (!HeapTupleIsValid(htup)) {
-		elog(ERROR, "cache lookup for index %d failed", indexId);
+		elog(ERROR, "cache lookup for index %u failed", indexId);
 	}
 	index_tup = (Form_pg_index) GETSTRUCT(htup);
 
diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c
index 5e1606bd2e..a4b67ba6e0 100644
--- a/src/backend/optimizer/plan/subselect.c
+++ b/src/backend/optimizer/plan/subselect.c
@@ -311,8 +311,7 @@ _finalize_primnode(void *expr, List **subplan)
 		}
 	}
 	else
-		elog(ERROR, "_finalize_primnode: can't handle node %d",
-			 nodeTag(expr));
+		elog(ERROR, "_finalize_primnode: can't handle node %d", nodeTag(expr));
 
 	return result;
 }
@@ -543,8 +542,7 @@ SS_pull_subplan(Node *expr)
 	else if (is_subplan(expr))
 		return lcons(((Expr *) expr)->oper, NULL);
 	else
-		elog(ERROR, "SS_pull_subplan: can't handle node %d",
-			 nodeTag(expr));
+		elog(ERROR, "SS_pull_subplan: can't handle node %d", nodeTag(expr));
 
 	return result;
 }
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index 113f78103b..0dbd65cd5d 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.32 1999/03/01 00:10:35 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.33 1999/05/10 00:45:24 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -786,7 +786,7 @@ CommuteClause(Node *clause)
 		get_operator_tuple(get_commutator(((Oper *) ((Expr *) clause)->oper)->opno));
 
 	if (heapTup == (HeapTuple) NULL)
-		elog(ERROR, "CommuteClause: no commutator for operator %d",
+		elog(ERROR, "CommuteClause: no commutator for operator %u",
 			 ((Oper *) ((Expr *) clause)->oper)->opno);
 
 	commuTup = (Form_pg_operator) GETSTRUCT(heapTup);
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index 710b627bbe..a1f6026b0e 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.28 1999/03/18 19:59:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.29 1999/05/10 00:45:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -76,7 +76,7 @@ relation_info(Query *root, Index relid,
 	}
 	else
 	{
-		elog(ERROR, "RelationCatalogInformation: Relation %d not found",
+		elog(ERROR, "RelationCatalogInformation: Relation %u not found",
 			 relationObjectId);
 	}
 
@@ -217,7 +217,7 @@ index_info(Query *root, bool first, int relid, IdxInfoRetval *info)
 										UInt16GetDatum(amstrategy),
 										0);
 		if (!HeapTupleIsValid(amopTuple))
-			elog(ERROR, "index_info: no amop %d %d %d",
+			elog(ERROR, "index_info: no amop %u %u %d",
 				 relam, index->indclass[i], amstrategy);
 		info->orderOprs[i] = ((Form_pg_amop) GETSTRUCT(amopTuple))->amopopr;
 	}
@@ -521,7 +521,7 @@ IndexSelectivity(Oid indexrelid,
 								 ObjectIdGetDatum(indexrelid),
 								 0, 0, 0);
 	if (!HeapTupleIsValid(indRel))
-		elog(ERROR, "IndexSelectivity: index %d not found",
+		elog(ERROR, "IndexSelectivity: index %u not found",
 			 indexrelid);
 	relam = ((Form_pg_class) GETSTRUCT(indRel))->relam;
 
@@ -529,7 +529,7 @@ IndexSelectivity(Oid indexrelid,
 									 ObjectIdGetDatum(indexrelid),
 									 0, 0, 0);
 	if (!HeapTupleIsValid(indexTuple))
-		elog(ERROR, "IndexSelectivity: index %d not found",
+		elog(ERROR, "IndexSelectivity: index %u not found",
 			 indexrelid);
 	index = (Form_pg_index) GETSTRUCT(indexTuple);
 
@@ -572,7 +572,7 @@ IndexSelectivity(Oid indexrelid,
 			 * clause and so had no variable to match to the index key ...
 			 * if not we are in trouble.
 			 */
-			elog(NOTICE, "IndexSelectivity: no key %d in index %d",
+			elog(NOTICE, "IndexSelectivity: no key %d in index %u",
 				 varAttributeNumbers[n], indexrelid);
 			continue;
 		}
@@ -583,7 +583,7 @@ IndexSelectivity(Oid indexrelid,
 										ObjectIdGetDatum(relam),
 										0);
 		if (!HeapTupleIsValid(amopTuple))
-			elog(ERROR, "IndexSelectivity: no amop %d %d",
+			elog(ERROR, "IndexSelectivity: no amop %u %u",
 				 indclass, operatorObjectIds[n]);
 		amop = (Form_pg_amop) GETSTRUCT(amopTuple);