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

Jump to bottom

In PG 17, the signature for tuplesort_puttuple_common changed. #130

Closed
wants to merge 2 commits into from
Closed

In PG 17, the signature for tuplesort_puttuple_common changed. #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc6b5d6
In PG 17, the signature for tuplesort_puttuple_common changed.
Florents-Tselai Sep 21, 2024
7873afe
PG 17 in travis too
Florents-Tselai Sep 21, 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
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ notifications:
on_failure: always

env:
- PG_VERSION=17
- PG_VERSION=17 LEVEL=hardcore
- PG_VERSION=16
- PG_VERSION=16 LEVEL=hardcore
- PG_VERSION=15
Expand Down
9 changes: 7 additions & 2 deletions src/rumsort.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,12 +492,15 @@ rum_tuplesort_putrum(RumTuplesortstate *state, RumSortItem *item)
oldcontext = MemoryContextSwitchTo(rum_tuplesort_get_memorycontext(state));
copytup_rum(state, &stup, item);

#if PG_VERSION_NUM >= 160000
#if PG_VERSION_NUM >= 170000
tuplesort_puttuple_common(state, &stup, false, GetMemoryChunkSpace(&stup));
#elif PG_VERSION_NUM == 160000
tuplesort_puttuple_common(state, &stup, false);
#else
puttuple_common(state, &stup);
#endif


MemoryContextSwitchTo(oldcontext);
}

Expand All @@ -510,7 +513,9 @@ rum_tuplesort_putrumitem(RumTuplesortstate *state, RumScanItem *item)
oldcontext = MemoryContextSwitchTo(rum_tuplesort_get_memorycontext(state));
copytup_rumitem(state, &stup, item);

#if PG_VERSION_NUM >= 160000
#if PG_VERSION_NUM >= 170000
tuplesort_puttuple_common(state, &stup, false, GetMemoryChunkSpace(&stup));
#elif PG_VERSION_NUM == 160000
tuplesort_puttuple_common(state, &stup, false);
#else
puttuple_common(state, &stup);
Expand Down