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

Fix another longstanding problem in copy_relation_data: it was blithely

Browse Source 
assuming that a local char[] array would be aligned on at least a word
boundary.  There are architectures on which that is pretty much guaranteed to
NOT be the case ... and those arches also don't like non-aligned memory
accesses, meaning that log_newpage() would crash if it ever got invoked.
Even on Intel-ish machines there's a potential for a large performance penalty
from doing I/O to an inadequately aligned buffer.  So palloc it instead.

Backpatch to 8.0 --- 7.4 doesn't have this code.
This commit is contained in:
Tom Lane
2010-07-29 19:23:51 +00:00
parent fb28d2604a
commit a0ad1d1f83
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/commands/tablecmds.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.206.2.10 2010/07/29 16:15:18 rhaas Exp $ * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.206.2.11 2010/07/29 19:23:51 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -6095,11 +6095,11 @@ static void
copy_relation_data(Relation rel, SMgrRelation dst) copy_relation_data(Relation rel, SMgrRelation dst)
{ {
SMgrRelation src; SMgrRelation src;
char *buf;
Page page;
bool use_wal; bool use_wal;
BlockNumber nblocks; BlockNumber nblocks;
BlockNumber blkno; BlockNumber blkno;
char buf[BLCKSZ];
Page page = (Page) buf;
/* /*
* Since we copy the file directly without looking at the shared buffers, * Since we copy the file directly without looking at the shared buffers,
@ -6109,6 +6109,15 @@ copy_relation_data(Relation rel, SMgrRelation dst)
*/ */
FlushRelationBuffers(rel); FlushRelationBuffers(rel);
/*
* palloc the buffer so that it's MAXALIGN'd. If it were just a local
* char[] array, the compiler might align it on any byte boundary, which
* can seriously hurt transfer speed to and from the kernel; not to
* mention possibly making PageSetLSN fail.
*/
buf = (char *) palloc(BLCKSZ);
page = (Page) buf;
/* /*
* We need to log the copied data in WAL iff WAL archiving is enabled AND * We need to log the copied data in WAL iff WAL archiving is enabled AND
* it's not a temp rel. * it's not a temp rel.
@ -6172,6 +6181,8 @@ copy_relation_data(Relation rel, SMgrRelation dst)
smgrwrite(dst, blkno, buf, true); smgrwrite(dst, blkno, buf, true);
} }
pfree(buf);
/* /*
* If the rel isn't temp, we must fsync it down to disk before it's safe * If the rel isn't temp, we must fsync it down to disk before it's safe
* to commit the transaction. (For a temp rel we don't care since the rel * to commit the transaction. (For a temp rel we don't care since the rel