One pass at materialized views, only about 30% faster, not good.

This commit is contained in:
Dessalines 2020-07-04 13:20:06 -04:00
parent eded51aab6
commit 9c30c65c07
10 changed files with 1220 additions and 82 deletions

View file

@ -0,0 +1,536 @@
-- Dropping all the fast tables
drop table user_fast;
drop table user_mention_fast;
drop trigger refresh_user_mention on user_mention;
drop table post_fast;
drop table community_fast;
drop table private_message_fast;
drop view reply_fast_view;
drop table comment_fast;
-- Re-adding all the triggers, functions, and mviews
-- private message
create materialized view private_message_mview as select * from private_message_view;
create unique index idx_private_message_mview_id on private_message_mview (id);
-- Create the triggers
create or replace function refresh_private_message()
returns trigger language plpgsql
as $$
begin
refresh materialized view concurrently private_message_mview;
return null;
end $$;
drop trigger refresh_private_message on private_message;
create trigger refresh_private_message
after insert or update or delete or truncate
on private_message
for each statement
execute procedure refresh_private_message();
-- user
create or replace function refresh_user()
returns trigger language plpgsql
as $$
begin
refresh materialized view concurrently user_mview;
refresh materialized view concurrently comment_aggregates_mview; -- cause of bans
refresh materialized view concurrently post_aggregates_mview;
return null;
end $$;
drop trigger refresh_user on user_;
create trigger refresh_user
after insert or update or delete or truncate
on user_
for each statement
execute procedure refresh_user();
drop view user_view cascade;
create view user_view as
select
u.id,
u.actor_id,
u.name,
u.avatar,
u.email,
u.matrix_user_id,
u.bio,
u.local,
u.admin,
u.banned,
u.show_avatars,
u.send_notifications_to_email,
u.published,
(select count(*) from post p where p.creator_id = u.id) as number_of_posts,
(select coalesce(sum(score), 0) from post p, post_like pl where u.id = p.creator_id and p.id = pl.post_id) as post_score,
(select count(*) from comment c where c.creator_id = u.id) as number_of_comments,
(select coalesce(sum(score), 0) from comment c, comment_like cl where u.id = c.creator_id and c.id = cl.comment_id) as comment_score
from user_ u;
create materialized view user_mview as select * from user_view;
create unique index idx_user_mview_id on user_mview (id);
-- community
drop trigger refresh_community on community;
create trigger refresh_community
after insert or update or delete or truncate
on community
for each statement
execute procedure refresh_community();
create or replace function refresh_community()
returns trigger language plpgsql
as $$
begin
refresh materialized view concurrently post_aggregates_mview;
refresh materialized view concurrently community_aggregates_mview;
refresh materialized view concurrently user_mview;
return null;
end $$;
drop view community_aggregates_view cascade;
create view community_aggregates_view as
-- Now that there's public and private keys, you have to be explicit here
select c.id,
c.name,
c.title,
c.description,
c.category_id,
c.creator_id,
c.removed,
c.published,
c.updated,
c.deleted,
c.nsfw,
c.actor_id,
c.local,
c.last_refreshed_at,
(select actor_id from user_ u where c.creator_id = u.id) as creator_actor_id,
(select local from user_ u where c.creator_id = u.id) as creator_local,
(select name from user_ u where c.creator_id = u.id) as creator_name,
(select avatar from user_ u where c.creator_id = u.id) as creator_avatar,
(select name from category ct where c.category_id = ct.id) as category_name,
(select count(*) from community_follower cf where cf.community_id = c.id) as number_of_subscribers,
(select count(*) from post p where p.community_id = c.id) as number_of_posts,
(select count(*) from comment co, post p where c.id = p.community_id and p.id = co.post_id) as number_of_comments,
hot_rank((select count(*) from community_follower cf where cf.community_id = c.id), c.published) as hot_rank
from community c;
create materialized view community_aggregates_mview as select * from community_aggregates_view;
create unique index idx_community_aggregates_mview_id on community_aggregates_mview (id);
create view community_view as
with all_community as
(
select
ca.*
from community_aggregates_view ca
)
select
ac.*,
u.id as user_id,
(select cf.id::boolean from community_follower cf where u.id = cf.user_id and ac.id = cf.community_id) as subscribed
from user_ u
cross join all_community ac
union all
select
ac.*,
null as user_id,
null as subscribed
from all_community ac
;
create view community_mview as
with all_community as
(
select
ca.*
from community_aggregates_mview ca
)
select
ac.*,
u.id as user_id,
(select cf.id::boolean from community_follower cf where u.id = cf.user_id and ac.id = cf.community_id) as subscribed
from user_ u
cross join all_community ac
union all
select
ac.*,
null as user_id,
null as subscribed
from all_community ac
;
-- Post
drop view post_view;
drop view post_aggregates_view;
-- regen post view
create view post_aggregates_view as
select
p.*,
(select u.banned from user_ u where p.creator_id = u.id) as banned,
(select cb.id::bool from community_user_ban cb where p.creator_id = cb.user_id and p.community_id = cb.community_id) as banned_from_community,
(select actor_id from user_ where p.creator_id = user_.id) as creator_actor_id,
(select local from user_ where p.creator_id = user_.id) as creator_local,
(select name from user_ where p.creator_id = user_.id) as creator_name,
(select avatar from user_ where p.creator_id = user_.id) as creator_avatar,
(select actor_id from community where p.community_id = community.id) as community_actor_id,
(select local from community where p.community_id = community.id) as community_local,
(select name from community where p.community_id = community.id) as community_name,
(select removed from community c where p.community_id = c.id) as community_removed,
(select deleted from community c where p.community_id = c.id) as community_deleted,
(select nsfw from community c where p.community_id = c.id) as community_nsfw,
(select count(*) from comment where comment.post_id = p.id) as number_of_comments,
coalesce(sum(pl.score), 0) as score,
count (case when pl.score = 1 then 1 else null end) as upvotes,
count (case when pl.score = -1 then 1 else null end) as downvotes,
hot_rank(coalesce(sum(pl.score) , 0),
(
case when (p.published < ('now'::timestamp - '1 month'::interval)) then p.published -- Prevents necro-bumps
else greatest(c.recent_comment_time, p.published)
end
)
) as hot_rank,
(
case when (p.published < ('now'::timestamp - '1 month'::interval)) then p.published -- Prevents necro-bumps
else greatest(c.recent_comment_time, p.published)
end
) as newest_activity_time
from post p
left join post_like pl on p.id = pl.post_id
left join (
select post_id,
max(published) as recent_comment_time
from comment
group by 1
) c on p.id = c.post_id
group by p.id, c.recent_comment_time;
create materialized view post_aggregates_mview as select * from post_aggregates_view;
create unique index idx_post_aggregates_mview_id on post_aggregates_mview (id);
create view post_view as
with all_post as (
select
pa.*
from post_aggregates_view pa
)
select
ap.*,
u.id as user_id,
coalesce(pl.score, 0) as my_vote,
(select cf.id::bool from community_follower cf where u.id = cf.user_id and cf.community_id = ap.community_id) as subscribed,
(select pr.id::bool from post_read pr where u.id = pr.user_id and pr.post_id = ap.id) as read,
(select ps.id::bool from post_saved ps where u.id = ps.user_id and ps.post_id = ap.id) as saved
from user_ u
cross join all_post ap
left join post_like pl on u.id = pl.user_id and ap.id = pl.post_id
union all
select
ap.*,
null as user_id,
null as my_vote,
null as subscribed,
null as read,
null as saved
from all_post ap
;
create view post_mview as
with all_post as (
select
pa.*
from post_aggregates_mview pa
)
select
ap.*,
u.id as user_id,
coalesce(pl.score, 0) as my_vote,
(select cf.id::bool from community_follower cf where u.id = cf.user_id and cf.community_id = ap.community_id) as subscribed,
(select pr.id::bool from post_read pr where u.id = pr.user_id and pr.post_id = ap.id) as read,
(select ps.id::bool from post_saved ps where u.id = ps.user_id and ps.post_id = ap.id) as saved
from user_ u
cross join all_post ap
left join post_like pl on u.id = pl.user_id and ap.id = pl.post_id
union all
select
ap.*,
null as user_id,
null as my_vote,
null as subscribed,
null as read,
null as saved
from all_post ap
;
drop trigger refresh_post on post;
create trigger refresh_post
after insert or update or delete or truncate
on post
for each statement
execute procedure refresh_post();
create or replace function refresh_post()
returns trigger language plpgsql
as $$
begin
refresh materialized view concurrently post_aggregates_mview;
refresh materialized view concurrently user_mview;
return null;
end $$;
-- User mention, comment, reply
drop view user_mention_view;
drop view comment_view;
drop view comment_aggregates_view;
-- reply and comment view
create view comment_aggregates_view as
select
c.*,
(select community_id from post p where p.id = c.post_id),
(select co.actor_id from post p, community co where p.id = c.post_id and p.community_id = co.id) as community_actor_id,
(select co.local from post p, community co where p.id = c.post_id and p.community_id = co.id) as community_local,
(select co.name from post p, community co where p.id = c.post_id and p.community_id = co.id) as community_name,
(select u.banned from user_ u where c.creator_id = u.id) as banned,
(select cb.id::bool from community_user_ban cb, post p where c.creator_id = cb.user_id and p.id = c.post_id and p.community_id = cb.community_id) as banned_from_community,
(select actor_id from user_ where c.creator_id = user_.id) as creator_actor_id,
(select local from user_ where c.creator_id = user_.id) as creator_local,
(select name from user_ where c.creator_id = user_.id) as creator_name,
(select avatar from user_ where c.creator_id = user_.id) as creator_avatar,
coalesce(sum(cl.score), 0) as score,
count (case when cl.score = 1 then 1 else null end) as upvotes,
count (case when cl.score = -1 then 1 else null end) as downvotes,
hot_rank(coalesce(sum(cl.score) , 0), c.published) as hot_rank
from comment c
left join comment_like cl on c.id = cl.comment_id
group by c.id;
create materialized view comment_aggregates_mview as select * from comment_aggregates_view;
create unique index idx_comment_aggregates_mview_id on comment_aggregates_mview (id);
create view comment_view as
with all_comment as
(
select
ca.*
from comment_aggregates_view ca
)
select
ac.*,
u.id as user_id,
coalesce(cl.score, 0) as my_vote,
(select cf.id::boolean from community_follower cf where u.id = cf.user_id and ac.community_id = cf.community_id) as subscribed,
(select cs.id::bool from comment_saved cs where u.id = cs.user_id and cs.comment_id = ac.id) as saved
from user_ u
cross join all_comment ac
left join comment_like cl on u.id = cl.user_id and ac.id = cl.comment_id
union all
select
ac.*,
null as user_id,
null as my_vote,
null as subscribed,
null as saved
from all_comment ac
;
create view comment_mview as
with all_comment as
(
select
ca.*
from comment_aggregates_mview ca
)
select
ac.*,
u.id as user_id,
coalesce(cl.score, 0) as my_vote,
(select cf.id::boolean from community_follower cf where u.id = cf.user_id and ac.community_id = cf.community_id) as subscribed,
(select cs.id::bool from comment_saved cs where u.id = cs.user_id and cs.comment_id = ac.id) as saved
from user_ u
cross join all_comment ac
left join comment_like cl on u.id = cl.user_id and ac.id = cl.comment_id
union all
select
ac.*,
null as user_id,
null as my_vote,
null as subscribed,
null as saved
from all_comment ac
;
-- Do the reply_view referencing the comment_mview
create view reply_view as
with closereply as (
select
c2.id,
c2.creator_id as sender_id,
c.creator_id as recipient_id
from comment c
inner join comment c2 on c.id = c2.parent_id
where c2.creator_id != c.creator_id
-- Do union where post is null
union
select
c.id,
c.creator_id as sender_id,
p.creator_id as recipient_id
from comment c, post p
where c.post_id = p.id and c.parent_id is null and c.creator_id != p.creator_id
)
select cv.*,
closereply.recipient_id
from comment_mview cv, closereply
where closereply.id = cv.id
;
-- user mention
create view user_mention_view as
select
c.id,
um.id as user_mention_id,
c.creator_id,
c.creator_actor_id,
c.creator_local,
c.post_id,
c.parent_id,
c.content,
c.removed,
um.read,
c.published,
c.updated,
c.deleted,
c.community_id,
c.community_actor_id,
c.community_local,
c.community_name,
c.banned,
c.banned_from_community,
c.creator_name,
c.creator_avatar,
c.score,
c.upvotes,
c.downvotes,
c.hot_rank,
c.user_id,
c.my_vote,
c.saved,
um.recipient_id,
(select actor_id from user_ u where u.id = um.recipient_id) as recipient_actor_id,
(select local from user_ u where u.id = um.recipient_id) as recipient_local
from user_mention um, comment_view c
where um.comment_id = c.id;
create view user_mention_mview as
with all_comment as
(
select
ca.*
from comment_aggregates_mview ca
)
select
ac.id,
um.id as user_mention_id,
ac.creator_id,
ac.creator_actor_id,
ac.creator_local,
ac.post_id,
ac.parent_id,
ac.content,
ac.removed,
um.read,
ac.published,
ac.updated,
ac.deleted,
ac.community_id,
ac.community_actor_id,
ac.community_local,
ac.community_name,
ac.banned,
ac.banned_from_community,
ac.creator_name,
ac.creator_avatar,
ac.score,
ac.upvotes,
ac.downvotes,
ac.hot_rank,
u.id as user_id,
coalesce(cl.score, 0) as my_vote,
(select cs.id::bool from comment_saved cs where u.id = cs.user_id and cs.comment_id = ac.id) as saved,
um.recipient_id,
(select actor_id from user_ u where u.id = um.recipient_id) as recipient_actor_id,
(select local from user_ u where u.id = um.recipient_id) as recipient_local
from user_ u
cross join all_comment ac
left join comment_like cl on u.id = cl.user_id and ac.id = cl.comment_id
left join user_mention um on um.comment_id = ac.id
union all
select
ac.id,
um.id as user_mention_id,
ac.creator_id,
ac.creator_actor_id,
ac.creator_local,
ac.post_id,
ac.parent_id,
ac.content,
ac.removed,
um.read,
ac.published,
ac.updated,
ac.deleted,
ac.community_id,
ac.community_actor_id,
ac.community_local,
ac.community_name,
ac.banned,
ac.banned_from_community,
ac.creator_name,
ac.creator_avatar,
ac.score,
ac.upvotes,
ac.downvotes,
ac.hot_rank,
null as user_id,
null as my_vote,
null as saved,
um.recipient_id,
(select actor_id from user_ u where u.id = um.recipient_id) as recipient_actor_id,
(select local from user_ u where u.id = um.recipient_id) as recipient_local
from all_comment ac
left join user_mention um on um.comment_id = ac.id
;

