Allow Maniphest tasks to be filtered by Project

Summary:
Major things taking place here:

  - A new table for storing <task, project> relationships.
  - Moved all task query logic into a dedicated class.
  - Added a "projects" filter to the UI.

I was originally going to try to drive this off the main search index but the
perf benefits of a custom schema make an overwhelming argument in favor of doing
it this way.

Test Plan:
Filtered tasks by author and owner and zero, one, and more than one project.
Exercised all the group/sort options. Ran the index script over my 100k task
corpus. Edited task-project membership and verified the index updated.

Reviewed By: cadamo
Reviewers: gc3, jungejason, cadamo, tuomaspelkonen, aran
CC: aran, cadamo, epriestley
Differential Revision: 556

Author: epriestley

CHANGELOG

@@ -2,6 +2,11 @@ This is not a complete list of changes, just of API or workflow changes that may
 break existing installs. Newer changes are listed at the top. If you pull new
 changes and things stop working, check here first!
 
+June 29 2011 - Maniphest project indexes
+  Old Maniphest tasks will not appear in project filter views until you run
+  "scripts/search/reindex_maniphest.php" to build indexes. New tasks will have
+  their indexes built automatically.
+
 May 31 2011 - Javelin submodule moved
   The externals/javelin submodule location has moved. If you have an older
   checkout of Phabricator, you may need to edit .git/config to point at

resources/sql/patches/051.projectfilter.sql

@@ -0,0 +1,6 @@
+CREATE TABLE phabricator_maniphest.maniphest_taskproject (
+  taskPHID varchar(64) BINARY NOT NULL,
+  projectPHID varchar(64) BINARY NOT NULL,
+  PRIMARY KEY (projectPHID, taskPHID),
+  UNIQUE KEY (taskPHID, projectPHID)
+);

scripts/search/reindex_maniphest.php

@@ -0,0 +1,32 @@
+#!/usr/bin/env php
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+$root = dirname(dirname(dirname(__FILE__)));
+require_once $root.'/scripts/__init_script__.php';
+require_once $root.'/scripts/__init_env__.php';
+
+ini_set('memory_limit', -1);
+$tasks = id(new ManiphestTask())->loadAll();
+echo "Updating relationships for ".count($tasks)." tasks";
+foreach ($tasks as $task) {
+  ManiphestTaskProject::updateTaskProjects($task);
+  echo '.';
+}
+echo "\nDone.\n";
+

src/__phutil_library_map__.php

@@ -272,6 +272,8 @@
     'ManiphestTaskListView' => 'applications/maniphest/view/tasklist',
     'ManiphestTaskOwner' => 'applications/maniphest/constants/owner',
     'ManiphestTaskPriority' => 'applications/maniphest/constants/priority',
+    'ManiphestTaskProject' => 'applications/maniphest/storage/taskproject',
+    'ManiphestTaskQuery' => 'applications/maniphest/query',
     'ManiphestTaskStatus' => 'applications/maniphest/constants/status',
     'ManiphestTaskSummaryView' => 'applications/maniphest/view/tasksummary',
     'ManiphestTransaction' => 'applications/maniphest/storage/transaction',
@@ -765,6 +767,7 @@
     'ManiphestTaskEditController' => 'ManiphestController',
     'ManiphestTaskListController' => 'ManiphestController',
     'ManiphestTaskListView' => 'AphrontView',
+    'ManiphestTaskProject' => 'ManiphestDAO',
     'ManiphestTaskSummaryView' => 'AphrontView',
     'ManiphestTransaction' => 'ManiphestDAO',
     'ManiphestTransactionDetailView' => 'AphrontView',

src/applications/maniphest/controller/tasklist/ManiphestTaskListController.php

@@ -33,23 +33,30 @@ public function processRequest() {
     $uri = $request->getRequestURI();
 
     if ($request->isFormPost()) {
-      $phid_arr = $request->getArr('view_user');
-      $view_target = head($phid_arr);
-      return id(new AphrontRedirectResponse())
-        ->setURI($request->getRequestURI()->alter('phid', $view_target));
-    }
+      // Redirect to GET so URIs can be copy/pasted.
+
+      $user_phids = $request->getArr('set_users');
+      $proj_phids = $request->getArr('set_projects');
+      $user_phids = implode(',', $user_phids);
+      $proj_phids = implode(',', $proj_phids);
+      $user_phids = nonempty($user_phids, null);
+      $proj_phids = nonempty($proj_phids, null);
 
+      $uri = $request->getRequestURI()
+        ->alter('users', $user_phids)
+        ->alter('projects', $proj_phids);
+
+      return id(new AphrontRedirectResponse())->setURI($uri);
+    }
 
     $views = array(
       'User Tasks',
       'action'    => 'Assigned',
       'created'   => 'Created',
       'triage'    => 'Need Triage',
-//      'touched'   => 'Touched',
       '<hr />',
       'All Tasks',
       'alltriage'   => 'Need Triage',
-      'unassigned'  => 'Unassigned',
       'all'         => 'All Tasks',
     );
 
