IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-01-23 23:13:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reverting patch for #7003, showing Nan in time fields.

Browse Source
This commit is contained in:
Akshay Joshi 2021-12-14 16:30:59 +05:30
parent d0d194b60d
commit 83e646c7d4
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_6_3.rst
View File

@ -34,7 +34,6 @@ Bug fixes
| `Issue #6978 <https://redmine.postgresql.org/issues/6978>`_ - Increase the width of the scrollbars.
| `Issue #6986 <https://redmine.postgresql.org/issues/6986>`_ - Fixed an issue where the user can't debug function with timestamp parameter.
| `Issue #6989 <https://redmine.postgresql.org/issues/6989>`_ - Fixed an issue where the Change Password menu option is missing for internal authentication source when more than one authentication source is defined.
| `Issue #7003 <https://redmine.postgresql.org/issues/7003>`_ - Fixed an issue where Explain Analyze shows negative exclusive time.
| `Issue #7005 <https://redmine.postgresql.org/issues/7005>`_ - Fixed an issue where On-demand rows throw an error when any row cell is edited and saved it then scroll to get more rows.
| `Issue #7006 <https://redmine.postgresql.org/issues/7006>`_ - Ensure that Python 3.10 and the latest eventlet dependency should not break the application.
| `Issue #7013 <https://redmine.postgresql.org/issues/7013>`_ - Fix an RPM build issue that could lead to a conflict with python3 at installation.

10
web/pgadmin/misc/static/explain/js/explain.js
View File

@ -660,7 +660,7 @@ define('pgadmin.misc.explain', [
if ('Actual Total Time' in data && 'Actual Loops' in data) {
data['inclusive'] = Math.ceil10(
data['Actual Total Time'], -3
data['Actual Total Time'] * data['Actual Loops'], -3
);
data['exclusive'] = data['inclusive'];
data['inclusive_factor'] = data['inclusive'] / (
@ -687,7 +687,7 @@ define('pgadmin.misc.explain', [
data['rowsx_flag'] = data['rowsx'] <= 10 ? '1' : (
data['rowsx'] <= 100 ? '2' : (data['rowsx'] <= 1000 ? '3' : '4')
);
data['rowsx'] = Math.ceil10(data['rowsx'] / data['loops'], -2);
data['rowsx'] = Math.ceil10(data['rowsx'], -2);
}
// Start calculating xpos, ypos, width and height for child plans if any
@ -709,7 +709,6 @@ define('pgadmin.misc.explain', [
ypos: ypos,
total_time: data['total_time'] || data['Actual Total Time'],
parent_node: lvl.join('_'),
loops: data['Actual Loops']
}), _opt));
if (maxChildWidth < plan.get('width')) {
@ -718,7 +717,7 @@ define('pgadmin.misc.explain', [
if ('exclusive' in data) {
inclusive = plan.get('inclusive');
if (inclusive && inclusive < data['exclusive']) {
if (inclusive) {
data['exclusive'] -= inclusive;
}
}
@ -735,9 +734,6 @@ define('pgadmin.misc.explain', [
plans.push(plan);
idx++;
});
} else{
data['inclusive'] = Math.ceil10(data['Actual Total Time'] / data['loops'], -3);
data['exclusive'] = data['inclusive'];
}
if ('exclusive' in data) {