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

Commitb8d7f05

Browse files
committed
Faster expression evaluation and targetlist projection.
This replaces the old, recursive tree-walk based evaluation, withnon-recursive, opcode dispatch based, expression evaluation.Projection is now implemented as part of expression evaluation.This both leads to significant performance improvements, and makesfuture just-in-time compilation of expressions easier.The speed gains primarily come from:- non-recursive implementation reduces stack usage / overhead- simple sub-expressions are implemented with a single jump, without function calls- sharing some state between different sub-expressions- reduced amount of indirect/hard to predict memory accesses by laying out operation metadata sequentially; including the avoidance of nearly all of the previously used linked lists- more code has been moved to expression initialization, avoiding constant re-checks at evaluation timeFuture just-in-time compilation (JIT) has become easier, asdemonstrated by released patches intended to be merged in a laterrelease, for primarily two reasons: Firstly, due to a stricter splitbetween expression initialization and evaluation, less code has to behandled by the JIT. Secondly, due to the non-recursive nature of thegenerated "instructions", less performance-critical code-paths caneasily be shared between interpreted and compiled evaluation.The new framework allows for significant future optimizations. E.g.:- basic infrastructure for to later reduce the per executor-startup overhead of expression evaluation, by caching state in prepared statements. That'd be helpful in OLTPish scenarios where initialization overhead is measurable.- optimizing the generated "code". A number of proposals for potential work has already been made.- optimizing the interpreter. Similarly a number of proposals have been made here too.The move of logic into the expression initialization step leads to somebackward-incompatible changes:- Function permission checks are now done during expression initialization, whereas previously they were done during execution. In edge cases this can lead to errors being raised that previously wouldn't have been, e.g. a NULL array being coerced to a different array type previously didn't perform checks.- The set of domain constraints to be checked, is now evaluated once during expression initialization, previously it was re-built every time a domain check was evaluated. For normal queries this doesn't change much, but e.g. for plpgsql functions, which caches ExprStates, the old set could stick around longer. The behavior around might still change.Author: Andres Freund, with significant changes by Tom Lane,changes by Heikki LinnakangasReviewed-By: Tom Lane, Heikki LinnakangasDiscussion:https://postgr.es/m/20161206034955.bh33paeralxbtluv@alap3.anarazel.de
1 parent7d3957e commitb8d7f05

File tree

71 files changed

+8871
-6534
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+8871
-6534
lines changed

‎contrib/postgres_fdw/postgres_fdw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3421,7 +3421,7 @@ prepare_query_params(PlanState *node,
34213421
* benefit, and it'd require postgres_fdw to know more than is desirable
34223422
* about Param evaluation.)
34233423
*/
3424-
*param_exprs=(List*)ExecInitExpr((Expr*)fdw_exprs,node);
3424+
*param_exprs=ExecInitExprList(fdw_exprs,node);
34253425

34263426
/* Allocate buffer for text form of query parameters. */
34273427
*param_values= (constchar**)palloc0(numParams*sizeof(char*));

