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

Commit6a918c3

Browse files
committed
Rework EXPLAIN format for incremental sort
The explain format used by incremental sort was somewhat inconsistentwith other nodes, making it harder to parse and understand. This commitaddresses that by - adding an extra space to better separate groups of values - using colons instead of equal signs to separate key/value - properly capitalizing first letter of a key - using separate lines for full and pre-sorted groupsThese changes were proposed by Justin Pryzby and mostly copy the finalexplain format used to report WAL usage.Author: Justin PryzbyReviewed-by: James ColemanDiscussion:https://postgr.es/m/20200419023625.GP26953@telsasoft.com
1 parent1a40d37 commit6a918c3

File tree

3 files changed

+22
-24
lines changed

3 files changed

+22
-24
lines changed

‎src/backend/commands/explain.c

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2778,7 +2778,7 @@ show_incremental_sort_group_info(IncrementalSortGroupInfo *groupInfo,
27782778
{
27792779
if (indent)
27802780
appendStringInfoSpaces(es->str,es->indent*2);
2781-
appendStringInfo(es->str,"%s Groups: "INT64_FORMAT" Sort Method",groupLabel,
2781+
appendStringInfo(es->str,"%s Groups: "INT64_FORMAT"Sort Method",groupLabel,
27822782
groupInfo->groupCount);
27832783
/* plural/singular based on methodNames size */
27842784
if (list_length(methodNames)>1)
@@ -2798,9 +2798,9 @@ show_incremental_sort_group_info(IncrementalSortGroupInfo *groupInfo,
27982798
constchar*spaceTypeName;
27992799

28002800
spaceTypeName=tuplesort_space_type_name(SORT_SPACE_TYPE_MEMORY);
2801-
appendStringInfo(es->str," %s:avg=%ldkBpeak=%ldkB",
2801+
appendStringInfo(es->str," Average%s: %ldkB Peak %s:%ldkB",
28022802
spaceTypeName,avgSpace,
2803-
groupInfo->maxMemorySpaceUsed);
2803+
spaceTypeName,groupInfo->maxMemorySpaceUsed);
28042804
}
28052805

28062806
if (groupInfo->maxDiskSpaceUsed>0)
@@ -2810,12 +2810,9 @@ show_incremental_sort_group_info(IncrementalSortGroupInfo *groupInfo,
28102810
constchar*spaceTypeName;
28112811

28122812
spaceTypeName=tuplesort_space_type_name(SORT_SPACE_TYPE_DISK);
2813-
/* Add a semicolon separator only if memory stats were printed. */
2814-
if (groupInfo->maxMemorySpaceUsed>0)
2815-
appendStringInfo(es->str,";");
2816-
appendStringInfo(es->str," %s: avg=%ldkB peak=%ldkB",
2813+
appendStringInfo(es->str," Average %s: %ldkB Peak %s: %ldkB",
28172814
spaceTypeName,avgSpace,
2818-
groupInfo->maxDiskSpaceUsed);
2815+
spaceTypeName,groupInfo->maxDiskSpaceUsed);
28192816
}
28202817
}
28212818
else
@@ -2899,8 +2896,8 @@ show_incremental_sort_info(IncrementalSortState *incrsortstate,
28992896
if (prefixsortGroupInfo->groupCount>0)
29002897
{
29012898
if (es->format==EXPLAIN_FORMAT_TEXT)
2902-
appendStringInfo(es->str,"");
2903-
show_incremental_sort_group_info(prefixsortGroupInfo,"Presorted",false,es);
2899+
appendStringInfo(es->str,"\n");
2900+
show_incremental_sort_group_info(prefixsortGroupInfo,"Pre-sorted",true,es);
29042901
}
29052902
if (es->format==EXPLAIN_FORMAT_TEXT)
29062903
appendStringInfo(es->str,"\n");
@@ -2942,8 +2939,8 @@ show_incremental_sort_info(IncrementalSortState *incrsortstate,
29422939
if (prefixsortGroupInfo->groupCount>0)
29432940
{
29442941
if (es->format==EXPLAIN_FORMAT_TEXT)
2945-
appendStringInfo(es->str,"");
2946-
show_incremental_sort_group_info(prefixsortGroupInfo,"Presorted",false,es);
2942+
appendStringInfo(es->str,"\n");
2943+
show_incremental_sort_group_info(prefixsortGroupInfo,"Pre-sorted",true,es);
29472944
}
29482945
if (es->format==EXPLAIN_FORMAT_TEXT)
29492946
appendStringInfo(es->str,"\n");

‎src/test/regress/expected/incremental_sort.out

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ declare
106106
space_key text;
107107
begin
108108
for node in select * from jsonb_array_elements(explain_analyze_inc_sort_nodes(query)) t loop
109-
for group_key in select unnest(array['Full-sort Groups', 'Presorted Groups']::text[]) t loop
109+
for group_key in select unnest(array['Full-sort Groups', 'Pre-sorted Groups']::text[]) t loop
110110
for space_key in select unnest(array['Sort Space Memory', 'Sort Space Disk']::text[]) t loop
111111
node := jsonb_set(node, array[group_key, space_key, 'Average Sort Space Used'], '"NN"', false);
112112
node := jsonb_set(node, array[group_key, space_key, 'Peak Sort Space Used'], '"NN"', false);
@@ -128,7 +128,7 @@ declare
128128
space_key text;
129129
begin
130130
for node in select * from jsonb_array_elements(explain_analyze_inc_sort_nodes(query)) t loop
131-
for group_key in select unnest(array['Full-sort Groups', 'Presorted Groups']::text[]) t loop
131+
for group_key in select unnest(array['Full-sort Groups', 'Pre-sorted Groups']::text[]) t loop
132132
group_stats := node->group_key;
133133
for space_key in select unnest(array['Sort Space Memory', 'Sort Space Disk']::text[]) t loop
134134
if (group_stats->space_key->'Peak Sort Space Used')::bigint < (group_stats->space_key->'Peak Sort Space Used')::bigint then
@@ -533,13 +533,13 @@ select * from (select * from t order by a) s order by a, b limit 55;
533533

534534
-- Test EXPLAIN ANALYZE with only a fullsort group.
535535
select explain_analyze_without_memory('select * from (select * from t order by a) s order by a, b limit 55');
536-
explain_analyze_without_memory
537-
------------------------------------------------------------------------------------------------
536+
explain_analyze_without_memory
537+
---------------------------------------------------------------------------------------------------------------
538538
Limit (actual rows=55 loops=1)
539539
-> Incremental Sort (actual rows=55 loops=1)
540540
Sort Key: t.a, t.b
541541
Presorted Key: t.a
542-
Full-sort Groups: 2 Sort Methods: top-N heapsort, quicksort Memory:avg=NNkBpeak=NNkB
542+
Full-sort Groups: 2Sort Methods: top-N heapsort, quicksort AverageMemory: NNkB Peak Memory:NNkB
543543
-> Sort (actual rows=101 loops=1)
544544
Sort Key: t.a
545545
Sort Method: quicksort Memory: NNkB
@@ -708,18 +708,19 @@ select * from t left join (select * from (select * from t order by a) v order by
708708
rollback;
709709
-- Test EXPLAIN ANALYZE with both fullsort and presorted groups.
710710
select explain_analyze_without_memory('select * from (select * from t order by a) s order by a, b limit 70');
711-
explain_analyze_without_memory
712-
----------------------------------------------------------------------------------------------------------------------------------------------------------------------
711+
explain_analyze_without_memory
712+
----------------------------------------------------------------------------------------------------------------
713713
Limit (actual rows=70 loops=1)
714714
-> Incremental Sort (actual rows=70 loops=1)
715715
Sort Key: t.a, t.b
716716
Presorted Key: t.a
717-
Full-sort Groups: 1 Sort Method: quicksort Memory: avg=NNkB peak=NNkB Presorted Groups: 5 Sort Methods: top-N heapsort, quicksort Memory: avg=NNkB peak=NNkB
717+
Full-sort Groups: 1 Sort Method: quicksort Average Memory: NNkB Peak Memory: NNkB
718+
Pre-sorted Groups: 5 Sort Methods: top-N heapsort, quicksort Average Memory: NNkB Peak Memory: NNkB
718719
-> Sort (actual rows=1000 loops=1)
719720
Sort Key: t.a
720721
Sort Method: quicksort Memory: NNkB
721722
-> Seq Scan on t (actual rows=1000 loops=1)
722-
(9 rows)
723+
(10 rows)
723724

724725
select jsonb_pretty(explain_analyze_inc_sort_nodes_without_memory('select * from (select * from t order by a) s order by a, b limit 70'));
725726
jsonb_pretty
@@ -747,7 +748,7 @@ select jsonb_pretty(explain_analyze_inc_sort_nodes_without_memory('select * from
747748
"Average Sort Space Used": "NN"+
748749
} +
749750
}, +
750-
"Presorted Groups": { +
751+
"Pre-sorted Groups": { +
751752
"Group Count": 5, +
752753
"Sort Methods Used": [ +
753754
"top-N heapsort", +

‎src/test/regress/sql/incremental_sort.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ declare
8282
space_keytext;
8383
begin
8484
for nodeinselect*from jsonb_array_elements(explain_analyze_inc_sort_nodes(query)) t loop
85-
for group_keyinselect unnest(array['Full-sort Groups','Presorted Groups']::text[]) t loop
85+
for group_keyinselect unnest(array['Full-sort Groups','Pre-sorted Groups']::text[]) t loop
8686
for space_keyinselect unnest(array['Sort Space Memory','Sort Space Disk']::text[]) t loop
8787
node := jsonb_set(node, array[group_key, space_key,'Average Sort Space Used'],'"NN"', false);
8888
node := jsonb_set(node, array[group_key, space_key,'Peak Sort Space Used'],'"NN"', false);
@@ -105,7 +105,7 @@ declare
105105
space_keytext;
106106
begin
107107
for nodeinselect*from jsonb_array_elements(explain_analyze_inc_sort_nodes(query)) t loop
108-
for group_keyinselect unnest(array['Full-sort Groups','Presorted Groups']::text[]) t loop
108+
for group_keyinselect unnest(array['Full-sort Groups','Pre-sorted Groups']::text[]) t loop
109109
group_stats := node->group_key;
110110
for space_keyinselect unnest(array['Sort Space Memory','Sort Space Disk']::text[]) t loop
111111
if (group_stats->space_key->'Peak Sort Space Used')::bigint< (group_stats->space_key->'Peak Sort Space Used')::bigint then

0 commit comments

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