github-starred/pgadmin3
2
0
Fork 0
mirror of https://github.com/levinsv/pgadmin3.git synced 2026-05-15 14:15:49 -06:00
Code Issues 6 Projects Packages Wiki Activity Actions

Fixes and improvements (fmrReport)

Browse source 
1. Сортировка колонок на вкладках Статистика сохряняется по возможности.
2. Узлы плана которые помечены как (never executed) не подсвечиваются.
3. При построении плана всегда добавляется опция "SUMMARY on"
4. Исправлено не корректное отображение зависимостей для таблиц из публикаций.
5. В отчетах о статистике добавлена итоговая информация по таблицам отчета.
This commit is contained in:
lsv 2025-08-13 16:36:36 +05:00 • committed by lsv
parent bd1e5f3518
commit 295b7f97d1
9 changed files with 399 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

71
ctl/ctlListView.cpp
View file

@ -41,11 +41,31 @@ ctlListView::ctlListView(wxWindow* p, int id, wxPoint pos, wxSize siz, long attr
Connect(wxID_ANY, wxEVT_LIST_COL_CLICK, wxListEventHandler(ctlListView::OnSortGrid));
}
#include <map>
void ctlListView::OnSortGrid(wxListEvent& event)
{
bool ctlListView::IsNumberColumn(const wxString& columnlabel) {
bool asnum = false;
if (columnlabel == _("CFS fragmentation") ||
columnlabel == (_("Tuples inserted")) ||
columnlabel == (_("Tuples updated")) ||
columnlabel == (_("Tuples deleted")) ||
columnlabel == (_("Tuples HOT updated")) ||
columnlabel == (_("Live tuples")) ||
columnlabel == (_("Dead tuples")) ||
columnlabel == (_("CFS %")) ||
columnlabel == (_("Autovacuum counter")) ||
columnlabel == (_("Autoanalyze counter")) ||
columnlabel == (_("Index Scans")) ||
columnlabel == (_("Index Tuples Read")) ||
columnlabel == (_("Index Tuples Fetched"))
) {
asnum = true;
}
return asnum;
}
void ctlListView::SortGrid(int colsort, bool isevent) {
if (!nosort) {
int col = event.GetColumn();
if (col == prev_col) order = order * -1;
int col = colsort;
if (col == prev_col && isevent) order = order * -1;
int rows = GetItemCount();
wxListItem listitem;
listitem.SetMask(wxLIST_MASK_TEXT);
@ -53,23 +73,7 @@ void ctlListView::OnSortGrid(wxListEvent& event)
wxString label = listitem.GetText();
bool issize = label == _("Size");
bool astext = true;
if (label == _("CFS fragmentation") ||
label == (_("Tuples inserted")) ||
label == (_("Tuples updated")) ||
label == (_("Tuples deleted")) ||
label == (_("Tuples HOT updated")) ||
label == (_("Live tuples")) ||
label == (_("Dead tuples")) ||
label == (_("CFS %")) ||
label == (_("Autovacuum counter")) ||
label == (_("Autoanalyze counter")) ||
label == (_("Index Scans")) ||
label == (_("Index Tuples Read")) ||
label == (_("Index Tuples Fetched")) ||
issize
) {
astext = false;
}
if (IsNumberColumn(label)|| issize) astext = false;
//sort numeric column
if (astext) {
std::multimap<wxString, int> mp;
@ -89,8 +93,10 @@ void ctlListView::OnSortGrid(wxListEvent& event)
{
std::multimap<double, int> mp;
double d;
for (int i = 0; i < rows; i++) {
wxString val = GetItemText(i, col);
d = 0;
if (val == "NaN") val = "0";
if (val.ToCDouble(&d))
{
@ -98,11 +104,9 @@ void ctlListView::OnSortGrid(wxListEvent& event)
}
else
{
if (issize)
if (val.Right(2) == "kB") d = d / 1024;
else if (val.Right(2) == "GB") d = d * 1024;
else if (val.Right(5) == "bytes") d = d / 1024 / 1024;
if (issize) // convert => MB
d=ConvertSizeToMB(val);
}
mp.insert(std::pair<double, int>(d, i));
}
@ -120,6 +124,21 @@ void ctlListView::OnSortGrid(wxListEvent& event)
prev_col = col;
}
}
bool ctlListView::ReSort() {
int ncols = GetColumnCount();
if (prev_col >= 0 && prev_col < ncols)
SortGrid(prev_col, false);
else
return false;
return true;
}
void ctlListView::OnSortGrid(wxListEvent& event)
{
int col = event.GetColumn();
SortGrid(col, true);
}
long ctlListView::GetSelection()
{
return GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);

13
ctl/ctlSQLGrid.cpp
View file

@ -1190,9 +1190,13 @@ int recurse(ctlSQLGrid* g, int pos, int row, double& transfer) {
//
lastnode = 0;
if (text.at(p) == '-') {
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
//
double m = 1;
// -> Nested Loop (cost=205.13..273.44 rows=4 width=188) (actual time=13.157..13.157 rows=0 loops=1)
bool isstd = false;
if (text.Contains("(never executed)")) {
isstd = true;
}
wxRegEx foundstr(wxT("actual time=.*?\\.\\.([0-9.]+).*?loops=([0-9]+)\\)"), wxRE_ADVANCED);
if (foundstr.Matches(text)) {
wxString v = foundstr.GetMatch(text, 1);
@ -1202,12 +1206,15 @@ int recurse(ctlSQLGrid* g, int pos, int row, double& transfer) {
lastnode = lastnode * m;
leveltime = leveltime + lastnode;
}
g->grp->ColoriseRow(row, wxColour(248, 240, 130));
if (isstd)
g->grp->ColoriseRow(row, wxColour(224, 255, 224)); // green
else
g->grp->ColoriseRow(row, wxColour(248, 240, 130)); // yellow
}
else
{
g->grp->ColoriseRow(row, wxColour(224, 255, 224));
g->grp->ColoriseRow(row, wxColour(224, 255, 224)); // green
g->GetTable()->SetRowLabelValue(row, wxEmptyString);
}
row++;