perf(activity): improved performance of group river filter

Elgg · Dec 7, 2018 · dbfdbd6 · dbfdbd6
1 parent 6b05f2c
commit dbfdbd6
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/mod/activity/classes/Elgg/Activity/GroupRiverFilter.php b/mod/activity/classes/Elgg/Activity/GroupRiverFilter.php
@@ -36,11 +36,13 @@ public function __invoke(QueryBuilder $qb, $main_alias) {
 		$wheres[] = $qb->compare("{$main_alias}.object_guid", '=', $this->group->guid, ELGG_VALUE_GUID);
 		$wheres[] = $qb->compare("{$main_alias}.target_guid", '=', $this->group->guid, ELGG_VALUE_GUID);
 
-		$object = $qb->joinEntitiesTable($main_alias, 'object_guid');
-		$wheres[] = $qb->compare("{$object}.container_guid", '=', $this->group->guid, ELGG_VALUE_GUID);
+		$sub = $qb->subquery('entities', 'ce');
+		$sub->select('ce.guid')
+			->where($qb->compare('ce.container_guid', 'in', $this->group->guid, ELGG_VALUE_GUID));
 
-		$target = $qb->joinEntitiesTable($main_alias, 'target_guid', 'left');
-		$wheres[] = $qb->compare("{$target}.container_guid", '=', $this->group->guid, ELGG_VALUE_GUID);
+		$wheres[] = $qb->compare("{$main_alias}.object_guid", 'in', $sub->getSQL());
+
+		$wheres[] = $qb->compare("{$main_alias}.target_guid", 'in', $sub->getSQL());
 
 		return $qb->merge($wheres, 'OR');
 	}