Skip to content

Commit 9f56819

Browse files
maksm90akorotkov
authored andcommitted
Make function CreateTemplateTupleDesc compatable with PG12
Move CreateTemplateTupleDesc to compat module to support compatibility with PG12.
1 parent 8bd3842 commit 9f56819

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

Diff for: compat.c

+11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "postgres.h"
2+
#include "access/tupdesc.h"
23

34
#include "pg_wait_sampling.h"
45

@@ -11,3 +12,13 @@ shm_mq_detach_compat(shm_mq_handle *mqh, shm_mq *mq)
1112
shm_mq_detach(mq);
1213
#endif
1314
}
15+
16+
inline TupleDesc
17+
CreateTemplateTupleDescCompat(int nattrs, bool hasoid)
18+
{
19+
#if PG_VERSION_NUM >= 120000
20+
return CreateTemplateTupleDesc(nattrs);
21+
#else
22+
return CreateTemplateTupleDesc(nattrs, hasoid);
23+
#endif
24+
}

Diff for: pg_wait_sampling.c

+3-15
Original file line numberDiff line numberDiff line change
@@ -380,11 +380,7 @@ pg_wait_sampling_get_current(PG_FUNCTION_ARGS)
380380
params->ts = GetCurrentTimestamp();
381381

382382
funcctx->user_fctx = params;
383-
#if PG_VERSION_NUM >= 120000
384-
tupdesc = CreateTemplateTupleDesc(4);
385-
#else
386-
tupdesc = CreateTemplateTupleDesc(4, false);
387-
#endif
383+
tupdesc = CreateTemplateTupleDescCompat(4, false);
388384
TupleDescInitEntry(tupdesc, (AttrNumber) 1, "pid",
389385
INT4OID, -1, 0);
390386
TupleDescInitEntry(tupdesc, (AttrNumber) 2, "type",
@@ -589,11 +585,7 @@ pg_wait_sampling_get_profile(PG_FUNCTION_ARGS)
589585
funcctx->max_calls = profile->count;
590586

591587
/* Make tuple descriptor */
592-
#if PG_VERSION_NUM >= 120000
593-
tupdesc = CreateTemplateTupleDesc(5);
594-
#else
595-
tupdesc = CreateTemplateTupleDesc(5, false);
596-
#endif
588+
tupdesc = CreateTemplateTupleDescCompat(5, false);
597589
TupleDescInitEntry(tupdesc, (AttrNumber) 1, "pid",
598590
INT4OID, -1, 0);
599591
TupleDescInitEntry(tupdesc, (AttrNumber) 2, "type",
@@ -711,11 +703,7 @@ pg_wait_sampling_get_history(PG_FUNCTION_ARGS)
711703
funcctx->max_calls = history->count;
712704

713705
/* Make tuple descriptor */
714-
#if PG_VERSION_NUM >= 120000
715-
tupdesc = CreateTemplateTupleDesc(5);
716-
#else
717-
tupdesc = CreateTemplateTupleDesc(5, false);
718-
#endif
706+
tupdesc = CreateTemplateTupleDescCompat(5, false);
719707
TupleDescInitEntry(tupdesc, (AttrNumber) 1, "pid",
720708
INT4OID, -1, 0);
721709
TupleDescInitEntry(tupdesc, (AttrNumber) 2, "sample_ts",

Diff for: pg_wait_sampling.h

+1
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,6 @@ extern void alloc_history(History *, int);
8484
extern void collector_main(Datum main_arg);
8585

8686
extern void shm_mq_detach_compat(shm_mq_handle *mqh, shm_mq *mq);
87+
extern TupleDesc CreateTemplateTupleDescCompat(int nattrs, bool hasoid);
8788

8889
#endif

0 commit comments

Comments
 (0)