Phase 2 of read-only-plans project: restructure expression-tree nodes

so that all executable expression nodes inherit from a common supertype
Expr.  This is somewhat of an exercise in code purity rather than any
real functional advance, but getting rid of the extra Oper or Func node
formerly used in each operator or function call should provide at least
a little space and speed improvement.
initdb forced by changes in stored-rules representation.

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.17 2002/12/06 05:00:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/dependency.c,v 1.18 2002/12/12 15:49:21 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -806,25 +806,28 @@ find_expr_references_walker(Node *node,
 		}
 		return false;
 	}
-	if (IsA(node, Expr))
+	if (IsA(node, FuncExpr))
 	{
-		Expr	   *expr = (Expr *) node;
+		FuncExpr   *funcexpr = (FuncExpr *) node;
 
-		if (expr->opType == OP_EXPR ||
-			expr->opType == DISTINCT_EXPR)
-		{
-			Oper	   *oper = (Oper *) expr->oper;
+		add_object_address(OCLASS_PROC, funcexpr->funcid, 0,
+						   &context->addrs);
+		/* fall through to examine arguments */
+	}
+	if (IsA(node, OpExpr))
+	{
+		OpExpr   *opexpr = (OpExpr *) node;
 
-			add_object_address(OCLASS_OPERATOR, oper->opno, 0,
-							   &context->addrs);
-		}
-		else if (expr->opType == FUNC_EXPR)
-		{
-			Func	   *func = (Func *) expr->oper;
+		add_object_address(OCLASS_OPERATOR, opexpr->opno, 0,
+						   &context->addrs);
+		/* fall through to examine arguments */
+	}
+	if (IsA(node, DistinctExpr))
+	{
+		DistinctExpr   *distinctexpr = (DistinctExpr *) node;
 
-			add_object_address(OCLASS_PROC, func->funcid, 0,
-							   &context->addrs);
-		}
+		add_object_address(OCLASS_OPERATOR, distinctexpr->opno, 0,
+						   &context->addrs);
 		/* fall through to examine arguments */
 	}
 	if (IsA(node, Aggref))

src/backend/catalog/heap.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.235 2002/11/15 02:50:05 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.236 2002/12/12 15:49:23 tgl Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -1602,11 +1602,6 @@ AddRelationRawConstraints(Relation rel,
 		 */
 		expr = (Node *) make_ands_implicit((Expr *) expr);
 
-		/*
-		 * Must fix opids in operator clauses.
-		 */
-		fix_opids(expr);
-
 		/*
 		 * OK, store it.
 		 */
@@ -1750,11 +1745,6 @@ cookDefault(ParseState *pstate,
 	 */
 	expr = eval_const_expressions(expr);
 
-	/*
-	 * Must fix opids, in case any operators remain...
-	 */
-	fix_opids(expr);
-
 	return (expr);
 }
 

src/backend/catalog/index.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.205 2002/11/13 00:39:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.206 2002/12/12 15:49:24 tgl Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -41,6 +41,7 @@
 #include "executor/executor.h"
 #include "miscadmin.h"
 #include "optimizer/clauses.h"
+#include "optimizer/planmain.h"
 #include "optimizer/prep.h"
 #include "parser/parse_func.h"
 #include "storage/sinval.h"
@@ -919,6 +920,7 @@ BuildIndexInfo(Form_pg_index indexStruct)
 		predString = DatumGetCString(DirectFunctionCall1(textout,
 								PointerGetDatum(&indexStruct->indpred)));
 		ii->ii_Predicate = stringToNode(predString);
+		fix_opfuncids((Node *) ii->ii_Predicate);
 		pfree(predString);
 	}
 	else

src/backend/catalog/pg_proc.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.94 2002/09/18 21:35:20 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.95 2002/12/12 15:49:24 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -424,7 +424,7 @@ checkretval(Oid rettype, char fn_typtype, List *queryTreeList)
 			} while (attr->attisdropped);
 			rellogcols++;
 
