Use %u to format Oid instead of %d

Since Oid is unsigned int we have to use %u to print it otherwise
oids >= 2^31 will not work correctly. This also switches the places
that print type oid to use format helper functions to resolve the
oids.

src/bgw/scheduler.c

@@ -747,7 +747,7 @@ ts_bgw_scheduler_process(int32 run_for_interval_ms,
 	if (run_for_interval_ms > 0)
 		quit_time = TimestampTzPlusMilliseconds(start, run_for_interval_ms);
 
-	ereport(DEBUG1, (errmsg("database scheduler starting for database %d", MyDatabaseId)));
+	ereport(DEBUG1, (errmsg("database scheduler starting for database %u", MyDatabaseId)));
 
 	/*
 	 * on SIGTERM the process will usually die from the CHECK_FOR_INTERRUPTS

src/hypertable_restrict_info.c

@@ -8,6 +8,7 @@
 #include <utils/lsyscache.h>
 #include <parser/parsetree.h>
 #include <utils/array.h>
+#include <utils/builtins.h>
 
 #include "compat.h"
 #if PG12_LT
@@ -442,7 +443,9 @@ dimension_values_create_from_array(Const *c, bool user_or)
 	/* it's an array type, lets get the base element type */
 	base_el_type = get_element_type(c->consttype);
 	if (base_el_type == InvalidOid)
-		elog(ERROR, "Couldn't get base element type from array type: %d", c->consttype);
+		elog(ERROR,
+			 "invalid base element type for array type: \"%s\"",
+			 format_type_be(c->consttype));
 
 	return dimension_values_create(values, base_el_type, user_or);
 }

src/plan_agg_bookend.c

@@ -52,7 +52,9 @@
 #include <parser/parse_clause.h>
 #include <parser/parse_func.h>
 #include <rewrite/rewriteManip.h>
+#include <utils/builtins.h>
 #include <utils/lsyscache.h>
+#include <utils/regproc.h>
 #include <utils/syscache.h>
 #include <utils/typcache.h>
 
@@ -484,9 +486,9 @@ find_first_last_aggs_walker(Node *node, List **context)
 			get_opfamily_member(sort_tce->btree_opf, sort_oid, sort_oid, func_strategy->strategy);
 		if (aggsortop == InvalidOid)
 			elog(ERROR,
-				 "Can't resolve sort operator oid for function oid: %d and type: %d",
-				 aggref->aggfnoid,
-				 sort_oid);
+				 "Cannot resolve sort operator for function \"%s\" and type \"%s\"",
+				 format_procedure(aggref->aggfnoid),
+				 format_type_be(sort_oid));
 
 		/* Used in projection */
 		value = (TargetEntry *) linitial(aggref->args);

src/time_bucket.c

@@ -5,11 +5,12 @@
  */
 #include <postgres.h>
 #include <catalog/pg_type.h>
-#include <utils/timestamp.h>
-#include <utils/datetime.h>
-#include <utils/date.h>
-#include <utils/fmgrprotos.h>
 #include <fmgr.h>
+#include <utils/builtins.h>
+#include <utils/date.h>
+#include <utils/datetime.h>
+#include <utils/fmgrprotos.h>
+#include <utils/timestamp.h>
 
 #include "utils.h"
 #include "time_bucket.h"
@@ -283,7 +284,7 @@ ts_time_bucket_by_type(int64 interval, int64 timestamp, Oid timestamp_type)
 			bucket_function = ts_date_bucket;
 			break;
 		default:
-			elog(ERROR, "invalid time_bucket Oid %d", timestamp_type);
+			elog(ERROR, "invalid time_bucket type \"%s\"", format_type_be(timestamp_type));
 	}
 
 	time_bucketed =

src/utils.c

@@ -4,24 +4,25 @@
  * LICENSE-APACHE for a copy of the license.
  */
 #include <postgres.h>
