This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 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 6d517baeb2d Fix some cases on pg_contrib
6d517baeb2d is described below
commit 6d517baeb2d73f6727caca16a7ea29671a7332f9
Author: Jinbao Chen <[email protected]>
AuthorDate: Wed Apr 1 21:25:08 2026 -0400
Fix some cases on pg_contrib
---
gpcontrib/gp_exttable_fdw/input/gp_exttable_fdw.source | 2 +-
gpcontrib/gp_exttable_fdw/output/gp_exttable_fdw.source | 4 ++--
gpcontrib/gp_toolkit/expected/gp_toolkit.out | 1 +
gpcontrib/gp_toolkit/expected/gp_toolkit_resqueue.out | 9 ++++-----
gpcontrib/gp_toolkit/sql/gp_toolkit.sql | 1 +
gpcontrib/gp_toolkit/sql/gp_toolkit_resqueue.sql | 3 +--
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/gpcontrib/gp_exttable_fdw/input/gp_exttable_fdw.source
b/gpcontrib/gp_exttable_fdw/input/gp_exttable_fdw.source
index 033dddd5215..41012e73c81 100644
--- a/gpcontrib/gp_exttable_fdw/input/gp_exttable_fdw.source
+++ b/gpcontrib/gp_exttable_fdw/input/gp_exttable_fdw.source
@@ -72,7 +72,7 @@ SELECT * FROM tableless_ext_fdw;
-- When using CREATE FOREIGN TABLE syntax, '|' and '\' need to be escaped as
'|' --> '\|' and '|' --> '\\'.
CREATE FOREIGN TABLE ext_special_uri(a int, b int)
SERVER gp_exttable_server
-OPTIONS (format 'csv', delimiter ',',
+OPTIONS (format_type 'c', delimiter ',',
location_uris
'file://@hostname@@abs_srcdir@/data/spe\\cial1\||file://@hostname@@abs_srcdir@/data/\|special2\\');
\a
SELECT urilocation FROM pg_exttable WHERE reloid =
'public.ext_special_uri'::regclass;
diff --git a/gpcontrib/gp_exttable_fdw/output/gp_exttable_fdw.source
b/gpcontrib/gp_exttable_fdw/output/gp_exttable_fdw.source
index 337d21a99e8..a3191eb0853 100644
--- a/gpcontrib/gp_exttable_fdw/output/gp_exttable_fdw.source
+++ b/gpcontrib/gp_exttable_fdw/output/gp_exttable_fdw.source
@@ -76,7 +76,7 @@ SELECT * FROM tableless_ext_fdw;
-- When using CREATE FOREIGN TABLE syntax, '|' and '\' need to be escaped as
'|' --> '\|' and '|' --> '\\'.
CREATE FOREIGN TABLE ext_special_uri(a int, b int)
SERVER gp_exttable_server
-OPTIONS (format 'csv', delimiter ',',
+OPTIONS (format_type 'c', delimiter ',',
location_uris
'file://@hostname@@abs_srcdir@/data/spe\\cial1\||file://@hostname@@abs_srcdir@/data/\|special2\\');
\a
SELECT urilocation FROM pg_exttable WHERE reloid =
'public.ext_special_uri'::regclass;
@@ -85,7 +85,7 @@ urilocation
(1 row)
SELECT ftoptions FROM pg_foreign_table WHERE
ftrelid='public.ext_special_uri'::regclass;
ftoptions
-{format=csv,"delimiter=,","location_uris=file://@hostname@@abs_srcdir@/data/spe\\\\cial1\\||file://@hostname@@abs_srcdir@/data/\\|special2\\\\"}
+{format_type=c,"delimiter=,","location_uris=file://@hostname@@abs_srcdir@/data/spe\\\\cial1\\||file://@hostname@@abs_srcdir@/data/\\|special2\\\\"}
(1 row)
\a
SELECT * FROM ext_special_uri ORDER BY a;
diff --git a/gpcontrib/gp_toolkit/expected/gp_toolkit.out
b/gpcontrib/gp_toolkit/expected/gp_toolkit.out
index 9755e08404c..761c80482f9 100644
--- a/gpcontrib/gp_toolkit/expected/gp_toolkit.out
+++ b/gpcontrib/gp_toolkit/expected/gp_toolkit.out
@@ -7,6 +7,7 @@ create database toolkit_testdb;
create role toolkit_admin superuser createdb;
create role toolkit_user1 login;
NOTICE: resource queue required -- using default resource queue "pg_default"
+GRANT CREATE ON SCHEMA public TO toolkit_user1;
CREATE TABLE toolkit_ao (id INTEGER) WITH (appendonly = true);
NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'id'
as the Apache Cloudberry data distribution key for this table.
HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make
sure column(s) chosen are the optimal data distribution key to minimize skew.
diff --git a/gpcontrib/gp_toolkit/expected/gp_toolkit_resqueue.out
b/gpcontrib/gp_toolkit/expected/gp_toolkit_resqueue.out
index 14cac6a2d61..e488ed52f6a 100644
--- a/gpcontrib/gp_toolkit/expected/gp_toolkit_resqueue.out
+++ b/gpcontrib/gp_toolkit/expected/gp_toolkit_resqueue.out
@@ -60,7 +60,6 @@ select * from gp_toolkit.gp_pgdatabase_invalid;
-- Test that the statistics on resource queue usage are properly updated and
-- reflected in the pg_stat_resqueues view
-set stats_queue_level=on;
create resource queue q with (active_statements = 10);
create user resqueuetest with resource queue q;
set role resqueuetest;
@@ -70,10 +69,10 @@ select 1;
1
(1 row)
-select n_queries_exec from pg_stat_resqueues where queuename = 'q';
- n_queries_exec
-----------------
- 1
+select queries_submitted from pg_stat_resqueues where queuename = 'q';
+ queries_submitted
+-------------------
+ 2
(1 row)
reset role;
diff --git a/gpcontrib/gp_toolkit/sql/gp_toolkit.sql
b/gpcontrib/gp_toolkit/sql/gp_toolkit.sql
index 0387a590b1e..1217d9f2c74 100644
--- a/gpcontrib/gp_toolkit/sql/gp_toolkit.sql
+++ b/gpcontrib/gp_toolkit/sql/gp_toolkit.sql
@@ -8,6 +8,7 @@ create database toolkit_testdb;
create role toolkit_admin superuser createdb;
create role toolkit_user1 login;
+GRANT CREATE ON SCHEMA public TO toolkit_user1;
CREATE TABLE toolkit_ao (id INTEGER) WITH (appendonly = true);
CREATE TABLE toolkit_heap (id INTEGER) WITH (appendonly = false);
diff --git a/gpcontrib/gp_toolkit/sql/gp_toolkit_resqueue.sql
b/gpcontrib/gp_toolkit/sql/gp_toolkit_resqueue.sql
index 79cb9964ba3..bb99727fe15 100644
--- a/gpcontrib/gp_toolkit/sql/gp_toolkit_resqueue.sql
+++ b/gpcontrib/gp_toolkit/sql/gp_toolkit_resqueue.sql
@@ -41,12 +41,11 @@ select * from gp_toolkit.gp_pgdatabase_invalid;
-- Test that the statistics on resource queue usage are properly updated and
-- reflected in the pg_stat_resqueues view
-set stats_queue_level=on;
create resource queue q with (active_statements = 10);
create user resqueuetest with resource queue q;
set role resqueuetest;
select 1;
-select n_queries_exec from pg_stat_resqueues where queuename = 'q';
+select queries_submitted from pg_stat_resqueues where queuename = 'q';
reset role;
drop role resqueuetest;
drop resource queue q;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
