mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Repair sloppiness about where cached mergeclause pathkeys are allocated.

Browse Source 
Without this fix, CVS tip dumps core when running the regression tests
with geqo_threshold = 2.  I would think that a similar patch might be
needed in 7.3, but cannot duplicate the failure in that branch --- so
for now, leave well enough alone.
This commit is contained in:
Tom Lane 2003-05-02 19:48:53 +00:00
parent f7d836212a
commit 1940434f1e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/optimizer/path/pathkeys.c
View File

@ -11,7 +11,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/pathkeys.c,v 1.47 2003/02/15 20:12:40 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/pathkeys.c,v 1.48 2003/05/02 19:48:53 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -27,6 +27,7 @@
#include "parser/parsetree.h" #include "parser/parsetree.h"
#include "parser/parse_func.h" #include "parser/parse_func.h"
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
#include "utils/memutils.h"
static PathKeyItem *makePathKeyItem(Node *key, Oid sortop); static PathKeyItem *makePathKeyItem(Node *key, Oid sortop);
@ -942,26 +943,35 @@ make_pathkeys_for_sortclauses(List *sortclauses,
* same, but not if the mergeclause appears above an OUTER JOIN.) * same, but not if the mergeclause appears above an OUTER JOIN.)
* This is a worthwhile savings because these routines will be invoked * This is a worthwhile savings because these routines will be invoked
* many times when dealing with a many-relation query. * many times when dealing with a many-relation query.
*
* We have to be careful that the cached values are palloc'd in the same
* context the RestrictInfo node itself is in. This is not currently a
* problem for normal planning, but it is an issue for GEQO planning.
*/ */
void void
cache_mergeclause_pathkeys(Query *root, RestrictInfo *restrictinfo) cache_mergeclause_pathkeys(Query *root, RestrictInfo *restrictinfo)
{ {
Node *key; Node *key;
PathKeyItem *item; PathKeyItem *item;
MemoryContext oldcontext;
Assert(restrictinfo->mergejoinoperator != InvalidOid); Assert(restrictinfo->mergejoinoperator != InvalidOid);
if (restrictinfo->left_pathkey == NIL) if (restrictinfo->left_pathkey == NIL)
{ {
oldcontext = MemoryContextSwitchTo(GetMemoryChunkContext(restrictinfo));
key = get_leftop(restrictinfo->clause); key = get_leftop(restrictinfo->clause);
item = makePathKeyItem(key, restrictinfo->left_sortop); item = makePathKeyItem(key, restrictinfo->left_sortop);
restrictinfo->left_pathkey = make_canonical_pathkey(root, item); restrictinfo->left_pathkey = make_canonical_pathkey(root, item);
MemoryContextSwitchTo(oldcontext);
} }
if (restrictinfo->right_pathkey == NIL) if (restrictinfo->right_pathkey == NIL)
{ {
oldcontext = MemoryContextSwitchTo(GetMemoryChunkContext(restrictinfo));
key = get_rightop(restrictinfo->clause); key = get_rightop(restrictinfo->clause);
item = makePathKeyItem(key, restrictinfo->right_sortop); item = makePathKeyItem(key, restrictinfo->right_sortop);
restrictinfo->right_pathkey = make_canonical_pathkey(root, item); restrictinfo->right_pathkey = make_canonical_pathkey(root, item);
MemoryContextSwitchTo(oldcontext);
} }
} }