Fix tests

Author: naisila

src/backend/distributed/sql/udfs/citus_stats/13.1-1.sql

@@ -6,7 +6,7 @@ CREATE OR REPLACE VIEW citus.citus_stats AS
 WITH most_common_vals_double_json AS (
     SELECT ( SELECT json_agg(row_to_json(f)) FROM ( SELECT * FROM run_command_on_shards(logicalrelid,
             $$ SELECT json_agg(row_to_json(shard_stats)) FROM (
-            SELECT '$$ || logicalrelid || $$' AS dist_table, attname, s.null_frac,
+            SELECT '$$ || logicalrelid || $$' AS citus_table, attname, s.null_frac,
                    most_common_vals, most_common_freqs, c.reltuples AS reltuples
             -- join on tablename is enough here, no need to join with pg_namespace
             -- since shards have unique ids in their names, hence two shard names
@@ -23,41 +23,42 @@ most_common_vals_json AS (
 table_reltuples_json AS (
     SELECT distinct(shardid),
            (json_array_elements(result::json)->>'reltuples')::bigint AS shard_reltuples,
-	       (json_array_elements(result::json)->>'dist_table')::regclass AS dist_table
+	       (json_array_elements(result::json)->>'citus_table')::regclass AS citus_table
     FROM most_common_vals_json),
 
 table_reltuples AS (
-        SELECT dist_table, sum(shard_reltuples) AS table_reltuples
-        FROM table_reltuples_json GROUP BY dist_table),
+        SELECT citus_table, sum(shard_reltuples) AS table_reltuples
+        FROM table_reltuples_json GROUP BY 1 ORDER BY 1),
 
 null_frac_json AS (
-    SELECT (json_array_elements(result::json)->>'dist_table')::regclass AS dist_table,
+    SELECT (json_array_elements(result::json)->>'citus_table')::regclass AS citus_table,
            (json_array_elements(result::json)->>'reltuples')::bigint AS shard_reltuples,
            (json_array_elements(result::json)->>'null_frac')::float4 AS null_frac,
            (json_array_elements(result::json)->>'attname')::text AS attname
     FROM most_common_vals_json
 ),
 
 null_occurrences AS (
-    SELECT dist_table, attname, sum(null_frac * shard_reltuples)::bigint AS null_occurrences
+    SELECT citus_table, attname, sum(null_frac * shard_reltuples)::bigint AS null_occurrences
     FROM null_frac_json
-    GROUP BY dist_table, attname
+    GROUP BY 1, 2
+    ORDER BY 1, 2
 ),
 
 most_common_vals AS (
-    SELECT (json_array_elements(result::json)->>'dist_table')::regclass AS dist_table,
+    SELECT (json_array_elements(result::json)->>'citus_table')::regclass AS citus_table,
            (json_array_elements(result::json)->>'attname')::text AS attname,
            json_array_elements_text((json_array_elements(result::json)->>'most_common_vals')::json)::text AS common_val,
            json_array_elements_text((json_array_elements(result::json)->>'most_common_freqs')::json)::float4 AS common_freq,
            (json_array_elements(result::json)->>'reltuples')::bigint AS shard_reltuples
     FROM most_common_vals_json),
 
 common_val_occurrence AS (
-    SELECT dist_table, m.attname, common_val,
+    SELECT citus_table, m.attname, common_val,
             sum(common_freq * shard_reltuples)::bigint AS occurrence
     FROM most_common_vals m
-    GROUP BY dist_table, m.attname, common_val
-    ORDER BY m.attname, occurrence DESC, common_val)
+    GROUP BY citus_table, m.attname, common_val
+    ORDER BY 1, 2, occurrence DESC)
 
 SELECT nsp.nspname AS schemaname, p.relname AS tablename, c.attname,
 
@@ -70,10 +71,10 @@ SELECT nsp.nspname AS schemaname, p.relname AS tablename, c.attname,
        ELSE ARRAY_agg((occurrence/t.table_reltuples)::float4) END AS most_common_freqs
 
 FROM common_val_occurrence c, table_reltuples t, null_occurrences n, pg_class p, pg_namespace nsp
-WHERE c.dist_table = t.dist_table
-      AND c.dist_table = n.dist_table AND c.attname = n.attname
-      AND c.dist_table::regclass::oid = p.oid AND p.relnamespace = nsp.oid
-GROUP BY nsp.nspname, c.dist_table, p.relname, c.attname;
+WHERE c.citus_table = t.citus_table
+      AND c.citus_table = n.citus_table AND c.attname = n.attname
+      AND c.citus_table::regclass::oid = p.oid AND p.relnamespace = nsp.oid
+GROUP BY nsp.nspname, c.citus_table, p.relname, c.attname;
 
 ALTER VIEW citus.citus_stats SET SCHEMA pg_catalog;
 GRANT SELECT ON pg_catalog.citus_stats TO PUBLIC;

src/backend/distributed/sql/udfs/citus_stats/latest.sql

@@ -402,6 +402,6 @@ ORDER BY 1;
  view citus_tables
  view pg_dist_shard_placement
  view time_partitions
-(369 rows)
+(370 rows)
 
 DROP TABLE extension_basic_types;