Skip to content

Commit c61249d

Browse files
committed
TEMP COMMIT change cdbconn_discardResults() prototype
1 parent 37bfcb4 commit c61249d

5 files changed

Lines changed: 5 additions & 10 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cdbconn_discardResults

src/backend/cdb/cdbutil.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ cleanupQE(SegmentDatabaseDescriptor *segdbDesc)
894894
return false;
895895

896896
/* Note, we cancel all "still running" queries */
897-
if (!cdbconn_discardResults(segdbDesc, -1))
897+
if (!cdbconn_discardResults(segdbDesc))
898898
{
899899
elog(LOG, "cleaning up seg%d while it is still busy", segdbDesc->segindex);
900900
return false;

src/backend/cdb/dispatcher/cdbconn.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -345,15 +345,12 @@ cdbconn_disconnect(SegmentDatabaseDescriptor *segdbDesc)
345345
* Return false if connection is still busy or dead.
346346
*/
347347
bool
348-
cdbconn_discardResults(SegmentDatabaseDescriptor *segdbDesc,
349-
int retryCount)
348+
cdbconn_discardResults(SegmentDatabaseDescriptor *segdbDesc)
350349
{
351350
PGresult *res;
352351
PGnotify *notify;
353352
PGconn *conn = segdbDesc->conn;
354353

355-
(void) retryCount;
356-
357354
/* Free some memory and replace current result with a fatal error dummy. */
358355
pqSaveErrorResult(conn);
359356

src/backend/cdb/dispatcher/cdbdisp_async.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,7 @@ handlePollSuccess(CdbDispatchCmdAsync *pParms,
883883
* Let's get the big guns out.
884884
*/
885885
dispatchResult->stillRunning =
886-
!cdbconn_discardResults(dispatchResult->segdbDesc, -1);
886+
!cdbconn_discardResults(dispatchResult->segdbDesc);
887887

888888
forwardQENotices();
889889

src/include/cdb/cdbconn.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,9 @@ cdbconn_doConnectComplete(SegmentDatabaseDescriptor *segdbDesc);
7878
/*
7979
* Read result from connection and discard it.
8080
*
81-
* retryCount is deprecated and isn't used anymore.
82-
*
8381
* Return false if there'er still leftovers.
8482
*/
85-
bool cdbconn_discardResults(SegmentDatabaseDescriptor *segdbDesc,
86-
int retryCount);
83+
bool cdbconn_discardResults(SegmentDatabaseDescriptor *segdbDesc);
8784

8885
/* Return if it's a bad connection */
8986
bool cdbconn_isBadConnection(SegmentDatabaseDescriptor *segdbDesc);

0 commit comments

Comments
 (0)