mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
1) Ensure that the Owner should not be disabled while creating the procedure. Fixes #7064
2) Fixed an issue where Explain Analyze shows negative exclusive time. Fixes #7003
This commit is contained in:
committed by
Akshay Joshi
parent
4ee9a95360
commit
9ec8d05a64
@@ -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'] * data['Actual Loops'], -3
|
||||
data['Actual Total Time'], -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'], -2);
|
||||
data['rowsx'] = Math.ceil10(data['rowsx'] / data['loops'], -2);
|
||||
}
|
||||
|
||||
// Start calculating xpos, ypos, width and height for child plans if any
|
||||
@@ -709,6 +709,7 @@ 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')) {
|
||||
@@ -717,7 +718,7 @@ define('pgadmin.misc.explain', [
|
||||
|
||||
if ('exclusive' in data) {
|
||||
inclusive = plan.get('inclusive');
|
||||
if (inclusive) {
|
||||
if (inclusive && inclusive < data['exclusive']) {
|
||||
data['exclusive'] -= inclusive;
|
||||
}
|
||||
}
|
||||
@@ -734,6 +735,9 @@ 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) {
|
||||
|
Reference in New Issue
Block a user