Skip to content

Commit e692244

Browse files
kormockormoc
committed
Add in columns for temp table counts
1 parent 69efd29 commit e692244

File tree

3 files changed

+39
-19
lines changed

3 files changed

+39
-19
lines changed

‎config.php.example

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ $settings['defaultColumnVis']['Checksum'] = true;
1313
$settings['defaultColumnVis']['Count'] = true;
1414
$settings['defaultColumnVis']['TotalMS'] = true;
1515
$settings['defaultColumnVis']['AvgMS'] = true;
16+
$settings['defaultColumnVis']['tmpDisk'] = false;
17+
$settings['defaultColumnVis']['tmpTbl'] = false;
1618
$settings['defaultColumnVis']['FirstSeen'] = true;
1719
$settings['defaultColumnVis']['LastSeen'] = true;
1820
$settings['defaultColumnVis']['Fingerprint'] = true;

‎index.php

+25-13
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
<th id="queriesColCount" class="count" > Count </th>
2020
<th id="queriesColTime" class="time" > Total ms </th>
2121
<th id="queriesColAvgTime" class="avgTime" > Avg ms </th>
22+
<th id="queriesColtmpDisk" class="tmpDisk" > Tmp Disk </th>
23+
<th id="queriesColtmpTbl" class="tmpTbl" > Tmp Tbl </th>
2224
<th id="queriesColFirstSeen" class="firstSeen" > First Seen </th>
2325
<th id="queriesColLastSeen" class="lastSeen" > Last Seen </th>
2426
<th id="queriesColfingerprint" class="fingerprint" > Query Fingerprint</th>
@@ -36,6 +38,8 @@
3638
<th class="number"></th>
3739
<th class="number"></th>
3840
<th class="number"></th>
41+
<th class="number"></th>
42+
<th class="number"></th>
3943
<th class="date"></th>
4044
<th class="date"></th>
4145
<th class=""></th>
@@ -68,13 +72,15 @@
6872
{ "sClass": "count number", "bSearchable": false, "aTargets": [ 1 ] },
6973
{ "sClass": "time number", "bSearchable": false, "aTargets": [ 2 ] },
7074
{ "sClass": "avgTime number", "bSearchable": false, "aTargets": [ 3 ] },
71-
{ "sClass": "firstSeen date", "bSearchable": false, "aTargets": [ 4 ] },
72-
{ "sClass": "lastSeen date", "bSearchable": false, "aTargets": [ 5 ] },
73-
{ "sClass": "fingerprint", "bSearchable": true, "aTargets": [ 6 ] },
74-
{ "sClass": "reviewed_on date", "bSearchable": false, "aTargets": [ 7 ] },
75-
{ "sClass": "reviewed_by", "bSearchable": true, "aTargets": [ 8 ] },
76-
{ "sClass": "comments", "bSearchable": true, "aTargets": [ 9 ] },
77-
{ "sClass": "details", "bSearchable": false, "aTargets": [ 10 ], "bSortable": false }
75+
{ "sClass": "tmpDisk number", "bSearchable": false, "aTargets": [ 4 ] },
76+
{ "sClass": "tmpTbl number", "bSearchable": false, "aTargets": [ 5 ] },
77+
{ "sClass": "firstSeen date", "bSearchable": false, "aTargets": [ 6 ] },
78+
{ "sClass": "lastSeen date", "bSearchable": false, "aTargets": [ 7 ] },
79+
{ "sClass": "fingerprint", "bSearchable": true, "aTargets": [ 8 ] },
80+
{ "sClass": "reviewed_on date", "bSearchable": false, "aTargets": [ 9 ] },
81+
{ "sClass": "reviewed_by", "bSearchable": true, "aTargets": [ 10 ] },
82+
{ "sClass": "comments", "bSearchable": true, "aTargets": [ 11 ] },
83+
{ "sClass": "details", "bSearchable": false, "aTargets": [ 12 ], "bSortable": false }
7884
],
7985
"oColVis": {
8086
"aiExclude": [ 10 ]
@@ -96,12 +102,16 @@
96102
oTable.fnSetColumnVis( 1, <?php echo ($settings['defaultColumnVis']['Count'] ? 'true' : 'false'); ?>, false);
97103
oTable.fnSetColumnVis( 2, <?php echo ($settings['defaultColumnVis']['TotalMS'] ? 'true' : 'false'); ?>, false);
98104
oTable.fnSetColumnVis( 3, <?php echo ($settings['defaultColumnVis']['AvgMS'] ? 'true' : 'false'); ?>, false);
99-
oTable.fnSetColumnVis( 4, <?php echo ($settings['defaultColumnVis']['FirstSeen'] ? 'true' : 'false'); ?>, false);
100-
oTable.fnSetColumnVis( 5, <?php echo ($settings['defaultColumnVis']['LastSeen'] ? 'true' : 'false'); ?>, false);
101-
oTable.fnSetColumnVis( 6, <?php echo ($settings['defaultColumnVis']['Fingerprint'] ? 'true' : 'false'); ?>, false);
102-
oTable.fnSetColumnVis( 7, <?php echo ($settings['defaultColumnVis']['ReviewedOn'] ? 'true' : 'false'); ?>, false);
103-
oTable.fnSetColumnVis( 8, <?php echo ($settings['defaultColumnVis']['ReviewedBy'] ? 'true' : 'false'); ?>, false);
104-
oTable.fnSetColumnVis( 9, <?php echo ($settings['defaultColumnVis']['Comments'] ? 'true' : 'false'); ?>, true);
105+
106+
oTable.fnSetColumnVis( 4, <?php echo ($settings['defaultColumnVis']['tmpDisk'] ? 'true' : 'false'); ?>, false);
107+
oTable.fnSetColumnVis( 5, <?php echo ($settings['defaultColumnVis']['tmpTbl'] ? 'true' : 'false'); ?>, false);
108+
109+
oTable.fnSetColumnVis( 6, <?php echo ($settings['defaultColumnVis']['FirstSeen'] ? 'true' : 'false'); ?>, false);
110+
oTable.fnSetColumnVis( 7, <?php echo ($settings['defaultColumnVis']['LastSeen'] ? 'true' : 'false'); ?>, false);
111+
oTable.fnSetColumnVis( 8, <?php echo ($settings['defaultColumnVis']['Fingerprint'] ? 'true' : 'false'); ?>, false);
112+
oTable.fnSetColumnVis( 9, <?php echo ($settings['defaultColumnVis']['ReviewedOn'] ? 'true' : 'false'); ?>, false);
113+
oTable.fnSetColumnVis( 10, <?php echo ($settings['defaultColumnVis']['ReviewedBy'] ? 'true' : 'false'); ?>, false);
114+
oTable.fnSetColumnVis( 11, <?php echo ($settings['defaultColumnVis']['Comments'] ? 'true' : 'false'); ?>, true);
105115
}
106116
},
107117
}).columnFilter({
@@ -112,6 +122,8 @@
112122
{ type: "number-range" },
113123
{ type: "number-range" },
114124
{ type: "number-range" },
125+
{ type: "number-range" },
126+
{ type: "number-range" },
115127
{ type: "date-range" },
116128
{ type: "date-range" },
117129
{ type: "text" },

‎list-ajax.php

+12-6
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,26 @@
22

33
require('init.php');
44

5-
$aColumns = array( 'checksum', 'count', 'time', 'time_avg', 'first_seen', 'last_seen', 'fingerprint', 'reviewed_on', 'reviewed_by', 'comments' );
5+
$aColumns = array( 'checksum', 'count', 'time', 'time_avg', 'disk_tmp_table', 'tmp_table', 'first_seen', 'last_seen', 'fingerprint', 'reviewed_on', 'reviewed_by', 'comments' );
66
// Controls if we use a HAVING clause vs a WHERE clause
7-
$having = array( false, true, true, true, false, false, false, false, false, false );
7+
$having = array( false, true, true, true, true, true, false, false, false, false, false, false );
88

99
$query = 'SELECT SQL_CALC_FOUND_ROWS ';
1010
$query .= ' review.checksum AS checksum,';
1111
$query .= ' review.fingerprint AS fingerprint,';
12-
$query .= " IFNULL(review.reviewed_by, '') AS reviewed_by,";
12+
$query .= ' IFNULL(review.reviewed_by, "") AS reviewed_by,';
1313
$query .= ' DATE(review.reviewed_on) AS reviewed_on,';
14-
$query .= ' review.comments AS comments,';
14+
$query .= ' IFNULL(review.comments, "") AS comments,';
1515
if (strlen($reviewhost['history_table'])) {
1616
$query .= ' DATE(MIN(history.ts_min)) AS first_seen,';
1717
$query .= ' DATE(MAX(history.ts_max)) AS last_seen,';
1818
$query .= ' SUM(history.ts_cnt) AS `count`,';
1919
$query .= ' ROUND(SUM(history.query_time_sum), 2)*1000 AS `time`,';
20-
$query .= ' ROUND(SUM(history.query_time_sum)*1000/SUM(history.ts_cnt), 2) AS time_avg';
20+
$query .= ' ROUND(SUM(history.query_time_sum)*1000/SUM(history.ts_cnt), 2) AS time_avg,';
21+
22+
$query .= ' IFNULL(SUM(history.Disk_tmp_table_sum), 0) AS disk_tmp_table,';
23+
$query .= ' IFNULL(SUM(history.Tmp_table_sum), 0) AS tmp_table';
24+
2125
$query .= ' FROM '.Database::escapeField($reviewhost['review_table']).' AS review';
2226
$query .= ' JOIN '.Database::escapeField($reviewhost['history_table']).' AS history';
2327
$query .= ' ON history.checksum = review.checksum';
@@ -27,7 +31,9 @@
2731
$query .= ' DATE(review.last_seen) AS last_seen,';
2832
$query .= ' 0 AS `count`,';
2933
$query .= ' 0 AS `time`,';
30-
$query .= ' 0 AS time_avg';
34+
$query .= ' 0 AS time_avg,';
35+
$query .= ' 0 AS disk_tmp_table,';
36+
$query .= ' 0 AS tmp_table';
3137
$query .= ' FROM '.$reviewhost['review_table'].' AS review';
3238
}
3339

0 commit comments

Comments
 (0)