diff options
author | David Rowley <drowley@postgresql.org> | 2024-07-27 23:46:07 +1200 |
---|---|---|
committer | David Rowley <drowley@postgresql.org> | 2024-07-27 23:46:07 +1200 |
commit | 17a5871d9d58ea639b6d1ba4f0ce58462d55a33c (patch) | |
tree | 197ee9a63a458f6980870bb30f75f3693f449aa9 /src/backend/backup/backup_manifest.c | |
parent | 67427f10093a9c50c79e1dbfdcd1698433e8a88f (diff) | |
download | postgresql-17a5871d9d58ea639b6d1ba4f0ce58462d55a33c.tar.gz postgresql-17a5871d9d58ea639b6d1ba4f0ce58462d55a33c.zip |
Optimize escaping of JSON strings
There were quite a few places where we either had a non-NUL-terminated
string or a text Datum which we needed to call escape_json() on. Many of
these places required that a temporary string was created due to the fact
that escape_json() needs a NUL-terminated cstring. For text types, those
first had to be converted to cstring before calling escape_json() on them.
Here we introduce two new functions to make escaping JSON more optimal:
escape_json_text() can be given a text Datum to append onto the given
buffer. This is more optimal as it foregoes the need to convert the text
Datum into a cstring. A temporary allocation is only required if the text
Datum needs to be detoasted.
escape_json_with_len() can be used when the length of the cstring is
already known or the given string isn't NUL-terminated. Having this
allows various places which were creating a temporary NUL-terminated
string to just call escape_json_with_len() without any temporary memory
allocations.
Discussion: https://postgr.es/m/CAApHDvpLXwMZvbCKcdGfU9XQjGCDm7tFpRdTXuB9PVgpNUYfEQ@mail.gmail.com
Reviewed-by: Melih Mutlu, Heikki Linnakangas
Diffstat (limited to 'src/backend/backup/backup_manifest.c')
-rw-r--r-- | src/backend/backup/backup_manifest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/backup/backup_manifest.c b/src/backend/backup/backup_manifest.c index b360a135472..4357cfa31de 100644 --- a/src/backend/backup/backup_manifest.c +++ b/src/backend/backup/backup_manifest.c @@ -148,7 +148,7 @@ AddFileToBackupManifest(backup_manifest_info *manifest, Oid spcoid, pg_verify_mbstr(PG_UTF8, pathname, pathlen, true)) { appendStringInfoString(&buf, "{ \"Path\": "); - escape_json(&buf, pathname); + escape_json_with_len(&buf, pathname, pathlen); appendStringInfoString(&buf, ", "); } else |