Optimize history.php for large data sets

This commit is contained in:
ruan 2015-12-31 12:31:04 +02:00
parent ee70900b8e
commit 57777295bb
2 changed files with 45 additions and 8 deletions

View File

@ -28,9 +28,14 @@ class History {
} }
$sel = $page->get_selection($table); $sel = $page->get_selection($table);
$st = $page->conn->prepare("SELECT $sel FROM $table WHERE $field=:uuid ORDER BY time"); $limit = $page->settings->limit_per_page;
$offset = History::get_offset($type);
$st = $page->conn->prepare("SELECT $sel FROM $table WHERE $field=:uuid ORDER BY time DESC LIMIT :limit OFFSET :offset");
$st->bindParam(":uuid", $uuid, PDO::PARAM_STR); $st->bindParam(":uuid", $uuid, PDO::PARAM_STR);
$st->bindParam(":limit", $limit, PDO::PARAM_INT);
$st->bindParam(":offset", $offset, PDO::PARAM_INT);
if ($st->execute()) { if ($st->execute()) {
while ($row = $st->fetch(PDO::FETCH_ASSOC)) { while ($row = $st->fetch(PDO::FETCH_ASSOC)) {
@ -54,6 +59,16 @@ class History {
} }
return ($a < $b) ? 1 : -1; return ($a < $b) ? 1 : -1;
} }
static function get_offset($table) {
$v = $table[0];
if (isset($_GET[$v]) && is_string($_GET[$v])) {
if (filter_var($_GET[$v], FILTER_VALIDATE_INT)) {
return (int)$_GET[$v];
}
}
return 0;
}
} }
$page = new Page("history"); $page = new Page("history");
@ -115,24 +130,35 @@ try {
if (!empty($all)) { if (!empty($all)) {
$page->table_begin(); $page->table_begin();
$offset = 0;
$limit = $page->settings->limit_per_page; $limit = $page->settings->limit_per_page;
/*$offset = 0;
if ($page->settings->show_pager) { if ($page->settings->show_pager) {
$current_page = $page->page - 1; $current_page = $page->page - 1;
$offset = ($limit * $current_page); $offset = ($limit * $current_page);
$limit += $offset; $limit += $offset;
} }*/
$totalb = 0;
$totalm = 0;
$totalw = 0;
$totalk = 0;
$i = 0; $i = 0;
foreach ($all as $row) { foreach ($all as $row) {
$i++; $i++;
if ($page->settings->show_pager && $i < $offset) { /*if ($page->settings->show_pager && $i < $offset) {
continue; continue;
} }*/
if ($i > $limit) break; if ($i > $limit) break;
$type = $row['__table__']; $type = $row['__table__'];
if ($type == 'bans') $totalb++;
elseif ($type == 'mutes') $totalm++;
elseif ($type == 'warnings') $totalw++;
elseif ($type == 'kicks') $totalk++;
$page->set_info($page->type_info($type)); $page->set_info($page->type_info($type));
$style = 'style="font-size: 13px;"'; $style = 'style="font-size: 13px;"';
@ -148,6 +174,7 @@ try {
'Reason' => $page->clean($row['reason']), 'Reason' => $page->clean($row['reason']),
'Date' => $page->millis_to_date($row['time']), 'Date' => $page->millis_to_date($row['time']),
'Expires' => $page->expiry($row), 'Expires' => $page->expiry($row),
//'i' => $i . "/" . $limit . "/" . $total,
)); ));
} }
@ -162,7 +189,17 @@ try {
if ($staffhistory) { if ($staffhistory) {
$args .= "&staffhistory=1"; $args .= "&staffhistory=1";
} }
$page->print_pager($total, $args);
$prevargs = $args;
$offb = History::get_offset("b") + $totalb;
$offm = History::get_offset("m") + $totalm;
$offw = History::get_offset("w") + $totalw;
$offk = History::get_offset("k") + $totalk;
$args .= "&b=$offb&m=$offm&w=$offw&k=$offk";
$page->print_pager($total, $args, $prevargs);
} }
} else { } else {
echo "No punishments found.<br>"; echo "No punishments found.<br>";

View File

@ -339,7 +339,7 @@ class Page {
'; ';
} }
function print_pager($total = -1, $args = "") { function print_pager($total = -1, $args = "", $prevargs = "") {
$table = $this->table; $table = $this->table;
$page = $this->name . ".php"; $page = $this->name . ".php";
@ -363,7 +363,7 @@ class Page {
$pager_prev = "<div class=\"litebans-pager litebans-pager-left $prev_class\">«</div>"; $pager_prev = "<div class=\"litebans-pager litebans-pager-left $prev_class\">«</div>";
if ($prev_active) { if ($prev_active) {
$pager_prev = "<a href=\"$page?page={$prev}{$args}\">$pager_prev</a>"; $pager_prev = "<a href=\"$page?page={$prev}{$prevargs}\">$pager_prev</a>";
} }
$pager_next = "<div class=\"litebans-pager litebans-pager-right $next_class\">»</div>"; $pager_next = "<div class=\"litebans-pager litebans-pager-right $next_class\">»</div>";