Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commiteab6b8b

Browse files
committed
Turn the rangetable used by the executor into a flat list, and avoid storing
useless substructure for its RangeTblEntry nodes. (I chose to keep using thesame struct node type and just zero out the link fields for unneeded info,rather than making a separate ExecRangeTblEntry type --- it seemed toofragile to have two different rangetable representations.)Along the way, put subplans into a list in the toplevel PlannedStmt node,and have SubPlan nodes refer to them by list index instead of direct pointers.Vadim wanted to do that years ago, but I never understood what he was on aboutuntil now. It makes things a *whole* lot more robust, because we can stopworrying about duplicate processing of subplans during expression treetraversals. That's been a constant source of bugs, and it's finally gone.There are some consequent simplifications yet to be made, like not usinga separate EState for subplans in the executor, but I'll tackle that later.
1 parent849000c commiteab6b8b

32 files changed

+844
-1007
lines changed

‎doc/src/sgml/indexam.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/indexam.sgml,v 2.21 2007/01/31 20:56:17 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/indexam.sgml,v 2.22 2007/02/22 22:00:22 tgl Exp $ -->
22

33
<chapter id="indexam">
44
<title>Index Access Method Interface Definition</title>
@@ -903,7 +903,7 @@ amcostestimate (PlannerInfo *root,
903903
* Also, we charge for evaluation of the indexquals at each index row.
904904
* All the costs are assumed to be paid incrementally during the scan.
905905
*/
906-
cost_qual_eval(&amp;index_qual_cost, indexQuals);
906+
cost_qual_eval(&amp;index_qual_cost, indexQuals, root);
907907
*indexStartupCost = index_qual_cost.startup;
908908
*indexTotalCost = seq_page_cost * numIndexPages +
909909
(cpu_index_tuple_cost + index_qual_cost.per_tuple) * numIndexTuples;

‎src/backend/commands/explain.c

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994-5, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.156 2007/02/20 17:32:14 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.157 2007/02/22 22:00:22 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -37,6 +37,7 @@ typedef struct ExplainState
3737
boolprintNodes;/* do nodeToString() too */
3838
boolprintAnalyze;/* print actual times */
3939
/* other states */
40+
PlannedStmt*pstmt;/* top of plan */
4041
List*rtable;/* range table */
4142
}ExplainState;
4243

