We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 9b0279c2 authored by Evan Prodromou's avatar Evan Prodromou

Don't fetch more than needed if exhausted

parent 0238aa9d
......@@ -70,9 +70,11 @@ abstract class FilteringNoticeStream extends NoticeStream
// or we get nothing from upstream.
$results = null;
$round = 0;
do {
common_debug(get_class($this) . ": ($offset, $limit) fetching $askFor notices starting at $startAt");
common_debug(get_class($this) . ": ($offset, $limit) Round $round: fetching $askFor notices starting at $startAt");
$raw = $this->upstream->getNotices($startAt, $askFor, $sinceId, $maxId);
......@@ -101,13 +103,17 @@ abstract class FilteringNoticeStream extends NoticeStream
$hits = count($filtered);
$lastAsk = $askFor;
if ($hits === 0) {
$askFor = max(min(2 * $askFor, NOTICES_PER_PAGE * 50), NOTICES_PER_PAGE);
} else {
$askFor = max(min((($total - $hits)*$startAt)/$hits, NOTICES_PER_PAGE * 50), NOTICES_PER_PAGE);
}
} while (count($filtered) < $total && $results !== 0);
common_debug(get_class($this) . ": ($offset, $limit) Round $round hits is $hits, results = $results.");
} while (count($filtered) < $total && $results >= $lastAsk);
return new ArrayWrapper(array_slice($filtered, $offset, $limit));
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment