upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-05-26 11:15:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use more consistent *GetDatum() macros for some unsigned numbers

Browse source 
This patch switches some code paths to use GetDatum() macros more in
line with the data types of the variables they manipulate.  This set of
changes does not fix a problem, but it is always nice to be more
consistent across the board.

Author: Kirill Reshke <reshkekirill@gmail.com>
Reviewed-by: Roman Khapov <rkhapov@yandex-team.ru>
Reviewed-by: Yuan Li <carol.li2025@outlook.com>
Reviewed-by: Michael Paquier <michael@paquier.xyz>
Reviewed-by: Man Zeng <zengman@halodbtech.com>
Discussion: https://postgr.es/m/CALdSSPidtC7j3MwhkqRj0K2hyp36ztnnjSt6qzGxQtiePR1dzw@mail.gmail.com
This commit is contained in:
Michael Paquier 2026-01-14 17:07:49 +09:00
parent e385a4e2fd
commit 6dcfac9696
9 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/pageinspect/btreefuncs.c
View file

@ -507,7 +507,7 @@ bt_page_print_tuples(ua_page_items *uargs)
j = 0; j = 0;
memset(nulls, 0, sizeof(nulls)); memset(nulls, 0, sizeof(nulls));
values[j++] = Int16GetDatum(offset); values[j++] = UInt16GetDatum(offset);
values[j++] = ItemPointerGetDatum(&itup->t_tid); values[j++] = ItemPointerGetDatum(&itup->t_tid);
values[j++] = Int32GetDatum((int) IndexTupleSize(itup)); values[j++] = Int32GetDatum((int) IndexTupleSize(itup));
values[j++] = BoolGetDatum(IndexTupleHasNulls(itup)); values[j++] = BoolGetDatum(IndexTupleHasNulls(itup));

2
contrib/pageinspect/ginfuncs.c
View file

@ -73,7 +73,7 @@ gin_metapage_info(PG_FUNCTION_ARGS)
values[0] = Int64GetDatum(metadata->head); values[0] = Int64GetDatum(metadata->head);
values[1] = Int64GetDatum(metadata->tail); values[1] = Int64GetDatum(metadata->tail);
values[2] = Int32GetDatum(metadata->tailFreeSize); values[2] = UInt32GetDatum(metadata->tailFreeSize);
values[3] = Int64GetDatum(metadata->nPendingPages); values[3] = Int64GetDatum(metadata->nPendingPages);
values[4] = Int64GetDatum(metadata->nPendingHeapTuples); values[4] = Int64GetDatum(metadata->nPendingHeapTuples);

4
contrib/pageinspect/gistfuncs.c
View file

@ -176,7 +176,7 @@ gist_page_items_bytea(PG_FUNCTION_ARGS)
memset(nulls, 0, sizeof(nulls)); memset(nulls, 0, sizeof(nulls));
values[0] = Int16GetDatum(offset); values[0] = UInt16GetDatum(offset);
values[1] = ItemPointerGetDatum(&itup->t_tid); values[1] = ItemPointerGetDatum(&itup->t_tid);
values[2] = Int32GetDatum((int) IndexTupleSize(itup)); values[2] = Int32GetDatum((int) IndexTupleSize(itup));
@ -283,7 +283,7 @@ gist_page_items(PG_FUNCTION_ARGS)
memset(nulls, 0, sizeof(nulls)); memset(nulls, 0, sizeof(nulls));
values[0] = Int16GetDatum(offset); values[0] = UInt16GetDatum(offset);
values[1] = ItemPointerGetDatum(&itup->t_tid); values[1] = ItemPointerGetDatum(&itup->t_tid);
values[2] = Int32GetDatum((int) IndexTupleSize(itup)); values[2] = Int32GetDatum((int) IndexTupleSize(itup));
values[3] = BoolGetDatum(ItemIdIsDead(id)); values[3] = BoolGetDatum(ItemIdIsDead(id));

2
contrib/pg_buffercache/pg_buffercache_pages.c
View file

@ -276,7 +276,7 @@ pg_buffercache_pages(PG_FUNCTION_ARGS)
nulls[5] = false; nulls[5] = false;
values[6] = BoolGetDatum(fctx->record[i].isdirty); values[6] = BoolGetDatum(fctx->record[i].isdirty);
nulls[6] = false; nulls[6] = false;
values[7] = Int16GetDatum(fctx->record[i].usagecount); values[7] = UInt16GetDatum(fctx->record[i].usagecount);
nulls[7] = false; nulls[7] = false;
/* unused for v1.0 callers, but the array is always long enough */ /* unused for v1.0 callers, but the array is always long enough */
values[8] = Int32GetDatum(fctx->record[i].pinning_backends); values[8] = Int32GetDatum(fctx->record[i].pinning_backends);

2
src/backend/access/brin/brin_inclusion.c
View file

