Revert "resgroup: add new flatten views on the status"

This reverts commit 1045e4e7.

src/backend/catalog/gp_toolkit.sql

@@ -1815,98 +1815,6 @@ CREATE VIEW gp_toolkit.gp_resgroup_status AS
 
 GRANT SELECT ON gp_toolkit.gp_resgroup_status TO public;
 
---------------------------------------------------------------------------------
--- @view:
---              gp_toolkit.gp_resgroup_status_per_host
---
--- @doc:
---              Resource group runtime status information grouped by host
---
---------------------------------------------------------------------------------
-
-CREATE VIEW gp_toolkit.gp_resgroup_status_per_host AS
-    WITH s AS (
-        SELECT
-            rsgname
-          , groupid
-          , (json_each(cpu_usage)).key::smallint AS segment_id
-          , (json_each(cpu_usage)).value AS cpu
-          , (json_each(memory_usage)).value AS memory
-        FROM gp_toolkit.gp_resgroup_status
-    )
-    SELECT
-        s.rsgname
-      , s.groupid
-      , c.hostname
-      , sum((s.cpu                       )::text::numeric) AS cpu
-      , sum((s.memory->'used'            )::text::integer) AS memory_used
-      , sum((s.memory->'available'       )::text::integer) AS memory_available
-      , sum((s.memory->'quota_used'      )::text::integer) AS memory_quota_used
-      , sum((s.memory->'quota_available' )::text::integer) AS memory_quota_available
-      , sum((s.memory->'quota_proposed'  )::text::integer) AS memory_quota_proposed
-      , sum((s.memory->'shared_used'     )::text::integer) AS memory_shared_used
-      , sum((s.memory->'shared_available')::text::integer) AS memory_shared_available
-      , sum((s.memory->'shared_granted'  )::text::integer) AS memory_shared_granted
-      , sum((s.memory->'shared_proposed' )::text::integer) AS memory_shared_proposed
-    FROM s
-    INNER JOIN pg_catalog.gp_segment_configuration AS c
-        ON s.segment_id = c.content
-        AND c.role = 'p'
-    GROUP BY
-        s.rsgname
-      , s.groupid
-      , c.hostname
-    ;
-
-GRANT SELECT ON gp_toolkit.gp_resgroup_status_per_host TO public;
-
---------------------------------------------------------------------------------
--- @view:
---              gp_toolkit.gp_resgroup_status_per_segment
---
--- @doc:
---              Resource group runtime status information grouped by segment
---
---------------------------------------------------------------------------------
-
-CREATE VIEW gp_toolkit.gp_resgroup_status_per_segment AS
-    WITH s AS (
-        SELECT
-            rsgname
-          , groupid
-          , (json_each(cpu_usage)).key::smallint AS segment_id
-          , (json_each(cpu_usage)).value AS cpu
-          , (json_each(memory_usage)).value AS memory
-        FROM gp_toolkit.gp_resgroup_status
-    )
-    SELECT
-        s.rsgname
-      , s.groupid
-      , c.hostname
-      , s.segment_id
-      , sum((s.cpu                       )::text::numeric) AS cpu
-      , sum((s.memory->'used'            )::text::integer) AS memory_used
-      , sum((s.memory->'available'       )::text::integer) AS memory_available
-      , sum((s.memory->'quota_used'      )::text::integer) AS memory_quota_used
-      , sum((s.memory->'quota_available' )::text::integer) AS memory_quota_available
-      , sum((s.memory->'quota_proposed'  )::text::integer) AS memory_quota_proposed
-      , sum((s.memory->'shared_used'     )::text::integer) AS memory_shared_used
-      , sum((s.memory->'shared_available')::text::integer) AS memory_shared_available
-      , sum((s.memory->'shared_granted'  )::text::integer) AS memory_shared_granted
-      , sum((s.memory->'shared_proposed' )::text::integer) AS memory_shared_proposed
-    FROM s
-    INNER JOIN pg_catalog.gp_segment_configuration AS c
-        ON s.segment_id = c.content
-        AND c.role = 'p'
-    GROUP BY
-        s.rsgname
-      , s.groupid
-      , c.hostname
-      , s.segment_id
-    ;
-
-GRANT SELECT ON gp_toolkit.gp_resgroup_status_per_segment TO public;
-
 --------------------------------------------------------------------------------
 -- AO/CO diagnostics functions
 --------------------------------------------------------------------------------

src/test/isolation2/expected/resgroup/resgroup_views.out

