mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-03 08:00:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix thinko in JsObjectSize() macro.

Browse Source 
The macro gave the wrong answers for a JsObject with is_json == 0:
it would return 1 if jsonb_cont == NULL, or if that wasn't NULL,
it would return 1 for any non-zero size.

We could fix that, but the only use of this macro at present is in the
JsObjectIsEmpty() macro, so it seems simpler and clearer to get rid of
JsObjectSize() and put corrected logic into JsObjectIsEmpty().

Thinko in commit cf35346e8, so no need for back-patch.

Nikita Glukhov

Discussion: https://postgr.es/m/fbd1d566-bba0-a3de-d6d0-d3b1d7c24ff2@postgrespro.ru
This commit is contained in:
Tom Lane 2017-05-29 18:51:56 -04:00
parent f3db7f164a
commit e45c5be99d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/utils/adt/jsonfuncs.c
View File

@ -308,14 +308,14 @@ typedef struct JsObject
((jsv)->is_json ? (jsv)->val.json.type == JSON_TOKEN_STRING \
: ((jsv)->val.jsonb && (jsv)->val.jsonb->type == jbvString))
#define JsObjectSize(jso) \
#define JsObjectIsEmpty(jso) \
((jso)->is_json \
? hash_get_num_entries((jso)->val.json_hash) \
: !(jso)->val.jsonb_cont || JsonContainerSize((jso)->val.jsonb_cont))
? hash_get_num_entries((jso)->val.json_hash) == 0 \
: ((jso)->val.jsonb_cont == NULL || \
JsonContainerSize((jso)->val.jsonb_cont) == 0))
#define JsObjectIsEmpty(jso) (JsObjectSize(jso) == 0)
#define JsObjectFree(jso) do { \
#define JsObjectFree(jso) \
do { \
if ((jso)->is_json) \
hash_destroy((jso)->val.json_hash); \
} while (0)