Skip to content

Support PostgreSQL 19 #430

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

Open
CyberDem0n wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Support PostgreSQL 19 #430

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ REGRESS = pg_cron-test
MODULE_big = $(EXTENSION)
OBJS = $(patsubst %.c,%.o,$(wildcard src/*.c))
ifeq ($(CC),gcc)
PG_CPPFLAGS = -std=c99 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-uninitialized -Wno-implicit-fallthrough -Iinclude -I$(libpq_srcdir)
PG_CPPFLAGS = -std=gnu11 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-uninitialized -Wno-implicit-fallthrough -Iinclude -I$(libpq_srcdir)
else
PG_CPPFLAGS = -std=c99 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-implicit-fallthrough -Iinclude -I$(libpq_srcdir)
PG_CPPFLAGS = -std=gnu11 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-implicit-fallthrough -Iinclude -I$(libpq_srcdir)
endif
ifeq ($(shell uname -s),SunOS)
PG_CPPFLAGS += -Wno-sign-compare -D__EXTENSIONS__
Expand Down
45 changes: 34 additions & 11 deletions src/pg_cron.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
/* these are always necessary for a bgworker */
#include "miscadmin.h"
#include "postmaster/bgworker.h"
#include "storage/fd.h"
#include "storage/ipc.h"
#include "storage/latch.h"
#include "storage/lwlock.h"
Expand Down Expand Up @@ -182,7 +183,10 @@ static bool UseBackgroundWorkers = false;

static char *cron_timezone = NULL;

static const struct config_enum_entry cron_message_level_options[] = {
#if PG_VERSION_NUM < 190000
#define PG_SIG_IGN SIG_IGN

static const struct config_enum_entry server_message_level_options[] = {
{"debug5", DEBUG5, false},
{"debug4", DEBUG4, false},
{"debug3", DEBUG3, false},
Expand All @@ -198,6 +202,7 @@ static const struct config_enum_entry cron_message_level_options[] = {
{"panic", PANIC, false},
{NULL, 0, false}
};
#endif

static const char *cron_error_severity(int elevel);

Expand All @@ -207,7 +212,7 @@ static const char *cron_error_severity(int elevel);
void
_PG_init(void)
{
BackgroundWorker worker;
BackgroundWorker worker = {0,};

if (IsBinaryUpgrade)
{
Expand Down Expand Up @@ -325,7 +330,7 @@ _PG_init(void)
NULL,
&CronLogMinMessages,
WARNING,
cron_message_level_options,
server_message_level_options,
PGC_SIGHUP,
GUC_SUPERUSER_ONLY,
NULL, NULL, NULL);
Expand Down Expand Up @@ -481,17 +486,18 @@ cron_error_severity(int elevel)
return elevel_char;
}

#if PG_VERSION_NUM < 150000
/*
* bgw_generate_returned_message -
* generates the message to be inserted into the job_run_details table
* first part is comming from error_severity (elog.c)
* error_severity --- get string representing elevel
*
* copied from elog.c
*/
static void
bgw_generate_returned_message(StringInfoData *display_msg, ErrorData edata)
static const char *
error_severity(int elevel)
{
const char *prefix;

switch (edata.elevel)
switch (elevel)
{
case DEBUG1:
case DEBUG2:
Expand All @@ -501,7 +507,7 @@ bgw_generate_returned_message(StringInfoData *display_msg, ErrorData edata)
prefix = gettext_noop("DEBUG");
break;
case LOG:
#if (PG_VERSION_NUM >= 100000)
#if PG_VERSION_NUM >= 100000
case LOG_SERVER_ONLY:
#endif
prefix = gettext_noop("LOG");
Expand All @@ -513,6 +519,9 @@ bgw_generate_returned_message(StringInfoData *display_msg, ErrorData edata)
prefix = gettext_noop("NOTICE");
break;
case WARNING:
#if PG_VERSION_NUM >= 140000
case WARNING_CLIENT_ONLY:
#endif
prefix = gettext_noop("WARNING");
break;
case ERROR:
Expand All @@ -529,6 +538,20 @@ bgw_generate_returned_message(StringInfoData *display_msg, ErrorData edata)
break;
}

return prefix;
}
#endif

/*
* bgw_generate_returned_message -
* generates the message to be inserted into the job_run_details table
* first part is comming from error_severity (elog.c)
*/
static void
bgw_generate_returned_message(StringInfoData *display_msg, ErrorData edata)
{
const char *prefix = error_severity(edata.elevel);

appendStringInfo(display_msg, "%s: %s", prefix, edata.message);
if (edata.detail != NULL)
appendStringInfo(display_msg, "\nDETAIL: %s", edata.detail);
Expand All @@ -553,7 +576,7 @@ PgCronLauncherMain(Datum arg)

/* Establish signal handlers before unblocking signals. */
pqsignal(SIGHUP, SignalHandlerForConfigReload);
pqsignal(SIGINT, SIG_IGN);
pqsignal(SIGINT, PG_SIG_IGN);
pqsignal(SIGTERM, die);

/* We're now ready to receive signals */
Expand Down