From ee44cb7566ffafc0144535e1f966f5e3bb7d384b Mon Sep 17 00:00:00 2001
From: Robert Haas <rhaas@postgresql.org>
Date: Tue, 3 Nov 2015 14:11:49 -0500
Subject: [PATCH] Improve comments about abbreviation abort.

Peter Geoghegan
---
 src/backend/utils/sort/tuplesort.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c
index d532e87450e..6572af875a5 100644
--- a/src/backend/utils/sort/tuplesort.c
+++ b/src/backend/utils/sort/tuplesort.c
@@ -1294,8 +1294,10 @@ tuplesort_putindextuplevalues(Tuplesortstate *state, Relation rel,
 		 *
 		 * Alter datum1 representation in already-copied tuples, so as to
 		 * ensure a consistent representation (current tuple was just
-		 * handled). Note that we rely on all tuples copied so far actually
-		 * being contained within memtuples array.
+		 * handled).  It does not matter if some dumped tuples are already
+		 * sorted on tape, since serialized tuples lack abbreviated keys
+		 * (TSS_BUILDRUNS state prevents control reaching here in any
+		 * case).
 		 */
 		for (i = 0; i < state->memtupcount; i++)
 		{
@@ -1373,8 +1375,10 @@ tuplesort_putdatum(Tuplesortstate *state, Datum val, bool isNull)
 			 *
 			 * Alter datum1 representation in already-copied tuples, so as to
 			 * ensure a consistent representation (current tuple was just
-			 * handled). Note that we rely on all tuples copied so far
-			 * actually being contained within memtuples array.
+			 * handled).  It does not matter if some dumped tuples are
+			 * already sorted on tape, since serialized tuples lack
+			 * abbreviated keys (TSS_BUILDRUNS state prevents control
+			 * reaching here in any case).
 			 */
 			for (i = 0; i < state->memtupcount; i++)
 			{
@@ -3174,8 +3178,10 @@ copytup_heap(Tuplesortstate *state, SortTuple *stup, void *tup)
 		 *
 		 * Alter datum1 representation in already-copied tuples, so as to
 		 * ensure a consistent representation (current tuple was just
-		 * handled). Note that we rely on all tuples copied so far actually
-		 * being contained within memtuples array.
+		 * handled).  It does not matter if some dumped tuples are already
+		 * sorted on tape, since serialized tuples lack abbreviated keys
+		 * (TSS_BUILDRUNS state prevents control reaching here in any
+		 * case).
 		 */
 		for (i = 0; i < state->memtupcount; i++)
 		{
@@ -3414,8 +3420,10 @@ copytup_cluster(Tuplesortstate *state, SortTuple *stup, void *tup)
 		 *
 		 * Alter datum1 representation in already-copied tuples, so as to
 		 * ensure a consistent representation (current tuple was just
-		 * handled). Note that we rely on all tuples copied so far actually
-		 * being contained within memtuples array.
+		 * handled).  It does not matter if some dumped tuples are already
+		 * sorted on tape, since serialized tuples lack abbreviated keys
+		 * (TSS_BUILDRUNS state prevents control reaching here in any
+		 * case).
 		 */
 		for (i = 0; i < state->memtupcount; i++)
 		{
@@ -3716,8 +3724,10 @@ copytup_index(Tuplesortstate *state, SortTuple *stup, void *tup)
 		 *
 		 * Alter datum1 representation in already-copied tuples, so as to
 		 * ensure a consistent representation (current tuple was just
-		 * handled). Note that we rely on all tuples copied so far actually
-		 * being contained within memtuples array.
+		 * handled).  It does not matter if some dumped tuples are already
+		 * sorted on tape, since serialized tuples lack abbreviated keys
+		 * (TSS_BUILDRUNS state prevents control reaching here in any
+		 * case).
 		 */
 		for (i = 0; i < state->memtupcount; i++)
 		{
-- 
GitLab