Fix: fix pgstats

Author: lss602726449

src/backend/catalog/system_views.sql

@@ -673,7 +673,7 @@ GRANT EXECUTE ON FUNCTION pg_get_backend_memory_contexts() TO pg_read_all_stats;
 
 -- Statistics views
 
-CREATE VIEW pg_stat_all_tables_internal AS
+CREATE VIEW pg_stat_all_tables AS
     SELECT
             C.oid AS relid,
             N.nspname AS schemaname,
@@ -810,7 +810,7 @@ CREATE VIEW pg_statio_user_tables AS
     WHERE schemaname NOT IN ('pg_catalog', 'information_schema') AND
           schemaname !~ '^pg_toast';
 
-CREATE VIEW pg_stat_all_indexes_internal AS
+CREATE VIEW pg_stat_all_indexes AS
     SELECT
             C.oid AS relid,
             I.oid AS indexrelid,
@@ -1206,19 +1206,6 @@ CREATE VIEW pg_stat_database AS
         SELECT oid, datname FROM pg_database
     ) D;
 
-CREATE VIEW pg_stat_resqueues AS
-    SELECT
-        pg_catalog.gp_execution_segment() AS gp_segment_id,
-        Q.oid AS queueid,
-        Q.rsqname AS queuename,
-        pg_stat_get_queue_num_exec(Q.oid) AS n_queries_exec,
-        pg_stat_get_queue_num_wait(Q.oid) AS n_queries_wait,
-        pg_stat_get_queue_elapsed_exec(Q.oid) AS elapsed_exec,
-        pg_stat_get_queue_elapsed_wait(Q.oid) AS elapsed_wait
-    FROM pg_resqueue AS Q;
-
--- Resource queue views
-
 CREATE VIEW pg_resqueue_status AS
     SELECT
             q.rsqname,
@@ -1834,3 +1821,94 @@ CREATE VIEW relation_tag_descriptions AS
          pg_namespace AS ns
     WHERE td.tagid = t.oid AND td.tdobjid = c.oid
           AND td.tddatabaseid = d.oid AND ns.oid = c.relnamespace;
+
+CREATE FUNCTION gp_stat_get_snapshot_timestamp() RETURNS timestamptz AS
+$$
+    SELECT MAX(pg_stat_get_snapshot_timestamp) as gp_stat_get_snapshot_timestamp
+    FROM
+    (
+    SELECT pg_stat_get_snapshot_timestamp()
+    UNION ALL
+    SELECT pg_stat_get_snapshot_timestamp() FROM gp_dist_random('gp_id')
+    )
+    WHERE pg_stat_get_snapshot_timestamp IS NOT NULL;
+$$
+LANGUAGE SQL;
+
+CREATE FUNCTION gp_stat_force_next_flush() RETURNS VOID AS
+$$
+    SELECT pg_stat_force_next_flush()
+    UNION ALL
+    SELECT pg_stat_force_next_flush() FROM gp_dist_random('gp_id');
+$$
+LANGUAGE SQL;
+
+CREATE FUNCTION gp_stat_reset(tableoid oid) RETURNS VOID AS
+$$
+    SELECT pg_stat_reset()
+    UNION ALL
+    SELECT pg_stat_reset() FROM gp_dist_random('gp_id');
+$$ LANGUAGE SQL;
+
+CREATE FUNCTION gp_stat_reset_shared(target text) RETURNS VOID AS
+$$
+    SELECT pg_stat_reset_shared(target)
+    UNION ALL
+    SELECT pg_stat_reset_shared(target) FROM gp_dist_random('gp_id');
+$$ LANGUAGE SQL;
+
+CREATE FUNCTION gp_stat_reset_single_table_counters(tableoid oid) RETURNS VOID AS
+$$
+    WITH table_info AS (
+    SELECT tableoid::regclass::text AS v_relname
+    )
+    SELECT pg_stat_reset_single_table_counters(v_relname::regclass)
+    FROM table_info
+    UNION ALL
+    SELECT pg_stat_reset_single_table_counters(v_relname::regclass)
+    FROM table_info, gp_dist_random('gp_id');
+$$ LANGUAGE SQL;
+
+CREATE FUNCTION gp_stat_reset_single_function_counters(funcoid oid) RETURNS VOID AS
+$$
+    WITH func_info AS (
+    SELECT proname FROM pg_proc WHERE oid = funcoid
+    )
+    SELECT pg_stat_reset_single_function_counters(funcoid)
+    UNION ALL
+    SELECT (
+        SELECT pg_stat_reset_single_function_counters(pg_proc.oid)
+        FROM pg_proc, func_info 
+        WHERE pg_proc.proname = func_info.proname
+    )
+    from gp_dist_random('gp_id');
+$$ LANGUAGE SQL;
+
+CREATE FUNCTION gp_stat_reset_slru(target text) RETURNS VOID AS
+$$
+    SELECT pg_stat_reset_slru(target)
+    UNION ALL
+    SELECT pg_stat_reset_slru(target) FROM gp_dist_random('gp_id');
+$$ LANGUAGE SQL;
+
+CREATE FUNCTION gp_stat_reset_replication_slot(target text) RETURNS VOID AS
+$$
+    SELECT pg_stat_reset_replication_slot(target)
+    UNION ALL
+    SELECT pg_stat_reset_replication_slot(target) FROM gp_dist_random('gp_id');
+$$ LANGUAGE SQL;
+
+CREATE FUNCTION gp_stat_reset_subscription_stats(subid oid) RETURNS VOID AS
+$$
+    WITH sub_info AS (
+    SELECT subname FROM pg_subscription WHERE oid = subid
+    )
+    SELECT pg_stat_reset_single_function_counters(subid)
+    UNION ALL
+    SELECT (
+        SELECT pg_stat_reset_single_function_counters(pg_subscription.oid)
+        FROM pg_subscription, sub_info 
+        WHERE pg_subscription.subname = sub_info.subname
+    )
+    from gp_dist_random('gp_id');
+$$ LANGUAGE SQL;

src/backend/catalog/system_views_gp.in

@@ -46,3 +46,4 @@ pg_statio_user_sequences
 pg_statio_user_tables
 pg_stats
 pg_stats_ext
+pg_stat_io

src/backend/catalog/system_views_gp_summary.sql

@@ -101,8 +101,10 @@ SELECT
     s.schemaname,
     s.relname,
     m.seq_scan,
+    m.last_seq_scan,
     m.seq_tup_read,
     m.idx_scan,
+    m.last_idx_scan,
     m.idx_tup_fetch,
     m.n_tup_ins,
     m.n_tup_upd,
@@ -125,13 +127,16 @@ FROM
          allt.schemaname,
          allt.relname,
          case when d.policytype = 'r' then (sum(seq_scan)/d.numsegments)::bigint else sum(seq_scan) end seq_scan,
+         max(last_seq_scan) as last_seq_scan,
          case when d.policytype = 'r' then (sum(seq_tup_read)/d.numsegments)::bigint else sum(seq_tup_read) end seq_tup_read,
          case when d.policytype = 'r' then (sum(idx_scan)/d.numsegments)::bigint else sum(idx_scan) end idx_scan,
+         max(last_idx_scan) as last_idx_scan,
          case when d.policytype = 'r' then (sum(idx_tup_fetch)/d.numsegments)::bigint else sum(idx_tup_fetch) end idx_tup_fetch,
          case when d.policytype = 'r' then (sum(n_tup_ins)/d.numsegments)::bigint else sum(n_tup_ins) end n_tup_ins,
          case when d.policytype = 'r' then (sum(n_tup_upd)/d.numsegments)::bigint else sum(n_tup_upd) end n_tup_upd,
          case when d.policytype = 'r' then (sum(n_tup_del)/d.numsegments)::bigint else sum(n_tup_del) end n_tup_del,
          case when d.policytype = 'r' then (sum(n_tup_hot_upd)/d.numsegments)::bigint else sum(n_tup_hot_upd) end n_tup_hot_upd,
