Further tweaking of parsetree & plantree representation of SubLinks.

Simplify SubLink by storing just a List of operator OIDs, instead of
a list of incomplete OpExprs --- that was a bizarre and bulky choice,
with no redeeming social value since we have to build new OpExprs
anyway when forming the plan tree.

Author: tglsfdc

src/backend/catalog/dependency.c

@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/dependency.c,v 1.18 2002/12/12 15:49:21 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/dependency.c,v 1.19 2003/01/10 21:08:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -838,6 +838,18 @@ find_expr_references_walker(Node *node,
 						   &context->addrs);
 		/* fall through to examine arguments */
 	}
+	if (IsA(node, SubLink))
+	{
+		SubLink	   *sublink = (SubLink *) node;
+		List	   *opid;
+
+		foreach(opid, sublink->operOids)
+		{
+			add_object_address(OCLASS_OPERATOR, (Oid) lfirsti(opid), 0,
+							   &context->addrs);
+		}
+		/* fall through to examine arguments */
+	}
 	if (is_subplan(node))
 	{
 		/* Extra work needed here if we ever need this case */

src/backend/executor/execQual.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.121 2002/12/15 16:17:45 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.122 2003/01/10 21:08:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2023,8 +2023,8 @@ ExecInitExpr(Expr *node, PlanState *parent)
 				sstate->sub_estate = NULL;
 				sstate->planstate = NULL;
 
-				sstate->oper = (List *)
-					ExecInitExpr((Expr *) subplan->oper, parent);
+				sstate->exprs = (List *)
+					ExecInitExpr((Expr *) subplan->exprs, parent);
 				sstate->args = (List *)
 					ExecInitExpr((Expr *) subplan->args, parent);
 
@@ -2156,7 +2156,7 @@ ExecInitExprInitPlan(SubPlan *node, PlanState *parent)
 	sstate->sub_estate = NULL;
 	sstate->planstate = NULL;
 
-	sstate->oper = (List *) ExecInitExpr((Expr *) node->oper, parent);
+	sstate->exprs = (List *) ExecInitExpr((Expr *) node->exprs, parent);
 	sstate->args = (List *) ExecInitExpr((Expr *) node->args, parent);
 
 	sstate->xprstate.expr = (Expr *) node;

src/backend/executor/nodeSubplan.c

@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSubplan.c,v 1.41 2003/01/09 20:50:50 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSubplan.c,v 1.42 2003/01/10 21:08:08 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -110,6 +110,7 @@ ExecSubPlan(SubPlanState *node,
 		Datum		rowresult = BoolGetDatum(!useOr);
 		bool		rownull = false;
 		int			col = 1;
+		List	   *plst;
 
 		if (subLinkType == EXISTS_SUBLINK)
 		{
@@ -155,45 +156,19 @@ ExecSubPlan(SubPlanState *node,
 		 * For ALL, ANY, and MULTIEXPR sublinks, iterate over combining
 		 * operators for columns of tuple.
 		 */
-		foreach(lst, node->oper)
+		plst = subplan->paramIds;
+		foreach(lst, node->exprs)
 		{
 			ExprState  *exprstate = (ExprState *) lfirst(lst);
-			OpExpr	   *expr = (OpExpr *) exprstate->expr;
-			Param	   *prm = lsecond(expr->args);
+			int			paramid = lfirsti(plst);
 			ParamExecData *prmdata;
 			Datum		expresult;
 			bool		expnull;
 
 			/*
-			 * The righthand side of the expression should be either a
-			 * Param or a function call or RelabelType node taking a Param
-			 * as arg (these nodes represent run-time type coercions
-			 * inserted by the parser to get to the input type needed by
-			 * the operator). Find the Param node and insert the actual
-			 * righthand-side value into the param's econtext slot.
-			 *
-			 * XXX possible improvement: could make a list of the ParamIDs
-			 * at startup time, instead of repeating this check at each row.
+			 * Load up the Param representing this column of the sub-select.
 			 */
-			if (!IsA(prm, Param))
-			{
-				switch (nodeTag(prm))
-				{
-					case T_FuncExpr:
-						prm = lfirst(((FuncExpr *) prm)->args);
-						break;
-					case T_RelabelType:
-						prm = (Param *) (((RelabelType *) prm)->arg);
-						break;
-					default:
-						/* will fail below */
-						break;
-				}
-				if (!IsA(prm, Param))
-					elog(ERROR, "ExecSubPlan: failed to find placeholder for subplan result");
-			}
-			Assert(prm->paramkind == PARAM_EXEC);
-			prmdata = &(econtext->ecxt_param_exec_vals[prm->paramid]);
+			prmdata = &(econtext->ecxt_param_exec_vals[paramid]);
 			Assert(prmdata->execPlan == NULL);
 			prmdata->value = heap_getattr(tup, col, tdesc,
 										  &(prmdata->isnull));
@@ -236,6 +211,8 @@ ExecSubPlan(SubPlanState *node,
 					break;		/* needn't look at any more columns */
 				}
 			}
+
+			plst = lnext(plst);
 			col++;
 		}
 
@@ -312,6 +289,8 @@ ExecInitSubPlan(SubPlanState *node, EState *estate)
 	 */
 	node->needShutdown = false;
 	node->curTuple = NULL;
+	node->hashtable = NULL;
+	node->hashnulls = NULL;
 
 	/*
 	 * create an EState for the subplan

src/backend/nodes/copyfuncs.c

@@ -15,7 +15,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.234 2003/01/09 20:50:50 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.235 2003/01/10 21:08:10 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -809,10 +809,10 @@ _copySubLink(SubLink *from)
 	SubLink    *newnode = makeNode(SubLink);
 
 	COPY_SCALAR_FIELD(subLinkType);
-	COPY_SCALAR_FIELD(operIsEquals);
 	COPY_SCALAR_FIELD(useOr);
 	COPY_NODE_FIELD(lefthand);
-	COPY_NODE_FIELD(oper);
+	COPY_NODE_FIELD(operName);
+	COPY_INTLIST_FIELD(operOids);
 	COPY_NODE_FIELD(subselect);
 
 	return newnode;
@@ -828,10 +828,13 @@ _copySubPlan(SubPlan *from)
 
 	COPY_SCALAR_FIELD(subLinkType);
 	COPY_SCALAR_FIELD(useOr);
-	COPY_NODE_FIELD(oper);
+	COPY_NODE_FIELD(exprs);
+	COPY_INTLIST_FIELD(paramIds);
 	COPY_NODE_FIELD(plan);
 	COPY_SCALAR_FIELD(plan_id);
 	COPY_NODE_FIELD(rtable);
+	COPY_SCALAR_FIELD(useHashTable);
+	COPY_SCALAR_FIELD(unknownEqFalse);
 	COPY_INTLIST_FIELD(setParam);
 	COPY_INTLIST_FIELD(parParam);
 	COPY_NODE_FIELD(args);

src/backend/nodes/equalfuncs.c

@@ -18,7 +18,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.178 2003/01/09 20:50:50 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.179 2003/01/10 21:08:10 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -287,10 +287,10 @@ static bool
 _equalSubLink(SubLink *a, SubLink *b)
 {
 	COMPARE_SCALAR_FIELD(subLinkType);
-	COMPARE_SCALAR_FIELD(operIsEquals);
 	COMPARE_SCALAR_FIELD(useOr);
 	COMPARE_NODE_FIELD(lefthand);
-	COMPARE_NODE_FIELD(oper);
+	COMPARE_NODE_FIELD(operName);
+	COMPARE_INTLIST_FIELD(operOids);
 	COMPARE_NODE_FIELD(subselect);
 
 	return true;
@@ -301,10 +301,13 @@ _equalSubPlan(SubPlan *a, SubPlan *b)
 {
 	COMPARE_SCALAR_FIELD(subLinkType);
 	COMPARE_SCALAR_FIELD(useOr);
-	COMPARE_NODE_FIELD(oper);
+	COMPARE_NODE_FIELD(exprs);
+	COMPARE_INTLIST_FIELD(paramIds);
 	/* should compare plans, but have to settle for comparing plan IDs */
 	COMPARE_SCALAR_FIELD(plan_id);
 	COMPARE_NODE_FIELD(rtable);
+	COMPARE_SCALAR_FIELD(useHashTable);
+	COMPARE_SCALAR_FIELD(unknownEqFalse);
 	COMPARE_INTLIST_FIELD(setParam);
 	COMPARE_INTLIST_FIELD(parParam);
 	COMPARE_NODE_FIELD(args);

src/backend/nodes/outfuncs.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.191 2003/01/09 20:50:50 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.192 2003/01/10 21:08:11 tgl Exp $
  *
  * NOTES
  *	  Every node type that can appear in stored rules' parsetrees *must*
@@ -658,10 +658,10 @@ _outSubLink(StringInfo str, SubLink *node)
 	WRITE_NODE_TYPE("SUBLINK");
 
 	WRITE_ENUM_FIELD(subLinkType, SubLinkType);
-	WRITE_BOOL_FIELD(operIsEquals);
 	WRITE_BOOL_FIELD(useOr);
 	WRITE_NODE_FIELD(lefthand);
-	WRITE_NODE_FIELD(oper);
+	WRITE_NODE_FIELD(operName);
+	WRITE_INTLIST_FIELD(operOids);
 	WRITE_NODE_FIELD(subselect);
 }
 
@@ -672,10 +672,13 @@ _outSubPlan(StringInfo str, SubPlan *node)
 
 	WRITE_ENUM_FIELD(subLinkType, SubLinkType);
 	WRITE_BOOL_FIELD(useOr);
-	WRITE_NODE_FIELD(oper);
+	WRITE_NODE_FIELD(exprs);
+	WRITE_INTLIST_FIELD(paramIds);
 	WRITE_NODE_FIELD(plan);
 	WRITE_INT_FIELD(plan_id);
 	WRITE_NODE_FIELD(rtable);
+	WRITE_BOOL_FIELD(useHashTable);
+	WRITE_BOOL_FIELD(unknownEqFalse);
 	WRITE_INTLIST_FIELD(setParam);
 	WRITE_INTLIST_FIELD(parParam);
 	WRITE_NODE_FIELD(args);

src/backend/nodes/readfuncs.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.145 2003/01/09 20:50:51 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.146 2003/01/10 21:08:11 tgl Exp $
  *
  * NOTES
  *	  Path and Plan nodes do not have any readfuncs support, because we
@@ -531,10 +531,10 @@ _readSubLink(void)
 	READ_LOCALS(SubLink);
 
 	READ_ENUM_FIELD(subLinkType, SubLinkType);
-	READ_BOOL_FIELD(operIsEquals);
 	READ_BOOL_FIELD(useOr);
 	READ_NODE_FIELD(lefthand);
-	READ_NODE_FIELD(oper);
+	READ_NODE_FIELD(operName);
+	READ_INTLIST_FIELD(operOids);
 	READ_NODE_FIELD(subselect);
 
 	READ_DONE();