Remove aggregate tables (fixes #4869)

crates/api_crud/src/comment/create.rs

@@ -145,7 +145,7 @@ pub async fn create_comment(
   update_read_comments(
     local_user_view.person.id,
     post_id,
-    post_view.counts.comments + 1,
+    post.comments + 1,
     &mut context.pool(),
   )
   .await?;

crates/api_crud/src/post/read.rs

@@ -69,7 +69,7 @@ pub async fn get_post(
     update_read_comments(
       person_id,
       post_id,
-      post_view.counts.comments,
+      post_view.post.comments,
       &mut context.pool(),
     )
     .await?;

crates/apub/src/activities/create_or_update/comment.rs

@@ -28,7 +28,6 @@ use lemmy_api_common::{
   utils::{check_post_deleted_or_removed, is_mod_or_admin},
 };
 use lemmy_db_schema::{
-  aggregates::structs::CommentAggregates,
   newtypes::{PersonId, PostOrCommentId},
   source::{
     activity::ActivitySendTargets,
@@ -160,7 +159,7 @@ impl ActivityHandler for CreateOrUpdateNote {
     CommentLike::like(&mut context.pool(), &like_form).await?;
 
     // Calculate initial hot_rank
-    CommentAggregates::update_hot_rank(&mut context.pool(), comment.id).await?;
+    Comment::update_hot_rank(&mut context.pool(), comment.id).await?;
 
     let do_send_email = self.kind == CreateOrUpdateType::Create;
     let actor = self.actor.dereference(context).await?;

crates/apub/src/activities/create_or_update/post.rs

@@ -22,7 +22,6 @@ use activitypub_federation::{
 };
 use lemmy_api_common::{build_response::send_local_notifs, context::LemmyContext};
 use lemmy_db_schema::{
-  aggregates::structs::PostAggregates,
   newtypes::{PersonId, PostOrCommentId},
   source::{
     activity::ActivitySendTargets,
@@ -121,7 +120,7 @@ impl ActivityHandler for CreateOrUpdatePage {
     PostLike::like(&mut context.pool(), &like_form).await?;
 
     // Calculate initial hot_rank for post
-    PostAggregates::update_ranks(&mut context.pool(), post.id).await?;
+    Post::update_ranks(&mut context.pool(), post.id).await?;
 
     let do_send_email = self.kind == CreateOrUpdateType::Create;
     let actor = self.actor.dereference(context).await?;

crates/db_schema/Cargo.toml

@@ -55,6 +55,7 @@ diesel = { workspace = true, features = [
   "postgres",
   "serde_json",
   "uuid",
+  "64-column-tables",
 ], optional = true }
 diesel-derive-newtype = { workspace = true, optional = true }
 diesel-derive-enum = { workspace = true, optional = true }

crates/db_schema/replaceable_schema/triggers.sql

@@ -6,7 +6,7 @@
 -- before the automatic deletion of the row that references it. This is not a problem for insert or delete.
 --
 -- Triggers that update multiple tables should use this order: person_aggregates, comment_aggregates,
--- post_aggregates, community_aggregates, site_aggregates
+-- post, community_aggregates, site_aggregates
 --   * The order matters because the updated rows are locked until the end of the transaction, and statements
 --     in a trigger don't use separate transactions. This means that updates closer to the beginning cause
 --     longer locks because the duration of each update extends the durations of the locks caused by previous
@@ -19,19 +19,6 @@
 --
 --
 -- Create triggers for both post and comments
-CREATE FUNCTION r.creator_id_from_post_aggregates (agg post_aggregates)
-    RETURNS int IMMUTABLE PARALLEL SAFE RETURN agg.creator_id;
-
-CREATE FUNCTION r.creator_id_from_comment_aggregates (agg comment_aggregates)
-    RETURNS int IMMUTABLE PARALLEL SAFE RETURN (
-        SELECT
-            creator_id
-        FROM
-            comment
-        WHERE
-            comment.id = agg.comment_id LIMIT 1
-);
-
 CREATE PROCEDURE r.post_or_comment (table_name text)
 LANGUAGE plpgsql
 AS $a$
@@ -41,18 +28,18 @@ BEGIN
         CALL r.create_triggers ('thing_actions', $$
             BEGIN
                 WITH thing_diff AS ( UPDATE
-                        thing_aggregates AS a
+                        thing AS a
                     SET
                         score = a.score + diff.upvotes - diff.downvotes, upvotes = a.upvotes + diff.upvotes, downvotes = a.downvotes + diff.downvotes, controversy_rank = r.controversy_rank ((a.upvotes + diff.upvotes)::numeric, (a.downvotes + diff.downvotes)::numeric)
                     FROM (
                         SELECT
                             (thing_actions).thing_id, coalesce(sum(count_diff) FILTER (WHERE (thing_actions).like_score = 1), 0) AS upvotes, coalesce(sum(count_diff) FILTER (WHERE (thing_actions).like_score != 1), 0) AS downvotes FROM select_old_and_new_rows AS old_and_new_rows
                 WHERE (thing_actions).like_score IS NOT NULL GROUP BY (thing_actions).thing_id) AS diff
             WHERE
-                a.thing_id = diff.thing_id
+                a.id = diff.thing_id
                     AND (diff.upvotes, diff.downvotes) != (0, 0)
                 RETURNING
-                    r.creator_id_from_thing_aggregates (a.*) AS creator_id, diff.upvotes - diff.downvotes AS score)
+                    a.creator_id AS creator_id, diff.upvotes - diff.downvotes AS score)
             UPDATE
                 person_aggregates AS a
             SET
@@ -109,7 +96,7 @@ WHERE
         AND diff.comment_count != 0;
 
 UPDATE
-    comment_aggregates AS a
+    comment AS a
 SET
     child_count = a.child_count + diff.child_count
 FROM (
@@ -143,12 +130,12 @@ FROM (
     GROUP BY
         parent_id) AS diff
 WHERE
-    a.comment_id = diff.parent_id
+    a.id = diff.parent_id
     AND diff.child_count != 0;
 
 WITH post_diff AS (
     UPDATE
-        post_aggregates AS a
+        post AS a
     SET
         comments = a.comments + diff.comments,
         newest_comment_time = GREATEST (a.newest_comment_time, diff.newest_comment_time),
@@ -173,7 +160,7 @@ WITH post_diff AS (
     GROUP BY
         post.id) AS diff
     WHERE
-        a.post_id = diff.post_id
+        a.id = diff.post_id
         AND (diff.comments,
             GREATEST (a.newest_comment_time, diff.newest_comment_time),
             GREATEST (a.newest_comment_time_necro, diff.newest_comment_time_necro)) != (0,
@@ -338,12 +325,12 @@ BEGIN
                     1
                 ELSE
                     -1
-                END) * post_aggregates.comments) AS comments
+                END) * post.comments) AS comments
         FROM
             new_post
             INNER JOIN old_post ON new_post.id = old_post.id
                 AND (r.is_counted (new_post.*) != r.is_counted (old_post.*))
-                INNER JOIN post_aggregates ON post_aggregates.post_id = new_post.id
+                INNER JOIN post ON post.id = new_post.id
             GROUP BY
                 old_post.community_id) AS diff
 WHERE
@@ -387,15 +374,15 @@ $$);
 CALL r.create_triggers ('post_report', $$
 BEGIN
     UPDATE
-        post_aggregates AS a
+        post AS a
     SET
         report_count = a.report_count + diff.report_count, unresolved_report_count = a.unresolved_report_count + diff.unresolved_report_count
     FROM (
         SELECT
             (post_report).post_id, coalesce(sum(count_diff), 0) AS report_count, coalesce(sum(count_diff) FILTER (WHERE NOT (post_report).resolved), 0) AS unresolved_report_count
     FROM select_old_and_new_rows AS old_and_new_rows GROUP BY (post_report).post_id) AS diff
 WHERE (diff.report_count, diff.unresolved_report_count) != (0, 0)
-    AND a.post_id = diff.post_id;
+    AND a.id = diff.post_id;
 
 RETURN NULL;
 
@@ -406,15 +393,15 @@ $$);
 CALL r.create_triggers ('comment_report', $$
 BEGIN
     UPDATE
-        comment_aggregates AS a
+        comment AS a
     SET
         report_count = a.report_count + diff.report_count, unresolved_report_count = a.unresolved_report_count + diff.unresolved_report_count
     FROM (
         SELECT
             (comment_report).comment_id, coalesce(sum(count_diff), 0) AS report_count, coalesce(sum(count_diff) FILTER (WHERE NOT (comment_report).resolved), 0) AS unresolved_report_count
     FROM select_old_and_new_rows AS old_and_new_rows GROUP BY (comment_report).comment_id) AS diff
 WHERE (diff.report_count, diff.unresolved_report_count) != (0, 0)
-    AND a.comment_id = diff.comment_id;
+    AND a.id = diff.comment_id;
 
 RETURN NULL;
 
@@ -443,26 +430,6 @@ $$);
 
 -- These triggers create and update rows in each aggregates table to match its associated table's rows.
 -- Deleting rows and updating IDs are already handled by `CASCADE` in foreign key constraints.
-CREATE FUNCTION r.comment_aggregates_from_comment ()
-    RETURNS TRIGGER
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-    INSERT INTO comment_aggregates (comment_id, published)
-    SELECT
-        id,
-        published
-    FROM
-        new_comment;
-    RETURN NULL;
-END;
-$$;
-
-CREATE TRIGGER aggregates
-    AFTER INSERT ON comment REFERENCING NEW TABLE AS new_comment
-    FOR EACH STATEMENT
-    EXECUTE FUNCTION r.comment_aggregates_from_comment ();
-
 CREATE FUNCTION r.community_aggregates_from_community ()
     RETURNS TRIGGER
     LANGUAGE plpgsql
@@ -502,41 +469,44 @@ CREATE TRIGGER aggregates
     FOR EACH STATEMENT
     EXECUTE FUNCTION r.person_aggregates_from_person ();
 
-CREATE FUNCTION r.post_aggregates_from_post ()
+CREATE FUNCTION r.post_from_post ()
     RETURNS TRIGGER
     LANGUAGE plpgsql
     AS $$
 BEGIN
-    INSERT INTO post_aggregates (post_id, published, newest_comment_time, newest_comment_time_necro, community_id, creator_id, instance_id, featured_community, featured_local)
-    SELECT
-        new_post.id,
-        new_post.published,
-        new_post.published,
-        new_post.published,
-        new_post.community_id,
-        new_post.creator_id,
-        community.instance_id,
-        new_post.featured_community,
-        new_post.featured_local
+    UPDATE
+        post
+    SET
+        published = new_post.published,
+        newest_comment_time = new_post.published,
+        newest_comment_time_necro = new_post.published,
+        community_id = new_post.community_id,
+        creator_id = new_post.creator_id,
+        instance_id = community.instance_id,
+        featured_community = new_post.featured_community,
+        featured_local = new_post.featured_local
     FROM
         new_post
-        INNER JOIN community ON community.id = new_post.community_id;
+        INNER JOIN community ON community.id = new_post.community_id
+    WHERE
+        post.id = new_post.id;
     RETURN NULL;
 END;
 $$;
 
 CREATE TRIGGER aggregates
     AFTER INSERT ON post REFERENCING NEW TABLE AS new_post
     FOR EACH STATEMENT
-    EXECUTE FUNCTION r.post_aggregates_from_post ();
+    WHEN (pg_trigger_depth() = 0)
+    EXECUTE FUNCTION r.post_from_post ();
 
-CREATE FUNCTION r.post_aggregates_from_post_update ()
+CREATE FUNCTION r.post_from_post_update ()
     RETURNS TRIGGER
     LANGUAGE plpgsql
     AS $$
 BEGIN
     UPDATE
-        post_aggregates
+        post
     SET
         featured_community = new_post.featured_community,
         featured_local = new_post.featured_local
@@ -547,15 +517,16 @@ BEGIN
                 old_post.featured_local) != (new_post.featured_community,
                 new_post.featured_local)
     WHERE
-        post_aggregates.post_id = new_post.id;
+        post.id = new_post.id;
     RETURN NULL;
 END;
 $$;
 
 CREATE TRIGGER aggregates_update
     AFTER UPDATE ON post REFERENCING OLD TABLE AS old_post NEW TABLE AS new_post
     FOR EACH STATEMENT
-    EXECUTE FUNCTION r.post_aggregates_from_post_update ();
+    WHEN (pg_trigger_depth() = 0)
+    EXECUTE FUNCTION r.post_from_post_update ();
 
 CREATE FUNCTION r.site_aggregates_from_site ()
     RETURNS TRIGGER
@@ -961,7 +932,7 @@ CALL r.create_search_combined_trigger ('community');
 CALL r.create_search_combined_trigger ('person');
 
 -- You also need to triggers to update the `score` column.
--- post | post_aggregates::score
+-- post | post::score
 -- comment | comment_aggregates::score
 -- community | community_aggregates::users_active_monthly
 -- person | person_aggregates::post_score
@@ -977,13 +948,13 @@ BEGIN
     SET
         score = NEW.score
     WHERE
-        post_id = NEW.post_id;
+        post_id = NEW.id;
     RETURN NULL;
 END
 $$;
 
 CREATE TRIGGER search_combined_post_score
-    AFTER UPDATE OF score ON post_aggregates
+    AFTER UPDATE OF score ON post
     FOR EACH ROW
     EXECUTE FUNCTION r.search_combined_post_score_update ();
 
@@ -998,13 +969,13 @@ BEGIN
     SET
         score = NEW.score
     WHERE
-        comment_id = NEW.comment_id;
+        comment_id = NEW.id;
     RETURN NULL;
 END
 $$;
 
 CREATE TRIGGER search_combined_comment_score
-    AFTER UPDATE OF score ON comment_aggregates
+    AFTER UPDATE OF score ON comment
     FOR EACH ROW
     EXECUTE FUNCTION r.search_combined_comment_score_update ();
 

crates/db_schema/replaceable_schema/utils.sql

@@ -92,6 +92,7 @@ DECLARE
     CREATE TRIGGER delete_statement
         AFTER DELETE ON thing REFERENCING OLD TABLE AS select_old_rows
         FOR EACH STATEMENT
+        WHEN (pg_trigger_depth( ) = 0 )
         EXECUTE FUNCTION r.thing_delete_statement ( );
     -- Insert
     CREATE FUNCTION r.thing_insert_statement ( )
@@ -101,6 +102,7 @@ DECLARE
     CREATE TRIGGER insert_statement
         AFTER INSERT ON thing REFERENCING NEW TABLE AS select_new_rows
         FOR EACH STATEMENT
+        WHEN (pg_trigger_depth( ) = 0 )
         EXECUTE FUNCTION r.thing_insert_statement ( );
     -- Update
     CREATE FUNCTION r.thing_update_statement ( )
@@ -110,6 +112,7 @@ DECLARE
     CREATE TRIGGER update_statement
         AFTER UPDATE ON thing REFERENCING OLD TABLE AS select_old_rows NEW TABLE AS select_new_rows
         FOR EACH STATEMENT
+        WHEN (pg_trigger_depth( ) = 0 )
         EXECUTE FUNCTION r.thing_update_statement ( );
     $$;
     select_old_and_new_rows text := $$ (
@@ -225,7 +228,7 @@ BEGIN
         COALESCE(sum(comments + upvotes + downvotes)::bigint, 0) AS count_,
         community_id AS community_id_
     FROM
-        post_aggregates
+        post
     WHERE
         published >= (CURRENT_TIMESTAMP - i::interval)
     GROUP BY