-#include <fmgr.h>
-#include <funcapi.h>
 #include <access/genam.h>
 #include <access/heapam.h>
 #include <access/htup_details.h>
 #include <access/htup.h>
-#include <access/xact.h>
 #include <access/reloptions.h>
+#include <access/xact.h>
 #include <catalog/indexing.h>
 #include <catalog/namespace.h>
 #include <catalog/pg_cast.h>
 #include <catalog/pg_inherits.h>
 #include <catalog/pg_operator.h>
 #include <catalog/pg_type.h>
+#include <fmgr.h>
+#include <funcapi.h>
 #include <nodes/makefuncs.h>
-#include <parser/parse_func.h>
 #include <parser/parse_coerce.h>
+#include <parser/parse_func.h>
 #include <parser/scansup.h>
+#include <utils/builtins.h>
 #include <utils/catcache.h>
 #include <utils/date.h>
 #include <utils/fmgroids.h>
@@ -126,7 +127,7 @@ ts_time_value_to_internal(Datum time_val, Oid type_oid)
 		if (ts_type_is_int8_binary_compatible(type_oid))
 			return DatumGetInt64(time_val);
 
-		elog(ERROR, "unknown time type OID %d", type_oid);
+		elog(ERROR, "unknown time type \"%s\"", format_type_be(type_oid));
 	}
 
 	if (IS_INTEGER_TYPE(type_oid))
@@ -171,7 +172,7 @@ ts_time_value_to_internal(Datum time_val, Oid type_oid)
 
 			return DatumGetInt64(res);
 		default:
-			elog(ERROR, "unknown time type OID %d", type_oid);
+			elog(ERROR, "unknown time type \"%s\"", format_type_be(type_oid));
 			return -1;
 	}
 }
@@ -197,7 +198,7 @@ ts_interval_value_to_internal(Datum time_val, Oid type_oid)
 			return interval->time + (interval->day * USECS_PER_DAY);
 		}
 		default:
-			elog(ERROR, "unknown interval type OID %d", type_oid);
+			elog(ERROR, "unknown interval type \"%s\"", format_type_be(type_oid));
 			return -1;
 	}
 }
@@ -214,7 +215,7 @@ ts_integer_to_internal(Datum time_val, Oid type_oid)
 		case INT2OID:
 			return (int64) DatumGetInt16(time_val);
 		default:
-			elog(ERROR, "unknown interval type OID %d", type_oid);
+			elog(ERROR, "unknown interval type \"%s\"", format_type_be(type_oid));
 			return -1;
 	}
 }
@@ -335,7 +336,9 @@ ts_internal_to_time_value(int64 value, Oid type)
 		default:
 			if (ts_type_is_int8_binary_compatible(type))
 				return Int64GetDatum(value);
-			elog(ERROR, "unknown time type OID %d in ts_internal_to_time_value", type);
+			elog(ERROR,
+				 "unknown time type \"%s\" in ts_internal_to_time_value",
+				 format_type_be(type));
 			pg_unreachable();
 	}
 }
@@ -377,7 +380,9 @@ ts_internal_to_interval_value(int64 value, Oid type)
 		case INTERVALOID:
 			return DirectFunctionCall1(ts_pg_unix_microseconds_to_interval, Int64GetDatum(value));
 		default:
-			elog(ERROR, "unknown time type OID %d in ts_internal_to_interval_value", type);
+			elog(ERROR,
+				 "unknown time type \"%s\" in ts_internal_to_interval_value",
+				 format_type_be(type));
 			pg_unreachable();
 	}
 }
@@ -394,7 +399,9 @@ ts_integer_to_internal_value(int64 value, Oid type)
 		case INT8OID:
 			return Int64GetDatum(value);
 		default:
-			elog(ERROR, "unknown time type OID %d in ts_internal_to_time_value", type);
+			elog(ERROR,
+				 "unknown time type \"%s\" in ts_internal_to_time_value",
+				 format_type_be(type));
 			pg_unreachable();
 	}
 }
