Merge remote-tracking branch 'origin/2.3.0-sync2' into 2.3.0-sync

arenadata · Nov 28, 2023 · b5b3589 · b5b3589
2 parents 18d1c19 + 6212270
commit b5b3589
Show file tree

Hide file tree

Showing 12 changed files with 354 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -174,3 +174,11 @@ install(PROGRAMS "cmake/install_gpdb_component" DESTINATION ".")
 install(FILES ${diskquota_DDL} DESTINATION "share/postgresql/extension/")
 install(TARGETS diskquota DESTINATION "lib/postgresql/")
 install(FILES ${build_info_PATH} DESTINATION ".")
+
+file(GLOB sql_files RELATIVE ${DISKQUOTA_DDL_DIR} "${DISKQUOTA_DDL_DIR}/diskquota--2.*.sql")
+list(FILTER sql_files EXCLUDE REGEX ".*--.*--.*")
+list(FILTER sql_files EXCLUDE REGEX ".*diskquota--${DISKQUOTA_MAJOR_VERSION}.${DISKQUOTA_MINOR_VERSION}.*")
+foreach(so IN LISTS sql_files)
+  string(REGEX REPLACE "^diskquota--([0-9]+)\.([0-9]+).sql$" "diskquota-\\1.\\2.so" so ${so})
+  install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${DISKQUOTA_BINARY_NAME}.so \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/postgresql/${so}\")")
+endforeach()
diff --git a/control/ddl/diskquota--1.0--1.0.3.sql b/control/ddl/diskquota--1.0--1.0.3.sql
@@ -0,0 +1,8 @@
+\echo use "alter extension diskquota update to '1.0.3'" to load this file. \quit
+
+SELECT gp_segment_id, pg_catalog.pg_extension_config_dump('diskquota.quota_config', '') from gp_dist_random('gp_id');
+
+CREATE FUNCTION diskquota.update_diskquota_db_list(oid, int4)
+RETURNS void STRICT
+AS 'MODULE_PATHNAME'
+LANGUAGE C;
diff --git a/control/ddl/diskquota--1.0--2.0.sql b/control/ddl/diskquota--1.0--2.0.sql
@@ -9,16 +9,16 @@ CREATE TABLE diskquota.target (
 	primaryOid oid,
 	tablespaceOid oid, -- REFERENCES pg_tablespace.oid,
 	PRIMARY KEY (primaryOid, tablespaceOid, quotatype)
-);
+) WITH (appendonly=false);
 -- TODO ALTER TABLE diskquota.target SET DEPENDS ON EXTENSION diskquota;
 
 ALTER TABLE diskquota.table_size ADD COLUMN segid smallint DEFAULT -1; -- segid = coordinator means table size in cluster level
 ALTER TABLE diskquota.table_size DROP CONSTRAINT table_size_pkey;
 ALTER TABLE diskquota.table_size ADD PRIMARY KEY (tableid, segid);
 ALTER TABLE diskquota.table_size SET WITH (REORGANIZE=true) DISTRIBUTED BY (tableid, segid);
 
--- TODO SELECT pg_catalog.pg_extension_config_dump('diskquota.target', '');
--- TODO SELECT gp_segment_id, pg_catalog.pg_extension_config_dump('diskquota.target', '') FROM gp_dist_random('gp_id');
+SELECT pg_catalog.pg_extension_config_dump('diskquota.target', '');
+SELECT gp_segment_id, pg_catalog.pg_extension_config_dump('diskquota.target', '') FROM gp_dist_random('gp_id');
 -- table part end
 
 -- type define