View file

@ -0,0 +1,375 @@
-- Drop the mviews
drop view post_mview;
drop materialized view user_mview;
drop view community_mview;
drop materialized view private_message_mview;
drop view user_mention_mview;
drop view reply_view;
drop view comment_mview;
drop materialized view post_aggregates_mview;
drop materialized view community_aggregates_mview;
drop materialized view comment_aggregates_mview;
-- User
create table user_fast as select * from user_view;
alter table user_fast add column fast_id serial primary key;
create index idx_user_fast_id on user_fast (id);
drop trigger refresh_user on user_;
create trigger refresh_user
after insert or update or delete
on user_
for each row
execute procedure refresh_user();
-- Sample insert
-- insert into user_(name, password_encrypted) values ('test_name', 'bleh');
-- Sample delete
-- delete from user_ where name like 'test_name';
-- Sample update
-- update user_ set avatar = 'hai' where name like 'test_name';
create or replace function refresh_user()
returns trigger language plpgsql
as $$
begin
IF (TG_OP = 'DELETE') THEN
delete from user_fast where id = OLD.id;
ELSIF (TG_OP = 'UPDATE') THEN
delete from user_fast where id = OLD.id;
insert into user_fast select * from user_view where id = NEW.id;
-- Refresh post_fast, cause of user info changes
-- TODO test this. Also is it locking?
delete from post_fast where creator_id = NEW.id;
insert into post_fast select * from post_view where creator_id = NEW.id;
-- TODO
-- refresh materialized view concurrently comment_aggregates_mview; -- cause of bans
-- refresh materialized view concurrently post_aggregates_mview; -- cause of user info changes
ELSIF (TG_OP = 'INSERT') THEN
insert into user_fast select * from user_view where id = NEW.id;
-- Update all the fast views
insert into community_fast select * from community_view where user_id = NEW.id;
insert into post_fast select * from post_view where user_id = NEW.id;
insert into comment_fast select * from comment_view where user_id = NEW.id;
END IF;
return null;
end $$;
-- Post
create table post_fast as select * from post_view;
alter table post_fast add column fast_id serial primary key;
create index idx_post_fast_user_id on post_fast (user_id);
create index idx_post_fast_id on post_fast (id);
-- For the hot rank resorting
create index idx_post_fast_hot_rank on post_fast (hot_rank);
-- This ones for the common case of null fetches
create index idx_post_fast_hot_rank_published_desc_user_null on post_fast (hot_rank desc, published desc) where user_id is null;
drop trigger refresh_post on post;
create trigger refresh_post
after insert or update or delete
on post
for each row
execute procedure refresh_post();
-- Sample insert
-- insert into post(name, creator_id, community_id) values ('test_post', 2, 2);
-- Sample delete
-- delete from post where name like 'test_post';
-- Sample update
-- update post set community_id = 4 where name like 'test_post';
create or replace function refresh_post()
returns trigger language plpgsql
as $$
begin
IF (TG_OP = 'DELETE') THEN
delete from post_fast where id = OLD.id;
ELSIF (TG_OP = 'UPDATE') THEN
delete from post_fast where id = OLD.id;
insert into post_fast select * from post_view where id = NEW.id;
ELSIF (TG_OP = 'INSERT') THEN
insert into post_fast select * from post_view where id = NEW.id;
-- TODO Update the user fast table
-- Update that users number of posts, post score
-- delete from user_fast where id = NEW.creator_id;
-- insert into user_fast select * from user_view where id = NEW.creator_id;
-- Update the hot rank on the post table TODO hopefully this doesn't lock it.
update post_fast set hot_rank = hot_rank(coalesce(score , 0), published) where hot_rank > 0 ;
END IF;
return null;
end $$;
-- Community
create table community_fast as select * from community_view;
alter table community_fast add column fast_id serial primary key;
create index idx_community_fast_id on community_fast (id);
create index idx_community_fast_user_id on community_fast (user_id);
drop trigger refresh_community on community;
create trigger refresh_community
after insert or update or delete
on community
for each row
execute procedure refresh_community();
-- Sample insert
-- insert into community(name, title, category_id, creator_id) values ('test_community_name', 'test_community_title', 1, 2);
-- Sample delete
-- delete from community where name like 'test_community_name';
-- Sample update
-- update community set title = 'test_community_title_2' where name like 'test_community_name';
create or replace function refresh_community()
returns trigger language plpgsql
as $$
begin
IF (TG_OP = 'DELETE') THEN
delete from community_fast where id = OLD.id;
ELSIF (TG_OP = 'UPDATE') THEN
delete from community_fast where id = OLD.id;
insert into community_fast select * from community_view where id = NEW.id;
-- Update user view due to owner changes
delete from user_fast where id = NEW.creator_id;
insert into user_fast select * from user_view where id = NEW.creator_id;
-- Update post view due to community changes
delete from post_fast where community_id = NEW.id;
insert into post_fast select * from post_view where community_id = NEW.id;
-- TODO make sure this shows up in the users page ?
ELSIF (TG_OP = 'INSERT') THEN
insert into community_fast select * from community_view where id = NEW.id;
END IF;
return null;
end $$;
-- Private message
create table private_message_fast as select * from private_message_view;
alter table private_message_fast add column fast_id serial primary key;
create index idx_private_message_fast_id on private_message_fast (id);
drop trigger refresh_private_message on private_message;
create trigger refresh_private_message
after insert or update or delete
on private_message
for each row
execute procedure refresh_private_message();
-- Sample insert
-- insert into private_message(creator_id, recipient_id, content) values (2, 3, 'test_private_message');
-- Sample delete
-- delete from private_message where content like 'test_private_message';
-- Sample update
-- update private_message set ap_id = 'test' where content like 'test_private_message';
create or replace function refresh_private_message()
returns trigger language plpgsql
as $$
begin
IF (TG_OP = 'DELETE') THEN
delete from private_message_fast where id = OLD.id;
ELSIF (TG_OP = 'UPDATE') THEN
delete from private_message_fast where id = OLD.id;
insert into private_message_fast select * from private_message_view where id = NEW.id;
ELSIF (TG_OP = 'INSERT') THEN
insert into private_message_fast select * from private_message_view where id = NEW.id;
END IF;
return null;
end $$;
-- Comment
create table comment_fast as select * from comment_view;
alter table comment_fast add column fast_id serial primary key;
create index idx_comment_fast_user_id on comment_fast (user_id);
create index idx_comment_fast_id on comment_fast (id);
-- This ones for the common case of null fetches
create index idx_comment_fast_hot_rank_published_desc_user_null on comment_fast (hot_rank desc, published desc) where user_id is null;
drop trigger refresh_comment on comment;
create trigger refresh_comment
after insert or update or delete
on comment
for each row
execute procedure refresh_comment();
-- Sample insert
-- insert into comment(creator_id, post_id, content) values (2, 2, 'test_comment');
-- Sample delete
-- delete from comment where content like 'test_comment';
-- Sample update
-- update comment set removed = true where content like 'test_comment';
create or replace function refresh_comment()
returns trigger language plpgsql
as $$
begin
IF (TG_OP = 'DELETE') THEN
-- delete from comment_fast where id = OLD.id;
ELSIF (TG_OP = 'UPDATE') THEN
-- delete from comment_fast where id = OLD.id;
-- insert into comment_fast select * from comment_view where id = NEW.id;
ELSIF (TG_OP = 'INSERT') THEN
insert into comment_fast select * from comment_view where id = NEW.id;
-- Update user view due to comment count
-- delete from user_fast where id = NEW.creator_id;
-- insert into user_fast select * from user_view where id = NEW.creator_id;
-- Update post view due to comment count
-- delete from post_fast where id = NEW.post_id;
-- insert into post_fast select * from post_view where id = NEW.post_id;
-- Update community view due to comment count
-- delete from community_fast as cf using post as p where cf.id = p.community_id and p.id = NEW.post_id;
-- insert into community_fast select cv.* from community_view cv, post p where cv.id = p.community_id and p.id = NEW.post_id;
END IF;
return null;
end $$;
-- User mention
create table user_mention_fast as select * from user_mention_view;
alter table user_mention_fast add column fast_id serial primary key;
create index idx_user_mention_fast_user_id on user_mention_fast (user_id);
create index idx_user_mention_fast_id on user_mention_fast (id);
-- Sample insert
-- insert into user_mention(recipient_id, comment_id) values (2, 4);
-- Sample delete
-- delete from user_mention where recipient_id = 2 and comment_id = 4;
-- Sample update
-- update user_mention set read = true where recipient_id = 2 and comment_id = 4;
create or replace function refresh_user_mention()
returns trigger language plpgsql
as $$
begin
IF (TG_OP = 'DELETE') THEN
delete from user_mention_fast where id = OLD.comment_id;
ELSIF (TG_OP = 'UPDATE') THEN
delete from user_mention_fast where id = OLD.comment_id;
insert into user_mention_fast select * from user_mention_view where id = NEW.comment_id;
ELSIF (TG_OP = 'INSERT') THEN
insert into user_mention_fast select * from user_mention_view where id = NEW.comment_id;
END IF;
return null;
end $$;
create trigger refresh_user_mention
after insert or update or delete
on user_mention
for each row
execute procedure refresh_user_mention();
-- The reply view, referencing the fast table
create view reply_fast_view as
with closereply as (
select
c2.id,
c2.creator_id as sender_id,
c.creator_id as recipient_id
from comment c
inner join comment c2 on c.id = c2.parent_id
where c2.creator_id != c.creator_id
-- Do union where post is null
union
select
c.id,
c.creator_id as sender_id,
p.creator_id as recipient_id
from comment c, post p
where c.post_id = p.id and c.parent_id is null and c.creator_id != p.creator_id
)
select cv.*,
closereply.recipient_id
from comment_fast cv, closereply
where closereply.id = cv.id
;
-- post_like
-- select id, score, my_vote from post_fast where id = 29 and user_id = 4;
-- Sample insert
-- insert into post_like(user_id, post_id, score) values (4, 29, 1);
-- Sample delete
-- delete from post_like where user_id = 4 and post_id = 29;
-- Sample update
-- update post_like set score = -1 where user_id = 4 and post_id = 29;
-- TODO test this a LOT
create or replace function refresh_post_like()
returns trigger language plpgsql
as $$
begin
-- TODO possibly select from post_fast to get previous scores, instead of re-fetching the views?
IF (TG_OP = 'DELETE') THEN
delete from post_fast where id = OLD.post_id;
insert into post_fast select * from post_view where id = OLD.post_id;
ELSIF (TG_OP = 'UPDATE') THEN
delete from post_fast where id = NEW.post_id;
insert into post_fast select * from post_view where id = NEW.post_id;
ELSIF (TG_OP = 'INSERT') THEN
delete from post_fast where id = NEW.post_id;
insert into post_fast select * from post_view where id = NEW.post_id;
END IF;
return null;
end $$;
drop trigger refresh_post_like on post_like;
create trigger refresh_post_like
after insert or update or delete
on post_like
for each row
execute procedure refresh_post_like();
create or replace function refresh_comment_like()
returns trigger language plpgsql
as $$
begin
-- TODO possibly select from comment_fast to get previous scores, instead of re-fetching the views?
-- IF (TG_OP = 'DELETE') THEN
-- delete from comment_fast where id = OLD.comment_id;
-- insert into comment_fast select * from comment_view where id = OLD.comment_id;
-- ELSIF (TG_OP = 'UPDATE') THEN
-- delete from comment_fast where id = NEW.comment_id;
-- insert into comment_fast select * from comment_view where id = NEW.comment_id;
-- ELSIF (TG_OP = 'INSERT') THEN
-- delete from comment_fast where id = NEW.comment_id;
-- insert into comment_fast select * from comment_view where id = NEW.comment_id;
-- END IF;
return null;
end $$;
drop trigger refresh_comment_like on comment_like;
create trigger refresh_comment_like
after insert or update or delete
on comment_like
for each row
execute procedure refresh_comment_like();

