From cd3ccd0334895c20b05723328ae1bbecddf5081a Mon Sep 17 00:00:00 2001
From: Yuwei Peng <ywpeng@whu.edu.cn>
Date: Tue, 2 Nov 2021 20:16:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=92=88=E5=AF=B9pg?=
 =?UTF-8?q?=5Fbuffercache=5Fpages=E5=87=BD=E6=95=B0=E7=9A=84=E5=9B=9E?=
 =?UTF-8?q?=E6=BB=9A=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加了针对pg_buffercache_pages函数的回滚脚本，同时补充了otherdb中针对该函数的升级脚本，也将升级脚本中bucketid的类型更正为int4。
---
 .../rollback_catalog_maindb_92_422.sql        | 19 +++++++++++++++---
 .../rollback_catalog_otherdb_92_422.sql       | 18 +++++++++++++++++
 .../upgrade_catalog_maindb_92_422.sql         |  2 +-
 .../upgrade_catalog_otherdb_92_422.sql        | 20 +++++++++++++++++++
 4 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_422.sql
 create mode 100644 src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_422.sql

diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_422.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_422.sql
index be46e8a6e..d41efbeb1 100644
--- a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_422.sql
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_422.sql
@@ -1,5 +1,18 @@
 -- --------------------------------------------------------------
--- rollback pg_catalog.pg_collation
+-- rollback pg_catalog.pg_buffercache_pages
 -- --------------------------------------------------------------
-delete from pg_catalog.pg_collation where collname='zh_CN' and collnamespace=11 and collencoding=36 and collcollate='zh_CN.gb18030' and collctype='zh_CN.gb18030';
-delete from pg_catalog.pg_collation where collname='zh_CN.gb18030' and collnamespace=11 and collencoding=36 and collcollate='zh_CN.gb18030' and collctype='zh_CN.gb18030';
\ No newline at end of file
+DROP FUNCTION IF EXISTS pg_catalog.pg_buffercache_pages() CASCADE;
+
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4130;
+CREATE OR REPLACE FUNCTION pg_catalog.pg_buffercache_pages
+(out bufferid pg_catalog.int4,
+out relfilenode pg_catalog.oid,
+out bucketid pg_catalog.int2,
+out storage_type pg_catalog.int2,
+out reltablespace pg_catalog.oid,
+out reldatabase pg_catalog.oid,
+out relforknumber pg_catalog.int2,
+out relblocknumber pg_catalog.int8,
+out isdirty pg_catalog.bool,
+out usage_count pg_catalog.int2)
+RETURNS SETOF record LANGUAGE INTERNAL STABLE STRICT as 'pg_buffercache_pages';
\ No newline at end of file
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_422.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_422.sql
new file mode 100644
index 000000000..d41efbeb1
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_422.sql
@@ -0,0 +1,18 @@
+-- --------------------------------------------------------------
+-- rollback pg_catalog.pg_buffercache_pages
+-- --------------------------------------------------------------
+DROP FUNCTION IF EXISTS pg_catalog.pg_buffercache_pages() CASCADE;
+
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4130;
+CREATE OR REPLACE FUNCTION pg_catalog.pg_buffercache_pages
+(out bufferid pg_catalog.int4,
+out relfilenode pg_catalog.oid,
+out bucketid pg_catalog.int2,
+out storage_type pg_catalog.int2,
+out reltablespace pg_catalog.oid,
+out reldatabase pg_catalog.oid,
+out relforknumber pg_catalog.int2,
+out relblocknumber pg_catalog.int8,
+out isdirty pg_catalog.bool,
+out usage_count pg_catalog.int2)
+RETURNS SETOF record LANGUAGE INTERNAL STABLE STRICT as 'pg_buffercache_pages';
\ No newline at end of file
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_422.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_422.sql
index 9caf405be..5285b72f6 100644
--- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_422.sql
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_422.sql
@@ -7,7 +7,7 @@ SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4130;
 CREATE OR REPLACE FUNCTION pg_catalog.pg_buffercache_pages
 (out bufferid pg_catalog.int4,
 out relfilenode pg_catalog.oid,
-out bucketid pg_catalog.int2,
+out bucketid pg_catalog.int4,
 out storage_type pg_catalog.int2,
 out reltablespace pg_catalog.oid,
 out reldatabase pg_catalog.oid,
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_422.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_422.sql
new file mode 100644
index 000000000..5285b72f6
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_422.sql
@@ -0,0 +1,20 @@
+-- --------------------------------------------------------------
+-- upgrade pg_catalog.pg_buffercache_pages
+-- --------------------------------------------------------------
+DROP FUNCTION IF EXISTS pg_catalog.pg_buffercache_pages() CASCADE;
+
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4130;
+CREATE OR REPLACE FUNCTION pg_catalog.pg_buffercache_pages
+(out bufferid pg_catalog.int4,
+out relfilenode pg_catalog.oid,
+out bucketid pg_catalog.int4,
+out storage_type pg_catalog.int2,
+out reltablespace pg_catalog.oid,
+out reldatabase pg_catalog.oid,
+out relforknumber pg_catalog.int2,
+out relblocknumber pg_catalog.int8,
+out isdirty pg_catalog.bool,
+out isvalid pg_catalog.bool,
+out usage_count pg_catalog.int2,
+out pinning_backends pg_catalog.int4)
+RETURNS SETOF record LANGUAGE INTERNAL STABLE STRICT as 'pg_buffercache_pages';
\ No newline at end of file