postgres
diff --git a/‎src/backend/commands/explain.c
Copy file name to clipboardExpand all lines: src/backend/commands/explain.c
+5-5Lines changed: 5 additions & 5 deletions b/‎src/backend/commands/explain.c
Copy file name to clipboardExpand all lines: src/backend/commands/explain.c
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎src/include/utils/tuplesort.h
Copy file name to clipboardExpand all lines: src/include/utils/tuplesort.h
+13-7Lines changed: 13 additions & 7 deletions b/‎src/include/utils/tuplesort.h
Copy file name to clipboardExpand all lines: src/include/utils/tuplesort.h
+13-7Lines changed: 13 additions & 7 deletions
@@ -2762,14 +2762,14 @@ show_incremental_sort_group_info(IncrementalSortGroupInfo *groupInfo,
 	List	   *methodNames = NIL;
 
 	/* Generate a list of sort methods used across all groups. */
-	for (int bit = 0; bit < sizeof(bits32); ++bit)
+	for (int bit = 0; bit < NUM_TUPLESORTMETHODS; bit++)
 	{
-		if (groupInfo->sortMethods & (1 << bit))
+		TuplesortMethod sortMethod = (1 << bit);
+
+		if (groupInfo->sortMethods & sortMethod)
 		{
-			TuplesortMethod sortMethod = (1 << bit);
-			const char *methodName;
+			const char *methodName = tuplesort_method_name(sortMethod);
 
-			methodName = tuplesort_method_name(sortMethod);
 			methodNames = lappend(methodNames, unconstify(char *, methodName));
 		}
 	}
 
@@ -62,18 +62,24 @@ typedef struct SortCoordinateData *SortCoordinate;
  * TuplesortInstrumentation can't contain any pointers because we
  * sometimes put it in shared memory.
  *
- * TuplesortMethod is used in a bitmask in Increment Sort's shared memory
- * instrumentation so needs to have each value be a separate bit.
+ * The parallel-sort infrastructure relies on having a zero TuplesortMethod
+ * indicate that a worker never did anything, so we assign zero to
+ * SORT_TYPE_STILL_IN_PROGRESS.  The other values of this enum can be
+ * OR'ed together to represent a situation where different workers used
+ * different methods, so we need a separate bit for each one.  Keep the
+ * NUM_TUPLESORTMETHODS constant in sync with the number of bits!
  */
 typedef enum
 {
-	SORT_TYPE_STILL_IN_PROGRESS = 1 << 0,
-	SORT_TYPE_TOP_N_HEAPSORT = 1 << 1,
-	SORT_TYPE_QUICKSORT = 1 << 2,
-	SORT_TYPE_EXTERNAL_SORT = 1 << 3,
-	SORT_TYPE_EXTERNAL_MERGE = 1 << 4
+	SORT_TYPE_STILL_IN_PROGRESS = 0,
+	SORT_TYPE_TOP_N_HEAPSORT = 1 << 0,
+	SORT_TYPE_QUICKSORT = 1 << 1,
+	SORT_TYPE_EXTERNAL_SORT = 1 << 2,
+	SORT_TYPE_EXTERNAL_MERGE = 1 << 3
 } TuplesortMethod;
 
+#define NUM_TUPLESORTMETHODS 4
+
 typedef enum
 {
 	SORT_SPACE_TYPE_DISK,
Original file line number	Diff line number	Diff line change
`@@ -2762,14 +2762,14 @@ show_incremental_sort_group_info(IncrementalSortGroupInfo *groupInfo,`
`2762`	`2762`	`List *methodNames = NIL;`
`2763`	`2763`
`2764`	`2764`	`/* Generate a list of sort methods used across all groups. */`
`2765`		`- for (int bit = 0; bit < sizeof(bits32); ++bit)`
	`2765`	`+ for (int bit = 0; bit < NUM_TUPLESORTMETHODS; bit++)`
`2766`	`2766`	`{`
`2767`		`- if (groupInfo->sortMethods & (1 << bit))`
	`2767`	`+ TuplesortMethod sortMethod = (1 << bit);`
	`2768`	`+`
	`2769`	`+ if (groupInfo->sortMethods & sortMethod)`
`2768`	`2770`	`{`
`2769`		`- TuplesortMethod sortMethod = (1 << bit);`
`2770`		`- const char *methodName;`
	`2771`	`+ const char *methodName = tuplesort_method_name(sortMethod);`
`2771`	`2772`
`2772`		`- methodName = tuplesort_method_name(sortMethod);`
`2773`	`2773`	`methodNames = lappend(methodNames, unconstify(char *, methodName));`
`2774`	`2774`	`}`
`2775`	`2775`	`}`