database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

In pageinspect/hashfuncs.c, avoid crashes on alignment-picky machines.

Browse Source 
On machines with MAXALIGN = 8, the payload of a bytea is not maxaligned,
since it will start 4 bytes into a palloc'd value.  On alignment-picky
hardware, this will cause failures in accesses to 8-byte-wide values
within the page.  We already encountered this problem when we introduced
GIN index inspection functions, and fixed it in commit 84ad68d64.  Make
use of the same function for hash indexes.

A small difficulty is that up to now contrib/pageinspect has not shared
any functions at all across files.  To support that, introduce a common
header file "pageinspect.h" for the module.

Also, move get_page_from_raw() out of ginfuncs.c, where it didn't
especially belong, and put it in rawpage.c which seems a more natural home.

Per buildfarm.

Discussion: https://postgr.es/m/17311.1486134714@sss.pgh.pa.us
This commit is contained in:
Tom Lane
2017-02-03 11:34:41 -05:00
parent 29e312bc13
commit 14e9b18fed
8 changed files with 73 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
contrib/pageinspect/rawpage.c
View File

@ -15,6 +15,8 @@
#include "postgres.h"
#include "pageinspect.h"
#include "access/htup_details.h"
#include "catalog/catalog.h"
#include "catalog/namespace.h"
@ -158,6 +160,42 @@ get_raw_page_internal(text *relname, ForkNumber forknum, BlockNumber blkno)
return raw_page;
}
/*
* get_page_from_raw
*
* Get a palloc'd, maxalign'ed page image from the result of get_raw_page()
*
* On machines with MAXALIGN = 8, the payload of a bytea is not maxaligned,
* since it will start 4 bytes into a palloc'd value. On alignment-picky
* machines, this will cause failures in accesses to 8-byte-wide values
* within the page. We don't need to worry if accessing only 4-byte or
* smaller fields, but when examining a struct that contains 8-byte fields,
* use this function for safety.
*/
Page
get_page_from_raw(bytea *raw_page)
{
Page page;
int raw_page_size;
raw_page_size = VARSIZE(raw_page) - VARHDRSZ;
if (raw_page_size != BLCKSZ)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("invalid page size"),
errdetail("Expected %d bytes, got %d.",
BLCKSZ, raw_page_size)));
page = palloc(raw_page_size);
memcpy(page, VARDATA(raw_page), raw_page_size);
return page;
}
/*
* page_header
*