Skip to content

Commit faf7d78

Browse files
bmomjianbmomjian
committed
Install new alignment code to use MAXALIGN rather than DOUBLEALIGN where
approproate.
1 parent e259780 commit faf7d78

File tree

19 files changed

+70
-69
lines changed

19 files changed

+70
-69
lines changed

‎src/backend/access/common/heaptuple.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.57 1999/07/17 20:16:35 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.58 1999/07/19 07:07:15 momjian Exp $
1212
*
1313
* NOTES
1414
* The old interface functions have been converted to macros
@@ -677,7 +677,7 @@ heap_formtuple(TupleDesc tupleDescriptor,
677677
len += bitmaplen;
678678
}
679679

680-
hoff = len = DOUBLEALIGN(len); /* be conservative here */
680+
hoff = len = MAXALIGN(len); /* be conservative here */
681681

682682
len += ComputeDataSize(tupleDescriptor, value, nulls);
683683

@@ -811,7 +811,7 @@ heap_addheader(uint32 natts, /* max domain index */
811811

812812
len = offsetof(HeapTupleHeaderData, t_bits);
813813

814-
hoff = len = DOUBLEALIGN(len); /* be conservative */
814+
hoff = len = MAXALIGN(len); /* be conservative */
815815
len += structlen;
816816
tuple = (HeapTuple) palloc(HEAPTUPLESIZE + len);
817817
td = tuple->t_data = (HeapTupleHeader) ((char *) tuple + HEAPTUPLESIZE);

‎src/backend/access/common/indextuple.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.37 1999/07/17 20:16:35 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.38 1999/07/19 07:07:15 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -60,7 +60,7 @@ index_formtuple(TupleDesc tupleDescriptor,
6060

6161
hoff = IndexInfoFindDataOffset(infomask);
6262
size = hoff + ComputeDataSize(tupleDescriptor, value, null);
63-
size = DOUBLEALIGN(size); /* be conservative */
63+
size = MAXALIGN(size); /* be conservative */
6464

6565
tp = (char *) palloc(size);
6666
tuple = (IndexTuple) tp;

‎src/backend/access/hash/hashinsert.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.17 1999/07/15 23:02:54 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.18 1999/07/19 07:07:16 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -128,7 +128,7 @@ _hash_insertonpg(Relation rel,
128128

129129
itemsz = IndexTupleDSize(hitem->hash_itup)
130130
+ (sizeof(HashItemData) - sizeof(IndexTupleData));
131-
itemsz = DOUBLEALIGN(itemsz);
131+
itemsz = MAXALIGN(itemsz);
132132

133133
while (PageGetFreeSpace(page) < itemsz)
134134
{

‎src/backend/access/hash/hashovfl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.24 1999/07/17 20:16:38 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.25 1999/07/19 07:07:16 momjian Exp $
1111
*
1212
* NOTES
1313
* Overflow pages look like ordinary relation pages.
@@ -531,7 +531,7 @@ _hash_squeezebucket(Relation rel,
531531
hitem = (HashItem) PageGetItem(rpage, PageGetItemId(rpage, roffnum));
532532
itemsz = IndexTupleDSize(hitem->hash_itup)
533533
+ (sizeof(HashItemData) - sizeof(IndexTupleData));
534-
itemsz = DOUBLEALIGN(itemsz);
534+
itemsz = MAXALIGN(itemsz);
535535

536536
/*
537537
* walk up the bucket chain, looking for a page big enough for

‎src/backend/access/hash/hashpage.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.24 1999/07/17 20:16:39 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.25 1999/07/19 07:07:17 momjian Exp $
1111
*
1212
* NOTES
1313
* Postgres hash pages look like ordinary relation pages. The opaque
@@ -96,8 +96,8 @@ _hash_metapinit(Relation rel)
9696
for (i = metap->hashm_bshift; i > 0; --i)
9797
{
9898
if ((1 << i) < (metap->hashm_bsize -
99-
(DOUBLEALIGN(sizeof(PageHeaderData)) +
100-
DOUBLEALIGN(sizeof(HashPageOpaqueData)))))
99+
(MAXALIGN(sizeof(PageHeaderData)) +
100+
MAXALIGN(sizeof(HashPageOpaqueData)))))
101101
break;
102102
}
103103
Assert(i);
@@ -605,7 +605,7 @@ _hash_splitpage(Relation rel,
605605
itemsz = IndexTupleDSize(hitem->hash_itup)
606606
+ (sizeof(HashItemData) - sizeof(IndexTupleData));
607607

608-
itemsz = DOUBLEALIGN(itemsz);
608+
itemsz = MAXALIGN(itemsz);
609609

610610
if (PageGetFreeSpace(npage) < itemsz)
611611
{

‎src/backend/access/hash/hashutil.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.21 1999/07/17 20:16:39 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.22 1999/07/19 07:07:17 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -127,9 +127,9 @@ _hash_checkpage(Page page, int flags)
127127
Assert(((PageHeader) (page))->pd_lower >= (sizeof(PageHeaderData) - sizeof(ItemIdData)));
128128
#if 1
129129
Assert(((PageHeader) (page))->pd_upper <=
130-
(BLCKSZ - DOUBLEALIGN(sizeof(HashPageOpaqueData))));
130+
(BLCKSZ - MAXALIGN(sizeof(HashPageOpaqueData))));
131131
Assert(((PageHeader) (page))->pd_special ==
132-
(BLCKSZ - DOUBLEALIGN(sizeof(HashPageOpaqueData))));
132+
(BLCKSZ - MAXALIGN(sizeof(HashPageOpaqueData))));
133133
Assert(((PageHeader) (page))->pd_opaque.od_pagesize == BLCKSZ);
134134
#endif
135135
if (flags)

‎src/backend/access/heap/heapam.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.52 1999/07/17 20:16:39 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.53 1999/07/19 07:07:18 momjian Exp $
1111
*
1212
*
1313
* INTERFACE ROUTINES
@@ -1280,7 +1280,7 @@ heap_replace(Relation relation, ItemPointer otid, HeapTuple newtup,
12801280
HEAP_XMAX_INVALID | HEAP_MARKED_FOR_UPDATE);
12811281

12821282
/* insert new item */
1283-
if ((unsigned) DOUBLEALIGN(newtup->t_len) <= PageGetFreeSpace((Page) dp))
1283+
if ((unsigned) MAXALIGN(newtup->t_len) <= PageGetFreeSpace((Page) dp))
12841284
RelationPutHeapTuple(relation, buffer, newtup);
12851285
else
12861286
{

‎src/backend/access/heap/hio.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Id: hio.c,v 1.25 1999/07/16 04:58:27 momjian Exp $
10+
* $Id: hio.c,v 1.26 1999/07/19 07:07:18 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -50,7 +50,7 @@ RelationPutHeapTuple(Relation relation,
5050
IncrHeapAccessStat(global_RelationPutHeapTuple);
5151

5252
pageHeader = (Page) BufferGetPage(buffer);
53-
len = (unsigned) DOUBLEALIGN(tuple->t_len); /* be conservative */
53+
len = (unsigned) MAXALIGN(tuple->t_len); /* be conservative */
5454
Assert((int) len <= PageGetFreeSpace(pageHeader));
5555

5656
offnum = PageAddItem((Page) pageHeader, (Item) tuple->t_data,
@@ -143,7 +143,7 @@ RelationPutHeapTupleAtEnd(Relation relation, HeapTuple tuple)
143143

144144
LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
145145
pageHeader = (Page) BufferGetPage(buffer);
146-
len = (unsigned) DOUBLEALIGN(tuple->t_len); /* be conservative */
146+
len = (unsigned) MAXALIGN(tuple->t_len); /* be conservative */
147147

148148
/*
149149
* Note that this is true if the above returned a bogus page, which it

‎src/backend/access/nbtree/nbtinsert.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.48 1999/07/17 20:16:42 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.49 1999/07/19 07:07:19 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -263,7 +263,7 @@ _bt_insertonpg(Relation rel,
263263
itemsz = IndexTupleDSize(btitem->bti_itup)
264264
+ (sizeof(BTItemData) - sizeof(IndexTupleData));
265265

266-
itemsz = DOUBLEALIGN(itemsz); /* be safe, PageAddItem will do
266+
itemsz = MAXALIGN(itemsz); /* be safe, PageAddItem will do
267267
* this but we need to be
268268
* consistent */
269269

@@ -369,7 +369,7 @@ _bt_insertonpg(Relation rel,
369369
if (currsize > maxsize)
370370
maxsize = currsize;
371371
maxsize += sizeof(PageHeaderData) +
372-
DOUBLEALIGN(sizeof(BTPageOpaqueData));
372+
MAXALIGN(sizeof(BTPageOpaqueData));
373373
if (maxsize >= PageGetPageSize(page) / 2)
374374
do_split = true;
375375
}
@@ -460,7 +460,7 @@ _bt_insertonpg(Relation rel,
460460

461461
maxoff = PageGetMaxOffsetNumber(page);
462462
llimit = PageGetPageSize(page) - sizeof(PageHeaderData) -
463-
DOUBLEALIGN(sizeof(BTPageOpaqueData))
463+
MAXALIGN(sizeof(BTPageOpaqueData))
464464
+sizeof(ItemIdData);
465465
llimit /= 2;
466466
firstright = _bt_findsplitloc(rel, page, start, maxoff, llimit);
@@ -689,8 +689,8 @@ l_spl: ;
689689
* then we must forse insertion.
690690
*/
691691
if (!parent_chained &&
692-
DOUBLEALIGN(IndexTupleDSize(lowLeftItem->bti_itup)) ==
693-
DOUBLEALIGN(IndexTupleDSize(stack->bts_btitem->bti_itup)))
692+
MAXALIGN(IndexTupleDSize(lowLeftItem->bti_itup)) ==
693+
MAXALIGN(IndexTupleDSize(stack->bts_btitem->bti_itup)))
694694
{
695695
_bt_updateitem(rel, keysz, pbuf,
696696
stack->bts_btitem, lowLeftItem);
@@ -1591,15 +1591,15 @@ _bt_shift(Relation rel, Buffer buf, BTStack stack, int keysz,
15911591
/* add passed hikey */
15921592
itemsz = IndexTupleDSize(hikey->bti_itup)
15931593
+ (sizeof(BTItemData) - sizeof(IndexTupleData));
1594-
itemsz = DOUBLEALIGN(itemsz);
1594+
itemsz = MAXALIGN(itemsz);
15951595
if (PageAddItem(page, (Item) hikey, itemsz, P_HIKEY, LP_USED) == InvalidOffsetNumber)
15961596
elog(FATAL, "btree: failed to add hikey in _bt_shift");
15971597
pfree(hikey);
15981598

15991599
/* add btitem */
16001600
itemsz = IndexTupleDSize(btitem->bti_itup)
16011601
+ (sizeof(BTItemData) - sizeof(IndexTupleData));
1602-
itemsz = DOUBLEALIGN(itemsz);
1602+
itemsz = MAXALIGN(itemsz);
16031603
if (PageAddItem(page, (Item) btitem, itemsz, P_FIRSTKEY, LP_USED) == InvalidOffsetNumber)
16041604
elog(FATAL, "btree: failed to add firstkey in _bt_shift");
16051605
pfree(btitem);

‎src/backend/access/nbtree/nbtsort.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
*
77
* IDENTIFICATION
8-
* $Id: nbtsort.c,v 1.45 1999/07/17 20:16:43 momjian Exp $
8+
* $Id: nbtsort.c,v 1.46 1999/07/19 07:07:19 momjian Exp $
99
*
1010
* NOTES
1111
*
@@ -86,7 +86,7 @@ extern int NDirectFileWrite;
8686
* are potentially reading a bunch of zeroes off of disk in many
8787
* cases.
8888
*
89-
* BTItems are packed in and DOUBLEALIGN'd.
89+
* BTItems are packed in and MAXALIGN'd.
9090
*
9191
* the fd should not be going out to disk, strictly speaking, but it's
9292
* the only thing like that so i'm not going to worry about wasting a
@@ -497,7 +497,7 @@ _bt_tapenext(BTTapeBlock *tape, char **pos)
497497
return (BTItem) NULL;
498498
bti = (BTItem) *pos;
499499
itemsz = BTITEMSZ(bti);
500-
*pos += DOUBLEALIGN(itemsz);
500+
*pos += MAXALIGN(itemsz);
501501
return bti;
502502
}
503503

@@ -517,7 +517,7 @@ _bt_tapeadd(BTTapeBlock *tape, BTItem item, int itemsz)
517517
{
518518
memcpy(tape->bttb_data + tape->bttb_top, item, itemsz);
519519
++tape->bttb_ntup;
520-
tape->bttb_top += DOUBLEALIGN(itemsz);
520+
tape->bttb_top += MAXALIGN(itemsz);
521521
}
522522

523523
/*-------------------------------------------------------------------------
@@ -653,7 +653,7 @@ _bt_spool(Relation index, BTItem btitem, void *spool)
653653

654654
itape = btspool->bts_itape[btspool->bts_tape];
655655
itemsz = BTITEMSZ(btitem);
656-
itemsz = DOUBLEALIGN(itemsz);
656+
itemsz = MAXALIGN(itemsz);
657657

658658
/*
659659
* if this buffer is too full for this BTItemData, or if we have run
@@ -693,15 +693,15 @@ _bt_spool(Relation index, BTItem btitem, void *spool)
693693
* BTItemDatas in the order dictated by the sorted array of
694694
* BTItems, not the original order.
695695
*
696-
* (since everything was DOUBLEALIGN'd and is all on a single tape
696+
* (since everything was MAXALIGN'd and is all on a single tape
697697
* block, everything had *better* still fit on one tape block..)
698698
*/
699699
otape = btspool->bts_otape[btspool->bts_tape];
700700
for (i = 0; i < it_ntup; ++i)
701701
{
702702
bti = parray[i].btsk_item;
703703
btisz = BTITEMSZ(bti);
704-
btisz = DOUBLEALIGN(btisz);
704+
btisz = MAXALIGN(btisz);
705705
_bt_tapeadd(otape, bti, btisz);
706706
#if defined(FASTBUILD_DEBUG) && defined(FASTBUILD_SPOOL)
707707
{
@@ -903,7 +903,7 @@ _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags)
903903

904904
pgspc = PageGetFreeSpace(npage);
905905
btisz = BTITEMSZ(bti);
906-
btisz = DOUBLEALIGN(btisz);
906+
btisz = MAXALIGN(btisz);
907907
if (pgspc < btisz)
908908
{
909909
Buffer obuf = nbuf;
@@ -1221,7 +1221,7 @@ _bt_merge(Relation index, BTSpool *btspool)
12211221
if (bti != (BTItem) NULL)
12221222
{
12231223
btisz = BTITEMSZ(bti);
1224-
btisz = DOUBLEALIGN(btisz);
1224+
btisz = MAXALIGN(btisz);
12251225
if (doleaf)
12261226
{
12271227
_bt_buildadd(index, state, bti, BTP_LEAF);

‎src/backend/commands/vacuum.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.114 1999/07/17 20:16:54 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.115 1999/07/19 07:07:20 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1282,9 +1282,9 @@ vc_rpfheap(VRelStats *vacrelstats, Relation onerel,
12821282
to_item = i;
12831283
to_vpd = fraged_pages->vpl_pagedesc[to_item];
12841284
}
1285-
to_vpd->vpd_free -= DOUBLEALIGN(tlen);
1285+
to_vpd->vpd_free -= MAXALIGN(tlen);
12861286
if (to_vpd->vpd_offsets_used >= to_vpd->vpd_offsets_free)
1287-
to_vpd->vpd_free -= DOUBLEALIGN(sizeof(ItemIdData));
1287+
to_vpd->vpd_free -= MAXALIGN(sizeof(ItemIdData));
12881288
(to_vpd->vpd_offsets_used)++;
12891289
if (free_vtmove == 0)
12901290
{
@@ -2790,7 +2790,7 @@ static bool
27902790
vc_enough_space(VPageDescr vpd, Size len)
27912791
{
27922792

2793-
len = DOUBLEALIGN(len);
2793+
len = MAXALIGN(len);
27942794

27952795
if (len > vpd->vpd_free)
27962796
return false;
@@ -2800,7 +2800,7 @@ vc_enough_space(VPageDescr vpd, Size len)
28002800
return true; /* and len <= free_space */
28012801

28022802
/* ok. noff_usd >= noff_free and so we'll have to allocate new itemid */
2803-
if (len + DOUBLEALIGN(sizeof(ItemIdData)) <= vpd->vpd_free)
2803+
if (len + MAXALIGN(sizeof(ItemIdData)) <= vpd->vpd_free)
28042804
return true;
28052805

28062806
return false;

‎src/backend/rewrite/rewriteDefine.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.34 1999/07/17 20:17:36 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.35 1999/07/19 07:07:21 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -108,8 +108,9 @@ InsertRule(char *rulname,
108108
(rulename, ev_type, ev_class, ev_attr, ev_action, ev_qual, is_instead) VALUES \
109109
('%s', %d::char, %u::oid, %d::int2, '%s'::text, '%s'::text, \
110110
'%s'::bool);";
111-
if (sizeof(FormData_pg_rewrite) + strlen(actionbuf) +
112-
strlen(qualbuf) > MaxAttrSize)
111+
if (MAXALIGN(sizeof(FormData_pg_rewrite)) +
112+
MAXALIGN(strlen(actionbuf)) +
113+
MAXALIGN(strlen(qualbuf)) > MaxAttrSize)
113114
elog(ERROR, "DefineQueryRewrite: rule plan string too big.");
114115
sprintf(rulebuf, template,
115116
rulname, evtype, eventrel_oid, evslot_index, actionbuf,

0 commit comments

Comments
 (0)