From: Álvaro Herrera <alvherre@kurilemu.de>
Date: Thu, 30 Oct 2025 10:26:06 +0000 (+0100)
Subject: Simplify coding in ProcessQuery
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a27c40bfe8ab1834c45d657844df3a84cbb292ac;p=thirdparty%2Fpostgresql.git

Simplify coding in ProcessQuery

The original is pretty baroque for no apparent reason; arguably, commit
2f9661311b83 should have done this.  Noted while reviewing related code
for bug #18984.  This is cosmetic (though I'm surprised that my compiler
generates shorter assembly this way), so no backpatch.

Discussion: https://postgr.es/m/18984-0f4778a6599ac3ae@postgresql.org
---

diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index 08791b8f75e..74179139fa9 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -165,27 +165,22 @@ ProcessQuery(PlannedStmt *plan,
 	 */
 	if (qc)
 	{
-		switch (queryDesc->operation)
-		{
-			case CMD_SELECT:
-				SetQueryCompletion(qc, CMDTAG_SELECT, queryDesc->estate->es_processed);
-				break;
-			case CMD_INSERT:
-				SetQueryCompletion(qc, CMDTAG_INSERT, queryDesc->estate->es_processed);
-				break;
-			case CMD_UPDATE:
-				SetQueryCompletion(qc, CMDTAG_UPDATE, queryDesc->estate->es_processed);
-				break;
-			case CMD_DELETE:
-				SetQueryCompletion(qc, CMDTAG_DELETE, queryDesc->estate->es_processed);
-				break;
-			case CMD_MERGE:
-				SetQueryCompletion(qc, CMDTAG_MERGE, queryDesc->estate->es_processed);
-				break;
-			default:
-				SetQueryCompletion(qc, CMDTAG_UNKNOWN, queryDesc->estate->es_processed);
-				break;
-		}
+		CommandTag	tag;
+
+		if (queryDesc->operation == CMD_SELECT)
+			tag = CMDTAG_SELECT;
+		else if (queryDesc->operation == CMD_INSERT)
+			tag = CMDTAG_INSERT;
+		else if (queryDesc->operation == CMD_UPDATE)
+			tag = CMDTAG_UPDATE;
+		else if (queryDesc->operation == CMD_DELETE)
+			tag = CMDTAG_DELETE;
+		else if (queryDesc->operation == CMD_MERGE)
+			tag = CMDTAG_MERGE;
+		else
+			tag = CMDTAG_UNKNOWN;
+
+		SetQueryCompletion(qc, tag, queryDesc->estate->es_processed);
 	}
 
 	/*