Skip to content
This repository was archived by the owner on Sep 13, 2022. It is now read-only.

Fix Monocle/Alternative out of memory with KEEP_GYM_HISTORY #78

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix Monocle/Alternative out of memory with KEEP_GYM_HISTORY #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67e2279
Fix Monocle/Alternative out of memory with KEEP_GYM_HISTORY
j16sdiz Jan 30, 2018
6f6e107
Add config for KEEP_GYM_HISTORY
j16sdiz Feb 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,3 +238,4 @@
//-----------------------------------------------------

$fork = "default"; // default/asner/sloppy
$alternateKeepGymHistory = false; // alternate - KEEP_GYM_HISTORY is on
1 change: 1 addition & 0 deletions config/example.config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@

$map = "monocle"; // monocle/rm
$fork = "default"; // default/asner/sloppy/alternate
$alternateKeepGymHistory = false; // alternate - KEEP_GYM_HISTORY is on

$db = new Medoo([// required
'database_type' => 'mysql', // mysql/mariadb/pgsql/sybase/oracle/mssql/sqlite
Expand Down
15 changes: 11 additions & 4 deletions lib/Monocle_Alternate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,10 @@ public function get_gyms($swLat, $swLng, $neLat, $neLng, $tstamp = 0, $oSwLat =

public function query_gyms($conds, $params)
{
global $db;
global $db, $alternateKeepGymHistory;

$query = "SELECT f.external_id AS gym_id,
$query = "SELECT
f.external_id AS gym_id,
fs.last_modified AS last_modified,
updated AS last_scanned,
f.lat AS latitude,
Expand All @@ -235,10 +236,16 @@ public function query_gyms($conds, $params)
r.move_1 AS raid_pokemon_move_1,
r.move_2 AS raid_pokemon_move_2
FROM forts f
LEFT JOIN fort_sightings fs ON fs.fort_id = f.id
LEFT JOIN raids r ON r.fort_id = f.id
LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND :fort_condition)
LEFT JOIN raids r ON (r.fort_id = f.id AND r.time_end >= :time)
WHERE :conditions";

if ($alternateKeepGymHistory) {
$query = str_replace(":fort_condition", "fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id)", $query);
} else {
$query = str_replace(":fort_condition", "1=1", $query);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't like the 1=1 check.
Maybe include the AND inside :fort_condition and replace it with an empty string if $alternateKeepGymHistory is false?

}
$query = str_replace(":time", time(), $query);
$query = str_replace(":conditions", join(" AND ", $conds), $query);
$gyms = $db->query($query, $params)->fetchAll(\PDO::FETCH_ASSOC);

Expand Down