Thank you for applying patch --- regexp_replace.

bmomjian · bmomjian · commit 722f31f78616 · 2005-07-29T03:17:55.000Z
An attached patch is a small additional improvement.

This patch use appendStringInfoText instead of appendStringInfoString.
There is an overhead of PG_TEXT_GET_STR when appendStringInfoString is
executed by text type. This can be reduced by appendStringInfoText.

Atsushi Ogawa
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.129 2005/07/21 04:41:43 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.130 2005/07/29 03:17:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2064,7 +2064,7 @@ appendStringInfoRegexpSubstr(StringInfo str, text *replace_text,
 		{
 			text *append_text = text_substring(PointerGetDatum(replace_text),
 									  substr_start, ch_cnt, false);
-			appendStringInfoString(str, PG_TEXT_GET_STR(append_text));
+			appendStringInfoText(str, append_text);
 			pfree(append_text);
 		}
 		substr_start += ch_cnt + 1;
@@ -2099,7 +2099,7 @@ appendStringInfoRegexpSubstr(StringInfo str, text *replace_text,
 			/* Copy the text that is back reference of regexp. */
 			text *append_text = text_substring(PointerGetDatum(src_text),
 									  so + 1, (eo - so), false);
-			appendStringInfoString(str, PG_TEXT_GET_STR(append_text));
+			appendStringInfoText(str, append_text);
 			pfree(append_text);
 		}
 	}
@@ -2169,7 +2169,7 @@ replace_text_regexp(PG_FUNCTION_ARGS)
 			text *left_text = text_substring(PointerGetDatum(src_text),
 									   data_pos + 1,
 									   pmatch[0].rm_so - data_pos, false);
-			appendStringInfoString(str, PG_TEXT_GET_STR(left_text));
+			appendStringInfoText(str, left_text);
 			pfree(left_text);
 		}
 
@@ -2180,7 +2180,7 @@ replace_text_regexp(PG_FUNCTION_ARGS)
 		if (have_escape)
 			appendStringInfoRegexpSubstr(str, replace_text, pmatch, src_text);
 		else
-			appendStringInfoString(str, PG_TEXT_GET_STR(replace_text));
+			appendStringInfoText(str, replace_text);
 
 		search_start = data_pos = pmatch[0].rm_eo;
 
@@ -2205,7 +2205,7 @@ replace_text_regexp(PG_FUNCTION_ARGS)
 	{
 		text *right_text = text_substring(PointerGetDatum(src_text),
 								   data_pos + 1, -1, true);
-		appendStringInfoString(str, PG_TEXT_GET_STR(right_text));
+		appendStringInfoText(str, right_text);
 		pfree(right_text);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.129 2005/07/21 04:41:43 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.130 2005/07/29 03:17:55 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -2064,7 +2064,7 @@ appendStringInfoRegexpSubstr(StringInfo str, text *replace_text,`
`2064`	`2064`	`{`
`2065`	`2065`	`text *append_text = text_substring(PointerGetDatum(replace_text),`
`2066`	`2066`	`substr_start, ch_cnt, false);`
`2067`		`- appendStringInfoString(str, PG_TEXT_GET_STR(append_text));`
	`2067`	`+ appendStringInfoText(str, append_text);`
`2068`	`2068`	`pfree(append_text);`
`2069`	`2069`	`}`
`2070`	`2070`	`substr_start += ch_cnt + 1;`
`@@ -2099,7 +2099,7 @@ appendStringInfoRegexpSubstr(StringInfo str, text *replace_text,`
`2099`	`2099`	`/* Copy the text that is back reference of regexp. */`
`2100`	`2100`	`text *append_text = text_substring(PointerGetDatum(src_text),`
`2101`	`2101`	`so + 1, (eo - so), false);`
`2102`		`- appendStringInfoString(str, PG_TEXT_GET_STR(append_text));`
	`2102`	`+ appendStringInfoText(str, append_text);`
`2103`	`2103`	`pfree(append_text);`
`2104`	`2104`	`}`
`2105`	`2105`	`}`
`@@ -2169,7 +2169,7 @@ replace_text_regexp(PG_FUNCTION_ARGS)`
`2169`	`2169`	`text *left_text = text_substring(PointerGetDatum(src_text),`
`2170`	`2170`	`data_pos + 1,`
`2171`	`2171`	`pmatch[0].rm_so - data_pos, false);`
`2172`		`- appendStringInfoString(str, PG_TEXT_GET_STR(left_text));`
	`2172`	`+ appendStringInfoText(str, left_text);`
`2173`	`2173`	`pfree(left_text);`
`2174`	`2174`	`}`
`2175`	`2175`
`@@ -2180,7 +2180,7 @@ replace_text_regexp(PG_FUNCTION_ARGS)`
`2180`	`2180`	`if (have_escape)`
`2181`	`2181`	`appendStringInfoRegexpSubstr(str, replace_text, pmatch, src_text);`
`2182`	`2182`	`else`
`2183`		`- appendStringInfoString(str, PG_TEXT_GET_STR(replace_text));`
	`2183`	`+ appendStringInfoText(str, replace_text);`
`2184`	`2184`
`2185`	`2185`	`search_start = data_pos = pmatch[0].rm_eo;`
`2186`	`2186`
`@@ -2205,7 +2205,7 @@ replace_text_regexp(PG_FUNCTION_ARGS)`
`2205`	`2205`	`{`
`2206`	`2206`	`text *right_text = text_substring(PointerGetDatum(src_text),`
`2207`	`2207`	`data_pos + 1, -1, true);`
`2208`		`- appendStringInfoString(str, PG_TEXT_GET_STR(right_text));`
	`2208`	`+ appendStringInfoText(str, right_text);`
`2209`	`2209`	`pfree(right_text);`
`2210`	`2210`	`}`
`2211`	`2211`