diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/optimizer/util/pathnode.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c index 02bbbc0647c..bc0841bf0b8 100644 --- a/src/backend/optimizer/util/pathnode.c +++ b/src/backend/optimizer/util/pathnode.c @@ -1462,10 +1462,16 @@ create_unique_path(PlannerInfo *root, RelOptInfo *rel, Path *subpath, return NULL; /* - * We must ensure path struct and subsidiary data are allocated in main - * planning context; otherwise GEQO memory management causes trouble. + * When called during GEQO join planning, we are in a short-lived memory + * context. We must make sure that the path and any subsidiary data + * structures created for a baserel survive the GEQO cycle, else the + * baserel is trashed for future GEQO cycles. On the other hand, when we + * are creating those for a joinrel during GEQO, we don't want them to + * clutter the main planning context. Upshot is that the best solution is + * to explicitly allocate memory in the same context the given RelOptInfo + * is in. */ - oldcontext = MemoryContextSwitchTo(root->planner_cxt); + oldcontext = MemoryContextSwitchTo(GetMemoryChunkContext(rel)); pathnode = makeNode(UniquePath); |