summaryrefslogtreecommitdiff
path: root/src/backend/executor/nodeNamedtuplestorescan.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/executor/nodeNamedtuplestorescan.c')
-rw-r--r--src/backend/executor/nodeNamedtuplestorescan.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/src/backend/executor/nodeNamedtuplestorescan.c b/src/backend/executor/nodeNamedtuplestorescan.c
index c3b28176e4..4d898b1f83 100644
--- a/src/backend/executor/nodeNamedtuplestorescan.c
+++ b/src/backend/executor/nodeNamedtuplestorescan.c
@@ -133,26 +133,21 @@ ExecInitNamedTuplestoreScan(NamedTuplestoreScan *node, EState *estate, int eflag
ExecAssignExprContext(estate, &scanstate->ss.ps);
/*
- * initialize child expressions
+ * Tuple table and result type initialization. The scan tuple type is
+ * specified for the tuplestore.
*/
- scanstate->ss.ps.qual =
- ExecInitQual(node->scan.plan.qual, (PlanState *) scanstate);
+ ExecInitResultTupleSlotTL(estate, &scanstate->ss.ps);
+ ExecInitScanTupleSlot(estate, &scanstate->ss, scanstate->tupdesc);
/*
- * tuple table initialization
- */
- ExecInitResultTupleSlot(estate, &scanstate->ss.ps);
- ExecInitScanTupleSlot(estate, &scanstate->ss);
-
- /*
- * The scan tuple type is specified for the tuplestore.
+ * initialize child expressions
*/
- ExecAssignScanType(&scanstate->ss, scanstate->tupdesc);
+ scanstate->ss.ps.qual =
+ ExecInitQual(node->scan.plan.qual, (PlanState *) scanstate);
/*
- * Initialize result tuple type and projection info.
+ * Initialize projection.
*/
- ExecAssignResultTypeFromTL(&scanstate->ss.ps);
ExecAssignScanProjectionInfo(&scanstate->ss);
return scanstate;