-select * from gp_toolkit.gp_resgroup_config where groupname='default_group';
- groupid | groupname     | concurrency | proposed_concurrency | cpu_rate_limit | memory_limit | proposed_memory_limit | memory_shared_quota | proposed_memory_shared_quota | memory_spill_ratio | proposed_memory_spill_ratio | memory_auditor | cpuset 
----------+---------------+-------------+----------------------+----------------+--------------+-----------------------+---------------------+------------------------------+--------------------+-----------------------------+----------------+--------
- 6437    | default_group | 20          | 20                   | 30             | 30           | 30                    | 50                  | 50                           | 20                 | 20                          | vmtracker      | -1     
-(1 row)
-
-select rsgname , groupid , num_running , num_queueing , num_queued , num_executed , cpu_usage->'-1' as qd_cpu_usage , memory_usage->'-1'->'used' as qd_memory_used , memory_usage->'-1'->'shared_used' as qd_memory_shared_used from gp_toolkit.gp_resgroup_status where rsgname='default_group';
- rsgname       | groupid | num_running | num_queueing | num_queued | num_executed | qd_cpu_usage | qd_memory_used | qd_memory_shared_used 
----------------+---------+-------------+--------------+------------+--------------+--------------+----------------+-----------------------
- default_group | 6437    | 0           | 0            | 0          | 0            | 0.00         | 0              | 0                     
-(1 row)
-
-select rsgname , groupid , cpu , memory_used , memory_shared_used from gp_toolkit.gp_resgroup_status_per_host where rsgname='default_group';
- rsgname       | groupid | cpu  | memory_used | memory_shared_used 
----------------+---------+------+-------------+--------------------
- default_group | 6437    | 0.00 | 0           | 0                  
-(1 row)
-
-select rsgname , groupid , segment_id , cpu , memory_used , memory_shared_used from gp_toolkit.gp_resgroup_status_per_segment where rsgname='default_group' order by segment_id;
- rsgname       | groupid | segment_id | cpu  | memory_used | memory_shared_used 
----------------+---------+------------+------+-------------+--------------------
- default_group | 6437    | -1         | 0.00 | 0           | 0                  
- default_group | 6437    | 0          | 0.00 | 0           | 0                  
- default_group | 6437    | 1          | 0.00 | 0           | 0                  
- default_group | 6437    | 2          | 0.00 | 0           | 0                  
-(4 rows)
-
--- also log the raw output of the views, if any of above tests failed it is
--- easier to find out the causes with these logs.
-
--- start_ignore
-select * from gp_toolkit.gp_resgroup_config;
-select * from gp_toolkit.gp_resgroup_status;
-select * from gp_toolkit.gp_resgroup_status_per_host;
-select * from gp_toolkit.gp_resgroup_status_per_segment;
--- end_ignore

src/test/isolation2/isolation2_resgroup_schedule

@@ -2,7 +2,6 @@ test: resgroup/enable_resgroup_validate
 test: resgroup/enable_resgroup
 
 # basic syntax
-test: resgroup/resgroup_views
 test: resgroup/resgroup_syntax
 test: resgroup/resgroup_transaction
 test: resgroup/resgroup_name_convention

src/test/isolation2/sql/resgroup/resgroup_views.sql

-select *
-  from gp_toolkit.gp_resgroup_config
- where groupname='default_group';
-
-select rsgname
-     , groupid
-     , num_running
-     , num_queueing
-     , num_queued
-     , num_executed
-     , cpu_usage->'-1' as qd_cpu_usage
-     , memory_usage->'-1'->'used' as qd_memory_used
-     , memory_usage->'-1'->'shared_used' as qd_memory_shared_used
-  from gp_toolkit.gp_resgroup_status
- where rsgname='default_group';
-
-select rsgname
-     , groupid
-     , cpu
-     , memory_used
-     , memory_shared_used
-  from gp_toolkit.gp_resgroup_status_per_host
- where rsgname='default_group';
-
-select rsgname
-     , groupid
-     , segment_id
-     , cpu
-     , memory_used
-     , memory_shared_used
-  from gp_toolkit.gp_resgroup_status_per_segment
- where rsgname='default_group'
- order by segment_id;
-
--- also log the raw output of the views, if any of above tests failed it is
--- easier to find out the causes with these logs.
-
--- start_ignore
-select * from gp_toolkit.gp_resgroup_config;
-select * from gp_toolkit.gp_resgroup_status;
-select * from gp_toolkit.gp_resgroup_status_per_host;
-select * from gp_toolkit.gp_resgroup_status_per_segment;
--- end_ignore