Install new alignment code to use MAXALIGN rather than DOUBLEALIGN where

approproate.

diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 009f8abdd1584bd3f6272e3a132706ad4c75be00..a88d68855988167b3dff9428d5ddd059faa53f94 100644 (file)
--- 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 c300e644a769171945ebf2fb468797084f45b2d1..7daa5974bd3e11f0e8e6aa54f54036f7c377ad66 100644 (file)
--- 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 bb5a4acc1d80659ed7798f06877c9126e7af24c7..a1c5b14879308ad960407748cc15ac103c7079ac 100644 (file)
--- 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 ea074c39099707825ab6e28b70a3920718f1dc8a..49186932e25b98afea541ccfef92e75ab31fc15b 100644 (file)
--- 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 b7abaa0cb719117dc02a1eecfa4f0866fab0dc3d..a43b56c5d1d5c80127785ecec362bf0fb3c307ca 100644 (file)
--- 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 9f13da34ab181a5547da8b0ca7d57b0a2103f8f5..eeff50a375eaa5976925c82ff74df8462e0bdb35 100644 (file)
--- 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 5fb0367f2c6d841764af3329fcacea454d2392dd..d8dc24c41f0a4502f04f00c879a6ab7b1e88a5d5 100644 (file)
--- 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 481692dea0e8de868cfc4f103fd4f9fc73c6657c..595c79e0236f50ee380f1fd7e92129068b764a15 100644 (file)
--- 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 b07db1d7c9bb34b71df9e458c0f78d393bb1fb8e..3827e7db29d401ed0700565188ad47b71b84761c 100644 (file)
--- 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 e3b1f5a043c0022e0c2b90fd07924f5cda3a8a0c..c1564544b0318f35164e24cf1437b0d1a6f9232b 100644 (file)
--- 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);

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index de4282ccec3bcfe91904e470dc2493a442b8b828..204bd8e2693351457505478f4d7e43b4f2f0b839 100644 (file)
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.114 1999/07/17 20:16:54 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.115 1999/07/19 07:07:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1282,9 +1282,9 @@ vc_rpfheap(VRelStats *vacrelstats, Relation onerel,
                        to_item = i;
                        to_vpd = fraged_pages->vpl_pagedesc[to_item];
                    }
-                   to_vpd->vpd_free -= DOUBLEALIGN(tlen);
+                   to_vpd->vpd_free -= MAXALIGN(tlen);
                    if (to_vpd->vpd_offsets_used >= to_vpd->vpd_offsets_free)