+         case when d.policytype = 'r' then (sum(n_tup_newpage_upd)/d.numsegments)::bigint else sum(n_tup_newpage_upd) end n_tup_newpage_upd,
          case when d.policytype = 'r' then (sum(n_live_tup)/d.numsegments)::bigint else sum(n_live_tup) end n_live_tup,
          case when d.policytype = 'r' then (sum(n_dead_tup)/d.numsegments)::bigint else sum(n_dead_tup) end n_dead_tup,
          case when d.policytype = 'r' then (sum(n_mod_since_analyze)/d.numsegments)::bigint else sum(n_mod_since_analyze) end n_mod_since_analyze,
@@ -190,7 +195,8 @@ SELECT
     CASE WHEN dst.policytype = 'r' THEN (sum(sxa.n_tup_ins)/dst.numsegments)::bigint ELSE sum(sxa.n_tup_ins) END AS n_tup_ins,
     CASE WHEN dst.policytype = 'r' THEN (sum(sxa.n_tup_upd)/dst.numsegments)::bigint ELSE sum(sxa.n_tup_upd) END AS n_tup_upd,
     CASE WHEN dst.policytype = 'r' THEN (sum(sxa.n_tup_del)/dst.numsegments)::bigint ELSE sum(sxa.n_tup_del) END AS n_tup_del,
-    CASE WHEN dst.policytype = 'r' THEN (sum(sxa.n_tup_hot_upd)/dst.numsegments)::bigint ELSE sum(sxa.n_tup_hot_upd) END AS n_tup_hot_upd
+    CASE WHEN dst.policytype = 'r' THEN (sum(sxa.n_tup_hot_upd)/dst.numsegments)::bigint ELSE sum(sxa.n_tup_hot_upd) END AS n_tup_hot_upd,
+    CASE WHEN dst.policytype = 'r' THEN (sum(sxa.n_tup_newpage_upd)/dst.numsegments)::bigint ELSE sum(sxa.n_tup_newpage_upd) END AS n_tup_newpage_upd
 FROM
     gp_stat_xact_all_tables sxa
     LEFT OUTER JOIN gp_distribution_policy dst
@@ -221,6 +227,7 @@ SELECT
     s.relname,
     s.indexrelname,
     m.idx_scan,
+    m.last_idx_scan,
     m.idx_tup_read,
     m.idx_tup_fetch
 FROM
@@ -231,6 +238,7 @@ FROM
          alli.relname,
          alli.indexrelname,
          case when d.policytype = 'r' then (sum(alli.idx_scan)/d.numsegments)::bigint else sum(alli.idx_scan) end idx_scan,
+         max(last_idx_scan) as last_idx_scan,
          case when d.policytype = 'r' then (sum(alli.idx_tup_read)/d.numsegments)::bigint else sum(alli.idx_tup_read) end idx_tup_read,
          case when d.policytype = 'r' then (sum(alli.idx_tup_fetch)/d.numsegments)::bigint else sum(alli.idx_tup_fetch) end idx_tup_fetch
      FROM
@@ -489,3 +497,26 @@ FROM gp_stat_progress_create_index a
     LEFT JOIN gp_stat_progress_create_index a1 ON a.pid = a1.pid AND a1.gp_segment_id = -1
 WHERE a.gp_segment_id > -1
 GROUP BY a.datid, a.datname, a.relid, a.index_relid, a.command, a.phase, d.policytype, d.numsegments;
