From 769065c1b2471f484bb48bb58a8bdcf1d12a419c Mon Sep 17 00:00:00 2001
From: Tom Lane
Date: Sun, 23 Feb 2014 16:59:05 -0500
Subject: Prefer pg_any_to_server/pg_server_to_any over
 pg_do_encoding_conversion.

A large majority of the callers of pg_do_encoding_conversion were
specifying the database encoding as either source or target of the
conversion, meaning that we can use the less general functions
pg_any_to_server/pg_server_to_any instead.

The main advantage of using the latter functions is that they can make use
of a cached conversion-function lookup in the common case that the other
encoding is the current client_encoding.  It's notationally cleaner too in
most cases, not least because of the historical artifact that the latter
functions use "char *" rather than "unsigned char *" in their APIs.

Note that pg_any_to_server will apply an encoding verification step in
some cases where pg_do_encoding_conversion would have just done nothing.
This seems to me to be a good idea at most of these call sites, though
it partially negates the performance benefit.

Per discussion of bug #9210.
---
 src/backend/snowball/dict_snowball.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'src/backend/snowball')

diff --git a/src/backend/snowball/dict_snowball.c b/src/backend/snowball/dict_snowball.c
index a585c7206b2..37d2966359f 100644
--- a/src/backend/snowball/dict_snowball.c
+++ b/src/backend/snowball/dict_snowball.c
@@ -255,10 +255,7 @@ dsnowball_lexize(PG_FUNCTION_ARGS)
 		{
 			char	   *recoded;
 
-			recoded = (char *) pg_do_encoding_conversion((unsigned char *) txt,
-														 strlen(txt),
-													   GetDatabaseEncoding(),
-														 PG_UTF8);
+			recoded = pg_server_to_any(txt, strlen(txt), PG_UTF8);
 			if (recoded != txt)
 			{
 				pfree(txt);
@@ -284,10 +281,7 @@ dsnowball_lexize(PG_FUNCTION_ARGS)
 		{
 			char	   *recoded;
 
-			recoded = (char *) pg_do_encoding_conversion((unsigned char *) txt,
-														 strlen(txt),
-														 PG_UTF8,
-													  GetDatabaseEncoding());
+			recoded = pg_any_to_server(txt, strlen(txt), PG_UTF8);
 			if (recoded != txt)
 			{
 				pfree(txt);
-- 
cgit v1.2.3