Large dataset performance

include/class.orm.php

@@ -3084,6 +3084,8 @@ function compileSelect($queryset) {
                     $group_by[] = $rootAlias .'.'. $pk;
             }
         }
+        if (!$need_group_by)
+            $group_by = [];
         // Add in SELECT extras
         if (isset($queryset->extra['select'])) {
             foreach ($queryset->extra['select'] as $name=>$expr) {

include/class.search.php

@@ -849,7 +849,9 @@ function update($vars, &$errors=array()) {
 
     function getCount($agent, $cached=true) {
         $criteria = $cached ? array() : array('id' => $this->getId());
-        $counts = self::counts($agent, $criteria, $cached);
+        if (!($counts = self::counts($agent, $criteria, $cached)))
+            return 0;
+
         return $counts["q{$this->getId()}"] ?: 0;
     }
 
@@ -900,11 +902,15 @@ static function counts($agent, $criteria=array(), $cached=true) {
             $Q = $queue->getBasicQuery();
             $expr = SqlCase::N()->when(new SqlExpr(new Q($Q->constraints)), new SqlField('ticket_id'));
             $query->aggregate(array(
-                "q{$queue->id}" => SqlAggregate::COUNT($expr, true)
+                "q{$queue->id}" => SqlAggregate::COUNT($expr)
             ));
         }
 
-        $counts = $query->values()->one();
+        try {
+            $counts = $query->values()->one();
+        }  catch (Exception $ex) {
+            return null;
+        }
         // Always cache the results
         if (function_exists('apcu_store')) {
             apcu_store($key, $counts, $ttl);

include/class.staff.php

@@ -580,20 +580,29 @@ function getTicketsVisibility() {
             'staff_id' => $this->getId(),
         ));
 
-        $assigned->add(array('thread__referrals__agent__staff_id' => $this->getId()));
+        $assigned->add(Q::all([
+            'thread__referrals__object_type' => 'S',
+            'thread__referrals__object_id' => $this->getId(),
+        ]));
 
         // -- Open and assigned to a team of mine
         if (($teams = array_filter($this->getTeams()))) {
             $assigned->add(array('team_id__in' => $teams));
-            $assigned->add(array('thread__referrals__team__team_id__in' => $teams));
+            $assigned->add(Q::all([
+                'thread__referrals__object_type' => 'E',
+                'thread__referrals__object_id__in' => $teams
+            ]));
         }
 
         $visibility = Q::any(new Q(array('status__state'=>'open', $assigned)));
 
         // -- Routed to a department of mine
         if (!$this->showAssignedOnly() && ($depts=$this->getDepts())) {
             $visibility->add(array('dept_id__in' => $depts));
-            $visibility->add(array('thread__referrals__dept__id__in' => $depts));
+            $visibility->add(Q::all([
+                'thread__referrals__object_type' => 'D',
+                'thread__referrals__object_id__in' => $depts
+            ]));
         }
 
         return $visibility;

include/class.ticket.php

@@ -45,7 +45,8 @@ class Ticket extends VerySimpleModel
             'sla', 'thread', 'user__default_email', 'status'),
         'joins' => array(
             'user' => array(
-                'constraint' => array('user_id' => 'User.id')
+                'constraint' => array('user_id' => 'User.id'),
+                'null' => true,
             ),
             'status' => array(
                 'constraint' => array('status_id' => 'TicketStatus.id')