@ -641,7 +641,7 @@ inclusion_get_strategy_procinfo(BrinDesc *bdesc, uint16 attno, Oid subtype,
tuple = SearchSysCache4(AMOPSTRATEGY, ObjectIdGetDatum(opfamily), tuple = SearchSysCache4(AMOPSTRATEGY, ObjectIdGetDatum(opfamily),
ObjectIdGetDatum(attr->atttypid), ObjectIdGetDatum(attr->atttypid),
ObjectIdGetDatum(subtype), ObjectIdGetDatum(subtype),
Int16GetDatum(strategynum)); UInt16GetDatum(strategynum));
if (!HeapTupleIsValid(tuple)) if (!HeapTupleIsValid(tuple))
elog(ERROR, "missing operator %d(%u,%u) in opfamily %u", elog(ERROR, "missing operator %d(%u,%u) in opfamily %u",

2
src/backend/access/brin/brin_minmax.c
View file

@ -294,7 +294,7 @@ minmax_get_strategy_procinfo(BrinDesc *bdesc, uint16 attno, Oid subtype,
tuple = SearchSysCache4(AMOPSTRATEGY, ObjectIdGetDatum(opfamily), tuple = SearchSysCache4(AMOPSTRATEGY, ObjectIdGetDatum(opfamily),
ObjectIdGetDatum(attr->atttypid), ObjectIdGetDatum(attr->atttypid),
ObjectIdGetDatum(subtype), ObjectIdGetDatum(subtype),
Int16GetDatum(strategynum)); UInt16GetDatum(strategynum));
if (!HeapTupleIsValid(tuple)) if (!HeapTupleIsValid(tuple))
elog(ERROR, "missing operator %d(%u,%u) in opfamily %u", elog(ERROR, "missing operator %d(%u,%u) in opfamily %u",

2
src/backend/access/brin/brin_minmax_multi.c
View file

@ -2932,7 +2932,7 @@ minmax_multi_get_strategy_procinfo(BrinDesc *bdesc, uint16 attno, Oid subtype,
tuple = SearchSysCache4(AMOPSTRATEGY, ObjectIdGetDatum(opfamily), tuple = SearchSysCache4(AMOPSTRATEGY, ObjectIdGetDatum(opfamily),
ObjectIdGetDatum(attr->atttypid), ObjectIdGetDatum(attr->atttypid),
ObjectIdGetDatum(subtype), ObjectIdGetDatum(subtype),
Int16GetDatum(strategynum)); UInt16GetDatum(strategynum));
if (!HeapTupleIsValid(tuple)) if (!HeapTupleIsValid(tuple))
elog(ERROR, "missing operator %d(%u,%u) in opfamily %u", elog(ERROR, "missing operator %d(%u,%u) in opfamily %u",
strategynum, attr->atttypid, subtype, opfamily); strategynum, attr->atttypid, subtype, opfamily);

4
src/backend/access/gist/gistget.c
View file

@ -223,7 +223,7 @@ gistindex_keytest(IndexScanDesc scan,
key->sk_collation, key->sk_collation,
PointerGetDatum(&de), PointerGetDatum(&de),
key->sk_argument, key->sk_argument,
Int16GetDatum(key->sk_strategy), UInt16GetDatum(key->sk_strategy),
ObjectIdGetDatum(key->sk_subtype), ObjectIdGetDatum(key->sk_subtype),
PointerGetDatum(&recheck)); PointerGetDatum(&recheck));
@ -287,7 +287,7 @@ gistindex_keytest(IndexScanDesc scan,
key->sk_collation, key->sk_collation,
PointerGetDatum(&de), PointerGetDatum(&de),
key->sk_argument, key->sk_argument,
Int16GetDatum(key->sk_strategy), UInt16GetDatum(key->sk_strategy),
ObjectIdGetDatum(key->sk_subtype), ObjectIdGetDatum(key->sk_subtype),
PointerGetDatum(&recheck)); PointerGetDatum(&recheck));
*recheck_distances_p |= recheck; *recheck_distances_p |= recheck;

4
src/backend/utils/adt/lockfuncs.c
View file

@ -329,7 +329,7 @@ pg_lock_status(PG_FUNCTION_ARGS)
values[1] = ObjectIdGetDatum(instance->locktag.locktag_field1); values[1] = ObjectIdGetDatum(instance->locktag.locktag_field1);
values[8] = ObjectIdGetDatum(instance->locktag.locktag_field2); values[8] = ObjectIdGetDatum(instance->locktag.locktag_field2);
values[6] = ObjectIdGetDatum(instance->locktag.locktag_field3); values[6] = ObjectIdGetDatum(instance->locktag.locktag_field3);
values[9] = Int16GetDatum(instance->locktag.locktag_field4); values[9] = UInt16GetDatum(instance->locktag.locktag_field4);
nulls[2] = true; nulls[2] = true;
nulls[3] = true; nulls[3] = true;
nulls[4] = true; nulls[4] = true;
@ -343,7 +343,7 @@ pg_lock_status(PG_FUNCTION_ARGS)
values[1] = ObjectIdGetDatum(instance->locktag.locktag_field1); values[1] = ObjectIdGetDatum(instance->locktag.locktag_field1);
values[7] = ObjectIdGetDatum(instance->locktag.locktag_field2); values[7] = ObjectIdGetDatum(instance->locktag.locktag_field2);
values[8] = ObjectIdGetDatum(instance->locktag.locktag_field3); values[8] = ObjectIdGetDatum(instance->locktag.locktag_field3);
values[9] = Int16GetDatum(instance->locktag.locktag_field4); values[9] = UInt16GetDatum(instance->locktag.locktag_field4);
nulls[2] = true; nulls[2] = true;
nulls[3] = true; nulls[3] = true;
nulls[4] = true; nulls[4] = true;