-                       to_vpd->vpd_free -= DOUBLEALIGN(sizeof(ItemIdData));
+                       to_vpd->vpd_free -= MAXALIGN(sizeof(ItemIdData));
                    (to_vpd->vpd_offsets_used)++;
                    if (free_vtmove == 0)
                    {
@@ -2790,7 +2790,7 @@ static bool
 vc_enough_space(VPageDescr vpd, Size len)
 {
 
-   len = DOUBLEALIGN(len);
+   len = MAXALIGN(len);
 
    if (len > vpd->vpd_free)
        return false;
@@ -2800,7 +2800,7 @@ vc_enough_space(VPageDescr vpd, Size len)
        return true;            /* and len <= free_space */
 
    /* ok. noff_usd >= noff_free and so we'll have to allocate new itemid */
-   if (len + DOUBLEALIGN(sizeof(ItemIdData)) <= vpd->vpd_free)
+   if (len + MAXALIGN(sizeof(ItemIdData)) <= vpd->vpd_free)
        return true;
 
    return false;

diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index 2916c22bba79a086bc15358ea4b15622adf1f714..b118bf8de5dc7bda56100dd7fcf94141c4b46dd0 100644 (file)
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.34 1999/07/17 20:17:36 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.35 1999/07/19 07:07:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -108,8 +108,9 @@ InsertRule(char *rulname,
 (rulename, ev_type, ev_class, ev_attr, ev_action, ev_qual, is_instead) VALUES \
 ('%s', %d::char, %u::oid, %d::int2, '%s'::text, '%s'::text, \
  '%s'::bool);";
-   if (sizeof(FormData_pg_rewrite) + strlen(actionbuf) +
-       strlen(qualbuf) > MaxAttrSize)
+   if (MAXALIGN(sizeof(FormData_pg_rewrite)) +
+       MAXALIGN(strlen(actionbuf)) +
+       MAXALIGN(strlen(qualbuf)) > MaxAttrSize)
        elog(ERROR, "DefineQueryRewrite: rule plan string too big.");
    sprintf(rulebuf, template,
            rulname, evtype, eventrel_oid, evslot_index, actionbuf,

diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 7740b5fc53ae953e17de6f741318bd6f715ee962..6b8765bb81ca605567ba4d815a2695d34a4624d4 100644 (file)
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.57 1999/07/17 20:17:45 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.58 1999/07/19 07:07:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,8 +57,8 @@
  */
 
 #define IFREESPC(p)        (PageGetFreeSpace(p) - \
-                DOUBLEALIGN(offsetof(HeapTupleHeaderData,t_bits)) - \
-                DOUBLEALIGN(sizeof(struct varlena) + sizeof(int32)) - \
+                MAXALIGN(offsetof(HeapTupleHeaderData,t_bits)) - \
+                MAXALIGN(sizeof(struct varlena) + sizeof(int32)) - \
                 sizeof(double))
 #define IMAXBLK            8092
 #define IMINBLK            512
@@ -1005,11 +1005,11 @@ inv_newtuple(LargeObjectDesc *obj_desc,
 
    /* compute tuple size -- no nulls */
    hoff = offsetof(HeapTupleHeaderData, t_bits);
-   hoff = DOUBLEALIGN(hoff);
+   hoff = MAXALIGN(hoff);
 
    /* add in olastbyte, varlena.vl_len, varlena.vl_dat */
    tupsize = hoff + (2 * sizeof(int32)) + nwrite;
-   tupsize = DOUBLEALIGN(tupsize);
+   tupsize = MAXALIGN(tupsize);
 
    /*
     * Allocate the tuple on the page, violating the page abstraction.

diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index d67fb0018c315f7667416973d79378aea474021c..be53bc295557d053dee82d882344faeba8aed61e 100644 (file)
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.26 1999/07/17 20:17:48 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.27 1999/07/19 07:07:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -41,7 +41,7 @@ PageInit(Page page, Size pageSize, Size specialSize)
    Assert(pageSize >
             specialSize + sizeof(PageHeaderData) - sizeof(ItemIdData));
 
-   specialSize = DOUBLEALIGN(specialSize);
+   specialSize = MAXALIGN(specialSize);
 
    p->pd_lower = sizeof(PageHeaderData) - sizeof(ItemIdData);
    p->pd_upper = pageSize - specialSize;
@@ -149,7 +149,7 @@ PageAddItem(Page page,
    else
        lower = ((PageHeader) page)->pd_lower;
 
-   alignedSize = DOUBLEALIGN(size);
+   alignedSize = MAXALIGN(size);
 
    upper = ((PageHeader) page)->pd_upper - alignedSize;
 
@@ -190,12 +190,12 @@ PageGetTempPage(Page page, Size specialSize)
 
    /* clear out the middle */
    size = (pageSize - sizeof(PageHeaderData)) + sizeof(ItemIdData);
-   size -= DOUBLEALIGN(specialSize);
+   size -= MAXALIGN(specialSize);
    MemSet((char *) &(thdr->pd_linp[0]), 0, size);
 
    /* set high, low water marks */
    thdr->pd_lower = sizeof(PageHeaderData) - sizeof(ItemIdData);
-   thdr->pd_upper = pageSize - DOUBLEALIGN(specialSize);
+   thdr->pd_upper = pageSize - MAXALIGN(specialSize);
 
    return temp;
 }
@@ -307,7 +307,7 @@ PageRepairFragmentation(Page page)
        for (i = 0, itemidptr = itemidbase; i < nused; i++, itemidptr++)
        {
            lp = ((PageHeader) page)->pd_linp + itemidptr->offsetindex;
-           alignedSize = DOUBLEALIGN((*lp).lp_len);
+           alignedSize = MAXALIGN((*lp).lp_len);
            upper = ((PageHeader) page)->pd_upper - alignedSize;
            memmove((char *) page + upper,
                    (char *) page + (*lp).lp_off,
@@ -381,7 +381,7 @@ PageIndexTupleDelete(Page page, OffsetNumber offnum)
 
    tup = PageGetItemId(page, offnum);
    size = ItemIdGetLength(tup);
-   size = DOUBLEALIGN(size);
+   size = MAXALIGN(size);
 
    /* location of deleted tuple data */
    locn = (char *) (page + ItemIdGetOffset(tup));

diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index c604ff852227820b7ad5c6092b977d658515af6b..57d7a08a9ea478253e5a9dcc4010b1bdcb623055 100644 (file)
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.47 1999/07/17 20:17:53 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.48 1999/07/19 07:07:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -472,7 +472,7 @@ _ReadArrayStr(char *arrayStr,
            if (values[i])
            {
                if (typalign == 'd')
-                   *nbytes += DOUBLEALIGN(*(int32 *) values[i]);
+                   *nbytes += MAXALIGN(*(int32 *) values[i]);
                else
                    *nbytes += INTALIGN(*(int32 *) values[i]);
            }

diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index 1dc84bf9e763c012c81d1bac3c8ffdecebe31935..ea94f5cc9e22c8985d5f18f397b958fb24aa3b19 100644 (file)
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hash.h,v 1.27 1999/07/16 17:07:26 momjian Exp $
+ * $Id: hash.h,v 1.28 1999/07/19 07:07:27 momjian Exp $
  *
  * NOTES
  *     modeled after Margo Seltzer's hash implementation for unix.
@@ -202,7 +202,7 @@ typedef HashItemData *HashItem;
 #define BMPGSZ_BYTE(metap)     ((metap)->hashm_bmsize)
 #define BMPGSZ_BIT(metap)      ((metap)->hashm_bmsize << BYTE_TO_BIT)
 #define HashPageGetBitmap(pg) \
-   ((uint32 *) (((char *) (pg)) + DOUBLEALIGN(sizeof(PageHeaderData))))
+   ((uint32 *) (((char *) (pg)) + MAXALIGN(sizeof(PageHeaderData))))
 
 /*
  * The number of bits in an ovflpage bitmap which

diff --git a/src/include/access/htup.h b/src/include/access/htup.h
index cae145ead4913ae024d27727cb888da11b3b953e..e091208e52e5a69396f874a7cd05a08f8d76b8ae 100644 (file)
--- a/src/include/access/htup.h
+++ b/src/include/access/htup.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: htup.h,v 1.24 1999/07/15 23:03:34 momjian Exp $
+ * $Id: htup.h,v 1.25 1999/07/19 07:07:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -88,7 +88,7 @@ typedef struct HeapTupleData
 
 typedef HeapTupleData *HeapTuple;
 
-#define HEAPTUPLESIZE  DOUBLEALIGN(sizeof(HeapTupleData))
+#define HEAPTUPLESIZE  MAXALIGN(sizeof(HeapTupleData))
 
 
 /* ----------------

diff --git a/src/include/access/itup.h b/src/include/access/itup.h
index 223c7f2bd2eafbc5d9c98d5af3f106fe0542d50f..3294d1948a3c4286595e758eb146ea7cd649bc06 100644 (file)
--- a/src/include/access/itup.h
+++ b/src/include/access/itup.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: itup.h,v 1.20 1999/07/16 17:07:27 momjian Exp $
+ * $Id: itup.h,v 1.21 1999/07/19 07:07:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -103,7 +103,7 @@ typedef struct PredInfo
    ) \
    : \
    ( \
-       (Size)DOUBLEALIGN(sizeof(IndexTupleData) + sizeof(IndexAttributeBitMapData)) \
+       (Size)MAXALIGN(sizeof(IndexTupleData) + sizeof(IndexAttributeBitMapData)) \
    ) \
 )
 

diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index f31c9d385d032d29786e84713981ed95ca5c353b..709d2a4722da153ce8a1769c6c8b99f8f1d5c5ac 100644 (file)
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -10,7 +10,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: array.h,v 1.20 1999/07/17 20:18:35 momjian Exp $
+ * $Id: array.h,v 1.21 1999/07/19 07:07:29 momjian Exp $
  *
  * NOTES
  *   XXX the data array should be LONGALIGN'd -- notice that the array
@@ -84,13 +84,13 @@ typedef struct
  */
 #define ARR_DATA_PTR(a) \
        (((char *) a) + \
-        DOUBLEALIGN(sizeof(ArrayType) + 2 * (sizeof(int) * (a)->ndim)))
+        MAXALIGN(sizeof(ArrayType) + 2 * (sizeof(int) * (a)->ndim)))
 
 /*
  * The total array header size for an array of dimension n (in bytes).
  */
 #define ARR_OVERHEAD(n) \
-       (DOUBLEALIGN(sizeof(ArrayType) + 2 * (n) * sizeof(int)))
+       (MAXALIGN(sizeof(ArrayType) + 2 * (n) * sizeof(int)))
 
 /*------------------------------------------------------------------------
  * Miscellaneous helper definitions and routines for arrayfuncs.c