6-pg85-provide-rowcount-for-utility-select-3-ctxdiff.patch
text/x-patch
Filename: 6-pg85-provide-rowcount-for-utility-select-3-ctxdiff.patch
Type: text/x-patch
Part: 0
Patch
Same data as JSON:
GET /api/v1/attachments/:id/patch
the parsed metadata as JSON — format, series position, per-file stats; never the diff bytes.
API reference →
Format: context
| File | + | − |
|---|---|---|
| src/backend/tcop/pquery.c | 33 | 8 |
| src/interfaces/libpq/fe-exec.c | 1 | 0 |
diff -dcrpN pgsql.orig/src/backend/tcop/pquery.c pgsql/src/backend/tcop/pquery.c
*** pgsql.orig/src/backend/tcop/pquery.c 2010-01-03 12:54:25.000000000 +0100
--- pgsql/src/backend/tcop/pquery.c 2010-02-02 09:59:34.000000000 +0100
*************** ProcessQuery(PlannedStmt *plan,
*** 205,211 ****
switch (queryDesc->operation)
{
case CMD_SELECT:
! strcpy(completionTag, "SELECT");
break;
case CMD_INSERT:
if (queryDesc->estate->es_processed == 1)
--- 205,212 ----
switch (queryDesc->operation)
{
case CMD_SELECT:
! snprintf(completionTag, COMPLETION_TAG_BUFSIZE,
! "SELECT %u", queryDesc->estate->es_processed);
break;
case CMD_INSERT:
if (queryDesc->estate->es_processed == 1)
*************** PortalRun(Portal portal, long count, boo
*** 714,719 ****
--- 715,721 ----
char *completionTag)
{
bool result;
+ uint32 nprocessed;
ResourceOwner saveTopTransactionResourceOwner;
MemoryContext saveTopTransactionContext;
Portal saveActivePortal;
*************** PortalRun(Portal portal, long count, boo
*** 776,786 ****
switch (portal->strategy)
{
case PORTAL_ONE_SELECT:
! (void) PortalRunSelect(portal, true, count, dest);
/* we know the query is supposed to set the tag */
if (completionTag && portal->commandTag)
! strcpy(completionTag, portal->commandTag);
/* Mark portal not active */
portal->status = PORTAL_READY;
--- 778,794 ----
switch (portal->strategy)
{
case PORTAL_ONE_SELECT:
! nprocessed = PortalRunSelect(portal, true, count, dest);
/* we know the query is supposed to set the tag */
if (completionTag && portal->commandTag)
! {
! if (pg_strcasecmp(portal->commandTag, "SELECT") == 0)
! snprintf(completionTag, COMPLETION_TAG_BUFSIZE,
! "SELECT %u", nprocessed);
! else
! strcpy(completionTag, portal->commandTag);
! }
/* Mark portal not active */
portal->status = PORTAL_READY;
*************** PortalRun(Portal portal, long count, boo
*** 804,814 ****
/*
* Now fetch desired portion of results.
*/
! (void) PortalRunSelect(portal, true, count, dest);
/* we know the query is supposed to set the tag */
if (completionTag && portal->commandTag)
! strcpy(completionTag, portal->commandTag);
/* Mark portal not active */
portal->status = PORTAL_READY;
--- 812,828 ----
/*
* Now fetch desired portion of results.
*/
! nprocessed = PortalRunSelect(portal, true, count, dest);
/* we know the query is supposed to set the tag */
if (completionTag && portal->commandTag)
! {
! if (pg_strcasecmp(portal->commandTag, "SELECT") == 0)
! snprintf(completionTag, COMPLETION_TAG_BUFSIZE,
! "SELECT %u", nprocessed);
! else
! strcpy(completionTag, portal->commandTag);
! }
/* Mark portal not active */
portal->status = PORTAL_READY;
*************** PortalRunMulti(Portal portal, bool isTop
*** 1324,1337 ****
*/
if (completionTag && completionTag[0] == '\0')
{
if (portal->commandTag)
strcpy(completionTag, portal->commandTag);
if (strcmp(completionTag, "INSERT") == 0)
! strcpy(completionTag, "INSERT 0 0");
else if (strcmp(completionTag, "UPDATE") == 0)
! strcpy(completionTag, "UPDATE 0");
else if (strcmp(completionTag, "DELETE") == 0)
! strcpy(completionTag, "DELETE 0");
}
}
--- 1338,1362 ----
*/
if (completionTag && completionTag[0] == '\0')
{
+ Oid lastOid = InvalidOid;
+ uint32 processed = 0;
+
+ if (portal->queryDesc && portal->queryDesc->estate)
+ {
+ lastOid = portal->queryDesc->estate->es_lastoid;
+ processed = portal->queryDesc->estate->es_processed;
+ }
+
if (portal->commandTag)
strcpy(completionTag, portal->commandTag);
if (strcmp(completionTag, "INSERT") == 0)
! sprintf(completionTag, "INSERT %u %u", lastOid, processed);
else if (strcmp(completionTag, "UPDATE") == 0)
! sprintf(completionTag, "UPDATE %u", processed);
else if (strcmp(completionTag, "DELETE") == 0)
! sprintf(completionTag, "DELETE %u", processed);
! else if (strcmp(completionTag, "SELECT") == 0)
! sprintf(completionTag, "SELECT %u", processed);
}
}
diff -dcrpN pgsql.orig/src/interfaces/libpq/fe-exec.c pgsql/src/interfaces/libpq/fe-exec.c
*** pgsql.orig/src/interfaces/libpq/fe-exec.c 2010-01-21 20:45:39.000000000 +0100
--- pgsql/src/interfaces/libpq/fe-exec.c 2010-02-02 09:12:25.000000000 +0100
*************** PQcmdTuples(PGresult *res)
*** 2753,2758 ****
--- 2753,2759 ----
p++;
}
else if (strncmp(res->cmdStatus, "DELETE ", 7) == 0 ||
+ strncmp(res->cmdStatus, "SELECT ", 7) == 0 ||
strncmp(res->cmdStatus, "UPDATE ", 7) == 0)
p = res->cmdStatus + 7;
else if (strncmp(res->cmdStatus, "FETCH ", 6) == 0)