‎src/backend/bootstrap/bootstrap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1084,7 +1084,7 @@ index_register(Oid heap,
10841084
/* predicate will likely be null, but may as well copy it */
10851085
newind->il_info->ii_Predicate= (List*)
10861086
copyObject(indexInfo->ii_Predicate);
1087-
newind->il_info->ii_PredicateState=NIL;
1087+
newind->il_info->ii_PredicateState=NULL;
10881088
/* no exclusion constraints at bootstrap time, so no need to copy */
10891089
Assert(indexInfo->ii_ExclusionOps==NULL);
10901090
Assert(indexInfo->ii_ExclusionProcs==NULL);

‎src/backend/catalog/index.c

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1658,7 +1658,7 @@ BuildIndexInfo(Relation index)
16581658

16591659
/* fetch index predicate if any */
16601660
ii->ii_Predicate=RelationGetIndexPredicate(index);
1661-
ii->ii_PredicateState=NIL;
1661+
ii->ii_PredicateState=NULL;
16621662

16631663
/* fetch exclusion constraint info if any */
16641664
if (indexStruct->indisexclusion)
@@ -1774,9 +1774,8 @@ FormIndexDatum(IndexInfo *indexInfo,
17741774
indexInfo->ii_ExpressionsState==NIL)
17751775
{
17761776
/* First time through, set up expression evaluation state */
1777-
indexInfo->ii_ExpressionsState= (List*)
1778-
ExecPrepareExpr((Expr*)indexInfo->ii_Expressions,
1779-
estate);
1777+
indexInfo->ii_ExpressionsState=
1778+
ExecPrepareExprList(indexInfo->ii_Expressions,estate);
17801779
/* Check caller has set up context correctly */
17811780
Assert(GetPerTupleExprContext(estate)->ecxt_scantuple==slot);
17821781
}
@@ -2208,7 +2207,7 @@ IndexBuildHeapRangeScan(Relation heapRelation,
22082207
Datumvalues[INDEX_MAX_KEYS];
22092208
boolisnull[INDEX_MAX_KEYS];
22102209
doublereltuples;
2211-
List*predicate;
2210+
ExprState*predicate;
22122211
TupleTableSlot*slot;
22132212
EState*estate;
22142213
ExprContext*econtext;
@@ -2247,9 +2246,7 @@ IndexBuildHeapRangeScan(Relation heapRelation,
22472246
econtext->ecxt_scantuple=slot;
22482247

22492248
/* Set up execution state for predicate, if any. */
2250-
predicate= (List*)
2251-
ExecPrepareExpr((Expr*)indexInfo->ii_Predicate,
2252-
estate);
2249+
predicate=ExecPrepareQual(indexInfo->ii_Predicate,estate);
22532250

22542251
/*
22552252
* Prepare for scan of the base relation. In a normal index build, we use
@@ -2552,9 +2549,9 @@ IndexBuildHeapRangeScan(Relation heapRelation,
25522549
* In a partial index, discard tuples that don't satisfy the
25532550
* predicate.
25542551
*/
2555-
if (predicate!=NIL)
2552+
if (predicate!=NULL)
25562553
{
2557-
if (!ExecQual(predicate,econtext, false))
2554+
if (!ExecQual(predicate,econtext))
25582555
continue;
25592556
}
25602557

@@ -2619,7 +2616,7 @@ IndexBuildHeapRangeScan(Relation heapRelation,
26192616

26202617
/* These may have been pointing to the now-gone estate */
26212618
indexInfo->ii_ExpressionsState=NIL;
2622-
indexInfo->ii_PredicateState=NIL;
2619+
indexInfo->ii_PredicateState=NULL;
26232620

26242621
returnreltuples;
26252622
}
@@ -2646,7 +2643,7 @@ IndexCheckExclusion(Relation heapRelation,
26462643
HeapTupleheapTuple;
26472644
Datumvalues[INDEX_MAX_KEYS];
26482645
boolisnull[INDEX_MAX_KEYS];
2649-
List*predicate;
2646+
ExprState*predicate;
26502647
TupleTableSlot*slot;
26512648
EState*estate;
26522649
ExprContext*econtext;
@@ -2672,9 +2669,7 @@ IndexCheckExclusion(Relation heapRelation,
26722669
econtext->ecxt_scantuple=slot;
26732670

26742671
/* Set up execution state for predicate, if any. */
2675-
predicate= (List*)
2676-
ExecPrepareExpr((Expr*)indexInfo->ii_Predicate,
2677-
estate);
2672+
predicate=ExecPrepareQual(indexInfo->ii_Predicate,estate);
26782673

26792674
/*
26802675
* Scan all live tuples in the base relation.
@@ -2699,9 +2694,9 @@ IndexCheckExclusion(Relation heapRelation,
26992694
/*
27002695
* In a partial index, ignore tuples that don't satisfy the predicate.
27012696
*/
2702-
if (predicate!=NIL)
2697+
if (predicate!=NULL)
27032698
{
2704-
if (!ExecQual(predicate,econtext, false))
2699+
if (!ExecQual(predicate,econtext))
27052700
continue;
27062701
}
27072702

@@ -2732,7 +2727,7 @@ IndexCheckExclusion(Relation heapRelation,
27322727

27332728
/* These may have been pointing to the now-gone estate */
27342729
indexInfo->ii_ExpressionsState=NIL;
2735-
indexInfo->ii_PredicateState=NIL;
2730+
indexInfo->ii_PredicateState=NULL;
27362731
}
27372732

27382733

@@ -2962,7 +2957,7 @@ validate_index_heapscan(Relation heapRelation,
29622957
HeapTupleheapTuple;
29632958
Datumvalues[INDEX_MAX_KEYS];
29642959
boolisnull[INDEX_MAX_KEYS];
2965-
List*predicate;
2960+
ExprState*predicate;
29662961
TupleTableSlot*slot;
29672962
EState*estate;
29682963
ExprContext*econtext;
@@ -2992,9 +2987,7 @@ validate_index_heapscan(Relation heapRelation,
29922987
econtext->ecxt_scantuple=slot;
29932988

29942989
/* Set up execution state for predicate, if any. */
2995-
predicate= (List*)
2996-
ExecPrepareExpr((Expr*)indexInfo->ii_Predicate,
2997-
estate);
2990+
predicate=ExecPrepareQual(indexInfo->ii_Predicate,estate);
29982991

29992992
/*
30002993
* Prepare for scan of the base relation. We need just those tuples
@@ -3121,9 +3114,9 @@ validate_index_heapscan(Relation heapRelation,
31213114
* In a partial index, discard tuples that don't satisfy the
31223115
* predicate.
31233116
*/
3124-
if (predicate!=NIL)
3117+
if (predicate!=NULL)
31253118
{
3126-
if (!ExecQual(predicate,econtext, false))
3119+
if (!ExecQual(predicate,econtext))
31273120
continue;
31283121
}
31293122

@@ -3177,7 +3170,7 @@ validate_index_heapscan(Relation heapRelation,
31773170

31783171
/* These may have been pointing to the now-gone estate */
31793172
indexInfo->ii_ExpressionsState=NIL;
3180-
indexInfo->ii_PredicateState=NIL;
3173+
indexInfo->ii_PredicateState=NULL;
31813174
}
31823175

31833176

‎src/backend/catalog/partition.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1618,8 +1618,7 @@ FormPartitionKeyDatum(PartitionDispatch pd,
16181618
GetPerTupleExprContext(estate)->ecxt_scantuple==slot);
16191619

16201620
/* First time through, set up expression evaluation state */
1621-
pd->keystate= (List*)ExecPrepareExpr((Expr*)pd->key->partexprs,
1622-
estate);
1621+
pd->keystate=ExecPrepareExprList(pd->key->partexprs,estate);
16231622
}
16241623

16251624
partexpr_item=list_head(pd->keystate);

‎src/backend/catalog/toasting.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid,
307307
indexInfo->ii_Expressions=NIL;
308308
indexInfo->ii_ExpressionsState=NIL;
309309
indexInfo->ii_Predicate=NIL;
310-
indexInfo->ii_PredicateState=NIL;
310+
indexInfo->ii_PredicateState=NULL;
311311
indexInfo->ii_ExclusionOps=NULL;
312312
indexInfo->ii_ExclusionProcs=NULL;
313313
indexInfo->ii_ExclusionStrats=NULL;

‎src/backend/commands/analyze.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ compute_index_stats(Relation onerel, double totalrows,
713713
TupleTableSlot*slot;
714714
EState*estate;
715715
ExprContext*econtext;
716-
List*predicate;
716+
ExprState*predicate;
717717
Datum*exprvals;
718718
bool*exprnulls;
719719
intnumindexrows,
@@ -739,9 +739,7 @@ compute_index_stats(Relation onerel, double totalrows,
739739
econtext->ecxt_scantuple=slot;
740740

741741
/* Set up execution state for predicate. */
742-
predicate=castNode(List,
743-
ExecPrepareExpr((Expr*)indexInfo->ii_Predicate,
744-
estate));
742+
predicate=ExecPrepareQual(indexInfo->ii_Predicate,estate);
745743

746744
/* Compute and save index expression values */
747745
exprvals= (Datum*)palloc(numrows*attr_cnt*sizeof(Datum));
@@ -764,9 +762,9 @@ compute_index_stats(Relation onerel, double totalrows,
764762
ExecStoreTuple(heapTuple,slot,InvalidBuffer, false);
765763

766764
/* If index is partial, check predicate */
767-
if (predicate!=NIL)
765+
if (predicate!=NULL)
768766
{
769-
if (!ExecQual(predicate,econtext, false))
767+
if (!ExecQual(predicate,econtext))
770768
continue;
771769
}
772770
numindexrows++;

‎src/backend/commands/explain.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2890,7 +2890,7 @@ ExplainSubPlans(List *plans, List *ancestors,
28902890
foreach(lst,plans)
28912891
{
28922892
SubPlanState*sps= (SubPlanState*)lfirst(lst);
2893-
SubPlan*sp=(SubPlan*)sps->xprstate.expr;
2893+
SubPlan*sp=sps->subplan;
28942894

28952895
/*
28962896
* There can be multiple SubPlan nodes referencing the same physical

‎src/backend/commands/indexcmds.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ CheckIndexCompatible(Oid oldId,
179179
indexInfo=makeNode(IndexInfo);
180180
indexInfo->ii_Expressions=NIL;
181181
indexInfo->ii_ExpressionsState=NIL;
182-
indexInfo->ii_PredicateState=NIL;
182+
indexInfo->ii_PredicateState=NULL;
183183
indexInfo->ii_ExclusionOps=NULL;
184184
indexInfo->ii_ExclusionProcs=NULL;
185185
indexInfo->ii_ExclusionStrats=NULL;
@@ -551,7 +551,7 @@ DefineIndex(Oid relationId,
551551
indexInfo->ii_Expressions=NIL;/* for now */
552552
indexInfo->ii_ExpressionsState=NIL;
553553
indexInfo->ii_Predicate=make_ands_implicit((Expr*)stmt->whereClause);
554-
indexInfo->ii_PredicateState=NIL;
554+
indexInfo->ii_PredicateState=NULL;
555555
indexInfo->ii_ExclusionOps=NULL;
556556
indexInfo->ii_ExclusionProcs=NULL;
557557
indexInfo->ii_ExclusionStrats=NULL;

‎src/backend/commands/prepare.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ EvaluateParams(PreparedStatement *pstmt, List *params,
391391
}
392392

393393
/* Prepare the expressions for execution */
394-
exprstates=(List*)ExecPrepareExpr((Expr*)params,estate);
394+
exprstates=ExecPrepareExprList(params,estate);
395395

396396
paramLI= (ParamListInfo)
397397
palloc(offsetof(ParamListInfoData,params)+
@@ -407,7 +407,7 @@ EvaluateParams(PreparedStatement *pstmt, List *params,
407407
i=0;
408408
foreach(l,exprstates)
409409
{
410-
ExprState*n=lfirst(l);
410+
ExprState*n=(ExprState*)lfirst(l);
411411
ParamExternData*prm=&paramLI->params[i];
412412

413413
prm->ptype=param_types[i];

‎src/backend/commands/tablecmds.c

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ typedef struct NewConstraint
185185
Oidrefindid;/* OID of PK's index, if FOREIGN */
186186
Oidconid;/* OID of pg_constraint entry, if FOREIGN */
187187
Node*qual;/* Check expr or CONSTR_FOREIGN Constraint */
188-
List*qualstate;/* Execution state for CHECK */
188+
ExprState*qualstate;/* Execution state for CHECK expr */
189189
}NewConstraint;
190190

191191
/*
@@ -4262,7 +4262,7 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
42624262
CommandIdmycid;
42634263
BulkInsertStatebistate;
42644264
inthi_options;
4265-
List*partqualstate=NIL;
4265+
ExprState*partqualstate=NULL;
42664266

42674267
/*
42684268
* Open the relation(s). We have surely already locked the existing
@@ -4315,8 +4315,7 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
43154315
{
43164316
caseCONSTR_CHECK:
43174317
needscan= true;
4318-
con->qualstate= (List*)
4319-
ExecPrepareExpr((Expr*)con->qual,estate);
4318+
con->qualstate=ExecPrepareExpr((Expr*)con->qual,estate);
43204319
break;
43214320
caseCONSTR_FOREIGN:
43224321
/* Nothing to do here */
@@ -4331,9 +4330,7 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
43314330
if (tab->partition_constraint)
43324331
{
43334332
needscan= true;
4334-
partqualstate= (List*)
4335-
ExecPrepareExpr((Expr*)tab->partition_constraint,
4336-
estate);
4333+
partqualstate=ExecPrepareCheck(tab->partition_constraint,estate);
43374334
}
43384335

43394336
foreach(l,tab->newvals)
@@ -4508,7 +4505,7 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
45084505
switch (con->contype)
45094506
{
45104507
caseCONSTR_CHECK:
4511-
if (!ExecQual(con->qualstate,econtext, true))
4508+
if (!ExecCheck(con->qualstate,econtext))
45124509
ereport(ERROR,
45134510
(errcode(ERRCODE_CHECK_VIOLATION),
45144511
errmsg("check constraint \"%s\" is violated by some row",
@@ -4524,7 +4521,7 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
45244521
}
45254522
}
45264523

4527-
if (partqualstate&& !ExecQual(partqualstate,econtext, true))
4524+
if (partqualstate&& !ExecCheck(partqualstate,econtext))
45284525
ereport(ERROR,
45294526
(errcode(ERRCODE_CHECK_VIOLATION),
45304527
errmsg("partition constraint is violated by some row")));
@@ -6607,8 +6604,7 @@ ATAddCheckConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel,
66076604
newcon= (NewConstraint*)palloc0(sizeof(NewConstraint));
66086605
newcon->name=ccon->name;
66096606
newcon->contype=ccon->contype;
6610-
/* ExecQual wants implicit-AND format */
6611-
newcon->qual= (Node*)make_ands_implicit((Expr*)ccon->expr);
6607+
newcon->qual=ccon->expr;
66126608

66136609
tab->constraints=lappend(tab->constraints,newcon);
66146610
}
@@ -7786,7 +7782,7 @@ validateCheckConstraint(Relation rel, HeapTuple constrtup)
77867782
Datumval;
77877783
char*conbin;
77887784
Expr*origexpr;
7789-
List*exprstate;
7785+
ExprState*exprstate;
77907786
TupleDesctupdesc;
77917787
HeapScanDescscan;
77927788
HeapTupletuple;
@@ -7817,8 +7813,7 @@ validateCheckConstraint(Relation rel, HeapTuple constrtup)
78177813
HeapTupleGetOid(constrtup));
78187814
conbin=TextDatumGetCString(val);
78197815
origexpr= (Expr*)stringToNode(conbin);
7820-
exprstate= (List*)
7821-
ExecPrepareExpr((Expr*)make_ands_implicit(origexpr),estate);
7816+
exprstate=ExecPrepareExpr(origexpr,estate);
78227817

78237818
econtext=GetPerTupleExprContext(estate);
78247819
tupdesc=RelationGetDescr(rel);
@@ -7838,7 +7833,7 @@ validateCheckConstraint(Relation rel, HeapTuple constrtup)
78387833
{
78397834
ExecStoreTuple(tuple,slot,InvalidBuffer, false);
78407835

7841-
if (!ExecQual(exprstate,econtext, true))
7836+
if (!ExecCheck(exprstate,econtext))
78427837
ereport(ERROR,
78437838
(errcode(ERRCODE_CHECK_VIOLATION),
78447839
errmsg("check constraint \"%s\" is violated by some row",

‎src/backend/commands/trigger.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3057,7 +3057,7 @@ TriggerEnabled(EState *estate, ResultRelInfo *relinfo,
30573057
if (trigger->tgqual)
30583058
{
30593059
TupleDesctupdesc=RelationGetDescr(relinfo->ri_RelationDesc);
3060-
List**predicate;
3060+
ExprState**predicate;
30613061
ExprContext*econtext;
30623062
TupleTableSlot*oldslot=NULL;
30633063
TupleTableSlot*newslot=NULL;
@@ -3078,7 +3078,7 @@ TriggerEnabled(EState *estate, ResultRelInfo *relinfo,
30783078
* nodetrees for it. Keep them in the per-query memory context so
30793079
* they'll survive throughout the query.
30803080
*/
3081-
if (*predicate==NIL)
3081+
if (*predicate==NULL)
30823082
{
30833083
Node*tgqual;
30843084

@@ -3087,9 +3087,9 @@ TriggerEnabled(EState *estate, ResultRelInfo *relinfo,
30873087
/* Change references to OLD and NEW to INNER_VAR and OUTER_VAR */
30883088
ChangeVarNodes(tgqual,PRS2_OLD_VARNO,INNER_VAR,0);
30893089
ChangeVarNodes(tgqual,PRS2_NEW_VARNO,OUTER_VAR,0);
3090-
/*ExecQual wants implicit-AND form */
3090+
/*ExecPrepareQual wants implicit-AND form */
30913091
tgqual= (Node*)make_ands_implicit((Expr*)tgqual);
3092-
*predicate=(List*)ExecPrepareExpr((Expr*)tgqual,estate);
3092+
*predicate=ExecPrepareQual((List*)tgqual,estate);
30933093
MemoryContextSwitchTo(oldContext);
30943094
}
30953095

@@ -3137,7 +3137,7 @@ TriggerEnabled(EState *estate, ResultRelInfo *relinfo,
31373137
*/
31383138
econtext->ecxt_innertuple=oldslot;
31393139
econtext->ecxt_outertuple=newslot;
3140-
if (!ExecQual(*predicate,econtext, false))
3140+
if (!ExecQual(*predicate,econtext))
31413141
return false;
31423142
}
31433143

0 commit comments

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