diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/backend/access/transam/xlogfuncs.c | 10 | ||||
-rw-r--r-- | src/include/catalog/catversion.h | 2 | ||||
-rw-r--r-- | src/include/catalog/pg_proc.dat | 6 | ||||
-rw-r--r-- | src/test/regress/expected/misc_functions.out | 36 | ||||
-rw-r--r-- | src/test/regress/sql/misc_functions.sql | 14 |
5 files changed, 34 insertions, 34 deletions
diff --git a/src/backend/access/transam/xlogfuncs.c b/src/backend/access/transam/xlogfuncs.c index 0a31837ef18..5c0ec0b6622 100644 --- a/src/backend/access/transam/xlogfuncs.c +++ b/src/backend/access/transam/xlogfuncs.c @@ -437,16 +437,16 @@ pg_walfile_name(PG_FUNCTION_ARGS) * name. */ Datum -pg_dissect_walfile_name(PG_FUNCTION_ARGS) +pg_split_walfile_name(PG_FUNCTION_ARGS) { -#define PG_DISSECT_WALFILE_NAME_COLS 2 +#define PG_SPLIT_WALFILE_NAME_COLS 2 char *fname = text_to_cstring(PG_GETARG_TEXT_PP(0)); char *fname_upper; char *p; TimeLineID tli; XLogSegNo segno; - Datum values[PG_DISSECT_WALFILE_NAME_COLS] = {0}; - bool isnull[PG_DISSECT_WALFILE_NAME_COLS] = {0}; + Datum values[PG_SPLIT_WALFILE_NAME_COLS] = {0}; + bool isnull[PG_SPLIT_WALFILE_NAME_COLS] = {0}; TupleDesc tupdesc; HeapTuple tuple; char buf[256]; @@ -482,7 +482,7 @@ pg_dissect_walfile_name(PG_FUNCTION_ARGS) PG_RETURN_DATUM(result); -#undef PG_DISSECT_WALFILE_NAME_COLS +#undef PG_SPLIT_WALFILE_NAME_COLS } /* diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index eba01463904..1adf1403c89 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -57,6 +57,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 202212231 +#define CATALOG_VERSION_NO 202212232 #endif diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat index 9e9de75a43c..88bd472ecdb 100644 --- a/src/include/catalog/pg_proc.dat +++ b/src/include/catalog/pg_proc.dat @@ -6374,11 +6374,11 @@ prosrc => 'pg_walfile_name' }, { oid => '8205', descr => 'sequence number and timeline ID given a wal filename', - proname => 'pg_dissect_walfile_name', provolatile => 's', + proname => 'pg_split_walfile_name', provolatile => 's', prorettype => 'record', proargtypes => 'text', proallargtypes => '{text,numeric,int8}', proargmodes => '{i,o,o}', - proargnames => '{file_name,segno,timeline_id}', - prosrc => 'pg_dissect_walfile_name' }, + proargnames => '{file_name,segment_number,timeline_id}', + prosrc => 'pg_split_walfile_name' }, { oid => '3165', descr => 'difference in bytes, given two wal locations', proname => 'pg_wal_lsn_diff', prorettype => 'numeric', diff --git a/src/test/regress/expected/misc_functions.out b/src/test/regress/expected/misc_functions.out index 2907f779a75..c6699483708 100644 --- a/src/test/regress/expected/misc_functions.out +++ b/src/test/regress/expected/misc_functions.out @@ -619,26 +619,26 @@ SELECT count(*) > 0 AS ok FROM pg_control_system(); t (1 row) --- pg_dissect_walfile_name -SELECT * FROM pg_dissect_walfile_name(NULL); - segno | timeline_id --------+------------- - | +-- pg_split_walfile_name +SELECT * FROM pg_split_walfile_name(NULL); + segment_number | timeline_id +----------------+------------- + | (1 row) -SELECT * FROM pg_dissect_walfile_name('invalid'); +SELECT * FROM pg_split_walfile_name('invalid'); ERROR: invalid WAL file name "invalid" -SELECT segno > 0 AS ok_segno, timeline_id - FROM pg_dissect_walfile_name('000000010000000100000000'); - ok_segno | timeline_id -----------+------------- - t | 1 -(1 row) - -SELECT segno > 0 AS ok_segno, timeline_id - FROM pg_dissect_walfile_name('ffffffFF00000001000000af'); - ok_segno | timeline_id -----------+------------- - t | 4294967295 +SELECT segment_number > 0 AS ok_segment_number, timeline_id + FROM pg_split_walfile_name('000000010000000100000000'); + ok_segment_number | timeline_id +-------------------+------------- + t | 1 +(1 row) + +SELECT segment_number > 0 AS ok_segment_number, timeline_id + FROM pg_split_walfile_name('ffffffFF00000001000000af'); + ok_segment_number | timeline_id +-------------------+------------- + t | 4294967295 (1 row) diff --git a/src/test/regress/sql/misc_functions.sql b/src/test/regress/sql/misc_functions.sql index 0c3d75fd1ac..b57f01f3e95 100644 --- a/src/test/regress/sql/misc_functions.sql +++ b/src/test/regress/sql/misc_functions.sql @@ -230,10 +230,10 @@ SELECT count(*) > 0 AS ok FROM pg_control_init(); SELECT count(*) > 0 AS ok FROM pg_control_recovery(); SELECT count(*) > 0 AS ok FROM pg_control_system(); --- pg_dissect_walfile_name -SELECT * FROM pg_dissect_walfile_name(NULL); -SELECT * FROM pg_dissect_walfile_name('invalid'); -SELECT segno > 0 AS ok_segno, timeline_id - FROM pg_dissect_walfile_name('000000010000000100000000'); -SELECT segno > 0 AS ok_segno, timeline_id - FROM pg_dissect_walfile_name('ffffffFF00000001000000af'); +-- pg_split_walfile_name +SELECT * FROM pg_split_walfile_name(NULL); +SELECT * FROM pg_split_walfile_name('invalid'); +SELECT segment_number > 0 AS ok_segment_number, timeline_id + FROM pg_split_walfile_name('000000010000000100000000'); +SELECT segment_number > 0 AS ok_segment_number, timeline_id + FROM pg_split_walfile_name('ffffffFF00000001000000af'); |