NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit70165f2

committed

Fix performance regression in dblink connection speed.

Previous commite5de601 modified dblinkto ensure client encoding matched the server. However the addedPQsetClientEncoding() call added significant overhead. Restore originalperformance in the common case where client encoding already matchesserver encoding by doing nothing in that case. Applies to all activebranches.Issue reported and work sponsored by Zonar Systems.

1 parentad910cc commit70165f2Copy full SHA for 70165f2

File tree

1 file changed

-3

lines changed

contrib/dblink
- dblink.c

1 file changed

-3

lines changed

`‎contrib/dblink/dblink.c`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,8 @@ typedef struct remoteConnHashEnt`
`192`	`192`	`errdetail_internal("%s", msg))); \`
`193`	`193`	`} \`
`194`	`194`	`dblink_security_check(conn, rconn); \`
`195`		`-PQsetClientEncoding(conn, GetDatabaseEncodingName()); \`
	`195`	`+if (PQclientEncoding(conn) != GetDatabaseEncoding()) \`
	`196`	`+PQsetClientEncoding(conn, GetDatabaseEncodingName()); \`
`196`	`197`	`freeconn = true; \`
`197`	`198`	`} \`
`198`	`199`	`} while (0)`
`@@ -271,8 +272,9 @@ dblink_connect(PG_FUNCTION_ARGS)`
`271`	`272`	`/* check password actually used if not superuser */`
`272`	`273`	`dblink_security_check(conn,rconn);`
`273`	`274`
`274`		`-/* attempt to set client encoding to match server encoding */`
`275`		`-PQsetClientEncoding(conn,GetDatabaseEncodingName());`
	`275`	`+/* attempt to set client encoding to match server encoding, if needed */`
	`276`	`+if (PQclientEncoding(conn)!=GetDatabaseEncoding())`
	`277`	`+PQsetClientEncoding(conn,GetDatabaseEncodingName());`
`276`	`278`
`277`	`279`	`if (connname)`
`278`	`280`	`{`

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!

Commit70165f2

File tree

1 file changed

1 file changed

`‎contrib/dblink/dblink.c`

0 commit comments