Skip to content

Commit fed29bf

Browse files
authored
Display the number of keys scanned (#210)
* Display the number of keys scanned and the limit * Reduce scansize according to scanmax * Simplify info about scanmax
1 parent 5d8756c commit fed29bf

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

index.php

+8-7
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,18 @@
1010
} else {
1111
$next = 0;
1212
$keys = array();
13-
13+
$scansize = $server['scansize'];
1414
while (true) {
15-
$r = $redis->scan($next, 'MATCH', $server['filter'], 'COUNT', $server['scansize']);
16-
15+
$r = $redis->scan($next, 'MATCH', $server['filter'], 'COUNT', $scansize);
1716
$next = $r[0];
1817
$keys = array_merge($keys, $r[1]);
19-
20-
if (count($keys) >= $server['scanmax']) {
18+
if ($next == 0) {
2119
break;
2220
}
23-
24-
if ($next == 0) {
21+
if (count($keys) >= $server['scanmax']) {
2522
break;
2623
}
24+
$scansize = min($server['scanmax'] - count($keys), $server['scansize']);
2725
}
2826
}
2927

@@ -256,6 +254,9 @@ function getDbInfo($d, $info, $padding = '') {
256254
</button>
257255
</div>
258256
<div id="keys">
257+
<div class="info">
258+
scaned <?php echo count($keys) ?> keys<?php echo (count($keys) >= $server['scanmax']) ? ', reached scanmax' : '' ?>
259+
</div>
259260
<ul>
260261
<?php print_namespace($namespaces, 'Keys', '', empty($namespaces))?>
261262
</ul>

0 commit comments

Comments
 (0)