mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-18 18:44:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bunch more portability bugs in commit 08bf6e529.

Browse Source 
It seems like somebody used a dartboard while choosing integer widths
for the various values taken and returned by these functions ... and
then threw a fresh set of darts while writing the SQL declarations.

This patch brings the C code into line with what the SQL declarations
say, which is enough to make it not dump core on the particular 32-bit
machine I'm testing on.  But I think we could do with another round
of looking at what the datum widths *should* be.  For instance, it's
not all that sensible that hash_bitmap_info decided to use int64 to
represent a BlockNumber input when get_raw_page doesn't do it that way.

There's also a remaining problem that the expected outputs from the
test script are platform-dependent, but I'll leave that issue for
somebody else.

Per buildfarm.
This commit is contained in:
Tom Lane 2017-02-02 23:11:08 -05:00
parent ed807fda6d
commit c6eeb67dcc
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
contrib/pageinspect/hashfuncs.c
View File

@ -360,7 +360,7 @@ hash_page_items(PG_FUNCTION_ARGS)
values[j++] = PointerGetDatum(&itup->t_tid); values[j++] = PointerGetDatum(&itup->t_tid);
hashkey = _hash_get_indextuple_hashkey(itup); hashkey = _hash_get_indextuple_hashkey(itup);
values[j] = UInt32GetDatum(hashkey); values[j] = UInt64GetDatum((uint64) hashkey);
tuple = heap_form_tuple(fctx->attinmeta->tupdesc, values, nulls); tuple = heap_form_tuple(fctx->attinmeta->tupdesc, values, nulls);
result = HeapTupleGetDatum(tuple); result = HeapTupleGetDatum(tuple);
@ -388,7 +388,7 @@ Datum
hash_bitmap_info(PG_FUNCTION_ARGS) hash_bitmap_info(PG_FUNCTION_ARGS)
{ {
Oid indexRelid = PG_GETARG_OID(0); Oid indexRelid = PG_GETARG_OID(0);
BlockNumber ovflblkno = (BlockNumber) PG_GETARG_INT64(1); uint64 ovflblkno = PG_GETARG_INT64(1);
HashMetaPage metap; HashMetaPage metap;
Buffer buf, Buffer buf,
metabuf; metabuf;
@ -422,13 +422,14 @@ hash_bitmap_info(PG_FUNCTION_ARGS)
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("cannot access temporary tables of other sessions"))); errmsg("cannot access temporary tables of other sessions")));
if (RelationGetNumberOfBlocks(indexRel) <= (BlockNumber) (ovflblkno)) if (ovflblkno >= RelationGetNumberOfBlocks(indexRel))
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("block number %u is out of range for relation \"%s\"", errmsg("block number " UINT64_FORMAT " is out of range for relation \"%s\"",
ovflblkno, RelationGetRelationName(indexRel)))); ovflblkno, RelationGetRelationName(indexRel))));
buf = ReadBufferExtended(indexRel, MAIN_FORKNUM, ovflblkno, RBM_NORMAL, NULL); buf = ReadBufferExtended(indexRel, MAIN_FORKNUM, (BlockNumber) ovflblkno,
RBM_NORMAL, NULL);
LockBuffer(buf, BUFFER_LOCK_SHARE); LockBuffer(buf, BUFFER_LOCK_SHARE);
_hash_checkpage(indexRel, buf, LH_PAGE_TYPE); _hash_checkpage(indexRel, buf, LH_PAGE_TYPE);
page = BufferGetPage(buf); page = BufferGetPage(buf);
@ -451,7 +452,7 @@ hash_bitmap_info(PG_FUNCTION_ARGS)
metap = HashPageGetMeta(BufferGetPage(metabuf)); metap = HashPageGetMeta(BufferGetPage(metabuf));
/* Identify overflow bit number */ /* Identify overflow bit number */
ovflbitno = _hash_ovflblkno_to_bitno(metap, ovflblkno); ovflbitno = _hash_ovflblkno_to_bitno(metap, (BlockNumber) ovflblkno);
bitmappage = ovflbitno >> BMPG_SHIFT(metap); bitmappage = ovflbitno >> BMPG_SHIFT(metap);
bitmapbit = ovflbitno & BMPG_MASK(metap); bitmapbit = ovflbitno & BMPG_MASK(metap);
@ -475,7 +476,7 @@ hash_bitmap_info(PG_FUNCTION_ARGS)
MemSet(nulls, 0, sizeof(nulls)); MemSet(nulls, 0, sizeof(nulls));
j = 0; j = 0;
values[j++] = UInt32GetDatum(bitmapblkno); values[j++] = UInt64GetDatum((uint64) bitmapblkno);
values[j++] = Int32GetDatum(bitmapbit); values[j++] = Int32GetDatum(bitmapbit);
values[j++] = BoolGetDatum(bit); values[j++] = BoolGetDatum(bit);
@ -524,34 +525,34 @@ hash_metapage_info(PG_FUNCTION_ARGS)
MemSet(nulls, 0, sizeof(nulls)); MemSet(nulls, 0, sizeof(nulls));
j = 0; j = 0;
values[j++] = UInt32GetDatum(metad->hashm_magic); values[j++] = UInt64GetDatum(metad->hashm_magic);
values[j++] = UInt32GetDatum(metad->hashm_version); values[j++] = UInt64GetDatum(metad->hashm_version);
values[j++] = Float8GetDatum(metad->hashm_ntuples); values[j++] = Float8GetDatum(metad->hashm_ntuples);
values[j++] = UInt16GetDatum(metad->hashm_ffactor); values[j++] = UInt32GetDatum(metad->hashm_ffactor);
values[j++] = UInt16GetDatum(metad->hashm_bsize); values[j++] = UInt32GetDatum(metad->hashm_bsize);
values[j++] = UInt16GetDatum(metad->hashm_bmsize); values[j++] = UInt32GetDatum(metad->hashm_bmsize);
values[j++] = UInt16GetDatum(metad->hashm_bmshift); values[j++] = UInt32GetDatum(metad->hashm_bmshift);
values[j++] = UInt32GetDatum(metad->hashm_maxbucket); values[j++] = UInt64GetDatum(metad->hashm_maxbucket);
values[j++] = UInt32GetDatum(metad->hashm_highmask); values[j++] = UInt64GetDatum(metad->hashm_highmask);
values[j++] = UInt32GetDatum(metad->hashm_lowmask); values[j++] = UInt64GetDatum(metad->hashm_lowmask);
values[j++] = UInt32GetDatum(metad->hashm_ovflpoint); values[j++] = UInt64GetDatum(metad->hashm_ovflpoint);
values[j++] = UInt32GetDatum(metad->hashm_firstfree); values[j++] = UInt64GetDatum(metad->hashm_firstfree);
values[j++] = UInt32GetDatum(metad->hashm_nmaps); values[j++] = UInt64GetDatum(metad->hashm_nmaps);
values[j++] = UInt16GetDatum(metad->hashm_procid); values[j++] = UInt32GetDatum(metad->hashm_procid);
for (i = 0; i < HASH_MAX_SPLITPOINTS; i++) for (i = 0; i < HASH_MAX_SPLITPOINTS; i++)
spares[i] = UInt32GetDatum(metad->hashm_spares[i]); spares[i] = UInt64GetDatum(metad->hashm_spares[i]);
values[j++] = PointerGetDatum(construct_array(spares, values[j++] = PointerGetDatum(construct_array(spares,
HASH_MAX_SPLITPOINTS, HASH_MAX_SPLITPOINTS,
INT8OID, INT8OID,
8, true, 'd')); 8, FLOAT8PASSBYVAL, 'd'));
for (i = 0; i < HASH_MAX_BITMAPS; i++) for (i = 0; i < HASH_MAX_BITMAPS; i++)
mapp[i] = UInt32GetDatum(metad->hashm_mapp[i]); mapp[i] = UInt64GetDatum(metad->hashm_mapp[i]);
values[j++] = PointerGetDatum(construct_array(mapp, values[j++] = PointerGetDatum(construct_array(mapp,
HASH_MAX_BITMAPS, HASH_MAX_BITMAPS,
INT8OID, INT8OID,
8, true, 'd')); 8, FLOAT8PASSBYVAL, 'd'));
tuple = heap_form_tuple(tupleDesc, values, nulls); tuple = heap_form_tuple(tupleDesc, values, nulls);