Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

join sat-table in PHP instead of DB. Huge performance booster

Browse Source
This commit is contained in:
int2001
2026-02-05 12:35:27 +00:00
parent d42dc8a6ce
commit f2ce52cad5
2 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Logbook.php
View File

@@ -7,7 +7,7 @@ require_once APPPATH . '../src/Dxcc/Dxcc.php';
class Logbook extends CI_Controller {
function index() {
$this->output->enable_profiler(TRUE);
// Check if users logged in
$this->load->model('user_model');
if($this->user_model->validate_session() == 0) {

44
application/models/Logbook_model.php
View File

@@ -2163,13 +2163,19 @@ class Logbook_model extends CI_Model {
return array();
}
// Load all satellites once for PHP-side join (much faster than SQL COALESCE)
$satellites = [];
$sat_query = $this->db->select('name, displayname')->get('satellite');
foreach ($sat_query->result() as $sat) {
$satellites[$sat->name] = $sat->displayname;
}
$binding = array();
$sql = "SELECT qsos.*, station_profile.*, dxcc_entities.*, lotw_users.callsign, lotw_users.lastupload, satellite.displayname AS sat_displayname, satellite.name AS sat_name
$sql = "SELECT qsos.*, station_profile.*, dxcc_entities.*, lotw_users.callsign, lotw_users.lastupload
FROM ".$this->config->item('table_name')." qsos
JOIN `station_profile` ON `station_profile`.`station_id` = qsos.`station_id`
LEFT JOIN `dxcc_entities` ON qsos.`col_dxcc` = `dxcc_entities`.`adif`
LEFT OUTER JOIN `lotw_users` ON `lotw_users`.`callsign` = qsos.`col_call`
LEFT OUTER JOIN satellite ON qsos.col_prop_mode='SAT' and qsos.COL_SAT_NAME = COALESCE(NULLIF(satellite.name, ''), NULLIF(satellite.displayname, ''))
WHERE 1=1";
if ($band != '') {
if ($band == 'SAT') {
@@ -2194,7 +2200,39 @@ class Logbook_model extends CI_Model {
$binding[] = (int) $offset;
}
$sql .= ";";
return $this->db->query($sql, $binding);
$query = $this->db->query($sql, $binding);
// Add satellite data via PHP-side join (much faster than SQL COALESCE join)
$results = $query->result();
foreach ($results as &$row) {
$row->sat_name = $row->COL_SAT_NAME ?? null;
$row->sat_displayname = null;
if (!empty($row->COL_SAT_NAME) && isset($satellites[$row->COL_SAT_NAME])) {
$row->sat_displayname = $satellites[$row->COL_SAT_NAME];
}
}
unset($row);
// Return a query-like object with result() method for compatibility
return new class($results) {
private $data;
public function __construct($data) {
$this->data = $data;
}
public function result() {
return $this->data;
}
public function num_rows() {
return count($this->data);
}
public function num_fields() {
return empty($this->data) ? 0 : count(get_object_vars($this->data[0]));
}
};
}
function get_qso($id, $trusted = false) {