@@ -77,7 +84,7 @@ public function processRequest() {
           phutil_render_tag(
             'a',
             array(
-              'href' => $uri,
+              'href' => $uri->alter('page', null),
               'class' => ($this->view == $view)
                 ? 'aphront-side-nav-selected'
                 : null,
@@ -90,13 +97,26 @@ public function processRequest() {
     list($grouping, $group_links) = $this->renderGroupLinks();
     list($order, $order_links) = $this->renderOrderLinks();
 
-    $view_phid = nonempty($request->getStr('phid'), $user->getPHID());
+    $user_phids = $request->getStr('users');
+    if (strlen($user_phids)) {
+      $user_phids = explode(',', $user_phids);
+    } else {
+      $user_phids = array($user->getPHID());
+    }
+
+    $project_phids = $request->getStr('projects');
+    if (strlen($project_phids)) {
+      $project_phids = explode(',', $project_phids);
+    } else {
+      $project_phids = array();
+    }
 
     $page = $request->getInt('page');
     $page_size = self::DEFAULT_PAGE_SIZE;
 
     list($tasks, $handles, $total_count) = $this->loadTasks(
-      $view_phid,
+      $user_phids,
+      $project_phids,
       array(
         'status'  => $status_map,
         'group'   => $grouping,
@@ -105,23 +125,33 @@ public function processRequest() {
         'limit'   => $page_size,
       ));
 
-
     $form = id(new AphrontFormView())
-      ->setUser($user);
+      ->setUser($user)
+      ->setAction($request->getRequestURI());
 
     if (isset($has_filter[$this->view])) {
+      $tokens = array();
+      foreach ($user_phids as $phid) {
+        $tokens[$phid] = $handles[$phid]->getFullName();
+      }
       $form->appendChild(
         id(new AphrontFormTokenizerControl())
-          ->setLimit(1)
           ->setDatasource('/typeahead/common/searchowner/')
-          ->setName('view_user')
-          ->setLabel('View User')
-          ->setCaption('Use "upforgrabs" to find unassigned tasks.')
-          ->setValue(
-            array(
-              $view_phid => $handles[$view_phid]->getFullName(),
-            )));
+          ->setName('set_users')
+          ->setLabel('Users')
+          ->setValue($tokens));
+    }
+
+    $tokens = array();
+    foreach ($project_phids as $phid) {
+      $tokens[$phid] = $handles[$phid]->getFullName();
     }
+    $form->appendChild(
+      id(new AphrontFormTokenizerControl())
+        ->setDatasource('/typeahead/common/projects/')
+        ->setName('set_projects')
+        ->setLabel('Projects')
+        ->setValue($tokens));
 
     $form
       ->appendChild(
@@ -137,6 +167,10 @@ public function processRequest() {
           ->setLabel('Order')
           ->setValue($order_links));
 
+    $form->appendChild(
+      id(new AphrontFormSubmitControl())
+        ->setValue('Filter Tasks'));
+
     $filter = new AphrontListFilterView();
     $filter->addButton(
       phutil_render_tag(
@@ -209,141 +243,71 @@ public function processRequest() {
       ));
   }
 
-  private function loadTasks($view_phid, array $dict) {
-    $phids = array($view_phid);
-
-    $include_upforgrabs = false;
-    foreach ($phids as $key => $phid) {
-      if ($phid == ManiphestTaskOwner::OWNER_UP_FOR_GRABS) {
-        unset($phids[$key]);
-        $include_upforgrabs = true;
-      }
-    }
+  private function loadTasks(
+    array $user_phids,
+    array $project_phids,
+    array $dict) {
 
-    $task = new ManiphestTask();
-
-    $argv = array();
+    $query = new ManiphestTaskQuery();
+    $query->withProjects($project_phids);
 
     $status = $dict['status'];
     if (!empty($status['open']) && !empty($status['closed'])) {
-      $status_clause = '1 = 1';
+      $query->withStatus(ManiphestTaskQuery::STATUS_ANY);
     } else if (!empty($status['open'])) {
-      $status_clause = 'status = %d';
-      $argv[] = 0;
+      $query->withStatus(ManiphestTaskQuery::STATUS_OPEN);
     } else {
-      $status_clause = 'status > %d';
-      $argv[] = 0;
+      $query->withStatus(ManiphestTaskQuery::STATUS_CLOSED);
     }
 
-    $extra_clause = '1 = 1';
     switch ($this->view) {
       case 'action':
-        $parts = array();
-        if ($phids) {
-          $parts[] = 'ownerPHID in (%Ls)';
-          $argv[] = $phids;
-        }
-        if ($include_upforgrabs) {
-          $parts[] = 'ownerPHID IS NULL';
-        }
-        $extra_clause = '('.implode(' OR ', $parts).')';
+        $query->withOwners($user_phids);
         break;
       case 'created':
-        $parts = array();
-        if ($phids) {
-          $parts[] = 'authorPHID in (%Ls)';
-          $argv[] = $phids;
-        }
-        if ($include_upforgrabs) {
-          // This should be impossible since every task is supposed to have a
-          // valid author, but we might as well run the query.
-          $parts[] = 'authorPHID IS NULL';
-        }
-        $extra_clause = '('.implode(' OR ', $parts).')';
+        $query->withAuthors($user_phids);
         break;
       case 'triage':
-        $parts = array();
-        if ($phids) {
-          $parts[] = 'ownerPHID in (%Ls)';
-          $argv[] = $phids;
-        }
-        if ($include_upforgrabs) {
-          $parts[] = 'ownerPHID IS NULL';
-        }
-        $extra_clause = '('.implode(' OR ', $parts).') AND priority = %d';
-        $argv[] = ManiphestTaskPriority::PRIORITY_TRIAGE;
+        $query->withOwners($user_phids);
+        $query->withPriority(ManiphestTaskPriority::PRIORITY_TRIAGE);
         break;
       case 'alltriage':
-        $extra_clause = 'priority = %d';
-        $argv[] = ManiphestTaskPriority::PRIORITY_TRIAGE;
-        break;
-      case 'unassigned':
-        $extra_clause = 'ownerPHID is NULL';
+        $query->withPriority(ManiphestTaskPriority::PRIORITY_TRIAGE);
         break;
       case 'all':
         break;
     }
 
-    $order = array();
-    switch ($dict['group']) {
-      case 'priority':
-        $order[] = 'priority';
-        break;
-      case 'owner':
-        $order[] = 'ownerOrdering';
-        break;
-      case 'status':
-        $order[] = 'status';
-        break;
-    }
-
-    switch ($dict['order']) {
-      case 'priority':
-        $order[] = 'priority';
-        $order[] = 'dateModified';
-        break;
-      case 'created':
-        $order[] = 'id';
-        break;
-      default:
-        $order[] = 'dateModified';
-        break;
-    }
-
-    $order = array_unique($order);
-
-    foreach ($order as $k => $column) {
-      switch ($column) {
-        case 'ownerOrdering':
-          $order[$k] = "{$column} ASC";
-          break;
-        default:
-          $order[$k] = "{$column} DESC";
-          break;
-      }
-    }
-
-    $order = implode(', ', $order);
-
-    $offset = (int)idx($dict, 'offset', 0);
-    $limit = (int)idx($dict, 'limit', self::DEFAULT_PAGE_SIZE);
-
-    $sql = "SELECT SQL_CALC_FOUND_ROWS * FROM %T WHERE ".
-           "({$status_clause}) AND ({$extra_clause}) ORDER BY {$order} ".
-           "LIMIT {$offset}, {$limit}";
-
-    array_unshift($argv, $task->getTableName());
-
-    $conn = $task->establishConnection('r');
-    $data = vqueryfx_all($conn, $sql, $argv);
+    $order_map = array(
+      'priority'  => ManiphestTaskQuery::ORDER_PRIORITY,
+      'created'   => ManiphestTaskQuery::ORDER_CREATED,
+    );
+    $query->setOrderBy(
+      idx(
+        $order_map,
+        $dict['order'],
+        ManiphestTaskQuery::ORDER_MODIFIED));
+
+    $group_map = array(
+      'priority'  => ManiphestTaskQuery::GROUP_PRIORITY,
+      'owner'     => ManiphestTaskQuery::GROUP_OWNER,
+      'status'    => ManiphestTaskQuery::GROUP_STATUS,
+    );
+    $query->setGroupBy(
+      idx(
+        $group_map,
+        $dict['group'],
+        ManiphestTaskQuery::GROUP_NONE));
 
-    $total_row_count = queryfx_one($conn, 'SELECT FOUND_ROWS() N');
-    $total_row_count = $total_row_count['N'];
+    $query->setCalculateRows(true);
+    $query->setLimit($dict['limit']);
+    $query->setOffset($dict['offset']);
 
-    $data = $task->loadAllFromArray($data);
+    $data = $query->execute();
+    $total_row_count = $query->getRowCount();
 
     $handle_phids = mpull($data, 'getOwnerPHID');
-    $handle_phids[] = $view_phid;
+    $handle_phids = array_merge($handle_phids, $project_phids, $user_phids);
     $handles = id(new PhabricatorObjectHandleData($handle_phids))
       ->loadHandles();