revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-04-04 00:18:21 +02:00
Code Issues Releases Wiki Activity

Add order-by-ID to PhabricatorWorkerTriggerQuery

Browse source 
Summary:
Ref T6881. By design, the EXECUTION order only selects tasks which have been scheduled (since it performs a JOIN). This is inconsistent with other queries and problematic for withID/withPHID queries which may want to select an unscheduled task.

Switch to standard ID ordering by default.

Test Plan:
  - Instances console now finds unscheduled triggers.
  - Verified that all existing queries specify an explicit order.

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: epriestley

Maniphest Tasks: T6881

Differential Revision: https://secure.phabricator.com/D11436
This commit is contained in:
epriestley 2015-01-19 16:55:52 -08:00
parent cccdc48883
commit ef106d2979
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/infrastructure/daemon/workers/query/PhabricatorWorkerTriggerQuery.php
View file

@ -3,6 +3,7 @@
final class PhabricatorWorkerTriggerQuery final class PhabricatorWorkerTriggerQuery
extends PhabricatorOffsetPagedQuery { extends PhabricatorOffsetPagedQuery {
const ORDER_ID = 'id';
const ORDER_EXECUTION = 'execution'; const ORDER_EXECUTION = 'execution';
const ORDER_VERSION = 'version'; const ORDER_VERSION = 'version';
@ -14,7 +15,7 @@ final class PhabricatorWorkerTriggerQuery
private $nextEpochMax; private $nextEpochMax;
private $needEvents; private $needEvents;
private $order = self::ORDER_EXECUTION; private $order = self::ORDER_ID;
public function withIDs(array $ids) { public function withIDs(array $ids) {
$this->ids = $ids; $this->ids = $ids;
@ -43,6 +44,16 @@ final class PhabricatorWorkerTriggerQuery
return $this; return $this;
} }
/**
* Set the result order.
*
* Note that using `ORDER_EXECUTION` will also filter results to include only
* triggers which have been scheduled to execute. You should not use this
* ordering when querying for specific triggers, e.g. by ID or PHID.
*
* @param const Result order.
* @return this
*/
public function setOrder($order) { public function setOrder($order) {
$this->order = $order; $this->order = $order;
return $this; return $this;
@ -185,6 +196,10 @@ final class PhabricatorWorkerTriggerQuery
private function buildOrderClause(AphrontDatabaseConnection $conn_r) { private function buildOrderClause(AphrontDatabaseConnection $conn_r) {
switch ($this->order) { switch ($this->order) {
case self::ORDER_ID:
return qsprintf(
$conn_r,
'ORDER BY id DESC');
case self::ORDER_EXECUTION: case self::ORDER_EXECUTION:
return qsprintf( return qsprintf(
$conn_r, $conn_r,