Use cstring_to_text_with_len when length is known.

robertmhaas · robertmhaas · commit f1df4731eea6 · 2013-11-18T10:19:00.000-05:00
This avoids a potentially-expensive extra call to strlen().

David Rowley
diff --git a/contrib/pageinspect/fsmfuncs.c b/contrib/pageinspect/fsmfuncs.c
@@ -56,5 +56,5 @@ fsm_page_contents(PG_FUNCTION_ARGS)
 	}
 	appendStringInfo(&sinfo, "fp_next_slot: %d\n", fsmpage->fp_next_slot);
 
-	PG_RETURN_TEXT_P(cstring_to_text(sinfo.data));
+	PG_RETURN_TEXT_P(cstring_to_text_with_len(sinfo.data, sinfo.len));
 }
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
@@ -1499,7 +1499,7 @@ array_to_json(PG_FUNCTION_ARGS)
 
 	array_to_json_internal(array, result, false);
 
-	PG_RETURN_TEXT_P(cstring_to_text(result->data));
+	PG_RETURN_TEXT_P(cstring_to_text_with_len(result->data, result->len));
 }
 
 /*
@@ -1516,7 +1516,7 @@ array_to_json_pretty(PG_FUNCTION_ARGS)
 
 	array_to_json_internal(array, result, use_line_feeds);
 
-	PG_RETURN_TEXT_P(cstring_to_text(result->data));
+	PG_RETURN_TEXT_P(cstring_to_text_with_len(result->data, result->len));
 }
 
 /*
@@ -1532,7 +1532,7 @@ row_to_json(PG_FUNCTION_ARGS)
 
 	composite_to_json(array, result, false);
 
-	PG_RETURN_TEXT_P(cstring_to_text(result->data));
+	PG_RETURN_TEXT_P(cstring_to_text_with_len(result->data, result->len));
 }
 
 /*
@@ -1549,7 +1549,7 @@ row_to_json_pretty(PG_FUNCTION_ARGS)
 
 	composite_to_json(array, result, use_line_feeds);
 
-	PG_RETURN_TEXT_P(cstring_to_text(result->data));
+	PG_RETURN_TEXT_P(cstring_to_text_with_len(result->data, result->len));
 }
 
 /*
@@ -1607,7 +1607,7 @@ to_json(PG_FUNCTION_ARGS)
 
 	datum_to_json(val, false, result, tcategory, typoutput);
 
-	PG_RETURN_TEXT_P(cstring_to_text(result->data));
+	PG_RETURN_TEXT_P(cstring_to_text_with_len(result->data, result->len));
 }
 
 /*
@@ -1733,7 +1733,7 @@ json_agg_finalfn(PG_FUNCTION_ARGS)
 
 	appendStringInfoChar(state, ']');
 
-	PG_RETURN_TEXT_P(cstring_to_text(state->data));
+	PG_RETURN_TEXT_P(cstring_to_text_with_len(state->data, state->len));
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -56,5 +56,5 @@ fsm_page_contents(PG_FUNCTION_ARGS)`
`56`	`56`	`}`
`57`	`57`	`appendStringInfo(&sinfo, "fp_next_slot: %d\n", fsmpage->fp_next_slot);`
`58`	`58`
`59`		`- PG_RETURN_TEXT_P(cstring_to_text(sinfo.data));`
	`59`	`+ PG_RETURN_TEXT_P(cstring_to_text_with_len(sinfo.data, sinfo.len));`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1499,7 +1499,7 @@ array_to_json(PG_FUNCTION_ARGS)`
`1499`	`1499`
`1500`	`1500`	`array_to_json_internal(array, result, false);`
`1501`	`1501`
`1502`		`- PG_RETURN_TEXT_P(cstring_to_text(result->data));`
	`1502`	`+ PG_RETURN_TEXT_P(cstring_to_text_with_len(result->data, result->len));`
`1503`	`1503`	`}`
`1504`	`1504`
`1505`	`1505`	`/*`
`@@ -1516,7 +1516,7 @@ array_to_json_pretty(PG_FUNCTION_ARGS)`
`1516`	`1516`
`1517`	`1517`	`array_to_json_internal(array, result, use_line_feeds);`
`1518`	`1518`
`1519`		`- PG_RETURN_TEXT_P(cstring_to_text(result->data));`
	`1519`	`+ PG_RETURN_TEXT_P(cstring_to_text_with_len(result->data, result->len));`
`1520`	`1520`	`}`
`1521`	`1521`
`1522`	`1522`	`/*`
`@@ -1532,7 +1532,7 @@ row_to_json(PG_FUNCTION_ARGS)`
`1532`	`1532`
`1533`	`1533`	`composite_to_json(array, result, false);`
`1534`	`1534`
`1535`		`- PG_RETURN_TEXT_P(cstring_to_text(result->data));`
	`1535`	`+ PG_RETURN_TEXT_P(cstring_to_text_with_len(result->data, result->len));`
`1536`	`1536`	`}`
`1537`	`1537`
`1538`	`1538`	`/*`
`@@ -1549,7 +1549,7 @@ row_to_json_pretty(PG_FUNCTION_ARGS)`
`1549`	`1549`
`1550`	`1550`	`composite_to_json(array, result, use_line_feeds);`
`1551`	`1551`
`1552`		`- PG_RETURN_TEXT_P(cstring_to_text(result->data));`
	`1552`	`+ PG_RETURN_TEXT_P(cstring_to_text_with_len(result->data, result->len));`
`1553`	`1553`	`}`
`1554`	`1554`
`1555`	`1555`	`/*`
`@@ -1607,7 +1607,7 @@ to_json(PG_FUNCTION_ARGS)`
`1607`	`1607`
`1608`	`1608`	`datum_to_json(val, false, result, tcategory, typoutput);`
`1609`	`1609`
`1610`		`- PG_RETURN_TEXT_P(cstring_to_text(result->data));`
	`1610`	`+ PG_RETURN_TEXT_P(cstring_to_text_with_len(result->data, result->len));`
`1611`	`1611`	`}`
`1612`	`1612`
`1613`	`1613`	`/*`
`@@ -1733,7 +1733,7 @@ json_agg_finalfn(PG_FUNCTION_ARGS)`
`1733`	`1733`
`1734`	`1734`	`appendStringInfoChar(state, ']');`
`1735`	`1735`
`1736`		`- PG_RETURN_TEXT_P(cstring_to_text(state->data));`
	`1736`	`+ PG_RETURN_TEXT_P(cstring_to_text_with_len(state->data, state->len));`
`1737`	`1737`	`}`
`1738`	`1738`
`1739`	`1739`	`/*`