-
Notifications
You must be signed in to change notification settings - Fork 26
/
Copy pathruntime_explain_11.0.patch
247 lines (234 loc) · 8.47 KB
/
runtime_explain_11.0.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index 16a80a0ea1..b12906b005 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -768,15 +768,35 @@ report_triggers(ResultRelInfo *rInfo, bool show_relname, ExplainState *es)
Instrumentation *instr = rInfo->ri_TrigInstrument + nt;
char *relname;
char *conname = NULL;
+ instr_time starttimespan;
+ double total;
+ double ntuples;
+ double ncalls;
+ if (!es->runtime)
+ {
/* Must clean up instrumentation state */
InstrEndLoop(instr);
+ }
+
+ /* Collect statistic variables */
+ if (!INSTR_TIME_IS_ZERO(instr->starttime))
+ {
+ INSTR_TIME_SET_CURRENT(starttimespan);
+ INSTR_TIME_SUBTRACT(starttimespan, instr->starttime);
+ }
+ else
+ INSTR_TIME_SET_ZERO(starttimespan);
+ total = instr->total + INSTR_TIME_GET_DOUBLE(instr->counter)
+ + INSTR_TIME_GET_DOUBLE(starttimespan);
+ ntuples = instr->ntuples + instr->tuplecount;
+ ncalls = ntuples + !INSTR_TIME_IS_ZERO(starttimespan);
/*
* We ignore triggers that were never invoked; they likely aren't
* relevant to the current query type.
*/
- if (instr->ntuples == 0)
+ if (ncalls == 0)
continue;
ExplainOpenGroup("Trigger", NULL, true, es);
@@ -802,9 +822,9 @@ report_triggers(ResultRelInfo *rInfo, bool show_relname, ExplainState *es)
appendStringInfo(es->str, " on %s", relname);
if (es->timing)
appendStringInfo(es->str, ": time=%.3f calls=%.0f\n",
- 1000.0 * instr->total, instr->ntuples);
+ 1000.0 * total, ncalls);
else
- appendStringInfo(es->str, ": calls=%.0f\n", instr->ntuples);
+ appendStringInfo(es->str, ": calls=%.0f\n", ncalls);
}
else
{
@@ -813,9 +833,8 @@ report_triggers(ResultRelInfo *rInfo, bool show_relname, ExplainState *es)
ExplainPropertyText("Constraint Name", conname, es);
ExplainPropertyText("Relation", relname, es);
if (es->timing)
- ExplainPropertyFloat("Time", "ms", 1000.0 * instr->total, 3,
- es);
- ExplainPropertyFloat("Calls", NULL, instr->ntuples, 0, es);
+ ExplainPropertyFloat("Time", "ms", 1000.0 * total, 3, es);
+ ExplainPropertyFloat("Calls", NULL, ncalls, 0, es);
}
if (conname)
@@ -1350,8 +1369,11 @@ ExplainNode(PlanState *planstate, List *ancestors,
* instrumentation results the user didn't ask for. But we do the
* InstrEndLoop call anyway, if possible, to reduce the number of cases
* auto_explain has to contend with.
+ *
+ * If flag es->stateinfo is set i.e. when printing the current execution state
+ * this step of cleaning up is miss.
*/
- if (planstate->instrument)
+ if (planstate->instrument && !es->runtime)
InstrEndLoop(planstate->instrument);
if (es->analyze &&
@@ -1386,7 +1408,7 @@ ExplainNode(PlanState *planstate, List *ancestors,
ExplainPropertyFloat("Actual Loops", NULL, nloops, 0, es);
}
}
- else if (es->analyze)
+ else if (es->analyze && !es->runtime)
{
if (es->format == EXPLAIN_FORMAT_TEXT)
appendStringInfoString(es->str, " (never executed)");
@@ -1402,6 +1424,75 @@ ExplainNode(PlanState *planstate, List *ancestors,
}
}
+ /*
+ * print the progress of node execution at current loop
+ */
+ if (planstate->instrument && es->analyze && es->runtime)
+ {
+ instr_time starttimespan;
+ double startup_sec;
+ double total_sec;
+ double rows;
+ double loop_num;
+ bool finished;
+
+ if (!INSTR_TIME_IS_ZERO(planstate->instrument->starttime))
+ {
+ INSTR_TIME_SET_CURRENT(starttimespan);
+ INSTR_TIME_SUBTRACT(starttimespan, planstate->instrument->starttime);
+ }
+ else
+ INSTR_TIME_SET_ZERO(starttimespan);
+ startup_sec = 1000.0 * planstate->instrument->firsttuple;
+ total_sec = 1000.0 * (INSTR_TIME_GET_DOUBLE(planstate->instrument->counter)
+ + INSTR_TIME_GET_DOUBLE(starttimespan));
+ rows = planstate->instrument->tuplecount;
+ loop_num = planstate->instrument->nloops + 1;
+
+ finished = planstate->instrument->nloops > 0
+ && !planstate->instrument->running
+ && INSTR_TIME_IS_ZERO(starttimespan);
+
+ if (!finished)
+ {
+ ExplainOpenGroup("Current loop", "Current loop", true, es);
+ if (es->format == EXPLAIN_FORMAT_TEXT)
+ {
+ if (es->timing)
+ {
+ if (planstate->instrument->running)
+ appendStringInfo(es->str,
+ " (Current loop: actual time=%.3f..%.3f rows=%.0f, loop number=%.0f)",
+ startup_sec, total_sec, rows, loop_num);
+ else
+ appendStringInfo(es->str,
+ " (Current loop: running time=%.3f actual rows=0, loop number=%.0f)",
+ total_sec, loop_num);
+ }
+ else
+ appendStringInfo(es->str,
+ " (Current loop: actual rows=%.0f, loop number=%.0f)",
+ rows, loop_num);
+ }
+ else
+ {
+ ExplainPropertyFloat("Actual Loop Number", NULL, loop_num, 0, es);
+ if (es->timing)
+ {
+ if (planstate->instrument->running)
+ {
+ ExplainPropertyFloat("Actual Startup Time", NULL, startup_sec, 3, es);
+ ExplainPropertyFloat("Actual Total Time", NULL, total_sec, 3, es);
+ }
+ else
+ ExplainPropertyFloat("Running Time", NULL, total_sec, 3, es);
+ }
+ ExplainPropertyFloat("Actual Rows", NULL, rows, 0, es);
+ }
+ ExplainCloseGroup("Current loop", "Current loop", true, es);
+ }
+ }
+
/* in text format, first line ends here */
if (es->format == EXPLAIN_FORMAT_TEXT)
appendStringInfoChar(es->str, '\n');
@@ -1698,8 +1789,9 @@ ExplainNode(PlanState *planstate, List *ancestors,
if (es->buffers && planstate->instrument)
show_buffer_usage(es, &planstate->instrument->bufusage);
- /* Show worker detail */
- if (es->analyze && es->verbose && planstate->worker_instrument)
+ /* Show worker detail after query execution */
+ if (es->analyze && es->verbose && planstate->worker_instrument
+ && !es->runtime)
{
WorkerInstrumentation *w = planstate->worker_instrument;
bool opened_group = false;
@@ -2586,20 +2678,17 @@ show_instrumentation_count(const char *qlabel, int which,
if (!es->analyze || !planstate->instrument)
return;
+ nloops = planstate->instrument->nloops;
if (which == 2)
- nfiltered = planstate->instrument->nfiltered2;
+ nfiltered = ((nloops > 0) ? planstate->instrument->nfiltered2 / nloops :
+ 0);
else
- nfiltered = planstate->instrument->nfiltered1;
- nloops = planstate->instrument->nloops;
+ nfiltered = ((nloops > 0) ? planstate->instrument->nfiltered1 / nloops :
+ 0);
/* In text mode, suppress zero counts; they're not interesting enough */
if (nfiltered > 0 || es->format != EXPLAIN_FORMAT_TEXT)
- {
- if (nloops > 0)
- ExplainPropertyFloat(qlabel, NULL, nfiltered / nloops, 0, es);
- else
- ExplainPropertyFloat(qlabel, NULL, 0.0, 0, es);
- }
+ ExplainPropertyFloat(qlabel, NULL, nfiltered, 0, es);
}
/*
@@ -3118,15 +3207,27 @@ show_modifytable_info(ModifyTableState *mtstate, List *ancestors,
double insert_path;
double other_path;
+ if (!es->runtime)
InstrEndLoop(mtstate->mt_plans[0]->instrument);
/* count the number of source rows */
- total = mtstate->mt_plans[0]->instrument->ntuples;
other_path = mtstate->ps.instrument->ntuples2;
- insert_path = total - other_path;
+ /*
+ * Insert occurs after extracting row from subplan and in runtime mode
+ * we can appear between these two operations - situation when
+ * total > insert_path + other_path. Therefore we don't know exactly
+ * whether last row from subplan is inserted.
+ * We don't print inserted tuples in runtime mode in order to not print
+ * inconsistent data
+ */
+ if (!es->runtime)
+ {
+ total = mtstate->mt_plans[0]->instrument->ntuples;
+ insert_path = total - other_path;
+ ExplainPropertyFloat("Tuples Inserted", NULL, insert_path, 0, es);
+ }
+
- ExplainPropertyFloat("Tuples Inserted", NULL,
- insert_path, 0, es);
ExplainPropertyFloat("Conflicting Tuples", NULL,
other_path, 0, es);
}
diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h
index 9b75baae6e..ee7f169755 100644
--- a/src/include/commands/explain.h
+++ b/src/include/commands/explain.h
@@ -36,6 +36,8 @@ typedef struct ExplainState
bool timing; /* print detailed node timing */
bool summary; /* print total planning and execution timing */
ExplainFormat format; /* output format */
+ bool runtime; /* print intermediate state of query execution,
+ not after completion */
/* state for output formatting --- not reset for each new plan tree */
int indent; /* current indentation level */
List *grouping_stack; /* format-specific grouping state */