database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +03:00
Code Activity

Handle empty result set in libpqrcv_exec

Browse Source 
Always return tupleslot and tupledesc from libpqrcv_exec.  This avoids
requiring callers to handle that separately.

Author: Petr Jelinek <petr.jelinek@2ndquadrant.com>
Reported-by: Michael Banck <michael.banck@credativ.de>
This commit is contained in:
Peter Eisentraut
2017-03-24 08:41:32 -04:00
parent 7ac955b347
commit 8398c83689
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
View File

@@ -803,10 +803,6 @@ libpqrcv_processTuples(PGresult *pgres, WalRcvExecResult *walres,
MemoryContext rowcontext; MemoryContext rowcontext;
MemoryContext oldcontext; MemoryContext oldcontext;
/* No point in doing anything here if there were no tuples returned. */
if (PQntuples(pgres) == 0)
return;
/* Make sure we got expected number of fields. */ /* Make sure we got expected number of fields. */
if (nfields != nRetTypes) if (nfields != nRetTypes)
ereport(ERROR, ereport(ERROR,
@@ -824,6 +820,10 @@ libpqrcv_processTuples(PGresult *pgres, WalRcvExecResult *walres,
PQfname(pgres, coln), retTypes[coln], -1, 0); PQfname(pgres, coln), retTypes[coln], -1, 0);
attinmeta = TupleDescGetAttInMetadata(walres->tupledesc); attinmeta = TupleDescGetAttInMetadata(walres->tupledesc);
/* No point in doing more here if there were no tuples returned. */
if (PQntuples(pgres) == 0)
return;
/* Create temporary context for local allocations. */ /* Create temporary context for local allocations. */
rowcontext = AllocSetContextCreate(CurrentMemoryContext, rowcontext = AllocSetContextCreate(CurrentMemoryContext,
"libpqrcv query result context", "libpqrcv query result context",