mirror of
https://github.com/postgres/postgres.git
synced 2025-07-28 23:42:10 +03:00
Remove planner's private fields from Query struct, and put them into
a new PlannerInfo struct, which is passed around instead of the bare Query in all the planning code. This commit is essentially just a code-beautification exercise, but it does open the door to making larger changes to the planner data structures without having to muck with the widely-known Query struct.
This commit is contained in:
Tom Lane
@ -15,7 +15,7 @@
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.304 2005/04/28 21:47:12 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.305 2005/06/05 22:32:54 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -1615,18 +1615,6 @@ _copyQuery(Query *from)
|
||||
COPY_NODE_FIELD(limitCount);
|
||||
COPY_NODE_FIELD(setOperations);
|
||||
COPY_NODE_FIELD(resultRelations);
|
||||
COPY_NODE_FIELD(in_info_list);
|
||||
COPY_SCALAR_FIELD(hasJoinRTEs);
|
||||
COPY_SCALAR_FIELD(hasHavingQual);
|
||||
|
||||
/*
|
||||
* We do not copy the other planner internal fields: base_rel_list,
|
||||
* other_rel_list, join_rel_list, equi_key_list, query_pathkeys. That
|
||||
* would get us into copying RelOptInfo/Path trees, which we don't
|
||||
* want to do. It is necessary to copy in_info_list, hasJoinRTEs,
|
||||
* and hasHavingQual for the benefit of inheritance_planner(), which
|
||||
* may try to copy a Query in which these are already set.
|
||||
*/
|
||||
|
||||
return newnode;
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.241 2005/04/28 21:47:12 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.242 2005/06/05 22:32:54 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -653,10 +653,6 @@ _equalQuery(Query *a, Query *b)
|
||||
COMPARE_NODE_FIELD(setOperations);
|
||||
COMPARE_NODE_FIELD(resultRelations);
|
||||
|
||||
/*
|
||||
* We do not check the planner-internal fields. They might not be set
|
||||
* yet, and in any case they should be derivable from the other fields.
|
||||
*/
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.252 2005/05/09 15:09:19 ishii Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.253 2005/06/05 22:32:54 tgl Exp $
|
||||
*
|
||||
* NOTES
|
||||
* Every node type that can appear in stored rules' parsetrees *must*
|
||||
@ -1145,6 +1145,69 @@ _outHashPath(StringInfo str, HashPath *node)
|
||||
WRITE_NODE_FIELD(path_hashclauses);
|
||||
}
|
||||
|
||||
static void
|
||||
_outPlannerInfo(StringInfo str, PlannerInfo *node)
|
||||
{
|
||||
WRITE_NODE_TYPE("PLANNERINFO");
|
||||
|
||||
WRITE_NODE_FIELD(parse);
|
||||
WRITE_NODE_FIELD(base_rel_list);
|
||||
WRITE_NODE_FIELD(other_rel_list);
|
||||
WRITE_NODE_FIELD(join_rel_list);
|
||||
WRITE_NODE_FIELD(equi_key_list);
|
||||
WRITE_NODE_FIELD(in_info_list);
|
||||
WRITE_NODE_FIELD(query_pathkeys);
|
||||
WRITE_BOOL_FIELD(hasJoinRTEs);
|
||||
WRITE_BOOL_FIELD(hasHavingQual);
|
||||
}
|
||||
|
||||
static void
|
||||
_outRelOptInfo(StringInfo str, RelOptInfo *node)
|
||||
{
|
||||
WRITE_NODE_TYPE("RELOPTINFO");
|
||||
|
||||
/* NB: this isn't a complete set of fields */
|
||||
WRITE_ENUM_FIELD(reloptkind, RelOptKind);
|
||||
WRITE_BITMAPSET_FIELD(relids);
|
||||
WRITE_FLOAT_FIELD(rows, "%.0f");
|
||||
WRITE_INT_FIELD(width);
|
||||
WRITE_NODE_FIELD(reltargetlist);
|
||||
WRITE_NODE_FIELD(pathlist);
|
||||
WRITE_NODE_FIELD(cheapest_startup_path);
|
||||
WRITE_NODE_FIELD(cheapest_total_path);
|
||||
WRITE_NODE_FIELD(cheapest_unique_path);
|
||||
WRITE_UINT_FIELD(relid);
|
||||
WRITE_ENUM_FIELD(rtekind, RTEKind);
|
||||
WRITE_UINT_FIELD(min_attr);
|
||||
WRITE_UINT_FIELD(max_attr);
|
||||
WRITE_NODE_FIELD(indexlist);
|
||||
WRITE_UINT_FIELD(pages);
|
||||
WRITE_FLOAT_FIELD(tuples, "%.0f");
|
||||
WRITE_NODE_FIELD(subplan);
|
||||
WRITE_NODE_FIELD(baserestrictinfo);
|
||||
WRITE_BITMAPSET_FIELD(outerjoinset);
|
||||
WRITE_NODE_FIELD(joininfo);
|
||||
WRITE_BITMAPSET_FIELD(index_outer_relids);
|
||||
WRITE_NODE_FIELD(index_inner_paths);
|
||||
}
|
||||
|
||||
static void
|
||||
_outIndexOptInfo(StringInfo str, IndexOptInfo *node)
|
||||
{
|
||||
WRITE_NODE_TYPE("INDEXOPTINFO");
|
||||
|
||||
/* NB: this isn't a complete set of fields */
|
||||
WRITE_OID_FIELD(indexoid);
|
||||
/* Do NOT print rel field, else infinite recursion */
|
||||
WRITE_UINT_FIELD(pages);
|
||||
WRITE_FLOAT_FIELD(tuples, "%.0f");
|
||||
WRITE_INT_FIELD(ncolumns);
|
||||
WRITE_NODE_FIELD(indexprs);
|
||||
WRITE_NODE_FIELD(indpred);
|
||||
WRITE_BOOL_FIELD(predOK);
|
||||
WRITE_BOOL_FIELD(unique);
|
||||
}
|
||||
|
||||
static void
|
||||
_outPathKeyItem(StringInfo str, PathKeyItem *node)
|
||||
{
|
||||
@ -1185,6 +1248,15 @@ _outJoinInfo(StringInfo str, JoinInfo *node)
|
||||
WRITE_NODE_FIELD(jinfo_restrictinfo);
|
||||
}
|
||||
|
||||
static void
|
||||
_outInnerIndexscanInfo(StringInfo str, InnerIndexscanInfo *node)
|
||||
{
|
||||
WRITE_NODE_TYPE("INNERINDEXSCANINFO");
|
||||
WRITE_BITMAPSET_FIELD(other_relids);
|
||||
WRITE_BOOL_FIELD(isouterjoin);
|
||||
WRITE_NODE_FIELD(best_innerpath);
|
||||
}
|
||||
|
||||
static void
|
||||
_outInClauseInfo(StringInfo str, InClauseInfo *node)
|
||||
{
|
||||
@ -1395,8 +1467,6 @@ _outQuery(StringInfo str, Query *node)
|
||||
WRITE_NODE_FIELD(limitCount);
|
||||
WRITE_NODE_FIELD(setOperations);
|
||||
WRITE_NODE_FIELD(resultRelations);
|
||||
|
||||
/* planner-internal fields are not written out */
|
||||
}
|
||||
|
||||
static void
|
||||
@ -1905,6 +1975,15 @@ _outNode(StringInfo str, void *obj)
|
||||
case T_HashPath:
|
||||
_outHashPath(str, obj);
|
||||
break;
|
||||
case T_PlannerInfo:
|
||||
_outPlannerInfo(str, obj);
|
||||
break;
|
||||
case T_RelOptInfo:
|
||||
_outRelOptInfo(str, obj);
|
||||
break;
|
||||
case T_IndexOptInfo:
|
||||
_outIndexOptInfo(str, obj);
|
||||
break;
|
||||
case T_PathKeyItem:
|
||||
_outPathKeyItem(str, obj);
|
||||
break;
|
||||
@ -1914,6 +1993,9 @@ _outNode(StringInfo str, void *obj)
|
||||
case T_JoinInfo:
|
||||
_outJoinInfo(str, obj);
|
||||
break;
|
||||
case T_InnerIndexscanInfo:
|
||||
_outInnerIndexscanInfo(str, obj);
|
||||
break;
|
||||
case T_InClauseInfo:
|
||||
_outInClauseInfo(str, obj);
|
||||
break;
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/nodes/readfuncs.c,v 1.177 2005/04/28 21:47:13 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/nodes/readfuncs.c,v 1.178 2005/06/05 22:32:54 tgl Exp $
|
||||
*
|
||||
* NOTES
|
||||
* Path and Plan nodes do not have any readfuncs support, because we
|
||||
@ -156,8 +156,6 @@ _readQuery(void)
|
||||
READ_NODE_FIELD(setOperations);
|
||||
READ_NODE_FIELD(resultRelations);
|
||||
|
||||
/* planner-internal fields are left zero */
|
||||
|
||||
READ_DONE();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user