Fix postgresql_fdw to reuse contents of tuplestore through whole of

the query to avoid unnecessary re-execution of remote query.

diff --git a/contrib/postgresql_fdw/postgresql_fdw.c b/contrib/postgresql_fdw/postgresql_fdw.c
index abeb2711260c0ec144276ba642da379b2d1207dd..288830430b4df16305e97cc2fcca38202dbb5f01 100644 (file)
--- a/contrib/postgresql_fdw/postgresql_fdw.c
+++ b/contrib/postgresql_fdw/postgresql_fdw.c
@@ -649,13 +649,9 @@ pgReOpen(ForeignScanState *scanstate)
 {
    pgFdwReply     *reply = (pgFdwReply *) scanstate->reply;
 
-   /* Free Tuplestore to execute query again */
-   /* TODO: reuse tupstore through the scan to avoid overhead */
+   /* Rewind tuplestore to retrieve all tuples again */
    if (reply->tupstore)
-   {
-       tuplestore_end(reply->tupstore);
-       reply->tupstore = NULL;
-   }
+       tuplestore_rescan(reply->tupstore);
 }
 
 /*