diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/catalog/pg_type.h | 2 | ||||
| -rw-r--r-- | src/include/fmgr.h | 2 | ||||
| -rw-r--r-- | src/include/postgres.h | 14 | ||||
| -rw-r--r-- | src/include/utils/pg_lsn.h | 7 |
4 files changed, 8 insertions, 17 deletions
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h index db18a23bf6..8ea9ceb1b8 100644 --- a/src/include/catalog/pg_type.h +++ b/src/include/catalog/pg_type.h @@ -578,7 +578,7 @@ DESCR("UUID datatype"); DATA(insert OID = 2951 ( _uuid PGNSP PGUID -1 f b A f t \054 0 2950 0 array_in array_out array_recv array_send - - array_typanalyze i x f 0 -1 0 0 _null_ _null_ _null_ )); /* pg_lsn */ -DATA(insert OID = 3220 ( pg_lsn PGNSP PGUID 8 t b U t t \054 0 0 3221 pg_lsn_in pg_lsn_out pg_lsn_recv pg_lsn_send - - - d p f 0 -1 0 0 _null_ _null_ _null_ )); +DATA(insert OID = 3220 ( pg_lsn PGNSP PGUID 8 FLOAT8PASSBYVAL b U t t \054 0 0 3221 pg_lsn_in pg_lsn_out pg_lsn_recv pg_lsn_send - - - d p f 0 -1 0 0 _null_ _null_ _null_ )); DESCR("PostgreSQL LSN datatype"); DATA(insert OID = 3221 ( _pg_lsn PGNSP PGUID -1 f b A f t \054 0 3220 0 array_in array_out array_recv array_send - - array_typanalyze d x f 0 -1 0 0 _null_ _null_ _null_ )); diff --git a/src/include/fmgr.h b/src/include/fmgr.h index dd4c672baf..aed81cdc26 100644 --- a/src/include/fmgr.h +++ b/src/include/fmgr.h @@ -230,7 +230,6 @@ extern struct varlena *pg_detoast_datum_packed(struct varlena * datum); #define PG_GETARG_CHAR(n) DatumGetChar(PG_GETARG_DATUM(n)) #define PG_GETARG_BOOL(n) DatumGetBool(PG_GETARG_DATUM(n)) #define PG_GETARG_OID(n) DatumGetObjectId(PG_GETARG_DATUM(n)) -#define PG_GETARG_LSN(n) DatumGetLSN(PG_GETARG_DATUM(n)) #define PG_GETARG_POINTER(n) DatumGetPointer(PG_GETARG_DATUM(n)) #define PG_GETARG_CSTRING(n) DatumGetCString(PG_GETARG_DATUM(n)) #define PG_GETARG_NAME(n) DatumGetName(PG_GETARG_DATUM(n)) @@ -303,7 +302,6 @@ extern struct varlena *pg_detoast_datum_packed(struct varlena * datum); #define PG_RETURN_CHAR(x) return CharGetDatum(x) #define PG_RETURN_BOOL(x) return BoolGetDatum(x) #define PG_RETURN_OID(x) return ObjectIdGetDatum(x) -#define PG_RETURN_LSN(x) return LSNGetDatum(x) #define PG_RETURN_POINTER(x) return PointerGetDatum(x) #define PG_RETURN_CSTRING(x) return CStringGetDatum(x) #define PG_RETURN_NAME(x) return NameGetDatum(x) diff --git a/src/include/postgres.h b/src/include/postgres.h index c8b311fa22..a8a206d988 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -484,20 +484,6 @@ typedef Datum *DatumPtr; #define ObjectIdGetDatum(X) ((Datum) SET_4_BYTES(X)) /* - * DatumGetLSN - * Returns PostgreSQL log sequence number of a datum. - */ - -#define DatumGetLSN(X) ((XLogRecPtr) GET_8_BYTES(X)) - -/* - * LSNGetDatum - * Returns datum representation for a PostgreSQL log sequence number. - */ - -#define LSNGetDatum(X) ((Datum) SET_8_BYTES(X)) - -/* * DatumGetTransactionId * Returns transaction identifier value of a datum. */ diff --git a/src/include/utils/pg_lsn.h b/src/include/utils/pg_lsn.h index dc2193006e..981fcd6fa8 100644 --- a/src/include/utils/pg_lsn.h +++ b/src/include/utils/pg_lsn.h @@ -16,6 +16,7 @@ #define PG_LSN_H #include "fmgr.h" +#include "access/xlogdefs.h" extern Datum pg_lsn_in(PG_FUNCTION_ARGS); extern Datum pg_lsn_out(PG_FUNCTION_ARGS); @@ -31,4 +32,10 @@ extern Datum pg_lsn_ge(PG_FUNCTION_ARGS); extern Datum pg_lsn_mi(PG_FUNCTION_ARGS); +#define DatumGetLSN(X) ((XLogRecPtr) DatumGetInt64(X)) +#define LSNGetDatum(X) (Int64GetDatum((int64) (X))) + +#define PG_GETARG_LSN(n) DatumGetLSN(PG_GETARG_DATUM(n)) +#define PG_RETURN_LSN(x) return LSNGetDatum(x) + #endif /* PG_LSN_H */ |