This is an automated email from the ASF dual-hosted git repository.
reshke pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new fa54f30319f `contrib/pg_buffercache` rebase fixes
fa54f30319f is described below
commit fa54f30319f1e6d92eb92378a556e216a72e566f
Author: reshke <[email protected]>
AuthorDate: Sun Dec 14 10:35:28 2025 +0000
`contrib/pg_buffercache` rebase fixes
---
contrib/pg_buffercache/expected/pg_buffercache.out | 44 ++++++++--------------
.../pg_buffercache/pg_buffercache--1.3--1.4.sql | 6 ---
contrib/pg_buffercache/pg_buffercache.control | 4 --
contrib/pg_buffercache/pg_buffercache_pages.c | 13 -------
contrib/pg_buffercache/sql/pg_buffercache.sql | 23 ++---------
5 files changed, 18 insertions(+), 72 deletions(-)
diff --git a/contrib/pg_buffercache/expected/pg_buffercache.out
b/contrib/pg_buffercache/expected/pg_buffercache.out
index ca63154a4b0..de77aac68b0 100644
--- a/contrib/pg_buffercache/expected/pg_buffercache.out
+++ b/contrib/pg_buffercache/expected/pg_buffercache.out
@@ -17,19 +17,30 @@ from pg_buffercache_summary();
t | t | t
(1 row)
-<<<<<<< HEAD
+SELECT count(*) > 0 FROM pg_buffercache_usage_counts() WHERE buffers >= 0;
+ ?column?
+----------
+ t
+(1 row)
+
-- Check that the functions / views can't be accessed by default. To avoid
-- having to create a dedicated user, use the pg_database_owner pseudo-role.
SET ROLE pg_database_owner;
-=======
->>>>>>> REL_16_9
+SELECT * FROM pg_buffercache;
+ERROR: permission denied for view pg_buffercache
+SELECT * FROM pg_buffercache_pages() AS p (wrong int);
+ERROR: permission denied for function pg_buffercache_pages
+SELECT * FROM pg_buffercache_summary();
+ERROR: permission denied for function pg_buffercache_summary
+SELECT * FROM pg_buffercache_usage_counts();
+ERROR: permission denied for function pg_buffercache_usage_counts
+RESET role;
SELECT count(*) > 0 FROM pg_buffercache_usage_counts() WHERE buffers >= 0;
?column?
----------
t
(1 row)
-<<<<<<< HEAD
-- Test GPDB functions/views
SELECT count(*) = (select setting::bigint
from pg_settings
@@ -76,23 +87,7 @@ SELECT count(*) > 0 FROM
gp_buffercache_usage_counts_aggregated WHERE buffers >=
(1 row)
-- Check that the functions / views can't be accessed by default.
-CREATE ROLE buffercache_test;
-SET ROLE buffercache_test;
-=======
--- Check that the functions / views can't be accessed by default. To avoid
--- having to create a dedicated user, use the pg_database_owner pseudo-role.
SET ROLE pg_database_owner;
->>>>>>> REL_16_9
-SELECT * FROM pg_buffercache;
-ERROR: permission denied for view pg_buffercache
-SELECT * FROM pg_buffercache_pages() AS p (wrong int);
-ERROR: permission denied for function pg_buffercache_pages
-SELECT * FROM pg_buffercache_summary();
-ERROR: permission denied for function pg_buffercache_summary
-<<<<<<< HEAD
-RESET role;
-SELECT * FROM pg_buffercache_usage_counts();
-ERROR: permission denied for function pg_buffercache_usage_counts
-- GPDB
SELECT * FROM pg_buffercache_summary;
ERROR: permission denied for view pg_buffercache_summary
@@ -109,11 +104,6 @@ ERROR: permission denied for view
gp_buffercache_summary_aggregated
SELECT * FROM gp_buffercache_usage_counts_aggregated;
ERROR: permission denied for view gp_buffercache_usage_counts_aggregated
RESET ROLE;
-=======
-SELECT * FROM pg_buffercache_usage_counts();
-ERROR: permission denied for function pg_buffercache_usage_counts
-RESET role;
->>>>>>> REL_16_9
-- Check that pg_monitor is allowed to query view / function
SET ROLE pg_monitor;
SELECT count(*) > 0 FROM pg_buffercache;
@@ -134,7 +124,6 @@ SELECT count(*) > 0 FROM pg_buffercache_usage_counts();
t
(1 row)
-<<<<<<< HEAD
-- GPDB
SELECT count(*) > 0 FROM pg_buffercache_summary;
?column?
@@ -182,6 +171,3 @@ SELECT count(*) > 0 FROM
gp_buffercache_usage_counts_aggregated;
(1 row)
RESET ROLE;
-DROP ROLE buffercache_test;
-=======
->>>>>>> REL_16_9
diff --git a/contrib/pg_buffercache/pg_buffercache--1.3--1.4.sql
b/contrib/pg_buffercache/pg_buffercache--1.3--1.4.sql
index e8f94c1970d..d5aebf3ba39 100644
--- a/contrib/pg_buffercache/pg_buffercache--1.3--1.4.sql
+++ b/contrib/pg_buffercache/pg_buffercache--1.3--1.4.sql
@@ -12,11 +12,6 @@ CREATE FUNCTION pg_buffercache_summary(
AS 'MODULE_PATHNAME', 'pg_buffercache_summary'
LANGUAGE C PARALLEL SAFE;
-<<<<<<< HEAD
--- Don't want these to be available to public.
-REVOKE ALL ON FUNCTION pg_buffercache_summary() FROM PUBLIC;
-GRANT EXECUTE ON FUNCTION pg_buffercache_summary() TO pg_monitor;
-=======
CREATE FUNCTION pg_buffercache_usage_counts(
OUT usage_count int4,
OUT buffers int4,
@@ -31,4 +26,3 @@ REVOKE ALL ON FUNCTION pg_buffercache_summary() FROM PUBLIC;
GRANT EXECUTE ON FUNCTION pg_buffercache_summary() TO pg_monitor;
REVOKE ALL ON FUNCTION pg_buffercache_usage_counts() FROM PUBLIC;
GRANT EXECUTE ON FUNCTION pg_buffercache_usage_counts() TO pg_monitor;
->>>>>>> REL_16_9
diff --git a/contrib/pg_buffercache/pg_buffercache.control
b/contrib/pg_buffercache/pg_buffercache.control
index 39f8a8ccba2..2ac156e183b 100644
--- a/contrib/pg_buffercache/pg_buffercache.control
+++ b/contrib/pg_buffercache/pg_buffercache.control
@@ -1,9 +1,5 @@
# pg_buffercache extension
comment = 'examine the shared buffer cache'
-<<<<<<< HEAD
default_version = '1.4.1'
-=======
-default_version = '1.4'
->>>>>>> REL_16_9
module_pathname = '$libdir/pg_buffercache'
relocatable = true
diff --git a/contrib/pg_buffercache/pg_buffercache_pages.c
b/contrib/pg_buffercache/pg_buffercache_pages.c
index 9d880aeb1f6..33167323653 100644
--- a/contrib/pg_buffercache/pg_buffercache_pages.c
+++ b/contrib/pg_buffercache/pg_buffercache_pages.c
@@ -18,10 +18,7 @@
#define NUM_BUFFERCACHE_PAGES_MIN_ELEM 8
#define NUM_BUFFERCACHE_PAGES_ELEM 9
#define NUM_BUFFERCACHE_SUMMARY_ELEM 5
-<<<<<<< HEAD
-=======
#define NUM_BUFFERCACHE_USAGE_COUNTS_ELEM 4
->>>>>>> REL_16_9
PG_MODULE_MAGIC;
@@ -31,11 +28,7 @@ PG_MODULE_MAGIC;
typedef struct
{
uint32 bufferid;
-<<<<<<< HEAD
- Oid relfilenode;
-=======
RelFileNumber relfilenumber;
->>>>>>> REL_16_9
Oid reltablespace;
Oid reldatabase;
ForkNumber forknum;
@@ -69,10 +62,7 @@ typedef struct
*/
PG_FUNCTION_INFO_V1(pg_buffercache_pages);
PG_FUNCTION_INFO_V1(pg_buffercache_summary);
-<<<<<<< HEAD
-=======
PG_FUNCTION_INFO_V1(pg_buffercache_usage_counts);
->>>>>>> REL_16_9
Datum
pg_buffercache_pages(PG_FUNCTION_ARGS)
@@ -316,8 +306,6 @@ pg_buffercache_summary(PG_FUNCTION_ARGS)
PG_RETURN_DATUM(result);
}
-<<<<<<< HEAD
-=======
Datum
pg_buffercache_usage_counts(PG_FUNCTION_ARGS)
@@ -359,4 +347,3 @@ pg_buffercache_usage_counts(PG_FUNCTION_ARGS)
return (Datum) 0;
}
->>>>>>> REL_16_9
diff --git a/contrib/pg_buffercache/sql/pg_buffercache.sql
b/contrib/pg_buffercache/sql/pg_buffercache.sql
index 750d9c7d253..dd836947e62 100644
--- a/contrib/pg_buffercache/sql/pg_buffercache.sql
+++ b/contrib/pg_buffercache/sql/pg_buffercache.sql
@@ -10,18 +10,15 @@ select buffers_used + buffers_unused > 0,
buffers_pinned <= buffers_used
from pg_buffercache_summary();
-<<<<<<< HEAD
-=======
SELECT count(*) > 0 FROM pg_buffercache_usage_counts() WHERE buffers >= 0;
->>>>>>> REL_16_9
-- Check that the functions / views can't be accessed by default. To avoid
-- having to create a dedicated user, use the pg_database_owner pseudo-role.
SET ROLE pg_database_owner;
SELECT * FROM pg_buffercache;
SELECT * FROM pg_buffercache_pages() AS p (wrong int);
SELECT * FROM pg_buffercache_summary();
-<<<<<<< HEAD
+SELECT * FROM pg_buffercache_usage_counts();
RESET role;
SELECT count(*) > 0 FROM pg_buffercache_usage_counts() WHERE buffers >= 0;
@@ -48,12 +45,7 @@ SELECT count(*) > 0 FROM gp_buffercache_usage_counts WHERE
buffers >= 0;
SELECT count(*) > 0 FROM gp_buffercache_usage_counts_aggregated WHERE buffers
>= 0;
-- Check that the functions / views can't be accessed by default.
-CREATE ROLE buffercache_test;
-SET ROLE buffercache_test;
-SELECT * FROM pg_buffercache;
-SELECT * FROM pg_buffercache_pages() AS p (wrong int);
-SELECT * FROM pg_buffercache_summary();
-SELECT * FROM pg_buffercache_usage_counts();
+SET ROLE pg_database_owner;
-- GPDB
SELECT * FROM pg_buffercache_summary;
SELECT * FROM pg_buffercache_usage_counts;
@@ -63,17 +55,12 @@ SELECT * FROM gp_buffercache_usage_counts;
SELECT * FROM gp_buffercache_summary_aggregated;
SELECT * FROM gp_buffercache_usage_counts_aggregated;
RESET ROLE;
-=======
-SELECT * FROM pg_buffercache_usage_counts();
-RESET role;
->>>>>>> REL_16_9
-- Check that pg_monitor is allowed to query view / function
SET ROLE pg_monitor;
SELECT count(*) > 0 FROM pg_buffercache;
SELECT buffers_used + buffers_unused > 0 FROM pg_buffercache_summary();
SELECT count(*) > 0 FROM pg_buffercache_usage_counts();
-<<<<<<< HEAD
-- GPDB
SELECT count(*) > 0 FROM pg_buffercache_summary;
@@ -83,8 +70,4 @@ SELECT buffers_used + buffers_unused > 0 FROM
gp_buffercache_summary;
SELECT buffers_used + buffers_unused > 0 FROM
gp_buffercache_summary_aggregated;
SELECT count(*) > 0 FROM gp_buffercache_usage_counts;
SELECT count(*) > 0 FROM gp_buffercache_usage_counts_aggregated;
-RESET ROLE;
-
-DROP ROLE buffercache_test;
-=======
->>>>>>> REL_16_9
+RESET ROLE;
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