View file

@ -1,13 +1,15 @@
#!/bin/bash #!/bin/bash
set -e set -e
# You can import these to http://tatiyants.com/pev/#/plans/new
# Do the views first # Do the views first
echo "explain (analyze, format json) select * from user_mview" > explain.sql echo "explain (analyze, format json) select * from user_mview" > explain.sql
psql -qAt -U lemmy -f explain.sql > user_view.json psql -qAt -U lemmy -f explain.sql > user_view.json
echo "explain (analyze, format json) select * from post_mview where user_id is null order by hot_rank desc, published desc" > explain.sql echo "explain (analyze, format json) select * from post_fast where user_id is null order by hot_rank desc, published desc" > explain.sql
psql -qAt -U lemmy -f explain.sql > post_view.json psql -qAt -U lemmy -f explain.sql > post_fast.json
echo "explain (analyze, format json) select * from comment_mview where user_id is null" > explain.sql echo "explain (analyze, format json) select * from comment_mview where user_id is null" > explain.sql
psql -qAt -U lemmy -f explain.sql > comment_view.json psql -qAt -U lemmy -f explain.sql > comment_view.json

View file

@ -39,7 +39,7 @@ table! {
} }
table! { table! {
comment_mview (id) { comment_fast (id) {
id -> Int4, id -> Int4,
creator_id -> Int4, creator_id -> Int4,
post_id -> Int4, post_id -> Int4,
@ -70,13 +70,14 @@ table! {
my_vote -> Nullable<Int4>, my_vote -> Nullable<Int4>,
subscribed -> Nullable<Bool>, subscribed -> Nullable<Bool>,
saved -> Nullable<Bool>, saved -> Nullable<Bool>,
fast_id -> Int4,
} }
} }
#[derive( #[derive(
Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone, Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone,
)] )]
#[table_name = "comment_view"] #[table_name = "comment_fast"]
pub struct CommentView { pub struct CommentView {
pub id: i32, pub id: i32,
pub creator_id: i32, pub creator_id: i32,
@ -108,11 +109,12 @@ pub struct CommentView {
pub my_vote: Option<i32>, pub my_vote: Option<i32>,
pub subscribed: Option<bool>, pub subscribed: Option<bool>,
pub saved: Option<bool>, pub saved: Option<bool>,
pub fast_id: i32,
} }
pub struct CommentQueryBuilder<'a> { pub struct CommentQueryBuilder<'a> {
conn: &'a PgConnection, conn: &'a PgConnection,
query: super::comment_view::comment_mview::BoxedQuery<'a, Pg>, query: super::comment_view::comment_fast::BoxedQuery<'a, Pg>,
listing_type: ListingType, listing_type: ListingType,
sort: &'a SortType, sort: &'a SortType,
for_community_id: Option<i32>, for_community_id: Option<i32>,
@ -127,9 +129,9 @@ pub struct CommentQueryBuilder<'a> {
impl<'a> CommentQueryBuilder<'a> { impl<'a> CommentQueryBuilder<'a> {
pub fn create(conn: &'a PgConnection) -> Self { pub fn create(conn: &'a PgConnection) -> Self {
use super::comment_view::comment_mview::dsl::*; use super::comment_view::comment_fast::dsl::*;
let query = comment_mview.into_boxed(); let query = comment_fast.into_boxed();
CommentQueryBuilder { CommentQueryBuilder {
conn, conn,
@ -198,7 +200,7 @@ impl<'a> CommentQueryBuilder<'a> {
} }
pub fn list(self) -> Result<Vec<CommentView>, Error> { pub fn list(self) -> Result<Vec<CommentView>, Error> {
use super::comment_view::comment_mview::dsl::*; use super::comment_view::comment_fast::dsl::*;
let mut query = self.query; let mut query = self.query;
@ -270,8 +272,8 @@ impl CommentView {
from_comment_id: i32, from_comment_id: i32,
my_user_id: Option<i32>, my_user_id: Option<i32>,
) -> Result<Self, Error> { ) -> Result<Self, Error> {
use super::comment_view::comment_mview::dsl::*; use super::comment_view::comment_fast::dsl::*;
let mut query = comment_mview.into_boxed(); let mut query = comment_fast.into_boxed();
// The view lets you pass a null user_id, if you're not logged in // The view lets you pass a null user_id, if you're not logged in
if let Some(my_user_id) = my_user_id { if let Some(my_user_id) = my_user_id {
@ -290,7 +292,7 @@ impl CommentView {
// The faked schema since diesel doesn't do views // The faked schema since diesel doesn't do views
table! { table! {
reply_view (id) { reply_fast_view (id) {
id -> Int4, id -> Int4,
creator_id -> Int4, creator_id -> Int4,
post_id -> Int4, post_id -> Int4,
@ -321,6 +323,7 @@ table! {
my_vote -> Nullable<Int4>, my_vote -> Nullable<Int4>,
subscribed -> Nullable<Bool>, subscribed -> Nullable<Bool>,
saved -> Nullable<Bool>, saved -> Nullable<Bool>,
fast_id -> Int4,
recipient_id -> Int4, recipient_id -> Int4,
} }
} }
@ -328,7 +331,7 @@ table! {
#[derive( #[derive(
Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone, Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone,
)] )]
#[table_name = "reply_view"] #[table_name = "reply_fast_view"]
pub struct ReplyView { pub struct ReplyView {
pub id: i32, pub id: i32,
pub creator_id: i32, pub creator_id: i32,
@ -360,12 +363,13 @@ pub struct ReplyView {
pub my_vote: Option<i32>, pub my_vote: Option<i32>,
pub subscribed: Option<bool>, pub subscribed: Option<bool>,
pub saved: Option<bool>, pub saved: Option<bool>,
pub fast_id: i32,
pub recipient_id: i32, pub recipient_id: i32,
} }
pub struct ReplyQueryBuilder<'a> { pub struct ReplyQueryBuilder<'a> {
conn: &'a PgConnection, conn: &'a PgConnection,
query: super::comment_view::reply_view::BoxedQuery<'a, Pg>, query: super::comment_view::reply_fast_view::BoxedQuery<'a, Pg>,
for_user_id: i32, for_user_id: i32,
sort: &'a SortType, sort: &'a SortType,
unread_only: bool, unread_only: bool,
@ -375,9 +379,9 @@ pub struct ReplyQueryBuilder<'a> {
impl<'a> ReplyQueryBuilder<'a> { impl<'a> ReplyQueryBuilder<'a> {
pub fn create(conn: &'a PgConnection, for_user_id: i32) -> Self { pub fn create(conn: &'a PgConnection, for_user_id: i32) -> Self {
use super::comment_view::reply_view::dsl::*; use super::comment_view::reply_fast_view::dsl::*;
let query = reply_view.into_boxed(); let query = reply_fast_view.into_boxed();
ReplyQueryBuilder { ReplyQueryBuilder {
conn, conn,
@ -411,7 +415,7 @@ impl<'a> ReplyQueryBuilder<'a> {
} }
pub fn list(self) -> Result<Vec<ReplyView>, Error> { pub fn list(self) -> Result<Vec<ReplyView>, Error> {
use super::comment_view::reply_view::dsl::*; use super::comment_view::reply_fast_view::dsl::*;
let mut query = self.query; let mut query = self.query;
@ -590,6 +594,7 @@ mod tests {
community_local: true, community_local: true,
creator_actor_id: inserted_user.actor_id.to_owned(), creator_actor_id: inserted_user.actor_id.to_owned(),
creator_local: true, creator_local: true,
fast_id: 0,
}; };
let expected_comment_view_with_user = CommentView { let expected_comment_view_with_user = CommentView {
@ -623,6 +628,7 @@ mod tests {
community_local: true, community_local: true,
creator_actor_id: inserted_user.actor_id.to_owned(), creator_actor_id: inserted_user.actor_id.to_owned(),
creator_local: true, creator_local: true,
fast_id: 0,
}; };
let mut read_comment_views_no_user = CommentQueryBuilder::create(&conn) let mut read_comment_views_no_user = CommentQueryBuilder::create(&conn)
@ -630,6 +636,7 @@ mod tests {
.list() .list()
.unwrap(); .unwrap();
read_comment_views_no_user[0].hot_rank = 0; read_comment_views_no_user[0].hot_rank = 0;
read_comment_views_no_user[0].fast_id = 0;
let mut read_comment_views_with_user = CommentQueryBuilder::create(&conn) let mut read_comment_views_with_user = CommentQueryBuilder::create(&conn)
.for_post_id(inserted_post.id) .for_post_id(inserted_post.id)
@ -637,6 +644,7 @@ mod tests {
.list() .list()
.unwrap(); .unwrap();
read_comment_views_with_user[0].hot_rank = 0; read_comment_views_with_user[0].hot_rank = 0;
read_comment_views_with_user[0].fast_id = 0;
let like_removed = CommentLike::remove(&conn, &comment_like_form).unwrap(); let like_removed = CommentLike::remove(&conn, &comment_like_form).unwrap();
let num_deleted = Comment::delete(&conn, inserted_comment.id).unwrap(); let num_deleted = Comment::delete(&conn, inserted_comment.id).unwrap();

View file

@ -1,4 +1,4 @@
use super::community_view::community_mview::BoxedQuery; use super::community_view::community_fast::BoxedQuery;
use crate::db::{fuzzy_search, limit_and_offset, MaybeOptional, SortType}; use crate::db::{fuzzy_search, limit_and_offset, MaybeOptional, SortType};
use diesel::{pg::Pg, result::Error, *}; use diesel::{pg::Pg, result::Error, *};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -34,7 +34,7 @@ table! {
} }
table! { table! {
community_mview (id) { community_fast (id) {
id -> Int4, id -> Int4,
name -> Varchar, name -> Varchar,
title -> Varchar, title -> Varchar,
@ -60,6 +60,7 @@ table! {
hot_rank -> Int4, hot_rank -> Int4,
user_id -> Nullable<Int4>, user_id -> Nullable<Int4>,
subscribed -> Nullable<Bool>, subscribed -> Nullable<Bool>,
fast_id -> Int4,
} }
} }
@ -114,7 +115,7 @@ table! {
#[derive( #[derive(
Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone, Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone,
)] )]
#[table_name = "community_view"] #[table_name = "community_fast"]
pub struct CommunityView { pub struct CommunityView {
pub id: i32, pub id: i32,
pub name: String, pub name: String,
@ -141,6 +142,7 @@ pub struct CommunityView {
pub hot_rank: i32, pub hot_rank: i32,
pub user_id: Option<i32>, pub user_id: Option<i32>,
pub subscribed: Option<bool>, pub subscribed: Option<bool>,
pub fast_id: i32,
} }
pub struct CommunityQueryBuilder<'a> { pub struct CommunityQueryBuilder<'a> {
@ -156,9 +158,9 @@ pub struct CommunityQueryBuilder<'a> {
impl<'a> CommunityQueryBuilder<'a> { impl<'a> CommunityQueryBuilder<'a> {
pub fn create(conn: &'a PgConnection) -> Self { pub fn create(conn: &'a PgConnection) -> Self {
use super::community_view::community_mview::dsl::*; use super::community_view::community_fast::dsl::*;
let query = community_mview.into_boxed(); let query = community_fast.into_boxed();
CommunityQueryBuilder { CommunityQueryBuilder {
conn, conn,
@ -203,7 +205,7 @@ impl<'a> CommunityQueryBuilder<'a> {
} }
pub fn list(self) -> Result<Vec<CommunityView>, Error> { pub fn list(self) -> Result<Vec<CommunityView>, Error> {
use super::community_view::community_mview::dsl::*; use super::community_view::community_fast::dsl::*;
let mut query = self.query; let mut query = self.query;
@ -259,9 +261,9 @@ impl CommunityView {
from_community_id: i32, from_community_id: i32,
from_user_id: Option<i32>, from_user_id: Option<i32>,
) -> Result<Self, Error> { ) -> Result<Self, Error> {
use super::community_view::community_mview::dsl::*; use super::community_view::community_fast::dsl::*;
let mut query = community_mview.into_boxed(); let mut query = community_fast.into_boxed();
query = query.filter(id.eq(from_community_id)); query = query.filter(id.eq(from_community_id));

View file

@ -1,4 +1,4 @@
use super::post_view::post_mview::BoxedQuery; use super::post_view::post_fast::BoxedQuery;
use crate::db::{fuzzy_search, limit_and_offset, ListingType, MaybeOptional, SortType}; use crate::db::{fuzzy_search, limit_and_offset, ListingType, MaybeOptional, SortType};
use diesel::{dsl::*, pg::Pg, result::Error, *}; use diesel::{dsl::*, pg::Pg, result::Error, *};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -52,7 +52,7 @@ table! {
} }
table! { table! {
post_mview (id) { post_fast (id) {
id -> Int4, id -> Int4,
name -> Varchar, name -> Varchar,
url -> Nullable<Text>, url -> Nullable<Text>,
@ -95,13 +95,14 @@ table! {
subscribed -> Nullable<Bool>, subscribed -> Nullable<Bool>,
read -> Nullable<Bool>, read -> Nullable<Bool>,
saved -> Nullable<Bool>, saved -> Nullable<Bool>,
fast_id -> Int4,
} }
} }
#[derive( #[derive(
Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone, Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone,
)] )]
#[table_name = "post_view"] #[table_name = "post_fast"]
pub struct PostView { pub struct PostView {
pub id: i32, pub id: i32,
pub name: String, pub name: String,
@ -145,6 +146,7 @@ pub struct PostView {
pub subscribed: Option<bool>, pub subscribed: Option<bool>,
pub read: Option<bool>, pub read: Option<bool>,
pub saved: Option<bool>, pub saved: Option<bool>,
pub fast_id: i32,
} }
pub struct PostQueryBuilder<'a> { pub struct PostQueryBuilder<'a> {
@ -166,9 +168,9 @@ pub struct PostQueryBuilder<'a> {
impl<'a> PostQueryBuilder<'a> { impl<'a> PostQueryBuilder<'a> {
pub fn create(conn: &'a PgConnection) -> Self { pub fn create(conn: &'a PgConnection) -> Self {
use super::post_view::post_mview::dsl::*; use super::post_view::post_fast::dsl::*;
let query = post_mview.into_boxed(); let query = post_fast.into_boxed();
PostQueryBuilder { PostQueryBuilder {
conn, conn,
@ -249,7 +251,7 @@ impl<'a> PostQueryBuilder<'a> {
} }
pub fn list(self) -> Result<Vec<PostView>, Error> { pub fn list(self) -> Result<Vec<PostView>, Error> {
use super::post_view::post_mview::dsl::*; use super::post_view::post_fast::dsl::*;
let mut query = self.query; let mut query = self.query;
@ -345,10 +347,10 @@ impl PostView {
from_post_id: i32, from_post_id: i32,
my_user_id: Option<i32>, my_user_id: Option<i32>,
) -> Result<Self, Error> { ) -> Result<Self, Error> {
use super::post_view::post_mview::dsl::*; use super::post_view::post_fast::dsl::*;
use diesel::prelude::*; use diesel::prelude::*;
let mut query = post_mview.into_boxed(); let mut query = post_fast.into_boxed();
query = query.filter(id.eq(from_post_id)); query = query.filter(id.eq(from_post_id));
@ -470,6 +472,25 @@ mod tests {
score: 1, score: 1,
}; };
let read_post_listings_with_user = PostQueryBuilder::create(&conn)
.listing_type(ListingType::Community)
.sort(&SortType::New)
.for_community_id(inserted_community.id)
.my_user_id(inserted_user.id)
.list()
.unwrap();
let read_post_listings_no_user = PostQueryBuilder::create(&conn)
.listing_type(ListingType::Community)
.sort(&SortType::New)
.for_community_id(inserted_community.id)
.list()
.unwrap();
let read_post_listing_no_user = PostView::read(&conn, inserted_post.id, None).unwrap();
let read_post_listing_with_user =
PostView::read(&conn, inserted_post.id, Some(inserted_user.id)).unwrap();
// the non user version // the non user version
let expected_post_listing_no_user = PostView { let expected_post_listing_no_user = PostView {
user_id: None, user_id: None,
@ -496,7 +517,7 @@ mod tests {
score: 1, score: 1,
upvotes: 1, upvotes: 1,
downvotes: 0, downvotes: 0,
hot_rank: 1728, hot_rank: read_post_listing_no_user.hot_rank,
published: inserted_post.published, published: inserted_post.published,
newest_activity_time: inserted_post.published, newest_activity_time: inserted_post.published,
updated: None, updated: None,
@ -514,6 +535,7 @@ mod tests {
creator_local: true, creator_local: true,
community_actor_id: inserted_community.actor_id.to_owned(), community_actor_id: inserted_community.actor_id.to_owned(),
community_local: true, community_local: true,
fast_id: read_post_listing_no_user.fast_id,
}; };
let expected_post_listing_with_user = PostView { let expected_post_listing_with_user = PostView {
@ -541,7 +563,7 @@ mod tests {
score: 1, score: 1,
upvotes: 1, upvotes: 1,
downvotes: 0, downvotes: 0,
hot_rank: 1728, hot_rank: read_post_listing_with_user.hot_rank,
published: inserted_post.published, published: inserted_post.published,
newest_activity_time: inserted_post.published, newest_activity_time: inserted_post.published,
updated: None, updated: None,
@ -559,27 +581,9 @@ mod tests {
creator_local: true, creator_local: true,
community_actor_id: inserted_community.actor_id.to_owned(), community_actor_id: inserted_community.actor_id.to_owned(),
community_local: true, community_local: true,
fast_id: read_post_listing_with_user.fast_id,
}; };
let read_post_listings_with_user = PostQueryBuilder::create(&conn)
.listing_type(ListingType::Community)
.sort(&SortType::New)
.for_community_id(inserted_community.id)
.my_user_id(inserted_user.id)
.list()
.unwrap();
let read_post_listings_no_user = PostQueryBuilder::create(&conn)
.listing_type(ListingType::Community)
.sort(&SortType::New)
.for_community_id(inserted_community.id)
.list()
.unwrap();
let read_post_listing_no_user = PostView::read(&conn, inserted_post.id, None).unwrap();
let read_post_listing_with_user =
PostView::read(&conn, inserted_post.id, Some(inserted_user.id)).unwrap();
let like_removed = PostLike::remove(&conn, &post_like_form).unwrap(); let like_removed = PostLike::remove(&conn, &post_like_form).unwrap();
let num_deleted = Post::delete(&conn, inserted_post.id).unwrap(); let num_deleted = Post::delete(&conn, inserted_post.id).unwrap();
Community::delete(&conn, inserted_community.id).unwrap(); Community::delete(&conn, inserted_community.id).unwrap();

View file

@ -27,7 +27,7 @@ table! {
} }
table! { table! {
private_message_mview (id) { private_message_fast (id) {
id -> Int4, id -> Int4,
creator_id -> Int4, creator_id -> Int4,
recipient_id -> Int4, recipient_id -> Int4,
@ -46,13 +46,14 @@ table! {
recipient_avatar -> Nullable<Text>, recipient_avatar -> Nullable<Text>,
recipient_actor_id -> Text, recipient_actor_id -> Text,
recipient_local -> Bool, recipient_local -> Bool,
fast_id -> Int4,
} }
} }
#[derive( #[derive(
Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone, Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone,
)] )]
#[table_name = "private_message_view"] #[table_name = "private_message_fast"]
pub struct PrivateMessageView { pub struct PrivateMessageView {
pub id: i32, pub id: i32,
pub creator_id: i32, pub creator_id: i32,
@ -72,11 +73,12 @@ pub struct PrivateMessageView {
pub recipient_avatar: Option<String>, pub recipient_avatar: Option<String>,
pub recipient_actor_id: String, pub recipient_actor_id: String,
pub recipient_local: bool, pub recipient_local: bool,
pub fast_id: i32,
} }
pub struct PrivateMessageQueryBuilder<'a> { pub struct PrivateMessageQueryBuilder<'a> {
conn: &'a PgConnection, conn: &'a PgConnection,
query: super::private_message_view::private_message_mview::BoxedQuery<'a, Pg>, query: super::private_message_view::private_message_fast::BoxedQuery<'a, Pg>,
for_recipient_id: i32, for_recipient_id: i32,
unread_only: bool, unread_only: bool,
page: Option<i64>, page: Option<i64>,
@ -85,9 +87,9 @@ pub struct PrivateMessageQueryBuilder<'a> {
impl<'a> PrivateMessageQueryBuilder<'a> { impl<'a> PrivateMessageQueryBuilder<'a> {
pub fn create(conn: &'a PgConnection, for_recipient_id: i32) -> Self { pub fn create(conn: &'a PgConnection, for_recipient_id: i32) -> Self {
use super::private_message_view::private_message_mview::dsl::*; use super::private_message_view::private_message_fast::dsl::*;
let query = private_message_mview.into_boxed(); let query = private_message_fast.into_boxed();
PrivateMessageQueryBuilder { PrivateMessageQueryBuilder {
conn, conn,
@ -115,7 +117,7 @@ impl<'a> PrivateMessageQueryBuilder<'a> {
} }
pub fn list(self) -> Result<Vec<PrivateMessageView>, Error> { pub fn list(self) -> Result<Vec<PrivateMessageView>, Error> {
use super::private_message_view::private_message_mview::dsl::*; use super::private_message_view::private_message_fast::dsl::*;
let mut query = self.query.filter(deleted.eq(false)); let mut query = self.query.filter(deleted.eq(false));
@ -146,9 +148,9 @@ impl<'a> PrivateMessageQueryBuilder<'a> {
impl PrivateMessageView { impl PrivateMessageView {
pub fn read(conn: &PgConnection, from_private_message_id: i32) -> Result<Self, Error> { pub fn read(conn: &PgConnection, from_private_message_id: i32) -> Result<Self, Error> {
use super::private_message_view::private_message_view::dsl::*; use super::private_message_view::private_message_fast::dsl::*;
let mut query = private_message_view.into_boxed(); let mut query = private_message_fast.into_boxed();
query = query query = query
.filter(id.eq(from_private_message_id)) .filter(id.eq(from_private_message_id))

View file

@ -40,7 +40,7 @@ table! {
} }
table! { table! {
user_mention_mview (id) { user_mention_fast (id) {
id -> Int4, id -> Int4,
user_mention_id -> Int4, user_mention_id -> Int4,
creator_id -> Int4, creator_id -> Int4,
@ -72,13 +72,14 @@ table! {
recipient_id -> Int4, recipient_id -> Int4,
recipient_actor_id -> Text, recipient_actor_id -> Text,
recipient_local -> Bool, recipient_local -> Bool,
fast_id -> Int4,
} }
} }
#[derive( #[derive(
Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone, Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone,
)] )]
#[table_name = "user_mention_view"] #[table_name = "user_mention_fast"]
pub struct UserMentionView { pub struct UserMentionView {
pub id: i32, pub id: i32,
pub user_mention_id: i32, pub user_mention_id: i32,
@ -111,11 +112,12 @@ pub struct UserMentionView {
pub recipient_id: i32, pub recipient_id: i32,
pub recipient_actor_id: String, pub recipient_actor_id: String,
pub recipient_local: bool, pub recipient_local: bool,
pub fast_id: i32,
} }
pub struct UserMentionQueryBuilder<'a> { pub struct UserMentionQueryBuilder<'a> {
conn: &'a PgConnection, conn: &'a PgConnection,
query: super::user_mention_view::user_mention_mview::BoxedQuery<'a, Pg>, query: super::user_mention_view::user_mention_fast::BoxedQuery<'a, Pg>,
for_user_id: i32, for_user_id: i32,
sort: &'a SortType, sort: &'a SortType,
unread_only: bool, unread_only: bool,
@ -125,9 +127,9 @@ pub struct UserMentionQueryBuilder<'a> {
impl<'a> UserMentionQueryBuilder<'a> { impl<'a> UserMentionQueryBuilder<'a> {
pub fn create(conn: &'a PgConnection, for_user_id: i32) -> Self { pub fn create(conn: &'a PgConnection, for_user_id: i32) -> Self {
use super::user_mention_view::user_mention_mview::dsl::*; use super::user_mention_view::user_mention_fast::dsl::*;
let query = user_mention_mview.into_boxed(); let query = user_mention_fast.into_boxed();
UserMentionQueryBuilder { UserMentionQueryBuilder {
conn, conn,
@ -161,7 +163,7 @@ impl<'a> UserMentionQueryBuilder<'a> {
} }
pub fn list(self) -> Result<Vec<UserMentionView>, Error> { pub fn list(self) -> Result<Vec<UserMentionView>, Error> {
use super::user_mention_view::user_mention_mview::dsl::*; use super::user_mention_view::user_mention_fast::dsl::*;
let mut query = self.query; let mut query = self.query;
@ -208,9 +210,9 @@ impl UserMentionView {
from_user_mention_id: i32, from_user_mention_id: i32,
from_recipient_id: i32, from_recipient_id: i32,
) -> Result<Self, Error> { ) -> Result<Self, Error> {
use super::user_mention_view::user_mention_view::dsl::*; use super::user_mention_view::user_mention_fast::dsl::*;
user_mention_view user_mention_fast
.filter(user_mention_id.eq(from_user_mention_id)) .filter(user_mention_id.eq(from_user_mention_id))
.filter(user_id.eq(from_recipient_id)) .filter(user_id.eq(from_recipient_id))
.first::<Self>(conn) .first::<Self>(conn)

View file

@ -1,4 +1,4 @@
use super::user_view::user_mview::BoxedQuery; use super::user_view::user_fast::BoxedQuery;
use crate::db::{fuzzy_search, limit_and_offset, MaybeOptional, SortType}; use crate::db::{fuzzy_search, limit_and_offset, MaybeOptional, SortType};
use diesel::{dsl::*, pg::Pg, result::Error, *}; use diesel::{dsl::*, pg::Pg, result::Error, *};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -26,7 +26,7 @@ table! {
} }
table! { table! {
user_mview (id) { user_fast (id) {
id -> Int4, id -> Int4,
actor_id -> Text, actor_id -> Text,
name -> Varchar, name -> Varchar,
@ -44,13 +44,14 @@ table! {
post_score -> BigInt, post_score -> BigInt,
number_of_comments -> BigInt, number_of_comments -> BigInt,
comment_score -> BigInt, comment_score -> BigInt,
fast_id -> Int4,
} }
} }
#[derive( #[derive(
Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone, Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone,
)] )]
#[table_name = "user_view"] #[table_name = "user_fast"]
pub struct UserView { pub struct UserView {
pub id: i32, pub id: i32,
pub actor_id: String, pub actor_id: String,
@ -69,6 +70,7 @@ pub struct UserView {
pub post_score: i64, pub post_score: i64,
pub number_of_comments: i64, pub number_of_comments: i64,
pub comment_score: i64, pub comment_score: i64,
pub fast_id: i32,
} }
pub struct UserQueryBuilder<'a> { pub struct UserQueryBuilder<'a> {
@ -81,9 +83,9 @@ pub struct UserQueryBuilder<'a> {
impl<'a> UserQueryBuilder<'a> { impl<'a> UserQueryBuilder<'a> {
pub fn create(conn: &'a PgConnection) -> Self { pub fn create(conn: &'a PgConnection) -> Self {
use super::user_view::user_mview::dsl::*; use super::user_view::user_fast::dsl::*;
let query = user_mview.into_boxed(); let query = user_fast.into_boxed();
UserQueryBuilder { UserQueryBuilder {
conn, conn,
@ -100,7 +102,7 @@ impl<'a> UserQueryBuilder<'a> {
} }
pub fn search_term<T: MaybeOptional<String>>(mut self, search_term: T) -> Self { pub fn search_term<T: MaybeOptional<String>>(mut self, search_term: T) -> Self {
use super::user_view::user_mview::dsl::*; use super::user_view::user_fast::dsl::*;
if let Some(search_term) = search_term.get_optional() { if let Some(search_term) = search_term.get_optional() {
self.query = self.query.filter(name.ilike(fuzzy_search(&search_term))); self.query = self.query.filter(name.ilike(fuzzy_search(&search_term)));
} }
@ -118,7 +120,7 @@ impl<'a> UserQueryBuilder<'a> {
} }
pub fn list(self) -> Result<Vec<UserView>, Error> { pub fn list(self) -> Result<Vec<UserView>, Error> {
use super::user_view::user_mview::dsl::*; use super::user_view::user_fast::dsl::*;
let mut query = self.query; let mut query = self.query;
@ -151,17 +153,17 @@ impl<'a> UserQueryBuilder<'a> {
impl UserView { impl UserView {
pub fn read(conn: &PgConnection, from_user_id: i32) -> Result<Self, Error> { pub fn read(conn: &PgConnection, from_user_id: i32) -> Result<Self, Error> {
use super::user_view::user_mview::dsl::*; use super::user_view::user_fast::dsl::*;
user_mview.find(from_user_id).first::<Self>(conn) user_fast.find(from_user_id).first::<Self>(conn)
} }
pub fn admins(conn: &PgConnection) -> Result<Vec<Self>, Error> { pub fn admins(conn: &PgConnection) -> Result<Vec<Self>, Error> {
use super::user_view::user_mview::dsl::*; use super::user_view::user_fast::dsl::*;
user_mview.filter(admin.eq(true)).load::<Self>(conn) user_fast.filter(admin.eq(true)).load::<Self>(conn)
} }
pub fn banned(conn: &PgConnection) -> Result<Vec<Self>, Error> { pub fn banned(conn: &PgConnection) -> Result<Vec<Self>, Error> {
use super::user_view::user_mview::dsl::*; use super::user_view::user_fast::dsl::*;
user_mview.filter(banned.eq(true)).load::<Self>(conn) user_fast.filter(banned.eq(true)).load::<Self>(conn)
} }
} }

View file

@ -33,6 +33,42 @@ table! {
} }
} }
table! {
comment_fast (fast_id) {
id -> Nullable<Int4>,
creator_id -> Nullable<Int4>,
post_id -> Nullable<Int4>,
parent_id -> Nullable<Int4>,
content -> Nullable<Text>,
removed -> Nullable<Bool>,
read -> Nullable<Bool>,
published -> Nullable<Timestamp>,
updated -> Nullable<Timestamp>,
deleted -> Nullable<Bool>,
ap_id -> Nullable<Varchar>,
local -> Nullable<Bool>,
community_id -> Nullable<Int4>,
community_actor_id -> Nullable<Varchar>,
community_local -> Nullable<Bool>,
community_name -> Nullable<Varchar>,
banned -> Nullable<Bool>,
banned_from_community -> Nullable<Bool>,
creator_actor_id -> Nullable<Varchar>,
creator_local -> Nullable<Bool>,
creator_name -> Nullable<Varchar>,
creator_avatar -> Nullable<Text>,
score -> Nullable<Int8>,
upvotes -> Nullable<Int8>,
downvotes -> Nullable<Int8>,
hot_rank -> Nullable<Int4>,
user_id -> Nullable<Int4>,
my_vote -> Nullable<Int4>,
subscribed -> Nullable<Bool>,
saved -> Nullable<Bool>,
fast_id -> Int4,
}
}
table! { table! {
comment_like (id) { comment_like (id) {
id -> Int4, id -> Int4,
@ -74,6 +110,37 @@ table! {
} }
} }
table! {
community_fast (fast_id) {
id -> Nullable<Int4>,
name -> Nullable<Varchar>,
title -> Nullable<Varchar>,
description -> Nullable<Text>,
category_id -> Nullable<Int4>,
creator_id -> Nullable<Int4>,
removed -> Nullable<Bool>,
published -> Nullable<Timestamp>,
updated -> Nullable<Timestamp>,
deleted -> Nullable<Bool>,
nsfw -> Nullable<Bool>,
actor_id -> Nullable<Varchar>,
local -> Nullable<Bool>,
last_refreshed_at -> Nullable<Timestamp>,
creator_actor_id -> Nullable<Varchar>,
creator_local -> Nullable<Bool>,
creator_name -> Nullable<Varchar>,
creator_avatar -> Nullable<Text>,
category_name -> Nullable<Varchar>,
number_of_subscribers -> Nullable<Int8>,
number_of_posts -> Nullable<Int8>,
number_of_comments -> Nullable<Int8>,
hot_rank -> Nullable<Int4>,
user_id -> Nullable<Int4>,
subscribed -> Nullable<Bool>,
fast_id -> Int4,
}
}
table! { table! {
community_follower (id) { community_follower (id) {
id -> Int4, id -> Int4,
@ -234,6 +301,54 @@ table! {
} }
} }
table! {
post_fast (fast_id) {
id -> Nullable<Int4>,
name -> Nullable<Varchar>,
url -> Nullable<Text>,
body -> Nullable<Text>,
creator_id -> Nullable<Int4>,
community_id -> Nullable<Int4>,
removed -> Nullable<Bool>,
locked -> Nullable<Bool>,
published -> Nullable<Timestamp>,
updated -> Nullable<Timestamp>,
deleted -> Nullable<Bool>,
nsfw -> Nullable<Bool>,
stickied -> Nullable<Bool>,
embed_title -> Nullable<Text>,
embed_description -> Nullable<Text>,
embed_html -> Nullable<Text>,
thumbnail_url -> Nullable<Text>,
ap_id -> Nullable<Varchar>,
local -> Nullable<Bool>,
banned -> Nullable<Bool>,
banned_from_community -> Nullable<Bool>,
creator_actor_id -> Nullable<Varchar>,
creator_local -> Nullable<Bool>,
creator_name -> Nullable<Varchar>,
creator_avatar -> Nullable<Text>,
community_actor_id -> Nullable<Varchar>,
community_local -> Nullable<Bool>,
community_name -> Nullable<Varchar>,
community_removed -> Nullable<Bool>,
community_deleted -> Nullable<Bool>,
community_nsfw -> Nullable<Bool>,
number_of_comments -> Nullable<Int8>,
score -> Nullable<Int8>,
upvotes -> Nullable<Int8>,
downvotes -> Nullable<Int8>,
hot_rank -> Nullable<Int4>,
newest_activity_time -> Nullable<Timestamp>,
user_id -> Nullable<Int4>,
my_vote -> Nullable<Int4>,
subscribed -> Nullable<Bool>,
read -> Nullable<Bool>,
saved -> Nullable<Bool>,
fast_id -> Int4,
}
}
table! { table! {
post_like (id) { post_like (id) {
id -> Int4, id -> Int4,
@ -277,6 +392,30 @@ table! {
} }
} }
table! {
private_message_fast (fast_id) {
id -> Nullable<Int4>,
creator_id -> Nullable<Int4>,
recipient_id -> Nullable<Int4>,
content -> Nullable<Text>,
deleted -> Nullable<Bool>,
read -> Nullable<Bool>,
published -> Nullable<Timestamp>,
updated -> Nullable<Timestamp>,
ap_id -> Nullable<Varchar>,
local -> Nullable<Bool>,
creator_name -> Nullable<Varchar>,
creator_avatar -> Nullable<Text>,
creator_actor_id -> Nullable<Varchar>,
creator_local -> Nullable<Bool>,
recipient_name -> Nullable<Varchar>,
recipient_avatar -> Nullable<Text>,
recipient_actor_id -> Nullable<Varchar>,
recipient_local -> Nullable<Bool>,
fast_id -> Int4,
}
}
table! { table! {
site (id) { site (id) {
id -> Int4, id -> Int4,
@ -328,6 +467,29 @@ table! {
} }
} }
table! {
user_fast (fast_id) {
id -> Nullable<Int4>,
actor_id -> Nullable<Varchar>,
name -> Nullable<Varchar>,
avatar -> Nullable<Text>,
email -> Nullable<Text>,
matrix_user_id -> Nullable<Text>,
bio -> Nullable<Text>,
local -> Nullable<Bool>,
admin -> Nullable<Bool>,
banned -> Nullable<Bool>,
show_avatars -> Nullable<Bool>,
send_notifications_to_email -> Nullable<Bool>,
published -> Nullable<Timestamp>,
number_of_posts -> Nullable<Int8>,
post_score -> Nullable<Int8>,
number_of_comments -> Nullable<Int8>,
comment_score -> Nullable<Int8>,
fast_id -> Int4,
}
}
table! { table! {
user_mention (id) { user_mention (id) {
id -> Int4, id -> Int4,
@ -338,6 +500,43 @@ table! {
} }
} }
table! {
user_mention_fast (fast_id) {
id -> Nullable<Int4>,
user_mention_id -> Nullable<Int4>,
creator_id -> Nullable<Int4>,
creator_actor_id -> Nullable<Varchar>,
creator_local -> Nullable<Bool>,
post_id -> Nullable<Int4>,
parent_id -> Nullable<Int4>,
content -> Nullable<Text>,
removed -> Nullable<Bool>,
read -> Nullable<Bool>,
published -> Nullable<Timestamp>,
updated -> Nullable<Timestamp>,
deleted -> Nullable<Bool>,
community_id -> Nullable<Int4>,
community_actor_id -> Nullable<Varchar>,
community_local -> Nullable<Bool>,
community_name -> Nullable<Varchar>,
banned -> Nullable<Bool>,
banned_from_community -> Nullable<Bool>,
creator_name -> Nullable<Varchar>,
creator_avatar -> Nullable<Text>,
score -> Nullable<Int8>,
upvotes -> Nullable<Int8>,
downvotes -> Nullable<Int8>,
hot_rank -> Nullable<Int4>,
user_id -> Nullable<Int4>,
my_vote -> Nullable<Int4>,
saved -> Nullable<Bool>,
recipient_id -> Nullable<Int4>,
recipient_actor_id -> Nullable<Varchar>,
recipient_local -> Nullable<Bool>,
fast_id -> Int4,
}
}
joinable!(activity -> user_ (user_id)); joinable!(activity -> user_ (user_id));
joinable!(comment -> post (post_id)); joinable!(comment -> post (post_id));
joinable!(comment -> user_ (creator_id)); joinable!(comment -> user_ (creator_id));
@ -384,9 +583,11 @@ allow_tables_to_appear_in_same_query!(
activity, activity,
category, category,
comment, comment,
comment_fast,
comment_like, comment_like,
comment_saved, comment_saved,
community, community,
community_fast,
community_follower, community_follower,
community_moderator, community_moderator,
community_user_ban, community_user_ban,
@ -401,12 +602,16 @@ allow_tables_to_appear_in_same_query!(
mod_sticky_post, mod_sticky_post,
password_reset_request, password_reset_request,
post, post,
post_fast,
post_like, post_like,
post_read, post_read,
post_saved, post_saved,
private_message, private_message,
private_message_fast,
site, site,
user_, user_,
user_ban, user_ban,
user_fast,
user_mention, user_mention,
user_mention_fast,
); );