Remove redundant query criteria in ThreadManager

The elemMatch() criteria already covers participants.$id, since metadata exists for each participant. Removing this extra criteria will allow us to focus on using the metadata indexes. Also left a TODO regarding the unindexable keywords query.
FriendsOfSymfony · Dec 13, 2011 · 2928424 · 2928424
1 parent 351c458
commit 2928424
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/DocumentManager/ThreadManager.php b/DocumentManager/ThreadManager.php
@@ -84,15 +84,13 @@ public function getParticipantInboxThreadsQueryBuilder(ParticipantInterface $par
 
         // TODO: sort by date of last message written by an other participant
         return $queryBuilder
-            // the participant is in the thread participants
-            ->field('participants.$id')->equals(new \MongoId($participant->getId()))
-            // the thread does not contain spam or flood
-            ->field('isSpam')->equals(false)
             // the participant hasn't deleted the thread, and another user wrote a message
             ->field('metadata')->elemMatch($this
                 ->getNotDeletedByParticipantExpression($queryBuilder, $participant)
                 ->field('lastMessageDate')->notEqual(null)
-            );
+            )
+            // the thread does not contain spam or flood
+            ->field('isSpam')->equals(false);
     }
 
     /**
@@ -124,8 +122,6 @@ public function getParticipantSentThreadsQueryBuilder(ParticipantInterface $part
 
         // TODO: sort by date of last message written by this participant
         return $queryBuilder
-            // the participant is in the thread participants
-            ->field('participants.$id')->equals(new \MongoId($participant->getId()))
             // the participant hasn't deleted the thread, and has written a message
             ->field('metadata')->elemMatch($this
                 ->getNotDeletedByParticipantExpression($queryBuilder, $participant)
@@ -167,10 +163,9 @@ public function getParticipantThreadsBySearchQueryBuilder(ParticipantInterface $
 
         // TODO: sort by date of last message written by an other participant
         return $queryBuilder
-            // the participant is in the thread participants
-            ->field('participants.$id')->equals(new \MongoId($participant->getId()))
             // the thread is not deleted by this participant
             ->field('metadata')->elemMatch($this->getNotDeletedByParticipantExpression($queryBuilder, $participant))
+            // TODO: this search is not anchored and uses no indexes
             ->field('keywords')->equals(new \MongoRegex($regex));
     }