Fixing slow joins to post_read, post_saved, and comment_saved . (#2738)

[lemmy.git] / crates / db_views / src / comment_view.rs

diff --git a/crates/db_views/src/comment_view.rs b/crates/db_views/src/comment_view.rs
index 15ec034f788d077812202fa104f276bd938b05bc..be2e4cc85e349025a79f09ad1b6786dade87df4c 100644 (file)
--- a/crates/db_views/src/comment_view.rs
+++ b/crates/db_views/src/comment_view.rs
@@ -1,6 +1,6 @@
 use crate::structs::CommentView;
 use diesel::{
-  dsl::*,
+  dsl::now,
   result::Error,
   BoolExpressionMethods,
   ExpressionMethods,
@@ -185,7 +185,6 @@ pub struct CommentQuery<'a> {
 
 impl<'a> CommentQuery<'a> {
   pub async fn list(self) -> Result<Vec<CommentView>, Error> {
-    use diesel::dsl::*;
     let conn = &mut get_conn(self.pool).await?;
 
     // The left join below will return None in this case
@@ -312,7 +311,7 @@ impl<'a> CommentQuery<'a> {
     }
 
     if self.saved_only.unwrap_or(false) {
-      query = query.filter(comment_saved::id.is_not_null());
+      query = query.filter(comment_saved::comment_id.is_not_null());
     }
 
     if !self.show_deleted_and_removed.unwrap_or(true) {
@@ -326,7 +325,7 @@ impl<'a> CommentQuery<'a> {
 
     if self.local_user.is_some() {
       // Filter out the rows with missing languages
-      query = query.filter(local_user_language::id.is_not_null());
+      query = query.filter(local_user_language::language_id.is_not_null());
 
       // Don't show blocked communities or persons
       query = query.filter(community_block::person_id.is_null());
@@ -403,20 +402,33 @@ impl ViewToVec for CommentView {
 
 #[cfg(test)]
 mod tests {
-  use crate::comment_view::*;
+  use crate::comment_view::{
+    Comment,
+    CommentQuery,
+    CommentSortType,
+    CommentView,
+    Community,
+    CommunitySafe,
+    DbPool,
+    LocalUser,
+    Person,
+    PersonBlock,
+    PersonSafe,
+    Post,
+  };
   use lemmy_db_schema::{
     aggregates::structs::CommentAggregates,
     newtypes::LanguageId,
     source::{
       actor_language::LocalUserLanguage,
-      comment::*,
-      community::*,
+      comment::{CommentInsertForm, CommentLike, CommentLikeForm},
+      community::CommunityInsertForm,
       instance::Instance,
       language::Language,
       local_user::LocalUserInsertForm,
-      person::*,
+      person::PersonInsertForm,
       person_block::PersonBlockForm,
-      post::*,
+      post::PostInsertForm,
     },
     traits::{Blockable, Crud, Likeable},
     utils::build_db_pool_for_tests,
@@ -447,7 +459,7 @@ mod tests {
     let inserted_person = Person::create(pool, &new_person).await.unwrap();
     let local_user_form = LocalUserInsertForm::builder()
       .person_id(inserted_person.id)
-      .password_encrypted("".to_string())
+      .password_encrypted(String::new())
       .build();
     let inserted_local_user = LocalUser::create(pool, &local_user_form).await.unwrap();
 
@@ -501,7 +513,10 @@ mod tests {
       .await
       .unwrap();
 
-    let finnish_id = Language::read_id_from_code(pool, "fi").await.unwrap();
+    let finnish_id = Language::read_id_from_code(pool, Some("fi"))
+      .await
+      .unwrap()
+      .unwrap();
     let comment_form_2 = CommentInsertForm::builder()
       .content("Comment 2".into())
       .creator_id(inserted_person.id)
@@ -524,7 +539,10 @@ mod tests {
         .await
         .unwrap();
 
-    let polish_id = Language::read_id_from_code(pool, "pl").await.unwrap();
+    let polish_id = Language::read_id_from_code(pool, Some("pl"))
+      .await
+      .unwrap()
+      .unwrap();
     let comment_form_4 = CommentInsertForm::builder()
       .content("Comment 4".into())
       .creator_id(inserted_person.id)
@@ -594,7 +612,7 @@ mod tests {
 
     let expected_comment_view_no_person = expected_comment_view(&data, pool).await;
 
-    let mut expected_comment_view_with_person = expected_comment_view_no_person.to_owned();
+    let mut expected_comment_view_with_person = expected_comment_view_no_person.clone();
     expected_comment_view_with_person.my_vote = Some(1);
 
     let read_comment_views_no_person = CommentQuery::builder()
@@ -735,7 +753,10 @@ mod tests {
     assert_eq!(5, all_languages.len());
 
     // change user lang to finnish, should only show single finnish comment
-    let finnish_id = Language::read_id_from_code(pool, "fi").await.unwrap();
+    let finnish_id = Language::read_id_from_code(pool, Some("fi"))
+      .await
+      .unwrap()
+      .unwrap();
     LocalUserLanguage::update(pool, vec![finnish_id], data.inserted_local_user.id)
       .await
       .unwrap();
@@ -754,7 +775,10 @@ mod tests {
     assert_eq!(finnish_id, finnish_comment[0].comment.language_id);
 
     // now show all comments with undetermined language (which is the default value)
-    let undetermined_id = Language::read_id_from_code(pool, "und").await.unwrap();
+    let undetermined_id = Language::read_id_from_code(pool, Some("und"))
+      .await
+      .unwrap()
+      .unwrap();
     LocalUserLanguage::update(pool, vec![undetermined_id], data.inserted_local_user.id)
       .await
       .unwrap();
@@ -815,7 +839,7 @@ mod tests {
         updated: None,
         local: true,
         distinguished: false,
-        path: data.inserted_comment_0.to_owned().path,
+        path: data.inserted_comment_0.clone().path,
         language_id: LanguageId(0),
       },
       creator: PersonSafe {
@@ -824,7 +848,7 @@ mod tests {
         display_name: None,
         published: data.inserted_person.published,
         avatar: None,
-        actor_id: data.inserted_person.actor_id.to_owned(),
+        actor_id: data.inserted_person.actor_id.clone(),
         local: true,
         banned: false,
         deleted: false,
@@ -833,7 +857,7 @@ mod tests {
         bio: None,
         banner: None,
         updated: None,
-        inbox_url: data.inserted_person.inbox_url.to_owned(),
+        inbox_url: data.inserted_person.inbox_url.clone(),
         shared_inbox_url: None,
         matrix_user_id: None,
         ban_expires: None,
@@ -841,7 +865,7 @@ mod tests {
       },
       post: Post {
         id: data.inserted_post.id,
-        name: data.inserted_post.name.to_owned(),
+        name: data.inserted_post.name.clone(),
         creator_id: data.inserted_person.id,
         url: None,
         body: None,
@@ -851,15 +875,16 @@ mod tests {
         removed: false,
         deleted: false,
         locked: false,
-        stickied: false,
         nsfw: false,
         embed_title: None,
         embed_description: None,
         embed_video_url: None,
         thumbnail_url: None,
-        ap_id: data.inserted_post.ap_id.to_owned(),
+        ap_id: data.inserted_post.ap_id.clone(),
         local: true,
         language_id: Default::default(),
+        featured_community: false,
+        featured_local: false,
       },
       community: CommunitySafe {
         id: data.inserted_community.id,
@@ -868,7 +893,7 @@ mod tests {
         removed: false,
         deleted: false,
         nsfw: false,
-        actor_id: data.inserted_community.actor_id.to_owned(),
+        actor_id: data.inserted_community.actor_id.clone(),
         local: true,
         title: "nada".to_owned(),
         description: None,