From f18a0d1f28c0ab8b9cd7e33ce7445830faa6e20d Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Mon, 6 Apr 2020 17:37:31 -0500 Subject: [PATCH v1 3/3] comment typos: Incremental Sort commit d2d8a229bc58a2014dce1c7a4fcdb6c5ab9fb8da Author: Tomas Vondra Previously reported here: https://www.postgresql.org/message-id/20200407042521.GH2228%40telsasoft.com --- src/backend/commands/explain.c | 4 ++-- src/backend/executor/nodeIncrementalSort.c | 8 +++++--- src/backend/utils/sort/tuplesort.c | 8 ++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index 2ec5d5b810..466666635b 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -2865,7 +2865,7 @@ show_incremental_sort_group_info(IncrementalSortGroupInfo *groupInfo, } /* - * If it's EXPLAIN ANALYZE, show tuplesort stats for a incremental sort node + * If it's EXPLAIN ANALYZE, show tuplesort stats for an incremental sort node */ static void show_incremental_sort_info(IncrementalSortState *incrsortstate, @@ -2916,7 +2916,7 @@ show_incremental_sort_info(IncrementalSortState *incrsortstate, &incrsortstate->shared_info->sinfo[n]; /* - * If a worker hasn't process any sort groups at all, then exclude + * If a worker hasn't processed any sort groups at all, then exclude * it from output since it either didn't launch or didn't * contribute anything meaningful. */ diff --git a/src/backend/executor/nodeIncrementalSort.c b/src/backend/executor/nodeIncrementalSort.c index 39ba11cdf7..da99453c91 100644 --- a/src/backend/executor/nodeIncrementalSort.c +++ b/src/backend/executor/nodeIncrementalSort.c @@ -987,7 +987,7 @@ ExecInitIncrementalSort(IncrementalSort *node, EState *estate, int eflags) /* * Incremental sort can't be used with either EXEC_FLAG_REWIND, - * EXEC_FLAG_BACKWARD or EXEC_FLAG_MARK, because we only one of many sort + * EXEC_FLAG_BACKWARD or EXEC_FLAG_MARK, because we only ???? one of many sort * batches in the current sort state. */ Assert((eflags & (EXEC_FLAG_BACKWARD | @@ -1153,8 +1153,10 @@ ExecReScanIncrementalSort(IncrementalSortState *node) /* * If we've set up either of the sort states yet, we need to reset them. * We could end them and null out the pointers, but there's no reason to - * repay the setup cost, and because guard setting up pivot comparator - * state similarly, doing so might actually cause a leak. + * repay the setup cost, and because ExecIncrementalSort guards + * presorted column functions by checking to see if the full sort state + * has been initialized yet, setting the sort states to null here might + * actually cause a leak. */ if (node->fullsort_state != NULL) { diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c index de38c6c7e0..c25a22f79b 100644 --- a/src/backend/utils/sort/tuplesort.c +++ b/src/backend/utils/sort/tuplesort.c @@ -1428,11 +1428,11 @@ tuplesort_updatemax(Tuplesortstate *state) } /* - * Sort evicts data to the disk when it didn't manage to fit those data to - * the main memory. This is why we assume space used on the disk to be + * Sort evicts data to the disk when it didn't fit data in + * main memory. This is why we assume space used on the disk to be * more important for tracking resource usage than space used in memory. - * Note that amount of space occupied by some tuple set on the disk might - * be less than amount of space occupied by the same tuple set in the + * Note that the amount of space occupied by some tupleset on the disk might + * be less than amount of space occupied by the same tupleset in * memory due to more compact representation. */ if ((isSpaceDisk && !state->isMaxSpaceDisk) || -- 2.17.0