Page MenuHomePhabricator
Files F13240828

D19878.diff
No OneTemporary
Actions

D19878.diff
View Options

diff --git a/src/applications/fact/extract/PhabricatorFactUpdateIterator.php b/src/applications/fact/extract/PhabricatorFactUpdateIterator.php
--- a/src/applications/fact/extract/PhabricatorFactUpdateIterator.php
+++ b/src/applications/fact/extract/PhabricatorFactUpdateIterator.php
@@ -12,11 +12,8 @@
private $position;
private $ignoreUpdatesDuration = 15;
- private $set;
-
public function __construct(LiskDAO $object) {
- $this->set = new LiskDAOSet();
- $this->object = $object->putInSet($this->set);
+ $this->object = $object;
}
public function setPosition($position) {
@@ -41,8 +38,6 @@
}
protected function loadPage() {
- $this->set->clearSet();
-
if ($this->object->hasProperty('dateModified')) {
if ($this->cursor) {
list($after_epoch, $after_id) = explode(':', $this->cursor);
diff --git a/src/applications/people/query/PhabricatorPeopleQuery.php b/src/applications/people/query/PhabricatorPeopleQuery.php
--- a/src/applications/people/query/PhabricatorPeopleQuery.php
+++ b/src/applications/people/query/PhabricatorPeopleQuery.php
@@ -163,14 +163,7 @@
}
protected function loadPage() {
- $table = new PhabricatorUser();
- $data = $this->loadStandardPageRows($table);
-
- if ($this->needPrimaryEmail) {
- $table->putInSet(new LiskDAOSet());
- }
-
- return $table->loadAllFromArray($data);
+ return $this->loadStandardPage($this->newResultObject());
}
protected function didFilterPage(array $users) {
diff --git a/src/infrastructure/storage/lisk/LiskMigrationIterator.php b/src/infrastructure/storage/lisk/LiskMigrationIterator.php
--- a/src/infrastructure/storage/lisk/LiskMigrationIterator.php
+++ b/src/infrastructure/storage/lisk/LiskMigrationIterator.php
@@ -17,11 +17,9 @@
private $object;
private $cursor;
- private $set;
public function __construct(LiskDAO $object) {
- $this->set = new LiskDAOSet();
- $this->object = $object->putInSet($this->set);
+ $this->object = $object;
}
protected function didRewind() {
@@ -33,15 +31,15 @@
}
protected function loadPage() {
- $this->set->clearSet();
-
$results = $this->object->loadAllWhere(
'id > %d ORDER BY id ASC LIMIT %d',
$this->cursor,
$this->getPageSize());
+
if ($results) {
$this->cursor = last($results)->getID();
}
+
return $results;
}

File Metadata

Mime Type
text/plain
Expires
Thu, May 23, 4:56 PM (3 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6303763
Default Alt Text
D19878.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility