From d5e06d909a036640e980e7b787d110af0e8efcca Mon Sep 17 00:00:00 2001
From: Thomas Munro <thomas.munro@enterprisedb.com>
Date: Sun, 11 Feb 2018 02:01:31 +1300
Subject: [PATCH] Register and document LWTRANCHE_PARALLEL_HASH_JOIN.

Commit 1804284042e659e7d16904e7bbb0ad546394b6a3 defined a new built-in LWLock
tranche, but failed to register a name to show in pg_stat_activity.wait_event.
Before this commit, waits on that LWLock were incorrectly reported as
"extension".

Thomas Munro
Discussion: https://postgr.es/m/CAEepm%3D1WM%3D02cKT7hinnx8xRhN2QdF%2BWfE6gk5oMPorwLi%2BXiA%40mail.gmail.com
---
 doc/src/sgml/monitoring.sgml      | 7 ++++++-
 src/backend/storage/lmgr/lwlock.c | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml
index 82c015806e..3bc4de57d5 100644
--- a/doc/src/sgml/monitoring.sgml
+++ b/doc/src/sgml/monitoring.sgml
@@ -845,7 +845,7 @@ postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: ser
 
       <tbody>
        <row>
-        <entry morerows="63"><literal>LWLock</literal></entry>
+        <entry morerows="64"><literal>LWLock</literal></entry>
         <entry><literal>ShmemIndexLock</literal></entry>
         <entry>Waiting to find or allocate space in shared memory.</entry>
        </row>
@@ -1121,6 +1121,11 @@ postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: ser
          <entry>Waiting to choose the next subplan during Parallel Append plan
          execution.</entry>
         </row>
+        <row>
+         <entry><literal>parallel_hash_join</literal></entry>
+         <entry>Waiting to allocate or exchange a chunk of memory or update
+         counters during Parallel Hash plan execution.</entry>
+        </row>
         <row>
          <entry morerows="9"><literal>Lock</literal></entry>
          <entry><literal>relation</literal></entry>
diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c
index 233606b414..a6fda81feb 100644
--- a/src/backend/storage/lmgr/lwlock.c
+++ b/src/backend/storage/lmgr/lwlock.c
@@ -520,6 +520,7 @@ RegisterLWLockTranches(void)
 						  "shared_tuplestore");
 	LWLockRegisterTranche(LWTRANCHE_TBM, "tbm");
 	LWLockRegisterTranche(LWTRANCHE_PARALLEL_APPEND, "parallel_append");
+	LWLockRegisterTranche(LWTRANCHE_PARALLEL_HASH_JOIN, "parallel_hash_join");
 
 	/* Register named tranches. */
 	for (i = 0; i < NamedLWLockTrancheRequests; i++)
-- 
2.15.1

