Skip to content

Commit 62b0581

Browse files
author
Marcus Pousette
committed
Use MemoryContextReset; drop legacy MemoryContextResetAndDeleteChildren macro
1 parent ed3ed3d commit 62b0581

File tree

4 files changed

+6
-12
lines changed

4 files changed

+6
-12
lines changed

pglite-REL_17_5_WASM

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/Users/admin/git/pglite-2/postgres-pglite/pglite-wasm

pglite-wasm/interactive_one.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ if (cma_rsize<0)
416416
}
417417

418418
MemoryContextSwitchTo(MessageContext);
419-
MemoryContextResetAndDeleteChildren(MessageContext);
419+
MemoryContextReset(MessageContext);
420420

421421
initStringInfo(&input_message);
422422

pglite-wasm/pg_main.c

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,10 @@
2929
// globals
3030

3131
/*
32-
* Ensure MessageContext and its children are actually cleared between
33-
* queries. Leaving this as a no-op causes unbounded growth in
34-
* MessageContext when large query strings or parameters are processed,
35-
* eventually exhausting memory.
32+
* MessageContext cleanup between queries relies on upstream semantics:
33+
* MemoryContextReset() deletes child contexts since v9.5.
34+
* Avoid redefining legacy MemoryContextResetAndDeleteChildren.
3635
*/
37-
#undef MemoryContextResetAndDeleteChildren
38-
#define MemoryContextResetAndDeleteChildren(ctx) \
39-
do { \
40-
MemoryContextDeleteChildren((ctx)); \
41-
MemoryContextReset((ctx)); \
42-
} while (0)
4336
// #define SpinLockInit(...)
4437

4538

pglite-wasm/pgl_mains.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ interactive_file() {
4545
* query input buffer in the cleared MessageContext.
4646
*/
4747
MemoryContextSwitchTo(MessageContext);
48-
MemoryContextResetAndDeleteChildren(MessageContext);
48+
MemoryContextReset(MessageContext);
4949

5050
initStringInfo(&input_message);
5151
inBuf = &input_message;

0 commit comments

Comments
 (0)