@@ -749,7 +756,7 @@ ts_has_row_security(Oid relid)
 	/* Fetch relation's relrowsecurity and relforcerowsecurity flags */
 	tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(relid));
 	if (!HeapTupleIsValid(tuple))
-		elog(ERROR, "cache lookup failed for relid %d", relid);
+		elog(ERROR, "cache lookup failed for relid %u", relid);
 	classform = (Form_pg_class) GETSTRUCT(tuple);
 	relrowsecurity = classform->relrowsecurity;
 	relforcerowsecurity = classform->relforcerowsecurity;

test/src/bgw/scheduler_mock.c

@@ -120,8 +120,8 @@ ts_bgw_db_scheduler_test_main(PG_FUNCTION_ARGS)
 
 	deserialize_test_parameters(MyBgworkerEntry->bgw_extra, &ttl, &user_oid);
 
-	elog(WARNING, "scheduler user id %d", user_oid);
-	elog(WARNING, "running a test in the background: db=%d ttl=%d", db_oid, ttl);
+	elog(WARNING, "scheduler user id %u", user_oid);
+	elog(WARNING, "running a test in the background: db=%u ttl=%d", db_oid, ttl);
 
 	BackgroundWorkerInitializeConnectionByOid(db_oid, user_oid, 0);
 

tsl/src/bgw_policy/job_api.c

