php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-18 23:43:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

polishing debugger.

Browse Source
This commit is contained in:
Qiang Xue
2013-07-09 12:33:14 -04:00
parent a6746ed0f5
commit ee994efdf0
3 changed files with 52 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/yii/db/Command.php
View File

@@ -275,13 +275,13 @@ class Command extends \yii\base\Component
$rawSql = $this->getRawSql();
Yii::trace("Executing SQL: $rawSql", __METHOD__);
Yii::info($rawSql, __METHOD__);
if ($sql == '') {
return 0;
}
$token = "SQL: $sql";
$token = $sql;
try {
Yii::beginProfile($token, __METHOD__);
@@ -383,7 +383,7 @@ class Command extends \yii\base\Component
$sql = $this->getSql();
$rawSql = $this->getRawSql();
Yii::trace("Querying SQL: $rawSql", __METHOD__);
Yii::info($rawSql, __METHOD__);
/** @var $cache \yii\caching\Cache */
if ($db->enableQueryCache && $method !== '') {
@@ -403,7 +403,7 @@ class Command extends \yii\base\Component
}
}
$token = "SQL: $sql";
$token = $sql;
try {
Yii::beginProfile($token, __METHOD__);

72
framework/yii/debug/panels/DbPanel.php
View File

@@ -24,10 +24,20 @@ class DbPanel extends Panel
public function getSummary()
{
$queryCount = count($this->data['messages']) / 2;
$timings = $this->calculateTimings();
$queryCount = count($timings);
$queryTime = 0;
foreach ($timings as $timing) {
$queryTime += $timing[3];
}
$queryTime = number_format($queryTime * 1000) . ' ms';
$url = $this->getUrl();
$output = <<<EOD
<div class="yii-debug-toolbar-block">
<a href="$url">
DB queries: <span class="label">$queryCount</span>
time: <span class="label">$queryTime</span>
</a>
</div>
EOD;
return $queryCount > 0 ? $output : '';
@@ -35,6 +45,39 @@ EOD;
public function getDetail()
{
$timings = $this->calculateTimings();
$rows = array();
foreach ($timings as $timing) {
$duration = sprintf('%.1f ms', $timing[3] * 1000);
$procedure = str_repeat('<span class="indent">→</span>', $timing[0]) . Html::encode($timing[1]);
$rows[] = "<tr><td style=\"width: 80px;\">$duration</td><td>$procedure</td>";
}
$rows = implode("\n", $rows);
return <<<EOD
<h1>Database Queries</h1>
<table class="table table-condensed table-bordered table-striped table-hover" style="table-layout: fixed;">
<thead>
<tr>
<th style="width: 80px;">Duration</th>
<th>Query</th>
</tr>
</thead>
<tbody>
$rows
</tbody>
</table>
EOD;
}
private $_timings;
protected function calculateTimings()
{
if ($this->_timings !== null) {
return $this->_timings;
}
$messages = $this->data['messages'];
$timings = array();
$stack = array();
@@ -56,32 +99,7 @@ EOD;
$timings[$last[4]] = array(count($stack), $last[0], $last[2], $delta);
}
ksort($timings);
$rows = array();
foreach ($timings as $timing) {
$time = date('Y.m.d, H:i:s.', $timing[2]) . round(($timing[2] - floor($timing[2])) * 10000);
$duration = sprintf('%.1f ms', $timing[3] * 1000);
$procedure = str_repeat('<span class="indent">→</span>', $timing[0]) . Html::encode($timing[1]);
$rows[] = "<tr><td style=\"width: 80px;\">$time</td><td style=\"width: 80px;\">$duration</td><td>$procedure</td>";
}
$rows = implode("\n", $rows);
return <<<EOD
<h1>Database Queries</h1>
<table class="table table-condensed table-bordered table-striped table-hover" style="table-layout: fixed;">
<thead>
<tr>
<th style="width: 180px;">Time</th>
<th style="width: 80px;">Duration</th>
<th>Query</th>
</tr>
</thead>
<tbody>
$rows
</tbody>
</table>
EOD;
return $this->_timings = $timings;
}
public function save()

4
framework/yii/debug/panels/RequestPanel.php
View File

@@ -31,11 +31,11 @@ class RequestPanel extends Panel
return <<<EOD
<div class="yii-debug-toolbar-block">
<a href="$url">Peak memory: <span class="label">$memory</span></a>
<a href="$url">Memory: <span class="label">$memory</span></a>
</div>
<div class="yii-debug-toolbar-block">
<a href="$url">Time spent: <span class="label">$time</span></a>
<a href="$url">Time: <span class="label">$time</span></a>
</div>
<div class="yii-debug-toolbar-block">