diff options
| author | Peter Eisentraut | 2023-02-13 08:50:14 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2023-02-13 08:57:15 +0000 |
| commit | bd944884e92af7082063428a1124a15041597c33 (patch) | |
| tree | 4692f84a6e7987ea59c47f9ebf485771ef7ae6b1 | |
| parent | 7da51590ed6cd46ff886e8e4d08e8703db9c2b5b (diff) | |
Consolidate ItemPointer to Datum conversion functions
Instead of defining the same set of macros several times, define it
once in an appropriate header file. In passing, convert to inline
functions.
Reviewed-by: Heikki Linnakangas <[email protected]>
Discussion: https://www.postgresql.org/message-id/flat/844dd4c5-e5a1-3df1-bfaf-d1e1c2a16e45%40enterprisedb.com
| -rw-r--r-- | contrib/pageinspect/btreefuncs.c | 2 | ||||
| -rw-r--r-- | contrib/pageinspect/ginfuncs.c | 3 | ||||
| -rw-r--r-- | contrib/pageinspect/gistfuncs.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/adt/tid.c | 5 | ||||
| -rw-r--r-- | src/include/storage/itemptr.h | 20 |
5 files changed, 20 insertions, 12 deletions
diff --git a/contrib/pageinspect/btreefuncs.c b/contrib/pageinspect/btreefuncs.c index e4e5dc3c81e..9cdc8e182b4 100644 --- a/contrib/pageinspect/btreefuncs.c +++ b/contrib/pageinspect/btreefuncs.c @@ -50,8 +50,6 @@ PG_FUNCTION_INFO_V1(bt_multi_page_stats); #define IS_INDEX(r) ((r)->rd_rel->relkind == RELKIND_INDEX) #define IS_BTREE(r) ((r)->rd_rel->relam == BTREE_AM_OID) -#define DatumGetItemPointer(X) ((ItemPointer) DatumGetPointer(X)) -#define ItemPointerGetDatum(X) PointerGetDatum(X) /* ------------------------------------------------ * structure for single btree page statistics diff --git a/contrib/pageinspect/ginfuncs.c b/contrib/pageinspect/ginfuncs.c index efaa47e86de..0f846988dff 100644 --- a/contrib/pageinspect/ginfuncs.c +++ b/contrib/pageinspect/ginfuncs.c @@ -21,9 +21,6 @@ #include "utils/builtins.h" #include "utils/rel.h" -#define DatumGetItemPointer(X) ((ItemPointer) DatumGetPointer(X)) -#define ItemPointerGetDatum(X) PointerGetDatum(X) - PG_FUNCTION_INFO_V1(gin_metapage_info); PG_FUNCTION_INFO_V1(gin_page_opaque_info); diff --git a/contrib/pageinspect/gistfuncs.c b/contrib/pageinspect/gistfuncs.c index 3a947c82afc..100697814dc 100644 --- a/contrib/pageinspect/gistfuncs.c +++ b/contrib/pageinspect/gistfuncs.c @@ -31,8 +31,6 @@ PG_FUNCTION_INFO_V1(gist_page_items_bytea); #define IS_GIST(r) ((r)->rd_rel->relam == GIST_AM_OID) -#define ItemPointerGetDatum(X) PointerGetDatum(X) - Datum gist_page_opaque_info(PG_FUNCTION_ARGS) diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c index 251219a1ef2..77fb74ab0c1 100644 --- a/src/backend/utils/adt/tid.c +++ b/src/backend/utils/adt/tid.c @@ -37,11 +37,6 @@ #include "utils/varlena.h" -#define DatumGetItemPointer(X) ((ItemPointer) DatumGetPointer(X)) -#define ItemPointerGetDatum(X) PointerGetDatum(X) -#define PG_GETARG_ITEMPOINTER(n) DatumGetItemPointer(PG_GETARG_DATUM(n)) -#define PG_RETURN_ITEMPOINTER(x) return ItemPointerGetDatum(x) - #define LDELIM '(' #define RDELIM ')' #define DELIM ',' diff --git a/src/include/storage/itemptr.h b/src/include/storage/itemptr.h index 354e50e68be..fafefa14cd8 100644 --- a/src/include/storage/itemptr.h +++ b/src/include/storage/itemptr.h @@ -222,4 +222,24 @@ extern int32 ItemPointerCompare(ItemPointer arg1, ItemPointer arg2); extern void ItemPointerInc(ItemPointer pointer); extern void ItemPointerDec(ItemPointer pointer); +/* ---------------- + * Datum conversion functions + * ---------------- + */ + +static inline ItemPointer +DatumGetItemPointer(Datum X) +{ + return (ItemPointer) DatumGetPointer(X); +} + +static inline Datum +ItemPointerGetDatum(const ItemPointerData *X) +{ + return PointerGetDatum(X); +} + +#define PG_GETARG_ITEMPOINTER(n) DatumGetItemPointer(PG_GETARG_DATUM(n)) +#define PG_RETURN_ITEMPOINTER(x) return ItemPointerGetDatum(x) + #endif /* ITEMPTR_H */ |