diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2020-03-02 18:19:51 -0300 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2020-03-02 18:19:51 -0300 |
| commit | 2f9661311b83dc481fc19f6e3bda015392010a40 (patch) | |
| tree | 9a1aabe1d15ac894f7badbc886ae33f16bbfc3b6 /src/backend/commands/portalcmds.c | |
| parent | 7b425a5283cb2c8a452c2e79d6218e41373fd641 (diff) | |
Represent command completion tags as structs
The backend was using strings to represent command tags and doing string
comparisons in multiple places, but that's slow and unhelpful. Create a
new command list with a supporting structure to use instead; this is
stored in a tag-list-file that can be tailored to specific purposes with
a caller-definable C macro, similar to what we do for WAL resource
managers. The first first such uses are a new CommandTag enum and a
CommandTagBehavior struct.
Replace numerous occurrences of char *completionTag with a
QueryCompletion struct so that the code no longer stores information
about completed queries in a cstring. Only at the last moment, in
EndCommand(), does this get converted to a string.
EventTriggerCacheItem no longer holds an array of palloc’d tag strings
in sorted order, but rather just a Bitmapset over the CommandTags.
Author: Mark Dilger, with unsolicited help from Álvaro Herrera
Reviewed-by: John Naylor, Tom Lane
Discussion: https://postgr.es/m/981A9DB4-3F0C-4DA5-88AD-CB9CFF4D6CAD@enterprisedb.com
Diffstat (limited to 'src/backend/commands/portalcmds.c')
| -rw-r--r-- | src/backend/commands/portalcmds.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/backend/commands/portalcmds.c b/src/backend/commands/portalcmds.c index 7e5c805a1e3..40be5069fef 100644 --- a/src/backend/commands/portalcmds.c +++ b/src/backend/commands/portalcmds.c @@ -106,7 +106,7 @@ PerformCursorOpen(ParseState *pstate, DeclareCursorStmt *cstmt, ParamListInfo pa PortalDefineQuery(portal, NULL, queryString, - "SELECT", /* cursor's query is always a SELECT */ + CMDTAG_SELECT, /* cursor's query is always a SELECT */ list_make1(plan), NULL); @@ -160,15 +160,14 @@ PerformCursorOpen(ParseState *pstate, DeclareCursorStmt *cstmt, ParamListInfo pa * * stmt: parsetree node for command * dest: where to send results - * completionTag: points to a buffer of size COMPLETION_TAG_BUFSIZE - * in which to store a command completion status string. + * qc: where to store a command completion status data. * - * completionTag may be NULL if caller doesn't want a status string. + * qc may be NULL if caller doesn't want status data. */ void PerformPortalFetch(FetchStmt *stmt, DestReceiver *dest, - char *completionTag) + QueryCompletion *qc) { Portal portal; uint64 nprocessed; @@ -203,10 +202,9 @@ PerformPortalFetch(FetchStmt *stmt, dest); /* Return command status if wanted */ - if (completionTag) - snprintf(completionTag, COMPLETION_TAG_BUFSIZE, "%s " UINT64_FORMAT, - stmt->ismove ? "MOVE" : "FETCH", - nprocessed); + if (qc) + SetQueryCompletion(qc, stmt->ismove ? CMDTAG_MOVE : CMDTAG_FETCH, + nprocessed); } /* |