diff --git a/control/ddl/diskquota--1.0.3--2.0.sql b/control/ddl/diskquota--1.0.3--2.0.sql
@@ -0,0 +1,284 @@
+-- TODO check if worker should not refresh, current lib should be diskquota-2.0.so
+
+-- table part
+ALTER TABLE diskquota.quota_config ADD COLUMN segratio float4 DEFAULT 0;
+
+CREATE TABLE diskquota.target (
+	rowId serial,
+	quotatype int, -- REFERENCES disquota.quota_config.quotatype,
+	primaryOid oid,
+	tablespaceOid oid, -- REFERENCES pg_tablespace.oid,
+	PRIMARY KEY (primaryOid, tablespaceOid, quotatype)
+) WITH (appendonly=false);
+-- TODO ALTER TABLE diskquota.target SET DEPENDS ON EXTENSION diskquota;
+
+ALTER TABLE diskquota.table_size ADD COLUMN segid smallint DEFAULT -1; -- segid = coordinator means table size in cluster level
+ALTER TABLE diskquota.table_size DROP CONSTRAINT table_size_pkey;
+ALTER TABLE diskquota.table_size ADD PRIMARY KEY (tableid, segid);
+ALTER TABLE diskquota.table_size SET WITH (REORGANIZE=true) DISTRIBUTED BY (tableid, segid);
+
+SELECT pg_catalog.pg_extension_config_dump('diskquota.target', '');
+SELECT gp_segment_id, pg_catalog.pg_extension_config_dump('diskquota.target', '') FROM gp_dist_random('gp_id');
+-- table part end
+
+-- type define
+ALTER TYPE diskquota.diskquota_active_table_type ADD ATTRIBUTE "GP_SEGMENT_ID" smallint;
+
+CREATE TYPE diskquota.rejectmap_entry AS (
+	target_oid oid,
+	database_oid oid,
+	tablespace_oid oid,
+	target_type integer,
+	seg_exceeded boolean
+);
+
+CREATE TYPE diskquota.rejectmap_entry_detail AS (
+	target_type text,
+	target_oid oid,
+	database_oid oid,
+	tablespace_oid oid,
+	seg_exceeded boolean,
+	dbnode oid,
+	spcnode oid,
+	relnode oid,
+	segid int
+);
+
+CREATE TYPE diskquota.relation_cache_detail AS (
+	RELID oid,
+	PRIMARY_TABLE_OID oid,
+	AUXREL_NUM int,
+	OWNEROID oid,
+	NAMESPACEOID oid,
+	BACKENDID int,
+	SPCNODE oid,
+	DBNODE oid,
+	RELNODE oid,
+	RELSTORAGE "char",
+	AUXREL_OID oid[]
+);
+-- type define end
+
+-- UDF
+/* ALTER */ CREATE OR REPLACE FUNCTION diskquota.set_schema_quota(text, text) RETURNS void STRICT AS '$libdir/diskquota-2.0.so' LANGUAGE C;
+/* ALTER */ CREATE OR REPLACE FUNCTION diskquota.set_role_quota(text, text) RETURNS void STRICT AS '$libdir/diskquota-2.0.so' LANGUAGE C;
+/* ALTER */ CREATE OR REPLACE FUNCTION diskquota.init_table_size_table() RETURNS void STRICT AS '$libdir/diskquota-2.0.so' LANGUAGE C;
+/* ALTER */ CREATE OR REPLACE FUNCTION diskquota.diskquota_fetch_table_stat(int4, oid[]) RETURNS setof diskquota.diskquota_active_table_type AS '$libdir/diskquota-2.0.so', 'diskquota_fetch_table_stat' LANGUAGE C VOLATILE;
+
+-- TODO solve dependency DROP FUNCTION diskquota.update_diskquota_db_list(oid, int4);
+
+CREATE FUNCTION diskquota.set_schema_tablespace_quota(text, text, text) RETURNS void STRICT AS '$libdir/diskquota-2.0.so' LANGUAGE C;
+CREATE FUNCTION diskquota.set_role_tablespace_quota(text, text, text) RETURNS void STRICT AS '$libdir/diskquota-2.0.so' LANGUAGE C;
+CREATE FUNCTION diskquota.set_per_segment_quota(text, float4) RETURNS void STRICT AS '$libdir/diskquota-2.0.so' LANGUAGE C;
+CREATE FUNCTION diskquota.refresh_rejectmap(diskquota.rejectmap_entry[], oid[]) RETURNS void STRICT AS '$libdir/diskquota-2.0.so' LANGUAGE C;
+CREATE FUNCTION diskquota.show_rejectmap() RETURNS setof diskquota.rejectmap_entry_detail AS '$libdir/diskquota-2.0.so', 'show_rejectmap' LANGUAGE C;
+CREATE FUNCTION diskquota.pause() RETURNS void STRICT AS '$libdir/diskquota-2.0.so', 'diskquota_pause' LANGUAGE C;
+CREATE FUNCTION diskquota.resume() RETURNS void STRICT AS '$libdir/diskquota-2.0.so', 'diskquota_resume' LANGUAGE C;
+CREATE FUNCTION diskquota.show_worker_epoch() RETURNS bigint STRICT AS '$libdir/diskquota-2.0.so', 'show_worker_epoch' LANGUAGE C;
+CREATE FUNCTION diskquota.wait_for_worker_new_epoch() RETURNS boolean STRICT AS '$libdir/diskquota-2.0.so', 'wait_for_worker_new_epoch' LANGUAGE C;
+CREATE FUNCTION diskquota.status() RETURNS TABLE ("name" text, "status" text) STRICT AS '$libdir/diskquota-2.0.so', 'diskquota_status' LANGUAGE C;
+CREATE FUNCTION diskquota.show_relation_cache() RETURNS setof diskquota.relation_cache_detail AS '$libdir/diskquota-2.0.so', 'show_relation_cache' LANGUAGE C;
+CREATE FUNCTION diskquota.relation_size_local(
+	reltablespace oid,
+	relfilenode oid,
+	relpersistence "char",
+	relstorage "char")
+RETURNS bigint STRICT AS '$libdir/diskquota-2.0.so', 'relation_size_local' LANGUAGE C;
+CREATE FUNCTION diskquota.pull_all_table_size(OUT tableid oid, OUT size bigint, OUT segid smallint) RETURNS SETOF RECORD AS '$libdir/diskquota-2.0.so', 'pull_all_table_size' LANGUAGE C;
+CREATE FUNCTION diskquota.relation_size(relation regclass) RETURNS bigint STRICT AS $$
+	SELECT SUM(size)::bigint FROM (
+		SELECT diskquota.relation_size_local(reltablespace, relfilenode, relpersistence, relstorage) AS size
+		FROM gp_dist_random('pg_class') WHERE oid = relation
+		UNION ALL
+		SELECT diskquota.relation_size_local(reltablespace, relfilenode, relpersistence, relstorage) AS size
+		FROM pg_class WHERE oid = relation
+	) AS t $$ LANGUAGE SQL;
+
+CREATE FUNCTION diskquota.show_relation_cache_all_seg() RETURNS setof diskquota.relation_cache_detail AS $$
+	WITH relation_cache AS (
+		SELECT diskquota.show_relation_cache() AS a
+		FROM  gp_dist_random('gp_id')
+	)
+	SELECT (a).* FROM relation_cache; $$ LANGUAGE SQL;
+-- UDF end
+
+-- views
+CREATE VIEW diskquota.rejectmap AS SELECT * FROM diskquota.show_rejectmap() AS BM;
+
+/* ALTER */ CREATE OR REPLACE VIEW diskquota.show_fast_database_size_view AS
+SELECT (
+    (SELECT SUM(pg_relation_size(oid)) FROM pg_class WHERE oid <= 16384)
+        +
+    (SELECT SUM(size) FROM diskquota.table_size WHERE segid = -1)
+) AS dbsize;
+
+/* ALTER */ CREATE OR REPLACE VIEW diskquota.show_fast_schema_quota_view AS
+WITH
+  quota_usage AS (
+    SELECT
+      relnamespace,
+      SUM(size) AS total_size
+    FROM
+      diskquota.table_size,
+      pg_class
+    WHERE
+      tableid = pg_class.oid AND
+      segid = -1
+    GROUP BY
+      relnamespace
+    )
+SELECT
+  nspname AS schema_name,
+  targetoid AS schema_oid,
+  quotalimitMB AS quota_in_mb,
+  COALESCE(total_size, 0) AS nspsize_in_bytes
+FROM
+  diskquota.quota_config JOIN
+  pg_namespace ON targetoid = pg_namespace.oid LEFT OUTER JOIN
+  quota_usage ON pg_namespace.oid = relnamespace
+WHERE
+  quotaType = 0; -- NAMESPACE_QUOTA
+
+/* ALTER */ CREATE OR REPLACE VIEW diskquota.show_fast_role_quota_view AS
+WITH
+  quota_usage AS (
+    SELECT
+      relowner,
+      SUM(size) AS total_size
+    FROM
+      diskquota.table_size,
+      pg_class
+    WHERE
+      tableid = pg_class.oid AND
+      segid = -1
+    GROUP BY
+      relowner
+  )
+SELECT
+  rolname AS role_name,
+  targetoid AS role_oid,
+  quotalimitMB AS quota_in_mb,
+  COALESCE(total_size, 0) AS rolsize_in_bytes
+FROM
+  diskquota.quota_config JOIN
+  pg_roles ON targetoid = pg_roles.oid LEFT OUTER JOIN
+  quota_usage ON pg_roles.oid = relowner
+WHERE
+  quotaType = 1; -- ROLE_QUOTA
+
+CREATE VIEW diskquota.show_fast_schema_tablespace_quota_view AS
+WITH
+  default_tablespace AS (
+    SELECT dattablespace FROM pg_database
+    WHERE datname = current_database()
+  ),
+  quota_usage AS (
+    SELECT
+      relnamespace,
+      CASE
+        WHEN reltablespace = 0 THEN dattablespace
+        ELSE reltablespace
+      END AS reltablespace,
+      SUM(size) AS total_size
+    FROM
+      diskquota.table_size,
+      pg_class,
+      default_tablespace
+    WHERE
+      tableid = pg_class.oid AND
+      segid = -1
+    GROUP BY
+      relnamespace,
+      reltablespace,
+      dattablespace
+  ),
+  full_quota_config AS (
+    SELECT
+      primaryOid,
+      tablespaceoid,
+      quotalimitMB
+    FROM
+      diskquota.quota_config AS config,
+      diskquota.target AS target
+    WHERE
+      config.targetOid = target.rowId AND
+      config.quotaType = target.quotaType AND
+      config.quotaType = 2 -- NAMESPACE_TABLESPACE_QUOTA
+  )
+SELECT
+  nspname AS schema_name,
+  primaryoid AS schema_oid,
+  spcname AS tablespace_name,
+  tablespaceoid AS tablespace_oid,
+  quotalimitMB AS quota_in_mb,
+  COALESCE(total_size, 0) AS nspsize_tablespace_in_bytes
+FROM
+  full_quota_config JOIN
+  pg_namespace ON primaryoid = pg_namespace.oid JOIN
+  pg_tablespace ON tablespaceoid = pg_tablespace.oid LEFT OUTER JOIN
+  quota_usage ON pg_namespace.oid = relnamespace AND pg_tablespace.oid = reltablespace;
+
+CREATE VIEW diskquota.show_fast_role_tablespace_quota_view AS
+WITH
+  default_tablespace AS (
+    SELECT dattablespace FROM pg_database
+    WHERE datname = current_database()
+  ),
+  quota_usage AS (
+    SELECT
+      relowner,
+      CASE
+        WHEN reltablespace = 0 THEN dattablespace
+        ELSE reltablespace
+      END AS reltablespace,
+      SUM(size) AS total_size
+    FROM
+      diskquota.table_size,
+      pg_class,
+      default_tablespace
+    WHERE
+      tableid = pg_class.oid AND
+      segid = -1
+    GROUP BY
+      relowner,
+      reltablespace,
+      dattablespace
+  ),
+  full_quota_config AS (
+    SELECT
+      primaryOid,
+      tablespaceoid,
+      quotalimitMB
+    FROM
+      diskquota.quota_config AS config,
+      diskquota.target AS target
+    WHERE
+      config.targetOid = target.rowId AND
+      config.quotaType = target.quotaType AND
+      config.quotaType = 3 -- ROLE_TABLESPACE_QUOTA
+  )
+SELECT
+  rolname AS role_name,
+  primaryoid AS role_oid,
+  spcname AS tablespace_name,
+  tablespaceoid AS tablespace_oid,
+  quotalimitMB AS quota_in_mb,
+  COALESCE(total_size, 0) AS rolsize_tablespace_in_bytes
+FROM
+  full_quota_config JOIN
+  pg_roles ON primaryoid = pg_roles.oid JOIN
+  pg_tablespace ON tablespaceoid = pg_tablespace.oid LEFT OUTER JOIN
+  quota_usage ON pg_roles.oid = relowner AND pg_tablespace.oid = reltablespace;
+
+CREATE VIEW diskquota.show_segment_ratio_quota_view AS
+SELECT 
+  spcname as tablespace_name,
+  pg_tablespace.oid as tablespace_oid,
+  segratio as per_seg_quota_ratio
+FROM
+  diskquota.quota_config JOIN
+  pg_tablespace ON targetOid = pg_tablespace.oid
+  AND quotatype = 4;
+
+-- views end
+
diff --git a/control/ddl/diskquota--1.0.sql b/control/ddl/diskquota--1.0.sql
@@ -9,18 +9,18 @@ CREATE TABLE diskquota.quota_config(
     quotatype int,
     quotalimitMB int8,
     PRIMARY KEY(targetOid, quotatype)
-);
+) WITH (appendonly=false);
 
 CREATE TABLE diskquota.table_size(
     tableid oid,
     size bigint,
     PRIMARY KEY(tableid)
-);
+) WITH (appendonly=false);
 
 CREATE TABLE diskquota.state(
     state int,
     PRIMARY KEY(state)
-);
+) WITH (appendonly=false);
 
 -- only diskquota.quota_config is dump-able, other table can be generate on fly
 SELECT pg_catalog.pg_extension_config_dump('diskquota.quota_config', '');

