NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit4eb9798

committed

Avoid freeing objects during json aggregate finalization

Commitf4fb45d tried to free memory during aggregate finalization.This cause issues, particularly when used as a window function, so stopdoing that.Per complaint by Jaime Casanova and diagnosis by Andres FreundDiscussion:https://postgr.es/m/YkfeMNYRCGhySKyg@ahch-to

1 parentafb529e commit4eb9798Copy full SHA for 4eb9798

File tree

1 file changed

-12

lines changed

src/backend/utils/adt
- json.c

1 file changed

-12

lines changed

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

Lines changed: 4 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -979,12 +979,6 @@ json_unique_check_init(JsonUniqueCheckState *cxt)`
`979`	`979`	`HASH_ELEM \|HASH_CONTEXT \|HASH_FUNCTION \|HASH_COMPARE);`
`980`	`980`	`}`
`981`	`981`
`982`		`-staticvoid`
`983`		`-json_unique_check_free(JsonUniqueCheckState*cxt)`
`984`		`-{`
`985`		`-hash_destroy(*cxt);`
`986`		`-}`
`987`		`-`
`988`	`982`	`staticbool`
`989`	`983`	`json_unique_check_key(JsonUniqueCheckStatecxt,constcharkey,intobject_id)`
`990`	`984`	`{`
`@@ -1009,12 +1003,10 @@ json_unique_builder_init(JsonUniqueBuilderState *cxt)`
`1009`	`1003`	`}`
`1010`	`1004`
`1011`	`1005`	`staticvoid`
`1012`		`-json_unique_builder_free(JsonUniqueBuilderState*cxt)`
	`1006`	`+json_unique_builder_clean(JsonUniqueBuilderState*cxt)`
`1013`	`1007`	`{`
`1014`		`-json_unique_check_free(&cxt->check);`
`1015`		`-`
`1016`	`1008`	`if (cxt->skipped_keys.data)`
`1017`		`-pfree(cxt->skipped_keys.data);`
	`1009`	`+resetStringInfo(&cxt->skipped_keys);`
`1018`	`1010`	`}`
`1019`	`1011`
`1020`	`1012`	`/* On-demand initialization of skipped_keys StringInfo structure */`
`@@ -1224,7 +1216,7 @@ json_object_agg_finalfn(PG_FUNCTION_ARGS)`
`1224`	`1216`	`if (state==NULL)`
`1225`	`1217`	`PG_RETURN_NULL();`
`1226`	`1218`
`1227`		`-json_unique_builder_free(&state->unique_check);`
	`1219`	`+json_unique_builder_clean(&state->unique_check);`
`1228`	`1220`
`1229`	`1221`	`/* Else return state with appropriate object terminator added */`
`1230`	`1222`	`PG_RETURN_TEXT_P(catenate_stringinfo_string(state->str," }"));`
`@@ -1333,7 +1325,7 @@ json_build_object_worker(int nargs, Datum args, bool nulls, Oid *types,`
`1333`	`1325`	`appendStringInfoChar(result,'}');`
`1334`	`1326`
`1335`	`1327`	`if (unique_keys)`
`1336`		`-json_unique_builder_free(&unique_check);`
	`1328`	`+json_unique_builder_clean(&unique_check);`
`1337`	`1329`
`1338`	`1330`	`returnPointerGetDatum(cstring_to_text_with_len(result->data,result->len));`
`1339`	`1331`	`}`

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!

Commit4eb9798

File tree

1 file changed

1 file changed

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

0 commit comments