On 2021/7/8 3:54 下午, Michael Paquier wrote:
On Wed, Jul 07, 2021 at 11:28:06PM -0500, Justin Pryzby wrote:
I think you can refer to this prior commit for guidance.
commit f18aa1b203930ed28cfe42e82d3418ae6277576d
Author: Peter Eisentraut <pe...@eisentraut.org>
Date: Tue Jan 19 10:28:05 2021 +0100
pageinspect: Change block number arguments to bigint
Yes, thanks. Peter's recent work is what I had in mind. I agree that
we could improve the situation, and the change is not complicated once
you know what needs to be done. It needs to be done as follows:
- Create a new pageinspect--1.9--1.10.sql.
- Provide a proper implementation for older extension version based on
the output parameter types, with a lookup at the TupleDesc for the
function to adapt.
- Add tests to sql/oldextversions.sql to stress the old function based
on smallint results.
- Bump pageinspect.control.
Quan, would you like to produce a patch? That's a good exercise to
understand how the maintenance of extensions is done.
new patch attached
--
Michael
diff --git a/contrib/pageinspect/Makefile b/contrib/pageinspect/Makefile
index 2d330ddb28..9999068134 100644
--- a/contrib/pageinspect/Makefile
+++ b/contrib/pageinspect/Makefile
@@ -13,7 +13,8 @@ OBJS = \
rawpage.o
EXTENSION = pageinspect
-DATA = pageinspect--1.8--1.9.sql \
+DATA = pageinspect--1.9--1.10.sql \
+ pageinspect--1.8--1.9.sql \
pageinspect--1.7--1.8.sql pageinspect--1.6--1.7.sql \
pageinspect--1.5.sql pageinspect--1.5--1.6.sql \
pageinspect--1.4--1.5.sql pageinspect--1.3--1.4.sql \
diff --git a/contrib/pageinspect/expected/oldextversions.out
b/contrib/pageinspect/expected/oldextversions.out
index 04dc7f8640..9546791e23 100644
--- a/contrib/pageinspect/expected/oldextversions.out
+++ b/contrib/pageinspect/expected/oldextversions.out
@@ -36,5 +36,32 @@ SELECT * FROM bt_page_items('test1_a_idx', 1);
1 | (0,1) | 16 | f | f | 01 00 00 00 00 00 00 01 | f
| (0,1) |
(1 row)
+\df page_header
+
List of functions
+ Schema | Name | Result data type |
Argument data types
| Type
+--------+-------------+------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------
+ public | page_header | record | page bytea, OUT lsn pg_lsn, OUT
checksum smallint, OUT flags smallint, OUT lower smallint, OUT upper smallint,
OUT special smallint, OUT pagesize smallint, OUT version smallint, OUT
prune_xid xid | func
+(1 row)
+
+SELECT lower, upper, special, pagesize, version FROM
page_header(get_raw_page('test1', 0));
+ lower | upper | special | pagesize | version
+-------+-------+---------+----------+---------
+ 28 | 8152 | 8192 | 8192 | 4
+(1 row)
+
+ALTER EXTENSION pageinspect UPDATE TO '1.10';
+\df page_header
+
List of functions
+ Schema | Name | Result data type |
Argument data types
|
Type
+--------+-------------+------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------
+ public | page_header | record | page bytea, OUT lsn pg_lsn, OUT
checksum smallint, OUT flags smallint, OUT lower integer, OUT upper integer,
OUT special integer, OUT pagesize integer, OUT version smallint, OUT prune_xid
xid | func
+(1 row)
+
+SELECT lower, upper, special, pagesize, version FROM
page_header(get_raw_page('test1', 0));
+ lower | upper | special | pagesize | version
+-------+-------+---------+----------+---------
+ 28 | 8152 | 8192 | 8192 | 4
+(1 row)
+
DROP TABLE test1;
DROP EXTENSION pageinspect;
diff --git a/contrib/pageinspect/pageinspect.control
b/contrib/pageinspect/pageinspect.control
index bd716769a1..7cdf37913d 100644
--- a/contrib/pageinspect/pageinspect.control
+++ b/contrib/pageinspect/pageinspect.control
@@ -1,5 +1,5 @@
# pageinspect extension
comment = 'inspect the contents of database pages at a low level'
-default_version = '1.9'
+default_version = '1.10'
module_pathname = '$libdir/pageinspect'
relocatable = true
diff --git a/contrib/pageinspect/rawpage.c b/contrib/pageinspect/rawpage.c
index e9fee73bc4..2d1f90e3bc 100644
--- a/contrib/pageinspect/rawpage.c
+++ b/contrib/pageinspect/rawpage.c
@@ -296,10 +296,27 @@ page_header(PG_FUNCTION_ARGS)
values[0] = LSNGetDatum(lsn);
values[1] = UInt16GetDatum(page->pd_checksum);
values[2] = UInt16GetDatum(page->pd_flags);
- values[3] = UInt16GetDatum(page->pd_lower);
- values[4] = UInt16GetDatum(page->pd_upper);
- values[5] = UInt16GetDatum(page->pd_special);
- values[6] = UInt16GetDatum(PageGetPageSize(page));
+
+ if (TupleDescAttr(tupdesc, 3)->atttypid == INT2OID)
+ values[3] = UInt16GetDatum(page->pd_lower);
+ else
+ values[3] = Int32GetDatum(page->pd_lower);
+
+ if (TupleDescAttr(tupdesc, 4)->atttypid == INT2OID)
+ values[4] = UInt16GetDatum(page->pd_upper);
+ else
+ values[4] = Int32GetDatum(page->pd_upper);
+
+ if (TupleDescAttr(tupdesc, 5)->atttypid == INT2OID)
+ values[5] = UInt16GetDatum(page->pd_special);
+ else
+ values[5] = Int32GetDatum(page->pd_special);
+
+ if (TupleDescAttr(tupdesc, 5)->atttypid == INT2OID)
+ values[6] = UInt16GetDatum(PageGetPageSize(page));
+ else
+ values[6] = Int32GetDatum(PageGetPageSize(page));
+
values[7] = UInt16GetDatum(PageGetPageLayoutVersion(page));
values[8] = TransactionIdGetDatum(page->pd_prune_xid);
diff --git a/contrib/pageinspect/sql/oldextversions.sql
b/contrib/pageinspect/sql/oldextversions.sql
index 78e08f40e8..1c0d73b441 100644
--- a/contrib/pageinspect/sql/oldextversions.sql
+++ b/contrib/pageinspect/sql/oldextversions.sql
@@ -16,5 +16,11 @@ SELECT page_checksum(get_raw_page('test1', 0), 0) IS NOT
NULL AS silly_checksum_
SELECT * FROM bt_page_stats('test1_a_idx', 1);
SELECT * FROM bt_page_items('test1_a_idx', 1);
+\df page_header
+SELECT lower, upper, special, pagesize, version FROM
page_header(get_raw_page('test1', 0));
+ALTER EXTENSION pageinspect UPDATE TO '1.10';
+\df page_header
+SELECT lower, upper, special, pagesize, version FROM
page_header(get_raw_page('test1', 0));
+
DROP TABLE test1;
DROP EXTENSION pageinspect;
/* contrib/pageinspect/pageinspect--1.9--1.10.sql */
-- complain if script is sourced in psql, rather than via ALTER EXTENSION
\echo Use "ALTER EXTENSION pageinspect UPDATE TO '1.10'" to load this file.
\quit
--
-- page_header()
--
DROP FUNCTION page_header(IN page bytea);
CREATE FUNCTION page_header(IN page bytea,
OUT lsn pg_lsn,
OUT checksum smallint,
OUT flags smallint,
OUT lower int,
OUT upper int,
OUT special int,
OUT pagesize int,
OUT version smallint,
OUT prune_xid xid)
AS 'MODULE_PATHNAME', 'page_header'
LANGUAGE C STRICT PARALLEL SAFE;
