*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.9 1996/11/13 20:48:28 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.10 1997/01/22 05:26:27 vadim Exp $
*
*-------------------------------------------------------------------------
*/
dest = queryDesc->dest;
destination = (void (*)()) DestToFunction(dest);
+#if 0
+ /*
+ * It doesn't work in common case (i.g. if function has a aggregate).
+ * Now we store parameter values before ExecutorStart. - vadim 01/22/97
+ */
#ifdef INDEXSCAN_PATCH
/*
* If the plan is an index scan and some of the scan key are
ExecIndexReScan((IndexScan *)plan, econtext, plan);
}
#endif
+#endif
switch(feature) {
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.4 1996/11/06 06:47:36 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.5 1997/01/22 05:26:37 vadim Exp $
*
*-------------------------------------------------------------------------
*/
{
TupleTableSlot *slot;
Datum value;
+
+#ifdef INDEXSCAN_PATCH
+ /*
+ * It's more right place to do it (before postquel_start->ExecutorStart).
+ * Now ExecutorStart->ExecInitIndexScan->ExecEvalParam works ok.
+ * (But note: I HOPE we can do it here). - vadim 01/22/97
+ */
+ if (fcache->nargs > 0)
+ postquel_sub_params(es, fcache->nargs, args, fcache->nullVect);
+#endif
if (es->status == F_EXEC_START)
{
(void) postquel_start(es);
es->status = F_EXEC_RUN;
}
-
+#ifndef INDEXSCAN_PATCH
if (fcache->nargs > 0)
postquel_sub_params(es, fcache->nargs, args, fcache->nullVect);
+#endif
slot = postquel_getnext(es);
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.5 1996/11/08 00:45:57 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.6 1997/01/22 05:26:50 vadim Exp $
*
*-------------------------------------------------------------------------
*/
Oper *op; /* operator used in scan.. */
Node *leftop; /* expr on lhs of operator */
Node *rightop; /* expr on rhs ... */
+ bits16 flags = 0;
int scanvar; /* which var identifies varattno */
AttrNumber varattno = 0; /* att number used in scan */
*/
run_keys[ j ] = NO_OP;
scanvalue = ((Const*) leftop)->constvalue;
+#ifdef INDEXSCAN_PATCH
+ } else if (IsA(leftop,Param)) {
+ bool isnull;
+ /* ----------------
+ * if the leftop is a Param node then it means
+ * it identifies the value to place in our scan key.
+ * ----------------
+ */
+ run_keys[ j ] = NO_OP;
+ scanvalue = ExecEvalParam((Param*) leftop,
+ scanstate->cstate.cs_ExprContext,
+ &isnull);
+ if ( isnull )
+ flags |= SK_ISNULL;
+#endif
} else if (leftop != NULL &&
is_funcclause(leftop) &&
var_is_rel(lfirst(((Expr*)leftop)->args))) {
*/
run_keys[ j ] = NO_OP;
scanvalue = ((Const*) rightop)->constvalue;
-
+#ifdef INDEXSCAN_PATCH
+ } else if (IsA(rightop,Param)) {
+ bool isnull;
+ /* ----------------
+ * if the rightop is a Param node then it means
+ * it identifies the value to place in our scan key.
+ * ----------------
+ */
+ run_keys[ j ] = NO_OP;
+ scanvalue = ExecEvalParam((Param*) rightop,
+ scanstate->cstate.cs_ExprContext,
+ &isnull);
+ if ( isnull )
+ flags |= SK_ISNULL;
+#endif
} else if (rightop!=NULL &&
is_funcclause(rightop) &&
var_is_rel(lfirst(((Expr*)rightop)->args))) {
* ----------------
*/
ScanKeyEntryInitialize(&scan_keys[j],
- 0,
+ flags,
varattno, /* attribute number to scan */
(RegProcedure) opid, /* reg proc to use */
(Datum) scanvalue); /* constant */