Use GetAccessMethodMeta.

diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h
index e56a92358c75b564347499f6b72c8b6806a2a007..dc4a35ffe714fa5b34ce5450fbe26288f80b541d 100644 (file)
--- a/src/include/access/gin_private.h
+++ b/src/include/access/gin_private.h
@@ -13,6 +13,7 @@
 #include "access/genam.h"
 #include "access/gin.h"
 #include "access/itup.h"
+#include "access/metapage.h"
 #include "fmgr.h"
 #include "storage/bufmgr.h"
 #include "utils/rbtree.h"
@@ -99,7 +100,7 @@ typedef struct GinMetaPageData
 #define GIN_CURRENT_VERSION            1
 
 #define GinPageGetMeta(p) \
-       ((GinMetaPageData *) PageGetContents(p))
+       ((GinMetaPageData *) GetAccessMethodMeta(p))
 
 /*
  * Macros for accessing a GIN index page's opaque data

diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index a3d0f98310f3591e9c9df297f9033ae76f806ebe..5850ea4b49cf3f092b105f943da5aa86dd539698 100644 (file)
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -19,6 +19,7 @@
 
 #include "access/genam.h"
 #include "access/itup.h"
+#include "access/metapage.h"
 #include "access/sdir.h"
 #include "access/xlog.h"
 #include "fmgr.h"
@@ -204,7 +205,7 @@ typedef HashMetaPageData *HashMetaPage;
         (MAXALIGN(SizeOfPageHeaderData) + MAXALIGN(sizeof(HashPageOpaqueData))))
 
 #define HashPageGetMeta(page) \
-       ((HashMetaPage) PageGetContents(page))
+       ((HashMetaPage) GetAccessMethodMeta(page))
 
 /*
  * The number of bits in an ovflpage bitmap word.

diff --git a/src/include/access/metapage.h b/src/include/access/metapage.h
index 721abe23c45e1fd7a46f53e6d9fe5cf3f920b2e6..6e5036838440f3f64c59c9d052f59acd7798fda7 100644 (file)
--- a/src/include/access/metapage.h
+++ b/src/include/access/metapage.h
@@ -64,7 +64,7 @@ typedef RelationMetaPageData *RelationMetaPage;
        (((char *) (page)) + ACCESS_METHOD_META_OFFSET)
 #define GetRelationMeta(page) \
        (PageIsRelationMetapage((page)) ? BlindGetRelationMeta((page)) : NULL)
-#define GetAccessMethodMeta(page)) \
+#define GetAccessMethodMeta(page) \
        (PageIsRelationMetapage((page)) ? BlindGetAccessMethodMeta((page)) \
                : PageGetContents((page)))
 

diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index f23ac3559ad6cc509fd6708cecdb5f64c348e444..c0bcffec22d147fbbdaa7c0a105df7f276b0af25 100644 (file)
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -16,6 +16,7 @@
 
 #include "access/genam.h"
 #include "access/itup.h"
+#include "access/metapage.h"
 #include "access/sdir.h"
 #include "access/xlog.h"
 #include "access/xlogutils.h"
@@ -102,7 +103,7 @@ typedef struct BTMetaPageData
 } BTMetaPageData;
 
 #define BTPageGetMeta(p) \
-       ((BTMetaPageData *) PageGetContents(p))
+       ((BTMetaPageData *) GetAccessMethodMeta(p))
 
 #define BTREE_METAPAGE 0               /* first page is meta */
 #define BTREE_MAGIC            0x053162        /* magic number of btree pages */

diff --git a/src/include/access/spgist_private.h b/src/include/access/spgist_private.h
index 74267a439002af2bc58806b0898a02098c2b5465..bc068b9579a5d32621b86de2cfebc8d0a087645b 100644 (file)
--- a/src/include/access/spgist_private.h
+++ b/src/include/access/spgist_private.h
@@ -15,6 +15,7 @@
 #define SPGIST_PRIVATE_H
 
 #include "access/itup.h"
+#include "access/metapage.h"
 #include "access/spgist.h"
 #include "nodes/tidbitmap.h"
 #include "utils/rel.h"
@@ -97,7 +98,7 @@ typedef struct SpGistMetaPageData
 #define SPGIST_MAGIC_NUMBER (0xBA0BABEE)
 
 #define SpGistPageGetMeta(p) \
-       ((SpGistMetaPageData *) PageGetContents(p))
+       ((SpGistMetaPageData *) GetAccessMethodMeta(p))
 
 /*
  * Private state of index AM.  SpGistState is common to both insert and