Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pgsql 16 and 17 support #22

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

pgsql 16 and 17 support #22

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
72ac278
redis_fdw.c: compile for pgsql 16, need to test for regressions
petrov9268 Oct 11, 2024
95b6bbd
redis_fdw.c: compile for pgsql 17, need to test for regressions
petrov9268 Oct 11, 2024
7b59f65
redis_fdw.c: fix PG_VERSION_NUM
petrov9268 Oct 25, 2024
23651e9
redis_fdw.c: conditionally include inherit.h, call function for pg>=15.2
petrov9268 Oct 25, 2024
0291524
redis_fdw.c: fix formatting
petrov9268 Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 26 additions & 7 deletions redis_fdw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@
#include "nodes/nodeFuncs.h"
#include "nodes/pg_list.h"
#include "optimizer/cost.h"

#if PG_VERSION_NUM >= 150200
#include "optimizer/inherit.h"
#endif

#include "optimizer/pathnode.h"
#include "optimizer/planmain.h"
#include "optimizer/restrictinfo.h"
Expand Down Expand Up @@ -2391,6 +2396,9 @@ redisGetForeignPaths(PlannerInfo *root,
NULL, /* no outer rel either */
#if PG_VERSION_NUM >= 90500
NULL, /* no extra plan */
#endif
#if PG_VERSION_NUM >= 170000
NIL, /* no fdw_restrictinfo */
#endif
NIL)); /* no fdw_private data */
}
Expand Down Expand Up @@ -3649,7 +3657,7 @@ redisPlanForeignModify(PlannerInfo *root,
default:
ereport(ERROR,
(errcode(ERRCODE_FDW_ERROR),
errmsg("table type %s is read-only",
errmsg("table type %s is read-only",
FIELD_NAMES[src->table_type])));
break;
}
Expand Down Expand Up @@ -3755,11 +3763,22 @@ redisPlanForeignModify(PlannerInfo *root,
/* figure out which attributes are affected */
#if PG_VERSION_NUM < 90500
tmpset = bms_copy(rte->modifiedCols);
#elif PG_VERSION_NUM < 120000
tmpset = rte->updatedCols;
#elif PG_VERSION_NUM < 150200
tmpset = bms_union(rte->updatedCols, rte->extraUpdatedCols);
#else
tmpset = bms_copy(rte->updatedCols);
/* this actually works on the latest 13 and 14 versions (after 14.6) */
tmpset = get_rel_all_updated_cols(root, find_base_rel(root,
resultRelation));
#endif

#if PG_VERSION_NUM < 90500
while ((i = bms_first_member(tmpset)) >= 0) {
#else
i = -1;
while ((i = bms_next_member(tmpset, i)) >= 0 ) {
#endif
/* bit numbers are offset by FirstLowInvalidHeapAttributeNumber */
AttrNumber attno = i + FirstLowInvalidHeapAttributeNumber;

Expand Down Expand Up @@ -3860,7 +3879,7 @@ redisPlanForeignModify(PlannerInfo *root,
if (!bms_is_member(rctx->rtable.columns[i].pgattnum -
FirstLowInvalidHeapAttributeNumber,
attrs_used)) {
rctx->rtable.columns[i].var_field = -1;
rctx->rtable.columns[i].var_field = -1;
}
}
}
Expand Down Expand Up @@ -3971,7 +3990,7 @@ redisExecForeignInsert(EState *estate,
if (!isnull)
param->value = DatumGetCString(OidFunctionCall1(
rctx->rtable.columns[param->paramid].typoutput,
datum));
datum));

switch (param->var_field) {
case VAR_KEY:
Expand Down Expand Up @@ -4223,11 +4242,11 @@ redisExecForeignInsert(EState *estate,
if (val) {
DEBUG((DEBUG_LEVEL, "EXPIREMEMBER %s %s %" PRId64 "", rctx->pfxkey, val, rctx->valttl));
expreply = redisCommand(rctx->r_ctx, "EXPIREMEMBER %s %s %" PRId64 "",
rctx->pfxkey, val, rctx->valttl);
rctx->pfxkey, val, rctx->valttl);
} else {
DEBUG((DEBUG_LEVEL, "EXPIREMEMBER %s %" PRId64 " %" PRId64 "", rctx->pfxkey, ival, rctx->valttl));
expreply = redisCommand(rctx->r_ctx, "EXPIREMEMBER %s %" PRId64 " %" PRId64 "",
rctx->pfxkey, ival, rctx->valttl);
rctx->pfxkey, ival, rctx->valttl);
}

if (expreply == NULL) {
Expand Down Expand Up @@ -4468,7 +4487,7 @@ redisExecForeignUpdate(EState *estate,

if (!isnull)
param->value = DatumGetCString(OidFunctionCall1(
rctx->rtable.columns[param->paramid].typoutput,
rctx->rtable.columns[param->paramid].typoutput,
datum));

switch (param->var_field) {
Expand Down