From c5ebc9da42ab6397f14218d160823c8baf0c6fef Mon Sep 17 00:00:00 2001 From: luoh51 Date: Mon, 11 Nov 2024 11:20:55 +0800 Subject: [PATCH] fix pg_buffercache install error --- contrib/pg_buffercache/Makefile | 3 --- contrib/pg_buffercache/pg_buffercache--1.0.sql | 11 +---------- .../pg_buffercache--unpackaged--1.0.sql | 1 - contrib/pg_buffercache/pg_buffercache_pages.cpp | 2 +- 4 files changed, 2 insertions(+), 15 deletions(-) diff --git a/contrib/pg_buffercache/Makefile b/contrib/pg_buffercache/Makefile index 323c0ac8e..df47259e1 100644 --- a/contrib/pg_buffercache/Makefile +++ b/contrib/pg_buffercache/Makefile @@ -1,8 +1,5 @@ # contrib/pg_buffercache/Makefile -MODULE_big = pg_buffercache -OBJS = pg_buffercache_pages.o - EXTENSION = pg_buffercache DATA = pg_buffercache--1.0.sql pg_buffercache--unpackaged--1.0.sql diff --git a/contrib/pg_buffercache/pg_buffercache--1.0.sql b/contrib/pg_buffercache/pg_buffercache--1.0.sql index cceebda87..b88e82745 100644 --- a/contrib/pg_buffercache/pg_buffercache--1.0.sql +++ b/contrib/pg_buffercache/pg_buffercache--1.0.sql @@ -3,18 +3,9 @@ -- complain if script is sourced in psql, rather than via CREATE EXTENSION \echo Use "CREATE EXTENSION pg_buffercache" to load this file. \quit --- Register the function. -CREATE FUNCTION pg_buffercache_pages_wrap() -RETURNS SETOF RECORD -AS 'MODULE_PATHNAME', 'pg_buffercache_pages' -LANGUAGE C; - -- Create a view for convenient access. CREATE VIEW pg_buffercache AS - SELECT P.* FROM pg_buffercache_pages_wrap() AS P - (bufferid integer, relfilenode oid, reltablespace oid, reldatabase oid, - relforknumber int2, relblocknumber int8, isdirty bool, usagecount int2); + SELECT * FROM pg_buffercache_pages(); -- Don't want these to be available to public. -REVOKE ALL ON FUNCTION pg_buffercache_pages_wrap() FROM PUBLIC; REVOKE ALL ON pg_buffercache FROM PUBLIC; diff --git a/contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql b/contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql index bfe6e52f8..46b843463 100644 --- a/contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql +++ b/contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql @@ -3,5 +3,4 @@ -- complain if script is sourced in psql, rather than via CREATE EXTENSION \echo Use "CREATE EXTENSION pg_buffercache" to load this file. \quit -ALTER EXTENSION pg_buffercache ADD function pg_buffercache_pages(); ALTER EXTENSION pg_buffercache ADD view pg_buffercache; diff --git a/contrib/pg_buffercache/pg_buffercache_pages.cpp b/contrib/pg_buffercache/pg_buffercache_pages.cpp index fc881eb10..6d046b06b 100644 --- a/contrib/pg_buffercache/pg_buffercache_pages.cpp +++ b/contrib/pg_buffercache/pg_buffercache_pages.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- * - * pg_buffercache_pages.c + * pg_buffercache_pages.c (deprecated in openGauss) * display some contents of the buffer cache * * contrib/pg_buffercache/pg_buffercache_pages.c