diff --git a/control/ddl/diskquota--2.0.sql b/control/ddl/diskquota--2.0.sql
@@ -11,27 +11,27 @@ CREATE TABLE diskquota.quota_config(
 	quotalimitMB int8,
 	segratio float4 DEFAULT 0,
 	PRIMARY KEY(targetOid, quotatype)
-) DISTRIBUTED BY (targetOid, quotatype);
+) WITH (appendonly=false) DISTRIBUTED BY (targetOid, quotatype);
 
 CREATE TABLE diskquota.target (
 	rowId serial,
 	quotatype int, --REFERENCES disquota.quota_config.quotatype,
 	primaryOid oid,
 	tablespaceOid oid, --REFERENCES pg_tablespace.oid,
 	PRIMARY KEY (primaryOid, tablespaceOid, quotatype)
-);
+) WITH (appendonly=false);
 
 CREATE TABLE diskquota.table_size(
 	tableid oid,
 	size bigint,
 	segid smallint,
 	PRIMARY KEY(tableid, segid)
-) DISTRIBUTED BY (tableid, segid);
+) WITH (appendonly=false) DISTRIBUTED BY (tableid, segid);
 
 CREATE TABLE diskquota.state(
 	state int,
 	PRIMARY KEY(state)
-) DISTRIBUTED BY (state);
+) WITH (appendonly=false) DISTRIBUTED BY (state);
 
 -- diskquota.quota_config AND diskquota.target is dump-able, other table can be generate on fly
 SELECT pg_catalog.pg_extension_config_dump('diskquota.quota_config', '');