diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/backend/storage/ipc/signalfuncs.c | 29 | ||||
-rw-r--r-- | src/backend/utils/adt/genfile.c | 46 | ||||
-rw-r--r-- | src/include/catalog/catversion.h | 2 | ||||
-rw-r--r-- | src/include/catalog/pg_proc.dat | 7 |
4 files changed, 2 insertions, 82 deletions
diff --git a/src/backend/storage/ipc/signalfuncs.c b/src/backend/storage/ipc/signalfuncs.c index 792e80ff900..88e9bf8125d 100644 --- a/src/backend/storage/ipc/signalfuncs.c +++ b/src/backend/storage/ipc/signalfuncs.c @@ -273,38 +273,11 @@ pg_reload_conf(PG_FUNCTION_ARGS) /* * Rotate log file * - * This function is kept to support adminpack 1.0. - */ -Datum -pg_rotate_logfile(PG_FUNCTION_ARGS) -{ - if (!superuser()) - ereport(ERROR, - (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - errmsg("must be superuser to rotate log files with adminpack 1.0"), - /* translator: %s is a SQL function name */ - errhint("Consider using %s, which is part of core, instead.", - "pg_logfile_rotate()"))); - - if (!Logging_collector) - { - ereport(WARNING, - (errmsg("rotation not possible because log collection not active"))); - PG_RETURN_BOOL(false); - } - - SendPostmasterSignal(PMSIGNAL_ROTATE_LOGFILE); - PG_RETURN_BOOL(true); -} - -/* - * Rotate log file - * * Permission checking for this function is managed through the normal * GRANT system. */ Datum -pg_rotate_logfile_v2(PG_FUNCTION_ARGS) +pg_rotate_logfile(PG_FUNCTION_ARGS) { if (!Logging_collector) { diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c index ca19903ac6a..0d825574179 100644 --- a/src/backend/utils/adt/genfile.c +++ b/src/backend/utils/adt/genfile.c @@ -230,52 +230,6 @@ read_text_file(const char *filename, int64 seek_offset, int64 bytes_to_read, /* * Read a section of a file, returning it as text * - * This function is kept to support adminpack 1.0. - */ -Datum -pg_read_file(PG_FUNCTION_ARGS) -{ - text *filename_t = PG_GETARG_TEXT_PP(0); - int64 seek_offset = 0; - int64 bytes_to_read = -1; - bool missing_ok = false; - char *filename; - text *result; - - if (!superuser()) - ereport(ERROR, - (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - errmsg("must be superuser to read files with adminpack 1.0"), - /* translator: %s is a SQL function name */ - errhint("Consider using %s, which is part of core, instead.", - "pg_read_file()"))); - - /* handle optional arguments */ - if (PG_NARGS() >= 3) - { - seek_offset = PG_GETARG_INT64(1); - bytes_to_read = PG_GETARG_INT64(2); - - if (bytes_to_read < 0) - ereport(ERROR, - (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("requested length cannot be negative"))); - } - if (PG_NARGS() >= 4) - missing_ok = PG_GETARG_BOOL(3); - - filename = convert_and_check_filename(filename_t); - - result = read_text_file(filename, seek_offset, bytes_to_read, missing_ok); - if (result) - PG_RETURN_TEXT_P(result); - else - PG_RETURN_NULL(); -} - -/* - * Read a section of a file, returning it as text - * * No superuser check done here- instead privileges are handled by the * GRANT system. * diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 7faa6a9bb7c..208ffbe2a35 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -57,6 +57,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 202402291 +#define CATALOG_VERSION_NO 202403041 #endif diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat index 9c120fc2b7f..291ed876fca 100644 --- a/src/include/catalog/pg_proc.dat +++ b/src/include/catalog/pg_proc.dat @@ -6545,9 +6545,6 @@ proargtypes => '', prosrc => 'pg_reload_conf' }, { oid => '2622', descr => 'rotate log file', proname => 'pg_rotate_logfile', provolatile => 'v', prorettype => 'bool', - proargtypes => '', prosrc => 'pg_rotate_logfile_v2' }, -{ oid => '4099', descr => 'rotate log file - old version for adminpack 1.0', - proname => 'pg_rotate_logfile_old', provolatile => 'v', prorettype => 'bool', proargtypes => '', prosrc => 'pg_rotate_logfile' }, { oid => '3800', descr => 'current logging collector file location', proname => 'pg_current_logfile', proisstrict => 'f', provolatile => 'v', @@ -6578,10 +6575,6 @@ proname => 'pg_read_file', provolatile => 'v', prorettype => 'text', proargtypes => 'text int8 int8 bool', prosrc => 'pg_read_file_off_len_missing' }, -{ oid => '4100', - descr => 'read text from a file - old version for adminpack 1.0', - proname => 'pg_read_file_old', provolatile => 'v', prorettype => 'text', - proargtypes => 'text int8 int8', prosrc => 'pg_read_file' }, { oid => '3826', descr => 'read text from a file', proname => 'pg_read_file', provolatile => 'v', prorettype => 'text', proargtypes => 'text', prosrc => 'pg_read_file_all' }, |