NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit4efcf47

committed

Add 'Portal Close' message to pipelined PQsendQuery()

Commitacb7e4e added a new implementation for PQsendQuery so thatit works in pipeline mode (by using extended query protocol), but itbehaves differently from the 'Q' message (in simple query protocol) usedby regular implementation: the new one doesn't close the unnamed portal.Change the new code to have identical behavior to the old.Reported-by: Yura Sokolov <y.sokolov@postgrespro.ru>Author: Álvaro Herrera <alvherre@alvh.no-ip.org>Discussion:https://postgr.es/m/202106072107.d4i55hdscxqj@alvherre.pgsql

1 parent1632ea4 commit4efcf47Copy full SHA for 4efcf47

File tree

2 files changed

-1

lines changed

src
- interfaces/libpq
  - fe-exec.c
- test/modules/libpq_pipeline/traces
  - pipeline_abort.trace

2 files changed

-1

lines changed

`‎src/interfaces/libpq/fe-exec.c`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1329,7 +1329,8 @@ PQsendQueryInternal(PGconn conn, const char query, bool newQuery)`
`1329`	`1329`	`{`
`1330`	`1330`	`/*`
`1331`	`1331`	`* In pipeline mode we cannot use the simple protocol, so we send`
`1332`		`- * Parse, Bind, Describe Portal, Execute.`
	`1332`	`+ * Parse, Bind, Describe Portal, Execute, Close Portal (with the`
	`1333`	`+ * unnamed portal).`
`1333`	`1334`	`*/`
`1334`	`1335`	`if (pqPutMsgStart('P',conn)<0\|\|`
`1335`	`1336`	`pqPuts("",conn)<0\|\|`
`@@ -1355,6 +1356,11 @@ PQsendQueryInternal(PGconn conn, const char query, bool newQuery)`
`1355`	`1356`	`pqPutInt(0,4,conn)<0\|\|`
`1356`	`1357`	`pqPutMsgEnd(conn)<0)`
`1357`	`1358`	`gotosendFailed;`
	`1359`	`+if (pqPutMsgStart('C',conn)<0\|\|`
	`1360`	`+pqPutc('P',conn)<0\|\|`
	`1361`	`+pqPuts("",conn)<0\|\|`
	`1362`	`+pqPutMsgEnd(conn)<0)`
	`1363`	`+gotosendFailed;`
`1358`	`1364`
`1359`	`1365`	`entry->queryclass=PGQUERY_EXTENDED;`
`1360`	`1366`	`entry->query=strdup(query);`

`‎src/test/modules/libpq_pipeline/traces/pipeline_abort.trace`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,13 +38,15 @@ F26Parse "" "SELECT 1; SELECT 2" 0`
`38`	`38`	`F12Bind "" "" 0 0 0`
`39`	`39`	`F6Describe P ""`
`40`	`40`	`F9Execute "" 0`
	`41`	`+F6Close P ""`
`41`	`42`	`F4Sync`
`42`	`43`	`BNNErrorResponse S "ERROR" V "ERROR" C "42601" M "cannot insert multiple commands into a prepared statement" F "SSSS" L "SSSS" R "SSSS" \x00`
`43`	`44`	`B5ReadyForQuery I`
`44`	`45`	`F54Parse "" "SELECT 1.0/g FROM generate_series(3, -1, -1) g" 0`
`45`	`46`	`F12Bind "" "" 0 0 0`
`46`	`47`	`F6Describe P ""`
`47`	`48`	`F9Execute "" 0`
	`49`	`+F6Close P ""`
`48`	`50`	`F4Sync`
`49`	`51`	`B4ParseComplete`
`50`	`52`	`B4BindComplete`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit4efcf47

File tree

2 files changed

2 files changed

`‎src/interfaces/libpq/fe-exec.c`

`‎src/test/modules/libpq_pipeline/traces/pipeline_abort.trace`

0 commit comments