From fa6ba8ec943bc06a7c7ca2008d9603b046191871 Mon Sep 17 00:00:00 2001 From: Peter Geoghegan Date: Thu, 30 Mar 2023 13:14:25 -0700 Subject: [PATCH v1] pg_get_wal_block_info: suppress block data outputs. Make block_data and block_fpi_data output NULLs in all cases when pg_get_wal_block_info is called with suppress_block_data = true. --- contrib/pg_walinspect/expected/oldextversions.out | 8 ++++---- contrib/pg_walinspect/expected/pg_walinspect.out | 10 +++++----- contrib/pg_walinspect/pg_walinspect--1.0--1.1.sql | 5 +++-- contrib/pg_walinspect/pg_walinspect.c | 13 ++++++++----- contrib/pg_walinspect/sql/pg_walinspect.sql | 10 +++++----- 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/contrib/pg_walinspect/expected/oldextversions.out b/contrib/pg_walinspect/expected/oldextversions.out index ed80a0c62..89953af3d 100644 --- a/contrib/pg_walinspect/expected/oldextversions.out +++ b/contrib/pg_walinspect/expected/oldextversions.out @@ -50,10 +50,10 @@ ERROR: WAL start LSN must be less than current LSN ALTER EXTENSION pg_walinspect UPDATE TO '1.1'; -- List what version 1.1 contains. \dx+ pg_walinspect - Objects in extension "pg_walinspect" - Object description --------------------------------------------------- - function pg_get_wal_block_info(pg_lsn,pg_lsn) + Objects in extension "pg_walinspect" + Object description +------------------------------------------------------- + function pg_get_wal_block_info(pg_lsn,pg_lsn,boolean) function pg_get_wal_record_info(pg_lsn) function pg_get_wal_records_info(pg_lsn,pg_lsn) function pg_get_wal_stats(pg_lsn,pg_lsn,boolean) diff --git a/contrib/pg_walinspect/expected/pg_walinspect.out b/contrib/pg_walinspect/expected/pg_walinspect.out index 950f0e921..a8f4c9106 100644 --- a/contrib/pg_walinspect/expected/pg_walinspect.out +++ b/contrib/pg_walinspect/expected/pg_walinspect.out @@ -166,7 +166,7 @@ SELECT has_function_privilege('regress_pg_walinspect', (1 row) SELECT has_function_privilege('regress_pg_walinspect', - 'pg_get_wal_block_info(pg_lsn, pg_lsn) ', 'EXECUTE'); -- no + 'pg_get_wal_block_info(pg_lsn, pg_lsn, boolean) ', 'EXECUTE'); -- no has_function_privilege ------------------------ f @@ -196,7 +196,7 @@ SELECT has_function_privilege('regress_pg_walinspect', (1 row) SELECT has_function_privilege('regress_pg_walinspect', - 'pg_get_wal_block_info(pg_lsn, pg_lsn) ', 'EXECUTE'); -- yes + 'pg_get_wal_block_info(pg_lsn, pg_lsn, boolean) ', 'EXECUTE'); -- yes has_function_privilege ------------------------ t @@ -210,7 +210,7 @@ GRANT EXECUTE ON FUNCTION pg_get_wal_records_info(pg_lsn, pg_lsn) TO regress_pg_walinspect; GRANT EXECUTE ON FUNCTION pg_get_wal_stats(pg_lsn, pg_lsn, boolean) TO regress_pg_walinspect; -GRANT EXECUTE ON FUNCTION pg_get_wal_block_info(pg_lsn, pg_lsn) +GRANT EXECUTE ON FUNCTION pg_get_wal_block_info(pg_lsn, pg_lsn, boolean) TO regress_pg_walinspect; SELECT has_function_privilege('regress_pg_walinspect', 'pg_get_wal_record_info(pg_lsn)', 'EXECUTE'); -- yes @@ -234,7 +234,7 @@ SELECT has_function_privilege('regress_pg_walinspect', (1 row) SELECT has_function_privilege('regress_pg_walinspect', - 'pg_get_wal_block_info(pg_lsn, pg_lsn) ', 'EXECUTE'); -- yes + 'pg_get_wal_block_info(pg_lsn, pg_lsn, boolean) ', 'EXECUTE'); -- yes has_function_privilege ------------------------ t @@ -246,7 +246,7 @@ REVOKE EXECUTE ON FUNCTION pg_get_wal_records_info(pg_lsn, pg_lsn) FROM regress_pg_walinspect; REVOKE EXECUTE ON FUNCTION pg_get_wal_stats(pg_lsn, pg_lsn, boolean) FROM regress_pg_walinspect; -REVOKE EXECUTE ON FUNCTION pg_get_wal_block_info(pg_lsn, pg_lsn) +REVOKE EXECUTE ON FUNCTION pg_get_wal_block_info(pg_lsn, pg_lsn, boolean) FROM regress_pg_walinspect; -- =================================================================== -- Clean up diff --git a/contrib/pg_walinspect/pg_walinspect--1.0--1.1.sql b/contrib/pg_walinspect/pg_walinspect--1.0--1.1.sql index fdd75e8a7..ef4e6e8fd 100644 --- a/contrib/pg_walinspect/pg_walinspect--1.0--1.1.sql +++ b/contrib/pg_walinspect/pg_walinspect--1.0--1.1.sql @@ -12,6 +12,7 @@ DROP FUNCTION pg_get_wal_stats_till_end_of_wal(pg_lsn, boolean); -- CREATE FUNCTION pg_get_wal_block_info(IN start_lsn pg_lsn, IN end_lsn pg_lsn, + IN no_bytea boolean DEFAULT false, OUT start_lsn pg_lsn, OUT end_lsn pg_lsn, OUT prev_lsn pg_lsn, @@ -37,5 +38,5 @@ RETURNS SETOF record AS 'MODULE_PATHNAME', 'pg_get_wal_block_info' LANGUAGE C STRICT PARALLEL SAFE; -REVOKE EXECUTE ON FUNCTION pg_get_wal_block_info(pg_lsn, pg_lsn) FROM PUBLIC; -GRANT EXECUTE ON FUNCTION pg_get_wal_block_info(pg_lsn, pg_lsn) TO pg_read_server_files; +REVOKE EXECUTE ON FUNCTION pg_get_wal_block_info(pg_lsn, pg_lsn, boolean) FROM PUBLIC; +GRANT EXECUTE ON FUNCTION pg_get_wal_block_info(pg_lsn, pg_lsn, boolean) TO pg_read_server_files; diff --git a/contrib/pg_walinspect/pg_walinspect.c b/contrib/pg_walinspect/pg_walinspect.c index 1ff53c5ab..8c34577c5 100644 --- a/contrib/pg_walinspect/pg_walinspect.c +++ b/contrib/pg_walinspect/pg_walinspect.c @@ -59,7 +59,8 @@ static void GetWalStats(FunctionCallInfo fcinfo, XLogRecPtr start_lsn, XLogRecPtr end_lsn, bool stats_per_record); -static void GetWALBlockInfo(FunctionCallInfo fcinfo, XLogReaderState *record); +static void GetWALBlockInfo(FunctionCallInfo fcinfo, XLogReaderState *record, + bool suppress_block_data); /* * Return the LSN up to which the server has WAL. @@ -244,7 +245,8 @@ GetWALRecordInfo(XLogReaderState *record, Datum *values, * Keep this in sync with GetWALRecordInfo. */ static void -GetWALBlockInfo(FunctionCallInfo fcinfo, XLogReaderState *record) +GetWALBlockInfo(FunctionCallInfo fcinfo, XLogReaderState *record, + bool suppress_block_data) { #define PG_GET_WAL_BLOCK_INFO_COLS 20 int block_id; @@ -359,7 +361,7 @@ GetWALBlockInfo(FunctionCallInfo fcinfo, XLogReaderState *record) nulls[i++] = true; /* block_data output */ - if (blk->has_data) + if (blk->has_data && !suppress_block_data) { bytea *block_data; @@ -372,7 +374,7 @@ GetWALBlockInfo(FunctionCallInfo fcinfo, XLogReaderState *record) nulls[i++] = true; /* block_fpi_data output */ - if (blk->has_image) + if (blk->has_image && !suppress_block_data) { PGAlignedBlock buf; Page page; @@ -410,6 +412,7 @@ pg_get_wal_block_info(PG_FUNCTION_ARGS) { XLogRecPtr start_lsn = PG_GETARG_LSN(0); XLogRecPtr end_lsn = PG_GETARG_LSN(1); + bool suppress_block_data = PG_GETARG_BOOL(2); XLogReaderState *xlogreader; MemoryContext old_cxt; MemoryContext tmp_cxt; @@ -435,7 +438,7 @@ pg_get_wal_block_info(PG_FUNCTION_ARGS) /* Use the tmp context so we can clean up after each tuple is done */ old_cxt = MemoryContextSwitchTo(tmp_cxt); - GetWALBlockInfo(fcinfo, xlogreader); + GetWALBlockInfo(fcinfo, xlogreader, suppress_block_data); /* clean up and switch back */ MemoryContextSwitchTo(old_cxt); diff --git a/contrib/pg_walinspect/sql/pg_walinspect.sql b/contrib/pg_walinspect/sql/pg_walinspect.sql index 0541e5fbf..f987ca31c 100644 --- a/contrib/pg_walinspect/sql/pg_walinspect.sql +++ b/contrib/pg_walinspect/sql/pg_walinspect.sql @@ -101,7 +101,7 @@ SELECT has_function_privilege('regress_pg_walinspect', SELECT has_function_privilege('regress_pg_walinspect', 'pg_get_wal_stats(pg_lsn, pg_lsn, boolean) ', 'EXECUTE'); -- no SELECT has_function_privilege('regress_pg_walinspect', - 'pg_get_wal_block_info(pg_lsn, pg_lsn) ', 'EXECUTE'); -- no + 'pg_get_wal_block_info(pg_lsn, pg_lsn, boolean) ', 'EXECUTE'); -- no -- Functions accessible by users with role pg_read_server_files. GRANT pg_read_server_files TO regress_pg_walinspect; @@ -113,7 +113,7 @@ SELECT has_function_privilege('regress_pg_walinspect', SELECT has_function_privilege('regress_pg_walinspect', 'pg_get_wal_stats(pg_lsn, pg_lsn, boolean) ', 'EXECUTE'); -- yes SELECT has_function_privilege('regress_pg_walinspect', - 'pg_get_wal_block_info(pg_lsn, pg_lsn) ', 'EXECUTE'); -- yes + 'pg_get_wal_block_info(pg_lsn, pg_lsn, boolean) ', 'EXECUTE'); -- yes REVOKE pg_read_server_files FROM regress_pg_walinspect; @@ -124,7 +124,7 @@ GRANT EXECUTE ON FUNCTION pg_get_wal_records_info(pg_lsn, pg_lsn) TO regress_pg_walinspect; GRANT EXECUTE ON FUNCTION pg_get_wal_stats(pg_lsn, pg_lsn, boolean) TO regress_pg_walinspect; -GRANT EXECUTE ON FUNCTION pg_get_wal_block_info(pg_lsn, pg_lsn) +GRANT EXECUTE ON FUNCTION pg_get_wal_block_info(pg_lsn, pg_lsn, boolean) TO regress_pg_walinspect; SELECT has_function_privilege('regress_pg_walinspect', @@ -134,7 +134,7 @@ SELECT has_function_privilege('regress_pg_walinspect', SELECT has_function_privilege('regress_pg_walinspect', 'pg_get_wal_stats(pg_lsn, pg_lsn, boolean) ', 'EXECUTE'); -- yes SELECT has_function_privilege('regress_pg_walinspect', - 'pg_get_wal_block_info(pg_lsn, pg_lsn) ', 'EXECUTE'); -- yes + 'pg_get_wal_block_info(pg_lsn, pg_lsn, boolean) ', 'EXECUTE'); -- yes REVOKE EXECUTE ON FUNCTION pg_get_wal_record_info(pg_lsn) FROM regress_pg_walinspect; @@ -142,7 +142,7 @@ REVOKE EXECUTE ON FUNCTION pg_get_wal_records_info(pg_lsn, pg_lsn) FROM regress_pg_walinspect; REVOKE EXECUTE ON FUNCTION pg_get_wal_stats(pg_lsn, pg_lsn, boolean) FROM regress_pg_walinspect; -REVOKE EXECUTE ON FUNCTION pg_get_wal_block_info(pg_lsn, pg_lsn) +REVOKE EXECUTE ON FUNCTION pg_get_wal_block_info(pg_lsn, pg_lsn, boolean) FROM regress_pg_walinspect; -- =================================================================== -- 2.39.2