@@ -93,7 +93,7 @@ job_add(PG_FUNCTION_ARGS)
 	if (func_name == NULL)
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_OBJECT),
-				 errmsg("function or procedure with OID %d does not exist", proc)));
+				 errmsg("function or procedure with OID %u does not exist", proc)));
 
 	if (pg_proc_aclcheck(proc, owner, ACL_EXECUTE) != ACLCHECK_OK)
 		ereport(ERROR,

tsl/src/compression/compression.c

@@ -453,7 +453,10 @@ compress_chunk_populate_sort_info_for_column(Oid table, const ColumnCompressionI
 
 	tp = SearchSysCacheAttName(table, NameStr(column->attname));
 	if (!HeapTupleIsValid(tp))
-		elog(ERROR, "table %d does not have column \"%s\"", table, NameStr(column->attname));
+		elog(ERROR,
+			 "table \"%s\" does not have column \"%s\"",
+			 get_rel_name(table),
+			 NameStr(column->attname));
 
 	att_tup = (Form_pg_attribute) GETSTRUCT(tp);
 	/* Other valdation checks beyond just existence of a valid comparison operator could be useful
@@ -1488,9 +1491,8 @@ update_compressed_chunk_relstats(Oid uncompressed_relid, Oid compressed_relid)
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_INTERNAL_ERROR),
-				 errmsg("mismatched chunks for relstats update %d %d",
-						uncompressed_relid,
-						compressed_relid)));
+				 errmsg("mismatched chunks for relstats update on compressed chunk \"%s\"",
+						get_rel_name(uncompressed_relid))));
 	}
 
 	capture_pgclass_stats(uncompressed_relid, &uncomp_pages, &uncomp_visible, &uncomp_tuples);

tsl/src/compression/create.c

@@ -451,7 +451,7 @@ create_compressed_table_indexes(Oid compresstable_relid, CompressColInfo *compre
 		index_tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(index_addr.objectId));
 
 		if (!HeapTupleIsValid(index_tuple))
-			elog(ERROR, "cache lookup failed for index relid %d", index_addr.objectId);
+			elog(ERROR, "cache lookup failed for index relid %u", index_addr.objectId);
 		index_name = ((Form_pg_class) GETSTRUCT(index_tuple))->relname;
 		elog(DEBUG1,
 			 "adding index %s ON %s.%s USING BTREE(%s, %s)",

tsl/src/compression/deltadelta.c

@@ -235,7 +235,9 @@ delta_delta_compressor_for_type(Oid element_type)
 			*compressor = (ExtendedCompressor){ .base = deltadelta_timestamptz_compressor };
 			return &compressor->base;
 		default:
-			elog(ERROR, "invalid type for delta-delta compressor %d", element_type);
+			elog(ERROR,
+				 "invalid type for delta-delta compressor \"%s\"",
+				 format_type_be(element_type));
 	}
 
 	pg_unreachable();
@@ -506,7 +508,9 @@ convert_from_internal(DecompressResultInternal res_internal, Oid element_type)
 				.val = TimestampGetDatum(res_internal.val),
 			};
 		default:
-			elog(ERROR, "invalid type requested from deltadelta decompression %d", element_type);
+			elog(ERROR,
+				 "invalid type requested from deltadelta decompression \"%s\"",
+				 format_type_be(element_type));
 	}
 
 	pg_unreachable();

tsl/src/compression/gorilla.c

@@ -8,8 +8,9 @@
 #include <catalog/pg_type.h>
 #include <common/base64.h>
 #include <funcapi.h>
-#include <lib/stringinfo.h>
 #include <libpq/pqformat.h>
+#include <lib/stringinfo.h>
+#include <utils/builtins.h>
 #include <utils/memutils.h>
 
 #include "compat.h"
@@ -325,7 +326,9 @@ gorilla_compressor_for_type(Oid element_type)
 			*compressor = (ExtendedCompressor){ .base = gorilla_uint64_compressor };
 			return &compressor->base;
 		default:
-			elog(ERROR, "invalid type for Gorilla compression %d", element_type);
+			elog(ERROR,
+				 "invalid type for Gorilla compression \"%s\"",
+				 format_type_be(element_type));
 	}
 	pg_unreachable();
 }

tsl/src/continuous_aggs/create.c

@@ -428,7 +428,7 @@ mattablecolumninfo_add_mattable_index(MatTableColumnInfo *matcolinfo, Hypertable
 		indxtuple = SearchSysCache1(RELOID, ObjectIdGetDatum(indxaddr.objectId));
 
 		if (!HeapTupleIsValid(indxtuple))
-			elog(ERROR, "cache lookup failed for index relid %d", indxaddr.objectId);
+			elog(ERROR, "cache lookup failed for index relid %u", indxaddr.objectId);
 		indxname = ((Form_pg_class) GETSTRUCT(indxtuple))->relname;
 		elog(DEBUG1,
 			 "adding index %s ON %s.%s USING BTREE(%s, %s)",

tsl/src/deparse.c

@@ -331,7 +331,7 @@ deparse_create_table_info(Oid relid)
 	Relation rel = table_open(relid, AccessShareLock);
 
 	if (rel == NULL)
-		ereport(ERROR, (errmsg("relation with id %d not found", relid)));
+		ereport(ERROR, (errmsg("relation with id %u not found", relid)));
 
 	validate_relation(rel);
 

tsl/test/expected/bgw_custom.out

@@ -32,8 +32,10 @@ SELECT add_job(NULL, '1h');
 ERROR:  function or procedure cannot be NULL
 SELECT add_job(0, '1h');
 ERROR:  function or procedure with OID 0 does not exist
+-- this will return an error about Oid 4294967295
+-- while regproc is unsigned int postgres has an implicit cast from int to regproc
 SELECT add_job(-1, '1h');
-ERROR:  function or procedure with OID -1 does not exist
+ERROR:  function or procedure with OID 4294967295 does not exist
 SELECT add_job('invalid_func', '1h');
 ERROR:  function "invalid_func" does not exist at character 16
 SELECT add_job('custom_func', NULL);

tsl/test/sql/bgw_custom.sql

@@ -36,6 +36,8 @@ $$;
 -- test bad input
 SELECT add_job(NULL, '1h');
 SELECT add_job(0, '1h');
+-- this will return an error about Oid 4294967295
+-- while regproc is unsigned int postgres has an implicit cast from int to regproc
 SELECT add_job(-1, '1h');
 SELECT add_job('invalid_func', '1h');
 SELECT add_job('custom_func', NULL);