NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commite45c5be

committed

Fix thinko in JsObjectSize() macro.

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 theJsObjectIsEmpty() macro, so it seems simpler and clearer to get rid ofJsObjectSize() and put corrected logic into JsObjectIsEmpty().Thinko in commitcf35346, so no need for back-patch.Nikita GlukhovDiscussion:https://postgr.es/m/fbd1d566-bba0-a3de-d6d0-d3b1d7c24ff2@postgrespro.ru

1 parentf3db7f1 commite45c5beCopy full SHA for e45c5be

File tree

1 file changed

-6

lines changed

src/backend/utils/adt
- jsonfuncs.c

1 file changed

-6

lines changed

`‎src/backend/utils/adt/jsonfuncs.c`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -308,14 +308,14 @@ typedef struct JsObject`
`308`	`308`	`((jsv)->is_json ? (jsv)->val.json.type == JSON_TOKEN_STRING \`
`309`	`309`	`: ((jsv)->val.jsonb && (jsv)->val.jsonb->type == jbvString))`
`310`	`310`
`311`		`-#defineJsObjectSize(jso) \`
	`311`	`+#defineJsObjectIsEmpty(jso) \`
`312`	`312`	`((jso)->is_json \`
`313`		`-? hash_get_num_entries((jso)->val.json_hash) \`
`314`		`-: !(jso)->val.jsonb_cont \|\| JsonContainerSize((jso)->val.jsonb_cont))`
	`313`	`+? hash_get_num_entries((jso)->val.json_hash) == 0 \`
	`314`	`+: ((jso)->val.jsonb_cont == NULL \|\| \`
	`315`	`+ JsonContainerSize((jso)->val.jsonb_cont) == 0))`
`315`	`316`
`316`		`-#defineJsObjectIsEmpty(jso) (JsObjectSize(jso) == 0)`
`317`		`-`
`318`		`-#defineJsObjectFree(jso) do { \`
	`317`	`+#defineJsObjectFree(jso) \`
	`318`	`+do { \`
`319`	`319`	`if ((jso)->is_json) \`
`320`	`320`	`hash_destroy((jso)->val.json_hash); \`
`321`	`321`	`} while (0)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite45c5be

File tree

1 file changed

1 file changed

`‎src/backend/utils/adt/jsonfuncs.c`

0 commit comments