Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15427711
D20292.id48433.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
13 KB
Referenced Files
None
Subscribers
None
D20292.id48433.diff
View Options
diff --git a/src/applications/almanac/query/AlmanacDeviceQuery.php b/src/applications/almanac/query/AlmanacDeviceQuery.php
--- a/src/applications/almanac/query/AlmanacDeviceQuery.php
+++ b/src/applications/almanac/query/AlmanacDeviceQuery.php
@@ -122,11 +122,10 @@
);
}
- protected function getPagingValueMap($cursor, array $keys) {
- $device = $this->loadCursorObject($cursor);
+ protected function newPagingMapFromPartialObject($object) {
return array(
- 'id' => $device->getID(),
- 'name' => $device->getName(),
+ 'id' => (int)$object->getID(),
+ 'name' => $object->getName(),
);
}
diff --git a/src/applications/almanac/query/AlmanacNamespaceQuery.php b/src/applications/almanac/query/AlmanacNamespaceQuery.php
--- a/src/applications/almanac/query/AlmanacNamespaceQuery.php
+++ b/src/applications/almanac/query/AlmanacNamespaceQuery.php
@@ -79,11 +79,10 @@
);
}
- protected function getPagingValueMap($cursor, array $keys) {
- $namespace = $this->loadCursorObject($cursor);
+ protected function newPagingMapFromPartialObject($object) {
return array(
- 'id' => $namespace->getID(),
- 'name' => $namespace->getName(),
+ 'id' => (int)$object->getID(),
+ 'name' => $object->getName(),
);
}
diff --git a/src/applications/almanac/query/AlmanacServiceQuery.php b/src/applications/almanac/query/AlmanacServiceQuery.php
--- a/src/applications/almanac/query/AlmanacServiceQuery.php
+++ b/src/applications/almanac/query/AlmanacServiceQuery.php
@@ -206,11 +206,10 @@
);
}
- protected function getPagingValueMap($cursor, array $keys) {
- $service = $this->loadCursorObject($cursor);
+ protected function newPagingMapFromPartialObject($object) {
return array(
- 'id' => $service->getID(),
- 'name' => $service->getName(),
+ 'id' => (int)$object->getID(),
+ 'name' => $object->getName(),
);
}
diff --git a/src/applications/badges/query/PhabricatorBadgesQuery.php b/src/applications/badges/query/PhabricatorBadgesQuery.php
--- a/src/applications/badges/query/PhabricatorBadgesQuery.php
+++ b/src/applications/badges/query/PhabricatorBadgesQuery.php
@@ -108,11 +108,11 @@
) + parent::getOrderableColumns();
}
- protected function getPagingValueMap($cursor, array $keys) {
- $badge = $this->loadCursorObject($cursor);
+
+ protected function newPagingMapFromPartialObject($object) {
return array(
- 'quality' => $badge->getQuality(),
- 'id' => $badge->getID(),
+ 'id' => (int)$object->getID(),
+ 'quality' => $object->getQuality(),
);
}
diff --git a/src/applications/calendar/query/PhabricatorCalendarEventQuery.php b/src/applications/calendar/query/PhabricatorCalendarEventQuery.php
--- a/src/applications/calendar/query/PhabricatorCalendarEventQuery.php
+++ b/src/applications/calendar/query/PhabricatorCalendarEventQuery.php
@@ -140,11 +140,10 @@
) + parent::getOrderableColumns();
}
- protected function getPagingValueMap($cursor, array $keys) {
- $event = $this->loadCursorObject($cursor);
+ protected function newPagingMapFromPartialObject($object) {
return array(
- 'start' => $event->getStartDateTimeEpoch(),
- 'id' => $event->getID(),
+ 'id' => (int)$object->getID(),
+ 'start' => (int)$object->getStartDateTimeEpoch(),
);
}
diff --git a/src/applications/countdown/query/PhabricatorCountdownQuery.php b/src/applications/countdown/query/PhabricatorCountdownQuery.php
--- a/src/applications/countdown/query/PhabricatorCountdownQuery.php
+++ b/src/applications/countdown/query/PhabricatorCountdownQuery.php
@@ -97,11 +97,10 @@
) + parent::getOrderableColumns();
}
- protected function getPagingValueMap($cursor, array $keys) {
- $countdown = $this->loadCursorObject($cursor);
+ protected function newPagingMapFromPartialObject($object) {
return array(
- 'epoch' => $countdown->getEpoch(),
- 'id' => $countdown->getID(),
+ 'id' => (int)$object->getID(),
+ 'epoch' => (int)$object->getEpoch(),
);
}
diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php
--- a/src/applications/differential/query/DifferentialRevisionQuery.php
+++ b/src/applications/differential/query/DifferentialRevisionQuery.php
@@ -800,11 +800,10 @@
) + parent::getOrderableColumns();
}
- protected function getPagingValueMap($cursor, array $keys) {
- $revision = $this->loadCursorObject($cursor);
+ protected function newPagingMapFromPartialObject($object) {
return array(
- 'id' => $revision->getID(),
- 'updated' => $revision->getDateModified(),
+ 'id' => (int)$object->getID(),
+ 'updated' => (int)$object->getDateModified(),
);
}
diff --git a/src/applications/diffusion/query/DiffusionCommitQuery.php b/src/applications/diffusion/query/DiffusionCommitQuery.php
--- a/src/applications/diffusion/query/DiffusionCommitQuery.php
+++ b/src/applications/diffusion/query/DiffusionCommitQuery.php
@@ -924,11 +924,10 @@
);
}
- protected function getPagingValueMap($cursor, array $keys) {
- $commit = $this->loadCursorObject($cursor);
+ protected function newPagingMapFromPartialObject($object) {
return array(
- 'id' => $commit->getID(),
- 'epoch' => $commit->getEpoch(),
+ 'id' => (int)$object->getID(),
+ 'epoch' => (int)$object->getEpoch(),
);
}
diff --git a/src/applications/diviner/query/DivinerBookQuery.php b/src/applications/diviner/query/DivinerBookQuery.php
--- a/src/applications/diviner/query/DivinerBookQuery.php
+++ b/src/applications/diviner/query/DivinerBookQuery.php
@@ -181,11 +181,10 @@
);
}
- protected function getPagingValueMap($cursor, array $keys) {
- $book = $this->loadCursorObject($cursor);
-
+ protected function newPagingMapFromPartialObject($object) {
return array(
- 'name' => $book->getName(),
+ 'id' => (int)$object->getID(),
+ 'name' => $object->getName(),
);
}
diff --git a/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php b/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php
--- a/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php
@@ -133,11 +133,10 @@
);
}
- protected function getPagingValueMap($cursor, array $keys) {
- $plan = $this->loadCursorObject($cursor);
+ protected function newPagingMapFromPartialObject($object) {
return array(
- 'id' => $plan->getID(),
- 'name' => $plan->getName(),
+ 'id' => (int)$object->getID(),
+ 'name' => $object->getName(),
);
}
diff --git a/src/applications/macro/query/PhabricatorMacroQuery.php b/src/applications/macro/query/PhabricatorMacroQuery.php
--- a/src/applications/macro/query/PhabricatorMacroQuery.php
+++ b/src/applications/macro/query/PhabricatorMacroQuery.php
@@ -249,11 +249,10 @@
);
}
- protected function getPagingValueMap($cursor, array $keys) {
- $macro = $this->loadCursorObject($cursor);
+ protected function newPagingMapFromPartialObject($object) {
return array(
- 'id' => $macro->getID(),
- 'name' => $macro->getName(),
+ 'id' => (int)$object->getID(),
+ 'name' => $object->getName(),
);
}
diff --git a/src/applications/owners/query/PhabricatorOwnersPackageQuery.php b/src/applications/owners/query/PhabricatorOwnersPackageQuery.php
--- a/src/applications/owners/query/PhabricatorOwnersPackageQuery.php
+++ b/src/applications/owners/query/PhabricatorOwnersPackageQuery.php
@@ -267,11 +267,10 @@
);
}
- protected function getPagingValueMap($cursor, array $keys) {
- $package = $this->loadCursorObject($cursor);
+ protected function newPagingMapFromPartialObject($object) {
return array(
- 'id' => $package->getID(),
- 'name' => $package->getName(),
+ 'id' => (int)$object->getID(),
+ 'name' => $object->getName(),
);
}
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
@@ -379,11 +379,10 @@
);
}
- protected function getPagingValueMap($cursor, array $keys) {
- $user = $this->loadCursorObject($cursor);
+ protected function newPagingMapFromPartialObject($object) {
return array(
- 'id' => $user->getID(),
- 'username' => $user->getUsername(),
+ 'id' => (int)$object->getID(),
+ 'username' => $object->getUsername(),
);
}
diff --git a/src/applications/phame/query/PhamePostQuery.php b/src/applications/phame/query/PhamePostQuery.php
--- a/src/applications/phame/query/PhamePostQuery.php
+++ b/src/applications/phame/query/PhamePostQuery.php
@@ -171,15 +171,11 @@
);
}
- protected function getPagingValueMap($cursor, array $keys) {
- $post = $this->loadCursorObject($cursor);
-
- $map = array(
- 'datePublished' => $post->getDatePublished(),
- 'id' => $post->getID(),
+ protected function newPagingMapFromPartialObject($object) {
+ return array(
+ 'id' => (int)$object->getID(),
+ 'datePublished' => (int)$object->getDatePublished(),
);
-
- return $map;
}
public function getQueryApplicationClass() {
diff --git a/src/applications/phlux/query/PhluxVariableQuery.php b/src/applications/phlux/query/PhluxVariableQuery.php
--- a/src/applications/phlux/query/PhluxVariableQuery.php
+++ b/src/applications/phlux/query/PhluxVariableQuery.php
@@ -81,9 +81,9 @@
);
}
- protected function getPagingValueMap($cursor, array $keys) {
- $object = $this->loadCursorObject($cursor);
+ protected function newPagingMapFromPartialObject($object) {
return array(
+ 'id' => (int)$object->getID(),
'key' => $object->getVariableKey(),
);
}
diff --git a/src/applications/phrequent/query/PhrequentUserTimeQuery.php b/src/applications/phrequent/query/PhrequentUserTimeQuery.php
--- a/src/applications/phrequent/query/PhrequentUserTimeQuery.php
+++ b/src/applications/phrequent/query/PhrequentUserTimeQuery.php
@@ -133,12 +133,11 @@
);
}
- protected function getPagingValueMap($cursor, array $keys) {
- $usertime = $this->loadCursorObject($cursor);
+ protected function newPagingMapFromPartialObject($object) {
return array(
- 'id' => $usertime->getID(),
- 'start' => $usertime->getDateStarted(),
- 'end' => $usertime->getDateEnded(),
+ 'id' => (int)$object->getID(),
+ 'start' => (int)$object->getDateStarted(),
+ 'end' => (int)$object->getDateEnded(),
);
}
diff --git a/src/applications/phurl/query/PhabricatorPhurlURLQuery.php b/src/applications/phurl/query/PhabricatorPhurlURLQuery.php
--- a/src/applications/phurl/query/PhabricatorPhurlURLQuery.php
+++ b/src/applications/phurl/query/PhabricatorPhurlURLQuery.php
@@ -50,13 +50,6 @@
return $this;
}
- protected function getPagingValueMap($cursor, array $keys) {
- $url = $this->loadCursorObject($cursor);
- return array(
- 'id' => $url->getID(),
- );
- }
-
protected function loadPage() {
return $this->loadStandardPage($this->newResultObject());
}
diff --git a/src/applications/project/query/PhabricatorProjectQuery.php b/src/applications/project/query/PhabricatorProjectQuery.php
--- a/src/applications/project/query/PhabricatorProjectQuery.php
+++ b/src/applications/project/query/PhabricatorProjectQuery.php
@@ -201,12 +201,11 @@
);
}
- protected function getPagingValueMap($cursor, array $keys) {
- $project = $this->loadCursorObject($cursor);
+ protected function newPagingMapFromPartialObject($object) {
return array(
- 'id' => $project->getID(),
- 'name' => $project->getName(),
- 'status' => $project->getStatus(),
+ 'id' => (int)$object->getID(),
+ 'name' => $object->getName(),
+ 'status' => $object->getStatus(),
);
}
diff --git a/src/applications/releeph/query/ReleephProductQuery.php b/src/applications/releeph/query/ReleephProductQuery.php
--- a/src/applications/releeph/query/ReleephProductQuery.php
+++ b/src/applications/releeph/query/ReleephProductQuery.php
@@ -130,12 +130,10 @@
);
}
- protected function getPagingValueMap($cursor, array $keys) {
- $product = $this->loadCursorObject($cursor);
-
+ protected function newPagingMapFromPartialObject($object) {
return array(
- 'id' => $product->getID(),
- 'name' => $product->getName(),
+ 'id' => (int)$object->getID(),
+ 'name' => $object->getName(),
);
}
diff --git a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
--- a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
+++ b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
@@ -62,6 +62,10 @@
$object = $cursor->getObject();
+ return $this->newPagingMapFromPartialObject($object);
+ }
+
+ protected function newPagingMapFromPartialObject($object) {
return array(
'id' => (int)$object->getID(),
);
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Mar 24, 3:44 PM (1 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7683130
Default Alt Text
D20292.id48433.diff (13 KB)
Attached To
Mode
D20292: Convert simple query subclasses to use internal cursors
Attached
Detach File
Event Timeline
Log In to Comment