Install new alignment code to use MAXALIGN rather than DOUBLEALIGN where

approproate.

10 files changed, 38 insertions, 38 deletions

diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 009f8abdd1..a88d688559 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.57 1999/07/17 20:16:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.58 1999/07/19 07:07:15 momjian Exp $
  *
  * NOTES
  *	  The old interface functions have been converted to macros
@@ -677,7 +677,7 @@ heap_formtuple(TupleDesc tupleDescriptor,
 		len += bitmaplen;
 	}
 
-	hoff = len = DOUBLEALIGN(len);		/* be conservative here */
+	hoff = len = MAXALIGN(len);		/* be conservative here */
 
 	len += ComputeDataSize(tupleDescriptor, value, nulls);
 
@@ -811,7 +811,7 @@ heap_addheader(uint32 natts,	/* max domain index */
 
 	len = offsetof(HeapTupleHeaderData, t_bits);
 
-	hoff = len = DOUBLEALIGN(len);		/* be conservative */
+	hoff = len = MAXALIGN(len);		/* be conservative */
 	len += structlen;
 	tuple = (HeapTuple) palloc(HEAPTUPLESIZE + len);
 	td = tuple->t_data = (HeapTupleHeader) ((char *) tuple + HEAPTUPLESIZE);
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index c300e644a7..7daa5974bd 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.37 1999/07/17 20:16:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.38 1999/07/19 07:07:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -60,7 +60,7 @@ index_formtuple(TupleDesc tupleDescriptor,
 
 	hoff = IndexInfoFindDataOffset(infomask);
 	size = hoff + ComputeDataSize(tupleDescriptor, value, null);
-	size = DOUBLEALIGN(size);	/* be conservative */
+	size = MAXALIGN(size);	/* be conservative */
 
 	tp = (char *) palloc(size);
 	tuple = (IndexTuple) tp;
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index bb5a4acc1d..a1c5b14879 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.17 1999/07/15 23:02:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.18 1999/07/19 07:07:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -128,7 +128,7 @@ _hash_insertonpg(Relation rel,
 
 	itemsz = IndexTupleDSize(hitem->hash_itup)
 		+ (sizeof(HashItemData) - sizeof(IndexTupleData));
-	itemsz = DOUBLEALIGN(itemsz);
+	itemsz = MAXALIGN(itemsz);
 
 	while (PageGetFreeSpace(page) < itemsz)
 	{
diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c
index ea074c3909..49186932e2 100644
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.24 1999/07/17 20:16:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.25 1999/07/19 07:07:16 momjian Exp $
  *
  * NOTES
  *	  Overflow pages look like ordinary relation pages.
@@ -531,7 +531,7 @@ _hash_squeezebucket(Relation rel,
 		hitem = (HashItem) PageGetItem(rpage, PageGetItemId(rpage, roffnum));
 		itemsz = IndexTupleDSize(hitem->hash_itup)
 			+ (sizeof(HashItemData) - sizeof(IndexTupleData));
-		itemsz = DOUBLEALIGN(itemsz);
+		itemsz = MAXALIGN(itemsz);
 
 		/*
 		 * walk up the bucket chain, looking for a page big enough for
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index b7abaa0cb7..a43b56c5d1 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.24 1999/07/17 20:16:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.25 1999/07/19 07:07:17 momjian Exp $
  *
  * NOTES
  *	  Postgres hash pages look like ordinary relation pages.  The opaque
@@ -96,8 +96,8 @@ _hash_metapinit(Relation rel)
 	for (i = metap->hashm_bshift; i > 0; --i)
 	{
 		if ((1 << i) < (metap->hashm_bsize -
-						(DOUBLEALIGN(sizeof(PageHeaderData)) +
-						 DOUBLEALIGN(sizeof(HashPageOpaqueData)))))
+						(MAXALIGN(sizeof(PageHeaderData)) +
+						 MAXALIGN(sizeof(HashPageOpaqueData)))))
 			break;
 	}
 	Assert(i);
@@ -605,7 +605,7 @@ _hash_splitpage(Relation rel,
 			itemsz = IndexTupleDSize(hitem->hash_itup)
 				+ (sizeof(HashItemData) - sizeof(IndexTupleData));
 
-			itemsz = DOUBLEALIGN(itemsz);
+			itemsz = MAXALIGN(itemsz);
 
 			if (PageGetFreeSpace(npage) < itemsz)
 			{
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index 9f13da34ab..eeff50a375 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.21 1999/07/17 20:16:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.22 1999/07/19 07:07:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -127,9 +127,9 @@ _hash_checkpage(Page page, int flags)
 	Assert(((PageHeader) (page))->pd_lower >= (sizeof(PageHeaderData) - sizeof(ItemIdData)));
 #if 1
 	Assert(((PageHeader) (page))->pd_upper <=
-		   (BLCKSZ - DOUBLEALIGN(sizeof(HashPageOpaqueData))));
+		   (BLCKSZ - MAXALIGN(sizeof(HashPageOpaqueData))));
 	Assert(((PageHeader) (page))->pd_special ==
-		   (BLCKSZ - DOUBLEALIGN(sizeof(HashPageOpaqueData))));
+		   (BLCKSZ - MAXALIGN(sizeof(HashPageOpaqueData))));
 	Assert(((PageHeader) (page))->pd_opaque.od_pagesize == BLCKSZ);
 #endif
 	if (flags)
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 5fb0367f2c..d8dc24c41f 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.52 1999/07/17 20:16:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.53 1999/07/19 07:07:18 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -1280,7 +1280,7 @@ l2:
 							 HEAP_XMAX_INVALID | HEAP_MARKED_FOR_UPDATE);
 
 	/* insert new item */
-	if ((unsigned) DOUBLEALIGN(newtup->t_len) <= PageGetFreeSpace((Page) dp))
+	if ((unsigned) MAXALIGN(newtup->t_len) <= PageGetFreeSpace((Page) dp))
 		RelationPutHeapTuple(relation, buffer, newtup);
 	else
 	{
diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c
index 481692dea0..595c79e023 100644
--- a/src/backend/access/heap/hio.c
+++ b/src/backend/access/heap/hio.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Id: hio.c,v 1.25 1999/07/16 04:58:27 momjian Exp $
+ *	  $Id: hio.c,v 1.26 1999/07/19 07:07:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -50,7 +50,7 @@ RelationPutHeapTuple(Relation relation,
 	IncrHeapAccessStat(global_RelationPutHeapTuple);
 
 	pageHeader = (Page) BufferGetPage(buffer);
-	len = (unsigned) DOUBLEALIGN(tuple->t_len); /* be conservative */
+	len = (unsigned) MAXALIGN(tuple->t_len); /* be conservative */
 	Assert((int) len <= PageGetFreeSpace(pageHeader));
 
 	offnum = PageAddItem((Page) pageHeader, (Item) tuple->t_data,
@@ -143,7 +143,7 @@ RelationPutHeapTupleAtEnd(Relation relation, HeapTuple tuple)
 
 	LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
 	pageHeader = (Page) BufferGetPage(buffer);
-	len = (unsigned) DOUBLEALIGN(tuple->t_len); /* be conservative */
+	len = (unsigned) MAXALIGN(tuple->t_len); /* be conservative */
 
 	/*
 	 * Note that this is true if the above returned a bogus page, which it
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index b07db1d7c9..3827e7db29 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.48 1999/07/17 20:16:42 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.49 1999/07/19 07:07:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -263,7 +263,7 @@ _bt_insertonpg(Relation rel,
 	itemsz = IndexTupleDSize(btitem->bti_itup)
 		+ (sizeof(BTItemData) - sizeof(IndexTupleData));
 
-	itemsz = DOUBLEALIGN(itemsz);		/* be safe, PageAddItem will do
+	itemsz = MAXALIGN(itemsz);		/* be safe, PageAddItem will do
 										 * this but we need to be
 										 * consistent */
 
@@ -369,7 +369,7 @@ _bt_insertonpg(Relation rel,
 		if (currsize > maxsize)
 			maxsize = currsize;
 		maxsize += sizeof(PageHeaderData) +
-			DOUBLEALIGN(sizeof(BTPageOpaqueData));
+			MAXALIGN(sizeof(BTPageOpaqueData));
 		if (maxsize >= PageGetPageSize(page) / 2)
 			do_split = true;
 	}
@@ -460,7 +460,7 @@ _bt_insertonpg(Relation rel,
 
 			maxoff = PageGetMaxOffsetNumber(page);
 			llimit = PageGetPageSize(page) - sizeof(PageHeaderData) -
-				DOUBLEALIGN(sizeof(BTPageOpaqueData))
+				MAXALIGN(sizeof(BTPageOpaqueData))
 				+sizeof(ItemIdData);
 			llimit /= 2;
 			firstright = _bt_findsplitloc(rel, page, start, maxoff, llimit);
@@ -689,8 +689,8 @@ l_spl:	;
 				 * then we must forse insertion.
 				 */
 				if (!parent_chained &&
-					DOUBLEALIGN(IndexTupleDSize(lowLeftItem->bti_itup)) ==
-				DOUBLEALIGN(IndexTupleDSize(stack->bts_btitem->bti_itup)))
+					MAXALIGN(IndexTupleDSize(lowLeftItem->bti_itup)) ==
+					MAXALIGN(IndexTupleDSize(stack->bts_btitem->bti_itup)))
 				{
 					_bt_updateitem(rel, keysz, pbuf,
 								   stack->bts_btitem, lowLeftItem);
@@ -1591,7 +1591,7 @@ _bt_shift(Relation rel, Buffer buf, BTStack stack, int keysz,
 	/* add passed hikey */
 	itemsz = IndexTupleDSize(hikey->bti_itup)
 		+ (sizeof(BTItemData) - sizeof(IndexTupleData));
-	itemsz = DOUBLEALIGN(itemsz);
+	itemsz = MAXALIGN(itemsz);
 	if (PageAddItem(page, (Item) hikey, itemsz, P_HIKEY, LP_USED) == InvalidOffsetNumber)
 		elog(FATAL, "btree: failed to add hikey in _bt_shift");
 	pfree(hikey);
@@ -1599,7 +1599,7 @@ _bt_shift(Relation rel, Buffer buf, BTStack stack, int keysz,
 	/* add btitem */
 	itemsz = IndexTupleDSize(btitem->bti_itup)
 		+ (sizeof(BTItemData) - sizeof(IndexTupleData));
-	itemsz = DOUBLEALIGN(itemsz);
+	itemsz = MAXALIGN(itemsz);
 	if (PageAddItem(page, (Item) btitem, itemsz, P_FIRSTKEY, LP_USED) == InvalidOffsetNumber)
 		elog(FATAL, "btree: failed to add firstkey in _bt_shift");
 	pfree(btitem);
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index e3b1f5a043..c1564544b0 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -5,7 +5,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Id: nbtsort.c,v 1.45 1999/07/17 20:16:43 momjian Exp $
+ *	  $Id: nbtsort.c,v 1.46 1999/07/19 07:07:19 momjian Exp $
  *
  * NOTES
  *
@@ -86,7 +86,7 @@ extern int	NDirectFileWrite;
  * are potentially reading a bunch of zeroes off of disk in many
  * cases.
  *
- * BTItems are packed in and DOUBLEALIGN'd.
+ * BTItems are packed in and MAXALIGN'd.
  *
  * the fd should not be going out to disk, strictly speaking, but it's
  * 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)
 		return (BTItem) NULL;
 	bti = (BTItem) *pos;
 	itemsz = BTITEMSZ(bti);
-	*pos += DOUBLEALIGN(itemsz);
+	*pos += MAXALIGN(itemsz);
 	return bti;
 }
 
@@ -517,7 +517,7 @@ _bt_tapeadd(BTTapeBlock *tape, BTItem item, int itemsz)
 {
 	memcpy(tape->bttb_data + tape->bttb_top, item, itemsz);
 	++tape->bttb_ntup;
-	tape->bttb_top += DOUBLEALIGN(itemsz);
+	tape->bttb_top += MAXALIGN(itemsz);
 }
 
 /*-------------------------------------------------------------------------
@@ -653,7 +653,7 @@ _bt_spool(Relation index, BTItem btitem, void *spool)
 
 	itape = btspool->bts_itape[btspool->bts_tape];
 	itemsz = BTITEMSZ(btitem);
-	itemsz = DOUBLEALIGN(itemsz);
+	itemsz = MAXALIGN(itemsz);
 
 	/*
 	 * if this buffer is too full for this BTItemData, or if we have run
@@ -693,7 +693,7 @@ _bt_spool(Relation index, BTItem btitem, void *spool)
 		 * BTItemDatas in the order dictated by the sorted array of
 		 * BTItems, not the original order.
 		 *
-		 * (since everything was DOUBLEALIGN'd and is all on a single tape
+		 * (since everything was MAXALIGN'd and is all on a single tape
 		 * block, everything had *better* still fit on one tape block..)
 		 */
 		otape = btspool->bts_otape[btspool->bts_tape];
@@ -701,7 +701,7 @@ _bt_spool(Relation index, BTItem btitem, void *spool)
 		{
 			bti = parray[i].btsk_item;
 			btisz = BTITEMSZ(bti);
-			btisz = DOUBLEALIGN(btisz);
+			btisz = MAXALIGN(btisz);
 			_bt_tapeadd(otape, bti, btisz);
 #if defined(FASTBUILD_DEBUG) && defined(FASTBUILD_SPOOL)
 			{
@@ -903,7 +903,7 @@ _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags)
 
 	pgspc = PageGetFreeSpace(npage);
 	btisz = BTITEMSZ(bti);
-	btisz = DOUBLEALIGN(btisz);
+	btisz = MAXALIGN(btisz);
 	if (pgspc < btisz)
 	{
 		Buffer		obuf = nbuf;
@@ -1221,7 +1221,7 @@ _bt_merge(Relation index, BTSpool *btspool)
 				if (bti != (BTItem) NULL)
 				{
 					btisz = BTITEMSZ(bti);
-					btisz = DOUBLEALIGN(btisz);
+					btisz = MAXALIGN(btisz);
 					if (doleaf)
 					{
 						_bt_buildadd(index, state, bti, BTP_LEAF);