+
+CREATE OR REPLACE VIEW gp_stat_io_summary AS
+SELECT
+    backend_type,
+    object,
+    context,
+    sum(reads) as reads,
+    sum(read_time) as read_time,
+    sum(writes) as writes,
+    sum(write_time) as write_time,
+    sum(writebacks) as writebacks,
+    sum(writeback_time) as writeback_time,
+    sum(extends) as extends,
+    sum(extend_time) as extend_time,
+    sum(op_bytes) as op_bytes,
+    sum(hits) as hits,
+    sum(evictions) as evictions,
+    sum(reuses) as reuses,
+    sum(fsyncs) as fsyncs,
+    sum(fsync_time) as fsync_time,
+    max(stats_reset) as stats_reset
+FROM gp_stat_io
+GROUP BY backend_type, object, context;

src/backend/commands/vacuum.c

@@ -217,6 +217,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel, bool auto_s
 
 	/* By default parallel vacuum is enabled */
 	params.nworkers = 0;
+	params.buffer_usage_limit = 0;
 
 	/*
 	 * Set this to an invalid value so it is clear whether or not a
@@ -262,6 +263,7 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel, bool auto_s
 			}
 
 			ring_size = result;
+			params.buffer_usage_limit = result;
 		}
 		else if (!vacstmt->is_vacuumcmd)
 			ereport(ERROR,
@@ -370,7 +372,9 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel, bool auto_s
 		(process_toast ? VACOPT_PROCESS_TOAST : 0) |
 		(skip_database_stats ? VACOPT_SKIP_DATABASE_STATS : 0) |
 		(only_database_stats ? VACOPT_ONLY_DATABASE_STATS : 0) |
-		(update_datfrozenxid ? VACOPT_UPDATE_DATFROZENXID : 0);
+		(update_datfrozenxid ? VACOPT_UPDATE_DATFROZENXID : 0) |
+		(params.nworkers != 0 ? VACOPT_PARALLEL : 0) |
+		(params.buffer_usage_limit != 0 ? VACOPT_BUFFER_USAGE_LIMIT : 0) ;
 
 	if (rootonly)
 		params.options |= VACOPT_ROOTONLY;
@@ -3439,6 +3443,18 @@ vacuum_params_to_options_list(VacuumParams *params)
 		options = lappend(options, makeDefElem("only_database_stats", (Node *) makeInteger(1), -1));
 		optmask &= ~VACOPT_ONLY_DATABASE_STATS;
 	}
+	if ((optmask & VACOPT_PARALLEL))
+	{
+		Assert(params->nworkers!=0);
+		options = lappend(options, makeDefElem("parallel", (Node *) makeInteger(params->nworkers==-1 ? 0 : params->nworkers), -1));
+		optmask &= ~VACOPT_PARALLEL;
+	}
+	if ((optmask & VACOPT_BUFFER_USAGE_LIMIT))
+	{
+		Assert(params->buffer_usage_limit!=0);
+		options = lappend(options, makeDefElem("buffer_usage_limit", (Node *) makeInteger(params->buffer_usage_limit), -1));
+		optmask &= ~VACOPT_BUFFER_USAGE_LIMIT;
+	}
 
 
 	if (optmask & VACUUM_AO_PHASE_MASK)

src/backend/commands/vacuum_ao.c

@@ -634,6 +634,7 @@ vacuum_appendonly_index(Relation indexRelation,
 	pg_rusage_init(&ru0);
 
 	ivinfo.index = indexRelation;
+	ivinfo.heaprel = aoRelation;
 	ivinfo.analyze_only = false;
 	ivinfo.message_level = elevel;
 	/* 
@@ -808,6 +809,7 @@ scan_index(Relation indrel, Relation aorel, int elevel, BufferAccessStrategy vac
 	pg_rusage_init(&ru0);
 
 	ivinfo.index = indrel;
+	ivinfo.heaprel = aorel;
 	ivinfo.analyze_only = false;
 	ivinfo.message_level = elevel;
 	/*