Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit b8c3267

Browse files
tglsfdctglsfdc
committed
Put function expressions and values lists into FunctionScan and ValuesScan
plan nodes, so that the executor does not need to get these items from the range table at runtime. This will avoid needing to include these fields in the compact range table I'm expecting to make the executor use.
1 parent f1f2b27 commit b8c3267

File tree

10 files changed

+102
-90
lines changed

10 files changed

+102
-90
lines changed

‎src/backend/commands/explain.c

Lines changed: 5 additions & 4 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.154 2007/02/14 01:58:56 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.155 2007/02/19 02:23:11 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -640,6 +640,7 @@ explain_outNode(StringInfo str,
640640
{
641641
RangeTblEntry *rte = rt_fetch(((Scan *) plan)->scanrelid,
642642
es->rtable);
643+
Node *funcexpr;
643644
char *proname;
644645

645646
/* Assert it's on a RangeFunction */
@@ -651,10 +652,10 @@ explain_outNode(StringInfo str,
651652
* happen if the optimizer simplified away the function call,
652653
* for example).
653654
*/
654-
if (rte->funcexpr && IsA(rte->funcexpr, FuncExpr))
655+
funcexpr = ((FunctionScan *) plan)->funcexpr;
656+
if (funcexpr && IsA(funcexpr, FuncExpr))
655657
{
656-
FuncExpr *funcexpr = (FuncExpr *) rte->funcexpr;
657-
Oid funcid = funcexpr->funcid;
658+
Oid funcid = ((FuncExpr *) funcexpr)->funcid;
658659

659660
/* We only show the func name, not schema name */
660661
proname = get_func_name(funcid);

‎src/backend/executor/execAmi.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* $PostgreSQL: pgsql/src/backend/executor/execAmi.c,v 1.91 2007/02/15 03:07:13 tgl Exp $
9+
* $PostgreSQL: pgsql/src/backend/executor/execAmi.c,v 1.92 2007/02/19 02:23:11 tgl Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -444,13 +444,16 @@ ExecMayReturnRawTuples(PlanState *node)
444444
case T_IndexScanState:
445445
case T_BitmapHeapScanState:
446446
case T_TidScanState:
447-
case T_SubqueryScanState:
448-
case T_FunctionScanState:
449-
case T_ValuesScanState:
450447
if (node->ps_ProjInfo == NULL)
451448
return true;
452449
break;
453450

451+
case T_SubqueryScanState:
452+
/* If not projecting, look at input plan */
453+
if (node->ps_ProjInfo == NULL)
454+
return ExecMayReturnRawTuples(((SubqueryScanState *) node)->subplan);
455+
break;
456+
454457
/* Non-projecting nodes */
455458
case T_HashState:
456459
case T_MaterialState:

‎src/backend/executor/nodeFunctionscan.c

Lines changed: 7 additions & 14 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.42 2007/01/05 22:19:28 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/executor/nodeFunctionscan.c,v 1.43 2007/02/19 02:23:11 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -118,7 +118,6 @@ FunctionScanState *
118118
ExecInitFunctionScan(FunctionScan *node, EState *estate, int eflags)
119119
{
120120
FunctionScanState *scanstate;
121-
RangeTblEntry *rte;
122121
Oid funcrettype;
123122
TypeFuncClass functypclass;
124123
TupleDesc tupdesc = NULL;
@@ -161,17 +160,11 @@ ExecInitFunctionScan(FunctionScan *node, EState *estate, int eflags)
161160
ExecInitExpr((Expr *) node->scan.plan.qual,
162161
(PlanState *) scanstate);
163162

164-
/*
165-
* get info about function
166-
*/
167-
rte = rt_fetch(node->scan.scanrelid, estate->es_range_table);
168-
Assert(rte->rtekind == RTE_FUNCTION);
169-
170163
/*
171164
* Now determine if the function returns a simple or composite type, and
172165
* build an appropriate tupdesc.
173166
*/
174-
functypclass = get_expr_result_type(rte->funcexpr,
167+
functypclass = get_expr_result_type(node->funcexpr,
175168
&funcrettype,
176169
&tupdesc);
177170

@@ -185,7 +178,7 @@ ExecInitFunctionScan(FunctionScan *node, EState *estate, int eflags)
185178
else if (functypclass == TYPEFUNC_SCALAR)
186179
{
187180
/* Base data type, i.e. scalar */
188-
char *attname = strVal(linitial(rte->eref->colnames));
181+
char *attname = strVal(linitial(node->funccolnames));
189182

190183
tupdesc = CreateTemplateTupleDesc(1, false);
191184
TupleDescInitEntry(tupdesc,
@@ -197,9 +190,9 @@ ExecInitFunctionScan(FunctionScan *node, EState *estate, int eflags)
197190
}
198191
else if (functypclass == TYPEFUNC_RECORD)
199192
{
200-
tupdesc = BuildDescFromLists(rte->eref->colnames,
201-
rte->funccoltypes,
202-
rte->funccoltypmods);
193+
tupdesc = BuildDescFromLists(node->funccolnames,
194+
node->funccoltypes,
195+
node->funccoltypmods);
203196
}
204197
else
205198
{
@@ -221,7 +214,7 @@ ExecInitFunctionScan(FunctionScan *node, EState *estate, int eflags)
221214
* Other node-specific setup
222215
*/
223216
scanstate->tuplestorestate = NULL;
224-
scanstate->funcexpr = ExecInitExpr((Expr *) rte->funcexpr,
217+
scanstate->funcexpr = ExecInitExpr((Expr *) node->funcexpr,
225218
(PlanState *) scanstate);
226219

227220
scanstate->ss.ps.ps_TupFromTlist = false;

‎src/backend/executor/nodeValuesscan.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $PostgreSQL: pgsql/src/backend/executor/nodeValuesscan.c,v 1.5 2007/01/05 22:19:28 momjian Exp $
12+
* $PostgreSQL: pgsql/src/backend/executor/nodeValuesscan.c,v 1.6 2007/02/19 02:23:11 tgl Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -182,7 +182,6 @@ ValuesScanState *
182182
ExecInitValuesScan(ValuesScan *node, EState *estate, int eflags)
183183
{
184184
ValuesScanState *scanstate;
185-
RangeTblEntry *rte;
186185
TupleDesc tupdesc;
187186
ListCell *vtl;
188187
int i;
@@ -236,9 +235,7 @@ ExecInitValuesScan(ValuesScan *node, EState *estate, int eflags)
236235
/*
237236
* get info about values list
238237
*/
239-
rte = rt_fetch(node->scan.scanrelid, estate->es_range_table);
240-
Assert(rte->rtekind == RTE_VALUES);
241-
tupdesc = ExecTypeFromExprList((List *) linitial(rte->values_lists));
238+
tupdesc = ExecTypeFromExprList((List *) linitial(node->values_lists));
242239

243240
ExecAssignScanType(&scanstate->ss, tupdesc);
244241

@@ -247,13 +244,13 @@ ExecInitValuesScan(ValuesScan *node, EState *estate, int eflags)
247244
*/
248245
scanstate->marked_idx = -1;
249246
scanstate->curr_idx = -1;
250-
scanstate->array_len = list_length(rte->values_lists);
247+
scanstate->array_len = list_length(node->values_lists);
251248

252249
/* convert list of sublists into array of sublists for easy addressing */
253250
scanstate->exprlists = (List **)
254251
palloc(scanstate->array_len * sizeof(List *));
255252
i = 0;
256-
foreach(vtl, rte->values_lists)
253+
foreach(vtl, node->values_lists)
257254
{
258255
scanstate->exprlists[i++] = (List *) lfirst(vtl);
259256
}

‎src/backend/nodes/copyfuncs.c

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Portions Copyright (c) 1994, Regents of the University of California
1616
*
1717
* IDENTIFICATION
18-
* $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.365 2007/02/03 14:06:54 petere Exp $
18+
* $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.366 2007/02/19 02:23:11 tgl Exp $
1919
*
2020
*-------------------------------------------------------------------------
2121
*/
@@ -363,6 +363,14 @@ _copyFunctionScan(FunctionScan *from)
363363
*/
364364
CopyScanFields((Scan *) from, (Scan *) newnode);
365365

366+
/*
367+
* copy remainder of node
368+
*/
369+
COPY_NODE_FIELD(funcexpr);
370+
COPY_NODE_FIELD(funccolnames);
371+
COPY_NODE_FIELD(funccoltypes);
372+
COPY_NODE_FIELD(funccoltypmods);
373+
366374
return newnode;
367375
}
368376

@@ -379,6 +387,11 @@ _copyValuesScan(ValuesScan *from)
379387
*/
380388
CopyScanFields((Scan *) from, (Scan *) newnode);
381389

390+
/*
391+
* copy remainder of node
392+
*/
393+
COPY_NODE_FIELD(values_lists);
394+
382395
return newnode;
383396
}
384397

‎src/backend/nodes/outfuncs.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.297 2007/02/12 17:19:30 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.298 2007/02/19 02:23:12 tgl Exp $
1212
*
1313
* NOTES
1414
* Every node type that can appear in stored rules' parsetrees *must*
@@ -408,6 +408,11 @@ _outFunctionScan(StringInfo str, FunctionScan *node)
408408
WRITE_NODE_TYPE("FUNCTIONSCAN");
409409

410410
_outScanInfo(str, (Scan *) node);
411+
412+
WRITE_NODE_FIELD(funcexpr);
413+
WRITE_NODE_FIELD(funccolnames);
414+
WRITE_NODE_FIELD(funccoltypes);
415+
WRITE_NODE_FIELD(funccoltypmods);
411416
}
412417

413418
static void
@@ -416,6 +421,8 @@ _outValuesScan(StringInfo str, ValuesScan *node)
416421
WRITE_NODE_TYPE("VALUESSCAN");
417422

418423
_outScanInfo(str, (Scan *) node);
424+
425+
WRITE_NODE_FIELD(values_lists);
419426
}
420427

421428
static void

‎src/backend/optimizer/plan/createplan.c

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/optimizer/plan/createplan.c,v 1.224 2007/01/30 01:33:36 tgl Exp $
13+
* $PostgreSQL: pgsql/src/backend/optimizer/plan/createplan.c,v 1.225 2007/02/19 02:23:12 tgl Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -96,9 +96,10 @@ static BitmapHeapScan *make_bitmap_heapscan(List *qptlist,
9696
static TidScan *make_tidscan(List *qptlist, List *qpqual, Index scanrelid,
9797
List *tidquals);
9898
static FunctionScan *make_functionscan(List *qptlist, List *qpqual,
99-
Index scanrelid);
99+
Index scanrelid, Node *funcexpr, List *funccolnames,
100+
List *funccoltypes, List *funccoltypmods);
100101
static ValuesScan *make_valuesscan(List *qptlist, List *qpqual,
101-
Index scanrelid);
102+
Index scanrelid, List *values_lists);
102103
static BitmapAnd *make_bitmap_and(List *bitmapplans);
103104
static BitmapOr *make_bitmap_or(List *bitmapplans);
104105
static NestLoop *make_nestloop(List *tlist,
@@ -1350,18 +1351,24 @@ create_functionscan_plan(PlannerInfo *root, Path *best_path,
13501351
{
13511352
FunctionScan *scan_plan;
13521353
Index scan_relid = best_path->parent->relid;
1354+
RangeTblEntry *rte;
13531355

13541356
/* it should be a function base rel... */
13551357
Assert(scan_relid > 0);
1356-
Assert(best_path->parent->rtekind == RTE_FUNCTION);
1358+
rte = rt_fetch(scan_relid, root->parse->rtable);
1359+
Assert(rte->rtekind == RTE_FUNCTION);
13571360

13581361
/* Sort clauses into best execution order */
13591362
scan_clauses = order_qual_clauses(root, scan_clauses);
13601363

13611364
/* Reduce RestrictInfo list to bare expressions; ignore pseudoconstants */
13621365
scan_clauses = extract_actual_clauses(scan_clauses, false);
13631366

1364-
scan_plan = make_functionscan(tlist, scan_clauses, scan_relid);
1367+
scan_plan = make_functionscan(tlist, scan_clauses, scan_relid,
1368+
rte->funcexpr,
1369+
rte->eref->colnames,
1370+
rte->funccoltypes,
1371+
rte->funccoltypmods);
13651372

13661373
copy_path_costsize(&scan_plan->scan.plan, best_path);
13671374

@@ -1379,18 +1386,21 @@ create_valuesscan_plan(PlannerInfo *root, Path *best_path,
13791386
{
13801387
ValuesScan *scan_plan;
13811388
Index scan_relid = best_path->parent->relid;
1389+
RangeTblEntry *rte;
13821390

13831391
/* it should be a values base rel... */
13841392
Assert(scan_relid > 0);
1385-
Assert(best_path->parent->rtekind == RTE_VALUES);
1393+
rte = rt_fetch(scan_relid, root->parse->rtable);
1394+
Assert(rte->rtekind == RTE_VALUES);
13861395

13871396
/* Sort clauses into best execution order */
13881397
scan_clauses = order_qual_clauses(root, scan_clauses);
13891398

13901399
/* Reduce RestrictInfo list to bare expressions; ignore pseudoconstants */
13911400
scan_clauses = extract_actual_clauses(scan_clauses, false);
13921401

1393-
scan_plan = make_valuesscan(tlist, scan_clauses, scan_relid);
1402+
scan_plan = make_valuesscan(tlist, scan_clauses, scan_relid,
1403+
rte->values_lists);
13941404

13951405
copy_path_costsize(&scan_plan->scan.plan, best_path);
13961406

@@ -2342,7 +2352,11 @@ make_subqueryscan(List *qptlist,
23422352
static FunctionScan *
23432353
make_functionscan(List *qptlist,
23442354
List *qpqual,
2345-
Index scanrelid)
2355+
Index scanrelid,
2356+
Node *funcexpr,
2357+
List *funccolnames,
2358+
List *funccoltypes,
2359+
List *funccoltypmods)
23462360
{
23472361
FunctionScan *node = makeNode(FunctionScan);
23482362
Plan *plan = &node->scan.plan;
@@ -2353,14 +2367,19 @@ make_functionscan(List *qptlist,
23532367
plan->lefttree = NULL;
23542368
plan->righttree = NULL;
23552369
node->scan.scanrelid = scanrelid;
2370+
node->funcexpr = funcexpr;
2371+
node->funccolnames = funccolnames;
2372+
node->funccoltypes = funccoltypes;
2373+
node->funccoltypmods = funccoltypmods;
23562374

23572375
return node;
23582376
}
23592377

23602378
static ValuesScan *
23612379
make_valuesscan(List *qptlist,
23622380
List *qpqual,
2363-
Index scanrelid)
2381+
Index scanrelid,
2382+
List *values_lists)
23642383
{
23652384
ValuesScan *node = makeNode(ValuesScan);
23662385
Plan *plan = &node->scan.plan;
@@ -2371,6 +2390,7 @@ make_valuesscan(List *qptlist,
23712390
plan->lefttree = NULL;
23722391
plan->righttree = NULL;
23732392
node->scan.scanrelid = scanrelid;
2393+
node->values_lists = values_lists;
23742394

23752395
return node;
23762396
}

0 commit comments

Comments
 (0)