mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

DB debug breaks queries using SQL_CALC_FOUND_ROWS - just block for now

Browse Source
This commit is contained in:
e107steved
2008-05-17 14:41:43 +00:00
parent afe6a44577
commit d919712b73
1 changed files with 61 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
e107_handlers/db_debug_class.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/db_debug_class.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/db_debug_class.php,v $
| $Revision: 1.5 $ | $Revision: 1.6 $
| $Date: 2007-06-21 16:55:10 $ | $Date: 2008-05-17 14:41:43 $
| $Author: sweetas $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -112,7 +112,9 @@ class e107_db_debug {
//$this->aMarkNotes[$nMarks] .= "verify start: ".$eTimingStart."<br/>"; //$this->aMarkNotes[$nMarks] .= "verify start: ".$eTimingStart."<br/>";
} }
function Mark_Query($query, $rli, $origQryRes, $aTrace, $mytime, $curtable) {
function Mark_Query($query, $rli, $origQryRes, $aTrace, $mytime, $curtable)
{
global $sql; global $sql;
// Explain the query, if possible... // Explain the query, if possible...
@@ -120,53 +122,72 @@ class e107_db_debug {
$nFields=0; $nFields=0;
$bExplained = FALSE; $bExplained = FALSE;
if (!strcasecmp($qtype,'SELECT') || !strcasecmp($qtype,'(SELECT')) { $ExplainText = '';
$sQryRes=is_null($rli) ? mysql_query("EXPLAIN $query") : mysql_query("EXPLAIN $query", $rli); // Note the subtle bracket in the second comparison! Also, strcasecmp() returns zero on match
if (!strcasecmp($qtype,'SELECT') || !strcasecmp($qtype,'(SELECT'))
if ($sQryRes) { // There's something to explain { // It's a SELECT statement - explain it (usually)
if (strpos($args,'SQL_CALC_FOUND_ROWS') === FALSE)
{
// $rli should always be set by caller
$sQryRes = (is_null($rli) ? mysql_query("EXPLAIN {$query}") : mysql_query("EXPLAIN {$query}", $rli));
if ($sQryRes)
{ // There's something to explain
$nFields = mysql_num_fields($sQryRes); $nFields = mysql_num_fields($sQryRes);
$bExplained = TRUE; $bExplained = TRUE;
} }
} else { }
$sQryRes = $origQryRes; else
$bExplained = FALSE; { // Blocked queries containing 'SQL_CALC_FOUND_ROWS' ATM - they get broken by the 'explain'
$nFields=0; $ExplainText = "<tr><td class='forumheader3'>Cannot EXPLAIN queries containing SQL_CALC_FOUND_ROWS</td></tr>";
$sQryRes = $origQryRes; // Return from original query could be TRUE or a link resource if success
}
}
else
{ // Don't run 'EXPLAIN' on other queries
$sQryRes = $origQryRes; // Return from original query could be TRUE or a link resource if success
} }
// Record Basic query info // Record Basic query info
$sCallingFile=$aTrace[1]['file']; $sCallingFile = $aTrace[1]['file'];
$sCallingLine=$aTrace[1]['line']; $sCallingLine = $aTrace[1]['line'];
$t = &$this->aSQLdetails[$sql->db_QueryCount()]; $t = &$this->aSQLdetails[$sql->db_QueryCount()];
$t['marker']=$this->curTimeMark; $t['marker'] = $this->curTimeMark;
$t['caller']="$sCallingFile($sCallingLine)"; $t['caller'] = "$sCallingFile($sCallingLine)";
$t['query']=$query; $t['query'] = $query;
$t['ok']=$sQryRes ? TRUE : FALSE; $t['ok'] = $sQryRes ? TRUE : FALSE;
$t['error']=$sQryRes ? '' : mysql_error(); $t['error'] = $sQryRes ? '' : mysql_error();
$t['nFields']=$nFields; $t['nFields'] = $nFields;
$t['time']=$mytime; $t['time'] = $mytime;
if ($bExplained) { if ($bExplained)
{
$bRowHeaders=FALSE; $bRowHeaders=FALSE;
while ($row = @mysql_fetch_assoc($sQryRes)) { while ($row = @mysql_fetch_assoc($sQryRes))
if (!$bRowHeaders) { {
if (!$bRowHeaders)
{
$bRowHeaders=TRUE; $bRowHeaders=TRUE;
$t['explain']="<tr><td class='forumheader3'><b>".implode("</b></td><td class='forumheader3'><b>", array_keys($row))."</b></td></tr>\n"; $t['explain']="<tr><td class='forumheader3'><b>".implode("</b></td><td class='forumheader3'><b>", array_keys($row))."</b></td></tr>\n";
} }
$t['explain'] .= "<tr><td class='forumheader3'>".implode("&nbsp;</td><td class='forumheader3'>", array_values($row))."&nbsp;</td></tr>\n"; $t['explain'] .= "<tr><td class='forumheader3'>".implode("&nbsp;</td><td class='forumheader3'>", array_values($row))."&nbsp;</td></tr>\n";
} }
} else { }
$t['explain'] = ''; else
{
$t['explain'] = $ExplainText;
} }
$this->aTimeMarks[$this->nTimeMarks]['DB Time'] += $mytime; $this->aTimeMarks[$this->nTimeMarks]['DB Time'] += $mytime;
$this->aTimeMarks[$this->nTimeMarks]['DB Count']++; $this->aTimeMarks[$this->nTimeMarks]['DB Count']++;
if (array_key_exists($curtable, $this->aDBbyTable)) { if (array_key_exists($curtable, $this->aDBbyTable))
{
$this->aDBbyTable[$curtable]['DB Time'] += $mytime; $this->aDBbyTable[$curtable]['DB Time'] += $mytime;
$this->aDBbyTable[$curtable]['DB Count']++; $this->aDBbyTable[$curtable]['DB Count']++;
} else { }
else
{
$this->aDBbyTable[$curtable]['Table']=$curtable; $this->aDBbyTable[$curtable]['Table']=$curtable;
$this->aDBbyTable[$curtable]['%DB Time']=0; // placeholder $this->aDBbyTable[$curtable]['%DB Time']=0; // placeholder
$this->aDBbyTable[$curtable]['%DB Count']=0; // placeholder $this->aDBbyTable[$curtable]['%DB Count']=0; // placeholder