-			tletype = exprType(tle->expr);
+			tletype = exprType((Node *) tle->expr);
 			atttype = attr->atttypid;
 			if (!IsBinaryCoercible(tletype, atttype))
 				elog(ERROR, "function declared to return %s returns %s instead of %s at column %d",

src/backend/commands/copy.c

@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.184 2002/12/01 18:14:22 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.185 2002/12/12 15:49:24 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,6 +35,7 @@
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
 #include "nodes/makefuncs.h"
+#include "optimizer/planmain.h"
 #include "parser/parse_coerce.h"
 #include "parser/parse_relation.h"
 #include "rewrite/rewriteHandler.h"
@@ -839,6 +840,7 @@ CopyFrom(Relation rel, List *attnumlist, bool binary, bool oids,
 			defexprs[num_defaults] = build_column_default(rel, i + 1);
 			if (defexprs[num_defaults] != NULL)
 			{
+				fix_opfuncids(defexprs[num_defaults]);
 				defmap[num_defaults] = i;
 				num_defaults++;
 			}
@@ -869,6 +871,7 @@ CopyFrom(Relation rel, List *attnumlist, bool binary, bool oids,
 			/* check whether any constraints actually found */
 			if (node != (Node *) prm)
 			{
+				fix_opfuncids(node);
 				constraintexprs[i] = node;
 				hasConstraints = true;
 			}

src/backend/commands/explain.c

@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994-5, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.95 2002/12/06 19:28:03 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.96 2002/12/12 15:49:24 tgl Exp $
  *
  */
 
@@ -417,20 +417,27 @@ explain_outNode(StringInfo str,
 			{
 				RangeTblEntry *rte = rt_fetch(((Scan *) plan)->scanrelid,
 											  es->rtable);
-				Expr	   *expr;
-				Func	   *funcnode;
-				Oid			funcid;
 				char	   *proname;
 
 				/* Assert it's on a RangeFunction */
 				Assert(rte->rtekind == RTE_FUNCTION);
 
-				expr = (Expr *) rte->funcexpr;
-				funcnode = (Func *) expr->oper;
-				funcid = funcnode->funcid;
-
-				/* We only show the func name, not schema name */
-				proname = get_func_name(funcid);
+				/*
+				 * If the expression is still a function call, we can get
+				 * the real name of the function.  Otherwise, punt (this
+				 * can happen if the optimizer simplified away the function
+				 * call, for example).
+				 */
+				if (rte->funcexpr && IsA(rte->funcexpr, FuncExpr))
+				{
+					FuncExpr   *funcexpr = (FuncExpr *) rte->funcexpr;
+					Oid			funcid = funcexpr->funcid;
+
+					/* We only show the func name, not schema name */
+					proname = get_func_name(funcid);
+				}
+				else
+					proname = rte->eref->aliasname;
 
 				appendStringInfo(str, " on %s",
 								 quote_identifier(proname));
@@ -583,7 +590,7 @@ explain_outNode(StringInfo str,
 		appendStringInfo(str, "  InitPlan\n");
 		foreach(lst, plan->initPlan)
 		{
-			SubPlan	   *subplan = (SubPlan *) lfirst(lst);
+			SubPlanExpr  *subplan = (SubPlanExpr *) lfirst(lst);
 			SubPlanState *subplanstate = (SubPlanState *) lfirst(pslist);
 
 			es->rtable = subplan->rtable;
@@ -683,7 +690,7 @@ explain_outNode(StringInfo str,
 		foreach(lst, planstate->subPlan)
 		{
 			SubPlanState *sps = (SubPlanState *) lfirst(lst);
-			SubPlan *sp = (SubPlan *) sps->ps.plan;
+			SubPlanExpr *sp = (SubPlanExpr *) sps->ps.plan;
 
 			es->rtable = sp->rtable;
 			for (i = 0; i < indent; i++)
@@ -870,7 +877,7 @@ show_sort_keys(List *tlist, int nkeys, const char *qlabel,
 			if (target->resdom->reskey == keyno)
 			{
 				/* Deparse the expression, showing any top-level cast */
-				exprstr = deparse_expression(target->expr, context,
+				exprstr = deparse_expression((Node *) target->expr, context,
 											 useprefix, true);
 				/* And add to str */
 				if (keyno > 1)

src/backend/commands/indexcmds.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.92 2002/10/21 22:06:19 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.93 2002/12/12 15:49:24 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -159,10 +159,10 @@ DefineIndex(RangeVar *heapRelation,
 	 * While we are at it, we reduce it to a canonical (CNF or DNF) form
 	 * to simplify the task of proving implications.
 	 */
-	if (predicate != NULL && rangetable != NIL)
+	if (predicate)
 	{
 		cnfPred = canonicalize_qual((Expr *) copyObject(predicate), true);
-		fix_opids((Node *) cnfPred);
+		fix_opfuncids((Node *) cnfPred);
 		CheckPredicate(cnfPred, rangetable, relationId);
 	}
 

src/backend/commands/tablecmds.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.57 2002/11/23 18:26:45 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.58 2002/12/12 15:49:24 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2723,7 +2723,7 @@ AlterTableAddCheckConstraint(Relation rel, Constraint *constr)
 	/*
 	 * We need to make a parse state and range
 	 * table to allow us to transformExpr and
-	 * fix_opids to get a version of the
+	 * fix_opfuncids to get a version of the
 	 * expression we can pass to ExecQual
 	 */
 	pstate = make_parsestate(NULL);
@@ -2764,8 +2764,8 @@ AlterTableAddCheckConstraint(Relation rel, Constraint *constr)
 	 */
 	expr = eval_const_expressions(expr);
 
-	/* And fix the opids */
-	fix_opids(expr);
+	/* And fix the opfuncids */
+	fix_opfuncids(expr);
 
 	qual = makeList1(expr);
 

src/backend/commands/typecmds.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/typecmds.c,v 1.21 2002/12/09 20:31:05 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/typecmds.c,v 1.22 2002/12/12 15:49:24 tgl Exp $
  *
  * DESCRIPTION
  *	  The "DefineFoo" routines take the parse tree and pick out the
@@ -1341,7 +1341,9 @@ AlterDomainAddConstraint(List *names, Node *newConstraint)
 	 * the constraint is being added to.
 	 */
 	expr = stringToNode(ccbin);
+	fix_opfuncids(expr);
 	rels = get_rels_with_domain(domainoid);
+
 	foreach (rt, rels)
 	{
 		Relation	typrel;
@@ -1522,7 +1524,7 @@ domainPermissionCheck(HeapTuple tup, TypeName *typename)
 
 
 /*
- *
+ * domainAddConstraint
  */
 char *
 domainAddConstraint(Oid domainOid, Oid domainNamespace, Oid baseTypeOid,
@@ -1601,21 +1603,20 @@ domainAddConstraint(Oid domainOid, Oid domainNamespace, Oid baseTypeOid,
 	expr = eval_const_expressions(expr);
 
 	/*
-	 * Must fix opids in operator clauses.
+	 * Convert to string form for storage.
 	 */
-	fix_opids(expr);
-
 	ccbin = nodeToString(expr);
 
 	/*
-	 * Deparse it.  Since VARNOs aren't allowed in domain
-	 * constraints, relation context isn't required as anything
-	 * other than a shell.
+	 * Deparse it to produce text for consrc.
+	 *
+	 * Since VARNOs aren't allowed in domain constraints, relation context
+	 * isn't required as anything other than a shell.
 	 */
 	ccsrc = deparse_expression(expr,
-				deparse_context_for(domainName,
-									InvalidOid),
-								   false, false);
+							   deparse_context_for(domainName,
+												   InvalidOid),
+							   false, false);
 
 	/* Write the constraint */
 	CreateConstraintEntry(constr->name,		/* Constraint Name */