diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index f14216e727d..54068c25cbd 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -4599,8 +4599,7 @@ int PQsendQuery(PGconn *conn, const char *command);
- In pipeline mode, command strings containing more than one SQL command
- are disallowed.
+ In pipeline mode, this function is disallowed.
@@ -5054,6 +5053,7 @@ int PQflush(PGconn *conn);
can be used
to test whether pipeline mode is active.
In pipeline mode, only asynchronous operations
+ that utilize the extended query protocol
are permitted, command strings containing multiple SQL commands are
disallowed, and so is COPY.
Using synchronous command execution functions
@@ -5065,6 +5065,8 @@ int PQflush(PGconn *conn);
PQdescribePrepared,
PQdescribePortal,
is an error condition.
+ PQsendQuery is
+ also disallowed, because it uses the simple query protocol.
Once all dispatched commands have had their results processed, and
the end pipeline result has been consumed, the application may return
to non-pipelined mode with .
@@ -5093,8 +5095,7 @@ int PQflush(PGconn *conn);
After entering pipeline mode, the application dispatches requests using
- ,
- ,
+
or its prepared-query sibling
.
These requests are queued on the client-side until flushed to the server;
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index 23ceff75024..8484c4dda1a 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -1437,7 +1437,6 @@ static int
PQsendQueryInternal(PGconn *conn, const char *query, bool newQuery)
{
PGcmdQueueEntry *entry = NULL;
- PGcmdQueueEntry *entry2 = NULL;
if (!PQsendQueryStart(conn, newQuery))
return 0;
@@ -1450,103 +1449,48 @@ PQsendQueryInternal(PGconn *conn, const char *query, bool newQuery)
return 0;
}
+ if (conn->pipelineStatus != PQ_PIPELINE_OFF)
+ {
+ appendPQExpBuffer(&conn->errorMessage,
+ libpq_gettext("%s not allowed in pipeline mode\n"),
+ "PQsendQuery");
+ return 0;
+ }
+
entry = pqAllocCmdQueueEntry(conn);
if (entry == NULL)
return 0; /* error msg already set */
- if (conn->pipelineStatus != PQ_PIPELINE_OFF)
- {
- entry2 = pqAllocCmdQueueEntry(conn);
- if (entry2 == NULL)
- goto sendFailed;
- }
/* Send the query message(s) */
- if (conn->pipelineStatus == PQ_PIPELINE_OFF)
+ /* construct the outgoing Query message */
+ if (pqPutMsgStart('Q', conn) < 0 ||
+ pqPuts(query, conn) < 0 ||
+ pqPutMsgEnd(conn) < 0)
{
- /* construct the outgoing Query message */
- if (pqPutMsgStart('Q', conn) < 0 ||
- pqPuts(query, conn) < 0 ||
- pqPutMsgEnd(conn) < 0)
- {
- /* error message should be set up already */
- pqRecycleCmdQueueEntry(conn, entry);
- return 0;
- }
-
- /* remember we are using simple query protocol */
- entry->queryclass = PGQUERY_SIMPLE;
- /* and remember the query text too, if possible */
- entry->query = strdup(query);
+ /* error message should be set up already */
+ pqRecycleCmdQueueEntry(conn, entry);
+ return 0;
}
- else
- {
- /*
- * In pipeline mode we cannot use the simple protocol, so we send
- * Parse, Bind, Describe Portal, Execute, Close Portal (with the
- * unnamed portal).
- */
- if (pqPutMsgStart('P', conn) < 0 ||
- pqPuts("", conn) < 0 ||
- pqPuts(query, conn) < 0 ||
- pqPutInt(0, 2, conn) < 0 ||
- pqPutMsgEnd(conn) < 0)
- goto sendFailed;
- if (pqPutMsgStart('B', conn) < 0 ||
- pqPuts("", conn) < 0 ||
- pqPuts("", conn) < 0 ||
- pqPutInt(0, 2, conn) < 0 ||
- pqPutInt(0, 2, conn) < 0 ||
- pqPutInt(0, 2, conn) < 0 ||
- pqPutMsgEnd(conn) < 0)
- goto sendFailed;
- if (pqPutMsgStart('D', conn) < 0 ||
- pqPutc('P', conn) < 0 ||
- pqPuts("", conn) < 0 ||
- pqPutMsgEnd(conn) < 0)
- goto sendFailed;
- if (pqPutMsgStart('E', conn) < 0 ||
- pqPuts("", conn) < 0 ||
- pqPutInt(0, 4, conn) < 0 ||
- pqPutMsgEnd(conn) < 0)
- goto sendFailed;
- if (pqPutMsgStart('C', conn) < 0 ||
- pqPutc('P', conn) < 0 ||
- pqPuts("", conn) < 0 ||
- pqPutMsgEnd(conn) < 0)
- goto sendFailed;
- entry->queryclass = PGQUERY_EXTENDED;
- entry->query = strdup(query);
- }
+ /* remember we are using simple query protocol */
+ entry->queryclass = PGQUERY_SIMPLE;
+ /* and remember the query text too, if possible */
+ entry->query = strdup(query);
/*
* Give the data a push. In nonblock mode, don't complain if we're unable
* to send it all; PQgetResult() will do any additional flushing needed.
*/
- if (pqPipelineFlush(conn) < 0)
+ if (pqFlush(conn) < 0)
goto sendFailed;
/* OK, it's launched! */
pqAppendCmdQueueEntry(conn, entry);
- /*
- * When pipeline mode is in use, we need a second entry in the command
- * queue to represent Close Portal message. This allows us later to wait
- * for the CloseComplete message to be received before getting in IDLE
- * state.
- */
- if (conn->pipelineStatus != PQ_PIPELINE_OFF)
- {
- entry2->queryclass = PGQUERY_CLOSE;
- entry2->query = NULL;
- pqAppendCmdQueueEntry(conn, entry2);
- }
-
return 1;
sendFailed:
pqRecycleCmdQueueEntry(conn, entry);
- pqRecycleCmdQueueEntry(conn, entry2);
/* error message should be set up already */
return 0;
}
@@ -2250,22 +2194,6 @@ PQgetResult(PGconn *conn)
break;
}
- /* If the next command we expect is CLOSE, read and consume it */
- if (conn->asyncStatus == PGASYNC_PIPELINE_IDLE &&
- conn->cmd_queue_head &&
- conn->cmd_queue_head->queryclass == PGQUERY_CLOSE)
- {
- if (res && res->resultStatus != PGRES_FATAL_ERROR)
- {
- conn->asyncStatus = PGASYNC_BUSY;
- parseInput(conn);
- conn->asyncStatus = PGASYNC_PIPELINE_IDLE;
- }
- else
- /* we won't ever see the Close */
- pqCommandQueueAdvance(conn);
- }
-
/* Time to fire PGEVT_RESULTCREATE events, if there are any */
if (res && res->nEvents > 0)
(void) PQfireResultCreateEvents(conn, res);
@@ -2982,8 +2910,9 @@ PQfn(PGconn *conn,
if (conn->pipelineStatus != PQ_PIPELINE_OFF)
{
- appendPQExpBufferStr(&conn->errorMessage,
- libpq_gettext("PQfn not allowed in pipeline mode\n"));
+ appendPQExpBuffer(&conn->errorMessage,
+ libpq_gettext("%s not allowed in pipeline mode\n"),
+ "PQfn");
return NULL;
}
diff --git a/src/interfaces/libpq/fe-protocol3.c b/src/interfaces/libpq/fe-protocol3.c
index f267dfd33c5..0d60e8c5c08 100644
--- a/src/interfaces/libpq/fe-protocol3.c
+++ b/src/interfaces/libpq/fe-protocol3.c
@@ -284,24 +284,8 @@ pqParseInput3(PGconn *conn)
}
break;
case '2': /* Bind Complete */
- /* Nothing to do for this message type */
- break;
case '3': /* Close Complete */
- /*
- * If we get CloseComplete when waiting for it, consume
- * the queue element and keep going. A result is not
- * expected from this message; it is just there so that
- * we know to wait for it when PQsendQuery is used in
- * pipeline mode, before going in IDLE state. Failing to
- * do this makes us receive CloseComplete when IDLE, which
- * creates problems.
- */
- if (conn->cmd_queue_head &&
- conn->cmd_queue_head->queryclass == PGQUERY_CLOSE)
- {
- pqCommandQueueAdvance(conn);
- }
-
+ /* Nothing to do for these message types */
break;
case 'S': /* parameter status */
if (getParameterStatus(conn))
diff --git a/src/test/modules/libpq_pipeline/libpq_pipeline.c b/src/test/modules/libpq_pipeline/libpq_pipeline.c
index ac62d475b91..bff7d4b90cc 100644
--- a/src/test/modules/libpq_pipeline/libpq_pipeline.c
+++ b/src/test/modules/libpq_pipeline/libpq_pipeline.c
@@ -108,6 +108,18 @@ test_disallowed_in_pipeline(PGconn *conn)
res = PQexec(conn, "SELECT 1");
if (PQresultStatus(res) != PGRES_FATAL_ERROR)
pg_fatal("PQexec should fail in pipeline mode but succeeded");
+ if (strcmp(PQerrorMessage(conn),
+ "synchronous command execution functions are not allowed in pipeline mode\n") != 0)
+ pg_fatal("did not get expected error message; got: \"%s\"",
+ PQerrorMessage(conn));
+
+ /* PQsendQuery should fail in pipeline mode */
+ if (PQsendQuery(conn, "SELECT 1") != 0)
+ pg_fatal("PQsendQuery should fail in pipeline mode but succeeded");
+ if (strcmp(PQerrorMessage(conn),
+ "PQsendQuery not allowed in pipeline mode\n") != 0)
+ pg_fatal("did not get expected error message; got: \"%s\"",
+ PQerrorMessage(conn));
/* Entering pipeline mode when already in pipeline mode is OK */
if (PQenterPipelineMode(conn) != 1)