Commit405c509

committed

Make last changes

1 parent58ef2a5 commit405c509Copy full SHA for 405c509

File tree

+12

-6

lines changed

+12

-6

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1783,6 +1783,8 @@ get_expression_node(Oid relid, const char *expr, bool analyze)`
`1783`	`1783`	`hooks_enabled= true;`
`1784`	`1784`
`1785`	`1785`	`result= (Node*)target_entry->expr;`
	`1786`	`+`
	`1787`	`+/* We keep expression in top context */`
`1786`	`1788`	`oldcontext=MemoryContextSwitchTo(TopMemoryContext);`
`1787`	`1789`
`1788`	`1790`	`/* We need relid and range table list for mutator */`

Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -632,6 +632,16 @@ partition_filter_exec(CustomScanState *node)`
`632`	`632`	`returnslot;`
`633`	`633`	`}`
`634`	`634`
	`635`	`+old_cxt=MemoryContextSwitchTo(estate->es_query_cxt);`
	`636`	`+`
	`637`	`+/* Fetch values from slot for expression */`
	`638`	`+adapt_values((Node)prel->expr, (void)&expr_walker_context);`
	`639`	`+`
	`640`	`+MemoryContextSwitchTo(old_cxt);`
	`641`	`+`
	`642`	`+/* Prepare state for execution */`
	`643`	`+expr_state=ExecPrepareExpr(prel->expr,estate);`
	`644`	`+`
`635`	`645`	`/* Switch to per-tuple context */`
`636`	`646`	`old_cxt=MemoryContextSwitchTo(GetPerTupleMemoryContext(estate));`
`637`	`647`
`@@ -641,12 +651,6 @@ partition_filter_exec(CustomScanState *node)`
`641`	`651`	`expr_walker_context.tup=ExecCopySlotTuple(slot);`
`642`	`652`	`expr_walker_context.clear= false;`
`643`	`653`
`644`		`-/* Fetch values from slot for expression */`
`645`		`-adapt_values((Node)prel->expr, (void)&expr_walker_context);`
`646`		`-`
`647`		`-/* Prepare state before execution */`
`648`		`-expr_state=ExecPrepareExpr(prel->expr,estate);`
`649`		`-`
`650`	`654`	`/* Execute expression */`
`651`	`655`	`value=ExecEvalExpr(expr_state,econtext,&isnull,&itemIsDone);`
`652`	`656`

Comments

(0)