Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0e3e1c4

Browse files
committed
Make EXPLAIN ANALYZE of HashAgg more similar to Hash Join
There were various unnecessary differences between Hash Agg's EXPLAINANALYZE output and Hash Join's. Here we modify the Hash Agg output sothat it's better aligned to Hash Join's.The following changes have been made:1. Start batches counter at 1 instead of 0.2. Always display the "Batches" property, even when we didn't spill to disk.3. Use the text "Batches" instead of "HashAgg Batches" for text format.4. Use the text "Memory Usage" instead of "Peak Memory Usage" for text format.5. Include "Batches" before "Memory Usage" in both text and non-text formats.In passing also modify the "Planned Partitions" property so that we showit regardless of if the value is 0 or not for non-text EXPLAIN formats.This was pointed out by Justin Pryzby and probably should have been partof40efbf8.Reviewed-by: Justin Pryzby, Jeff DavisDiscussion:https://postgr.es/m/CAApHDvrshRnA6C0VFnu7Fb9TVvgGo80PUMm5+2DiaS1gEkPvtw@mail.gmail.comBackpatch-through: 13, where HashAgg batching was introduced
1 parentd7c8576 commit0e3e1c4

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

‎src/backend/commands/explain.c

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3059,21 +3059,19 @@ show_hashagg_info(AggState *aggstate, ExplainState *es)
30593059
if (es->format!=EXPLAIN_FORMAT_TEXT)
30603060
{
30613061

3062-
if (es->costs&&aggstate->hash_planned_partitions>0)
3063-
{
3062+
if (es->costs)
30643063
ExplainPropertyInteger("Planned Partitions",NULL,
30653064
aggstate->hash_planned_partitions,es);
3066-
}
30673065

30683066
if (!es->analyze)
30693067
return;
30703068

30713069
/* EXPLAIN ANALYZE */
3070+
ExplainPropertyInteger("HashAgg Batches",NULL,
3071+
aggstate->hash_batches_used,es);
30723072
ExplainPropertyInteger("Peak Memory Usage","kB",memPeakKb,es);
30733073
ExplainPropertyInteger("Disk Usage","kB",
30743074
aggstate->hash_disk_used,es);
3075-
ExplainPropertyInteger("HashAgg Batches",NULL,
3076-
aggstate->hash_batches_used,es);
30773075
}
30783076
else
30793077
{
@@ -3099,13 +3097,13 @@ show_hashagg_info(AggState *aggstate, ExplainState *es)
30993097
else
31003098
appendStringInfoString(es->str," ");
31013099

3102-
appendStringInfo(es->str,"Peak Memory Usage: "INT64_FORMAT"kB",
3103-
memPeakKb);
3100+
appendStringInfo(es->str,"Batches: %d Memory Usage: "INT64_FORMAT"kB",
3101+
aggstate->hash_batches_used,memPeakKb);
31043102

3105-
if(aggstate->hash_batches_used>0)
3106-
appendStringInfo(es->str," Disk Usage: "UINT64_FORMAT"kB HashAgg Batches: %d",
3107-
aggstate->hash_disk_used,
3108-
aggstate->hash_batches_used);
3103+
/* Only display disk usageifwe spilled to disk */
3104+
if (aggstate->hash_batches_used>1)
3105+
appendStringInfo(es->str," Disk Usage: "UINT64_FORMAT"kB",
3106+
aggstate->hash_disk_used);
31093107
appendStringInfoChar(es->str,'\n');
31103108
}
31113109

@@ -3130,21 +3128,22 @@ show_hashagg_info(AggState *aggstate, ExplainState *es)
31303128
{
31313129
ExplainIndentText(es);
31323130

3133-
appendStringInfo(es->str,"Peak Memory Usage: "INT64_FORMAT"kB",
3134-
memPeakKb);
3131+
appendStringInfo(es->str,"Batches: %d Memory Usage: "INT64_FORMAT"kB",
3132+
hash_batches_used,memPeakKb);
31353133

3136-
if (hash_batches_used>0)
3137-
appendStringInfo(es->str," Disk Usage: "UINT64_FORMAT"kB HashAgg Batches: %d",
3138-
hash_disk_used,hash_batches_used);
3134+
/* Only display disk usage if we spilled to disk */
3135+
if (hash_batches_used>1)
3136+
appendStringInfo(es->str," Disk Usage: "UINT64_FORMAT"kB",
3137+
hash_disk_used);
31393138
appendStringInfoChar(es->str,'\n');
31403139
}
31413140
else
31423141
{
3142+
ExplainPropertyInteger("HashAgg Batches",NULL,
3143+
hash_batches_used,es);
31433144
ExplainPropertyInteger("Peak Memory Usage","kB",memPeakKb,
31443145
es);
31453146
ExplainPropertyInteger("Disk Usage","kB",hash_disk_used,es);
3146-
ExplainPropertyInteger("HashAgg Batches",NULL,
3147-
hash_batches_used,es);
31483147
}
31493148

31503149
if (es->workers_state)

‎src/backend/executor/nodeAgg.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3641,6 +3641,9 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
36413641
find_hash_columns(aggstate);
36423642
build_hash_tables(aggstate);
36433643
aggstate->table_filled= false;
3644+
3645+
/* Initialize this to 1, meaning nothing spilled, yet */
3646+
aggstate->hash_batches_used=1;
36443647
}
36453648

36463649
/*

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp