]> git.ipfire.org Git - thirdparty/postgresql.git/commitdiff
Simplify coding in ProcessQuery
authorÁlvaro Herrera <alvherre@kurilemu.de>
Thu, 30 Oct 2025 10:26:06 +0000 (11:26 +0100)
committerÁlvaro Herrera <alvherre@kurilemu.de>
Thu, 30 Oct 2025 10:26:35 +0000 (11:26 +0100)
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

src/backend/tcop/pquery.c

index 08791b8f75ec28abb87c09ef4919a84e76753bae..74179139fa90ef8edb5334b7c2ba131c02d07431 100644 (file)
@@ -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);
        }
 
        /*