@@ -260,6 +261,7 @@ ExplainOnePlan(QueryDesc *queryDesc, ExplainStmt *stmt,
260261

261262
es->printNodes=stmt->verbose;
262263
es->printAnalyze=stmt->analyze;
264+
es->pstmt=queryDesc->plannedstmt;
263265
es->rtable=queryDesc->plannedstmt->rtable;
264266

265267
if (es->printNodes)
@@ -858,7 +860,6 @@ explain_outNode(StringInfo str,
858860
/* initPlan-s */
859861
if (plan->initPlan)
860862
{
861-
List*saved_rtable=es->rtable;
862863
ListCell*lst;
863864

864865
for (i=0;i<indent;i++)
@@ -869,16 +870,15 @@ explain_outNode(StringInfo str,
869870
SubPlanState*sps= (SubPlanState*)lfirst(lst);
870871
SubPlan*sp= (SubPlan*)sps->xprstate.expr;
871872

872-
es->rtable=sp->rtable;
873873
for (i=0;i<indent;i++)
874874
appendStringInfo(str," ");
875875
appendStringInfo(str," -> ");
876-
explain_outNode(str,sp->plan,
876+
explain_outNode(str,
877+
exec_subplan_get_plan(es->pstmt,sp),
877878
sps->planstate,
878879
NULL,
879880
indent+4,es);
880881
}
881-
es->rtable=saved_rtable;
882882
}
883883

884884
/* lefttree */
@@ -994,12 +994,6 @@ explain_outNode(StringInfo str,
994994
SubqueryScan*subqueryscan= (SubqueryScan*)plan;
995995
SubqueryScanState*subquerystate= (SubqueryScanState*)planstate;
996996
Plan*subnode=subqueryscan->subplan;
997-
RangeTblEntry*rte=rt_fetch(subqueryscan->scan.scanrelid,
998-
es->rtable);
999-
List*saved_rtable=es->rtable;
1000-
1001-
Assert(rte->rtekind==RTE_SUBQUERY);
1002-
es->rtable=rte->subquery->rtable;
1003997

1004998
for (i=0;i<indent;i++)
1005999
appendStringInfo(str," ");
@@ -1009,14 +1003,11 @@ explain_outNode(StringInfo str,
10091003
subquerystate->subplan,
10101004
NULL,
10111005
indent+3,es);
1012-
1013-
es->rtable=saved_rtable;
10141006
}
10151007

10161008
/* subPlan-s */
10171009
if (planstate->subPlan)
10181010
{
1019-
List*saved_rtable=es->rtable;
10201011
ListCell*lst;
10211012

10221013
for (i=0;i<indent;i++)
@@ -1027,16 +1018,15 @@ explain_outNode(StringInfo str,
10271018
SubPlanState*sps= (SubPlanState*)lfirst(lst);
10281019
SubPlan*sp= (SubPlan*)sps->xprstate.expr;
10291020

1030-
es->rtable=sp->rtable;
10311021
for (i=0;i<indent;i++)
10321022
appendStringInfo(str," ");
10331023
appendStringInfo(str," -> ");
1034-
explain_outNode(str,sp->plan,
1024+
explain_outNode(str,
1025+
exec_subplan_get_plan(es->pstmt,sp),
10351026
sps->planstate,
10361027
NULL,
10371028
indent+4,es);
10381029
}
1039-
es->rtable=saved_rtable;
10401030
}
10411031
}
10421032

‎src/backend/executor/execMain.c

Lines changed: 11 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*
2727
*
2828
* IDENTIFICATION
29-
* $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.287 2007/02/20 17:32:14 tgl Exp $
29+
* $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.288 2007/02/22 22:00:22 tgl Exp $
3030
*
3131
*-------------------------------------------------------------------------
3232
*/
@@ -92,9 +92,9 @@ static void ExecProcessReturning(ProjectionInfo *projectReturning,
9292
DestReceiver*dest);
9393
staticTupleTableSlot*EvalPlanQualNext(EState*estate);
9494
staticvoidEndEvalPlanQual(EState*estate);
95+
staticvoidExecCheckRTPerms(List*rangeTable);
9596
staticvoidExecCheckRTEPerms(RangeTblEntry*rte);
9697
staticvoidExecCheckXactReadOnly(PlannedStmt*plannedstmt);
97-
staticvoidExecCheckRangeTblReadOnly(List*rtable);
9898
staticvoidEvalPlanQualStart(evalPlanQual*epq,EState*estate,
9999
evalPlanQual*priorepq);
100100
staticvoidEvalPlanQualStop(evalPlanQual*epq);
@@ -348,16 +348,14 @@ ExecutorRewind(QueryDesc *queryDesc)
348348
* ExecCheckRTPerms
349349
*Check access permissions for all relations listed in a range table.
350350
*/
351-
void
351+
staticvoid
352352
ExecCheckRTPerms(List*rangeTable)
353353
{
354354
ListCell*l;
355355

356356
foreach(l,rangeTable)
357357
{
358-
RangeTblEntry*rte=lfirst(l);
359-
360-
ExecCheckRTEPerms(rte);
358+
ExecCheckRTEPerms((RangeTblEntry*)lfirst(l));
361359
}
362360
}
363361

@@ -373,12 +371,9 @@ ExecCheckRTEPerms(RangeTblEntry *rte)
373371
Oiduserid;
374372

375373
/*
376-
* Only plain-relation RTEs need to be checked here. Subquery RTEs are
377-
* checked by ExecInitSubqueryScan if the subquery is still a separate
378-
* subquery --- if it's been pulled up into our query level then the RTEs
379-
* are in our rangetable and will be checked here. Function RTEs are
374+
* Only plain-relation RTEs need to be checked here. Function RTEs are
380375
* checked by init_fcache when the function is prepared for execution.
381-
* Join and special RTEs need no checks.
376+
* Join, subquery, and special RTEs need no checks.
382377
*/
383378
if (rte->rtekind!=RTE_RELATION)
384379
return;
@@ -417,6 +412,8 @@ ExecCheckRTEPerms(RangeTblEntry *rte)
417412
staticvoid
418413
ExecCheckXactReadOnly(PlannedStmt*plannedstmt)
419414
{
415+
ListCell*l;
416+
420417
/*
421418
* CREATE TABLE AS or SELECT INTO?
422419
*
@@ -426,32 +423,9 @@ ExecCheckXactReadOnly(PlannedStmt *plannedstmt)
426423
gotofail;
427424

428425
/* Fail if write permissions are requested on any non-temp table */
429-
ExecCheckRangeTblReadOnly(plannedstmt->rtable);
430-
431-
return;
432-
433-
fail:
434-
ereport(ERROR,
435-
(errcode(ERRCODE_READ_ONLY_SQL_TRANSACTION),
436-
errmsg("transaction is read-only")));
437-
}
438-
439-
staticvoid
440-
ExecCheckRangeTblReadOnly(List*rtable)
441-
{
442-
ListCell*l;
443-
444-
/* Fail if write permissions are requested on any non-temp table */
445-
foreach(l,rtable)
426+
foreach(l,plannedstmt->rtable)
446427
{
447-
RangeTblEntry*rte=lfirst(l);
448-
449-
if (rte->rtekind==RTE_SUBQUERY)
450-
{
451-
Assert(!rte->subquery->into);
452-
ExecCheckRangeTblReadOnly(rte->subquery->rtable);
453-
continue;
454-
}
428+
RangeTblEntry*rte= (RangeTblEntry*)lfirst(l);
455429

456430
if (rte->rtekind!=RTE_RELATION)
457431
continue;
@@ -494,9 +468,7 @@ InitPlan(QueryDesc *queryDesc, int eflags)
494468
ListCell*l;
495469

496470
/*
497-
* Do permissions checks. It's sufficient to examine the query's top
498-
* rangetable here --- subplan RTEs will be checked during
499-
* ExecInitSubPlan().
471+
* Do permissions checks
500472
*/
501473
ExecCheckRTPerms(rangeTable);
502474

‎src/backend/executor/execUtils.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/executor/execUtils.c,v 1.145 2007/02/20 17:32:14 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/executor/execUtils.c,v 1.146 2007/02/22 22:00:22 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -847,7 +847,6 @@ ExecRelationIsTargetRelation(EState *estate, Index scanrelid)
847847
Relation
848848
ExecOpenScanRelation(EState*estate,Indexscanrelid)
849849
{
850-
RangeTblEntry*rtentry;
851850
Oidreloid;
852851
LOCKMODElockmode;
853852
ResultRelInfo*resultRelInfos;
@@ -885,8 +884,7 @@ ExecOpenScanRelation(EState *estate, Index scanrelid)
885884
}
886885

887886
/* OK, open the relation and acquire lock as needed */
888-
rtentry=rt_fetch(scanrelid,estate->es_range_table);
889-
reloid=rtentry->relid;
887+
reloid=getrelid(scanrelid,estate->es_range_table);
890888

891889
returnheap_open(reloid,lockmode);
892890
}

‎src/backend/executor/nodeFunctionscan.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/executor/nodeFunctionscan.c,v 1.43 2007/02/19 02:23:11 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/executor/nodeFunctionscan.c,v 1.44 2007/02/22 22:00:23 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -24,7 +24,6 @@
2424

2525
#include"executor/nodeFunctionscan.h"
2626
#include"funcapi.h"
27-
#include"parser/parsetree.h"
2827
#include"utils/builtins.h"
2928

3029

‎src/backend/executor/nodeSubplan.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/executor/nodeSubplan.c,v 1.85 2007/02/06 02:59:11 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/executor/nodeSubplan.c,v 1.86 2007/02/22 22:00:23 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -637,13 +637,9 @@ void
637637
ExecInitSubPlan(SubPlanState*node,EState*estate,inteflags)
638638
{
639639
SubPlan*subplan= (SubPlan*)node->xprstate.expr;
640+
Plan*plan=exec_subplan_get_plan(estate->es_plannedstmt,subplan);
640641
EState*sp_estate;
641642

642-
/*
643-
* Do access checking on the rangetable entries in the subquery.
644-
*/
645-
ExecCheckRTPerms(subplan->rtable);
646-
647643
/*
648644
* initialize my state
649645
*/
@@ -668,18 +664,21 @@ ExecInitSubPlan(SubPlanState *node, EState *estate, int eflags)
668664
* shares our Param ID space and es_query_cxt, however. XXX if rangetable
669665
* access were done differently, the subquery could share our EState,
670666
* which would eliminate some thrashing about in this module...
667+
*
668+
* XXX make that happen!
671669
*/
672670
sp_estate=CreateSubExecutorState(estate);
673671
node->sub_estate=sp_estate;
674672

675-
sp_estate->es_range_table=subplan->rtable;
673+
sp_estate->es_range_table=estate->es_range_table;
676674
sp_estate->es_param_list_info=estate->es_param_list_info;
677675
sp_estate->es_param_exec_vals=estate->es_param_exec_vals;
678676
sp_estate->es_tupleTable=
679-
ExecCreateTupleTable(ExecCountSlotsNode(subplan->plan)+10);
677+
ExecCreateTupleTable(ExecCountSlotsNode(plan)+10);
680678
sp_estate->es_snapshot=estate->es_snapshot;
681679
sp_estate->es_crosscheck_snapshot=estate->es_crosscheck_snapshot;
682680
sp_estate->es_instrument=estate->es_instrument;
681+
sp_estate->es_plannedstmt=estate->es_plannedstmt;
683682

684683
/*
685684
* Start up the subplan (this is a very cut-down form of InitPlan())
@@ -692,7 +691,7 @@ ExecInitSubPlan(SubPlanState *node, EState *estate, int eflags)
692691
if (subplan->parParam==NIL&&subplan->setParam==NIL)
693692
eflags |=EXEC_FLAG_REWIND;
694693

695-
node->planstate=ExecInitNode(subplan->plan,sp_estate,eflags);
694+
node->planstate=ExecInitNode(plan,sp_estate,eflags);
696695

697696
node->needShutdown= true;/* now we need to shutdown the subplan */
698697

‎src/backend/executor/nodeSubqueryscan.c

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*
1414
* IDENTIFICATION
15-
* $PostgreSQL: pgsql/src/backend/executor/nodeSubqueryscan.c,v 1.35 2007/01/05 22:19:28 momjian Exp $
15+
* $PostgreSQL: pgsql/src/backend/executor/nodeSubqueryscan.c,v 1.36 2007/02/22 22:00:23 tgl Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -29,7 +29,6 @@
2929

3030
#include"executor/execdebug.h"
3131
#include"executor/nodeSubqueryscan.h"
32-
#include"parser/parsetree.h"
3332

3433
staticTupleTableSlot*SubqueryNext(SubqueryScanState*node);
3534

@@ -104,17 +103,18 @@ SubqueryScanState *
104103
ExecInitSubqueryScan(SubqueryScan*node,EState*estate,inteflags)
105104
{
106105
SubqueryScanState*subquerystate;
107-
RangeTblEntry*rte;
108106
EState*sp_estate;
109107

110108
/* check for unsupported flags */
111109
Assert(!(eflags&EXEC_FLAG_MARK));
112110

113111
/*
114-
* SubqueryScan should not have any "normal" children.
112+
* SubqueryScan should not have any "normal" children. Also, if planner
113+
* left anything in subrtable, it's fishy.
115114
*/
116115
Assert(outerPlan(node)==NULL);
117116
Assert(innerPlan(node)==NULL);
117+
Assert(node->subrtable==NIL);
118118

119119
/*
120120
* create state structure
@@ -152,32 +152,26 @@ ExecInitSubqueryScan(SubqueryScan *node, EState *estate, int eflags)
152152
* initialize subquery
153153
*
154154
* This should agree with ExecInitSubPlan
155-
*/
156-
rte=rt_fetch(node->scan.scanrelid,estate->es_range_table);
157-
Assert(rte->rtekind==RTE_SUBQUERY);
158-
159-
/*
160-
* Do access checking on the rangetable entries in the subquery.
161-
*/
162-
ExecCheckRTPerms(rte->subquery->rtable);
163-
164-
/*
155+
*
165156
* The subquery needs its own EState because it has its own rangetable. It
166157
* shares our Param ID space and es_query_cxt, however. XXX if rangetable
167158
* access were done differently, the subquery could share our EState,
168159
* which would eliminate some thrashing about in this module...
160+
*
161+
* XXX make that happen!
169162
*/
170163
sp_estate=CreateSubExecutorState(estate);
171164
subquerystate->sss_SubEState=sp_estate;
172165

173-
sp_estate->es_range_table=rte->subquery->rtable;
166+
sp_estate->es_range_table=estate->es_range_table;
174167
sp_estate->es_param_list_info=estate->es_param_list_info;
175168
sp_estate->es_param_exec_vals=estate->es_param_exec_vals;
176169
sp_estate->es_tupleTable=
177170
ExecCreateTupleTable(ExecCountSlotsNode(node->subplan)+10);
178171
sp_estate->es_snapshot=estate->es_snapshot;
179172
sp_estate->es_crosscheck_snapshot=estate->es_crosscheck_snapshot;
180173
sp_estate->es_instrument=estate->es_instrument;
174+
sp_estate->es_plannedstmt=estate->es_plannedstmt;
181175

182176
/*
183177
* Start up the subplan (this is a very cut-down form of InitPlan())

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp