Skip to content

Changes needed for PG 18 #529

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

Merged
jcflack merged 1 commit into from
May 27, 2025
Merged

Changes needed for PG 18 #529

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions pljava-so/src/main/c/VarlenaWrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018-2023 Tada AB and other contributors, as listed below.
* Copyright (c) 2018-2025 Tada AB and other contributors, as listed below.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the The BSD 3-Clause License
Expand Down Expand Up @@ -33,7 +33,11 @@
#include "pljava/JNICalls.h"

#if PG_VERSION_NUM < 90600
#define GetOldestSnapshot() NULL
#define get_toast_snapshot() NULL
#elif PG_VERSION_NUM < 180000
#define get_toast_snapshot() GetOldestSnapshot()
#else
#include <access/toast_internals.h>
#endif

#define _VL_TYPE struct varlena *
Expand Down Expand Up @@ -145,7 +149,7 @@ jobject pljava_VarlenaWrapper_Input(
goto justDetoastEagerly;
if ( VARATT_IS_EXTERNAL_ONDISK(vl) )
{
pin = GetOldestSnapshot();
pin = get_toast_snapshot();
if ( NULL == pin )
{
/*
Expand Down
Loading