Commitfd8474f

committed

Fix execution

1 parentbd44be0 commitfd8474fCopy full SHA for fd8474f

File tree

+11

-10

lines changed

+11

-10

lines changed

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1804,21 +1804,22 @@ get_part_expression_info(Oid relid, const char *expr_string,`
`1804`	`1804`	`}`
`1805`	`1805`
`1806`	`1806`	`if (!make_plan)`
`1807`		`-returnexpr_info;`
	`1807`	`+gotoend;`
`1808`	`1808`
`1809`	`1809`	`/* Plan this query. We reuse 'expr_node' here */`
`1810`	`1810`	`plan=pg_plan_query(query,0,NULL);`
`1811`	`1811`	`target_entry=lfirst(list_head(plan->planTree->targetlist));`
`1812`	`1812`	`expr_node= (Node*)target_entry->expr;`
`1813`	`1813`	`expr_node=eval_const_expressions(NULL,expr_node);`
`1814`	`1814`
`1815`		`-/* Enable pathman */`
`1816`		`-hooks_enabled= true;`
`1817`		`-`
`1818`	`1815`	`/* Convert expression to string and return it as datum */`
`1819`	`1816`	`out_string=nodeToString(expr_node);`
`1820`	`1817`	`expr_info->expr_datum=CStringGetTextDatum(out_string);`
`1821`	`1818`	`pfree(out_string);`
`1822`	`1819`
	`1820`	`+end:`
	`1821`	`+/* Enable pathman hooks */`
	`1822`	`+hooks_enabled= true;`
	`1823`	`+`
`1823`	`1824`	`returnexpr_info;`
`1824`	`1825`	`}`

Lines changed: 6 additions & 6 deletions

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

Comments

(0)