Don't call ExecOpenIndices if pg_class relhasindex shows there are no

tglsfdc · tglsfdc · commit e81ad79de0cc · 1999-11-01T05:09:18.000Z
indexes to open.  Avoid unnecessary work in ExecCheckPerm, too.
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.98 1999/10/30 23:13:30 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.99 1999/11/01 05:09:17 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -383,26 +383,26 @@ ExecCheckPerms(CmdType operation,
 			   List *rangeTable,
 			   Query *parseTree)
 {
-	int			i = 1;
-	Oid			relid;
-	HeapTuple	htup;
+	int			rtindex = 0;
 	List	   *lp;
 	List	   *qvars,
 			   *tvars;
 	int32		ok = 1,
 				aclcheck_result = -1;
 	char	   *opstr;
-	NameData	rname;
+	char	   *relName = NULL;
 	char	   *userName;
 
-#define CHECK(MODE)		pg_aclcheck(rname.data, userName, MODE)
+#define CHECK(MODE)		pg_aclcheck(relName, userName, MODE)
 
 	userName = GetPgUserName();
 
 	foreach(lp, rangeTable)
 	{
 		RangeTblEntry *rte = lfirst(lp);
 
+		++rtindex;
+
 		if (rte->skipAcl)
 		{
 
@@ -415,16 +415,8 @@ ExecCheckPerms(CmdType operation,
 			continue;
 		}
 
-		relid = rte->relid;
-		htup = SearchSysCacheTuple(RELOID,
-								   ObjectIdGetDatum(relid),
-								   0, 0, 0);
-		if (!HeapTupleIsValid(htup))
-			elog(ERROR, "ExecCheckPerms: bogus RT relid: %u", relid);
-		StrNCpy(rname.data,
-				((Form_pg_class) GETSTRUCT(htup))->relname.data,
-				NAMEDATALEN);
-		if (i == resultRelation)
+		relName = rte->relname;
+		if (rtindex == resultRelation)
 		{						/* this is the result relation */
 			qvars = pull_varnos(parseTree->qual);
 			tvars = pull_varnos((Node *) parseTree->targetList);
@@ -461,10 +453,9 @@ ExecCheckPerms(CmdType operation,
 		}
 		if (!ok)
 			break;
-		++i;
 	}
 	if (!ok)
-		elog(ERROR, "%s: %s", rname.data, aclcheck_error_strings[aclcheck_result]);
+		elog(ERROR, "%s: %s", relName, aclcheck_error_strings[aclcheck_result]);
 
 	if (parseTree != NULL && parseTree->rowMark != NULL)
 	{
@@ -475,19 +466,11 @@ ExecCheckPerms(CmdType operation,
 			if (!(rm->info & ROW_ACL_FOR_UPDATE))
 				continue;
 
-			relid = ((RangeTblEntry *) nth(rm->rti - 1, rangeTable))->relid;
-			htup = SearchSysCacheTuple(RELOID,
-									   ObjectIdGetDatum(relid),
-									   0, 0, 0);
-			if (!HeapTupleIsValid(htup))
-				elog(ERROR, "ExecCheckPerms: bogus RT relid: %u", relid);
-			StrNCpy(rname.data,
-					((Form_pg_class) GETSTRUCT(htup))->relname.data,
-					NAMEDATALEN);
+			relName = rt_fetch(rm->rti, rangeTable)->relname;
 			ok = ((aclcheck_result = CHECK(ACL_WR)) == ACLCHECK_OK);
 			opstr = "write";
 			if (!ok)
-				elog(ERROR, "%s: %s", rname.data, aclcheck_error_strings[aclcheck_result]);
+				elog(ERROR, "%s: %s", relName, aclcheck_error_strings[aclcheck_result]);
 		}
 	}
 }
@@ -586,10 +569,13 @@ InitPlan(CmdType operation, Query *parseTree, Plan *plan, EState *estate)
 		resultRelationInfo->ri_IndexRelationInfo = NULL;
 
 		/*
-		 * open indices on result relation and save descriptors in the
-		 * result relation information..
+		 * If there are indices on the result relation, open them and save
+		 * descriptors in the result relation info, so that we can add new
+		 * index entries for the tuples we add/update.  We need not do this
+		 * for a DELETE, however, since deletion doesn't affect indexes.
 		 */
-		if (operation != CMD_DELETE)
+		if (resultRelationDesc->rd_rel->relhasindex &&
+			operation != CMD_DELETE)
 			ExecOpenIndices(resultRelationOid, resultRelationInfo);
 
 		estate->es_result_relation_info = resultRelationInfo;
@@ -618,7 +604,7 @@ InitPlan(CmdType operation, Query *parseTree, Plan *plan, EState *estate)
 		foreach(l, parseTree->rowMark)
 		{
 			rm = lfirst(l);
-			relid = ((RangeTblEntry *) nth(rm->rti - 1, rangeTable))->relid;
+			relid = rt_fetch(rm->rti, rangeTable)->relid;
 			relation = heap_open(relid, RowShareLock);
 			if (!(rm->info & ROW_MARK_FOR_UPDATE))
 				continue;
@@ -740,6 +726,8 @@ InitPlan(CmdType operation, Query *parseTree, Plan *plan, EState *estate)
 				 * XXX rather than having to call setheapoverride(true)
 				 * and then back to false, we should change the arguments
 				 * to heap_open() instead..
+				 *
+				 * XXX no, we should use commandCounterIncrement...
 				 */
 				setheapoverride(true);
 
diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.27 1999/10/30 23:13:30 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.28 1999/11/01 05:09:18 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -181,7 +181,6 @@ ExecInitAppend(Append *node, EState *estate, Plan *parent)
 {
 	AppendState *appendstate;
 	int			nplans;
-	List	   *resultList = NULL;
 	List	   *rtable;
 	List	   *appendplans;
 	bool	   *initialized;
@@ -246,13 +245,14 @@ ExecInitAppend(Append *node, EState *estate, Plan *parent)
 	if ((es_rri != (RelationInfo *) NULL) &&
 		(node->inheritrelid == es_rri->ri_RangeTableIndex))
 	{
-		RelationInfo *rri;
+		List	   *resultList = NIL;
 		List	   *rtentryP;
 
 		foreach(rtentryP, rtable)
 		{
-			Oid			reloid;
-			RangeTblEntry *rtentry = lfirst(rtentryP);
+			RangeTblEntry  *rtentry = lfirst(rtentryP);
+			Oid				reloid;
+			RelationInfo   *rri;
 
 			reloid = rtentry->relid;
 			rri = makeNode(RelationInfo);
@@ -262,8 +262,10 @@ ExecInitAppend(Append *node, EState *estate, Plan *parent)
 			rri->ri_IndexRelationDescs = NULL;	/* index descs */
 			rri->ri_IndexRelationInfo = NULL;	/* index key info */
 
+			if (rri->ri_RelationDesc->rd_rel->relhasindex)
+				ExecOpenIndices(reloid, rri);
+
 			resultList = lcons(rri, resultList);
-			ExecOpenIndices(reloid, rri);
 		}
 		appendstate->as_result_relation_info_list = resultList;
 	}

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.27 1999/10/30 23:13:30 tgl Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.28 1999/11/01 05:09:18 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -181,7 +181,6 @@ ExecInitAppend(Append node, EState estate, Plan *parent)`
`181`	`181`	`{`
`182`	`182`	`AppendState *appendstate;`
`183`	`183`	`int nplans;`
`184`		`- List *resultList = NULL;`
`185`	`184`	`List *rtable;`
`186`	`185`	`List *appendplans;`
`187`	`186`	`bool *initialized;`
`@@ -246,13 +245,14 @@ ExecInitAppend(Append node, EState estate, Plan *parent)`
`246`	`245`	`if ((es_rri != (RelationInfo *) NULL) &&`
`247`	`246`	`(node->inheritrelid == es_rri->ri_RangeTableIndex))`
`248`	`247`	`{`
`249`		`- RelationInfo *rri;`
	`248`	`+ List *resultList = NIL;`
`250`	`249`	`List *rtentryP;`
`251`	`250`
`252`	`251`	`foreach(rtentryP, rtable)`
`253`	`252`	`{`
`254`		`- Oid reloid;`
`255`		`- RangeTblEntry *rtentry = lfirst(rtentryP);`
	`253`	`+ RangeTblEntry *rtentry = lfirst(rtentryP);`
	`254`	`+ Oid reloid;`
	`255`	`+ RelationInfo *rri;`
`256`	`256`
`257`	`257`	`reloid = rtentry->relid;`
`258`	`258`	`rri = makeNode(RelationInfo);`
`@@ -262,8 +262,10 @@ ExecInitAppend(Append node, EState estate, Plan *parent)`
`262`	`262`	`rri->ri_IndexRelationDescs = NULL; /* index descs */`
`263`	`263`	`rri->ri_IndexRelationInfo = NULL; /* index key info */`
`264`	`264`
	`265`	`+ if (rri->ri_RelationDesc->rd_rel->relhasindex)`
	`266`	`+ ExecOpenIndices(reloid, rri);`
	`267`	`+`
`265`	`268`	`resultList = lcons(rri, resultList);`
`266`		`- ExecOpenIndices(reloid, rri);`
`267`	`269`	`}`
`268`	`270`	`appendstate->as_result_relation_info_list = resultList;`
`269`	`271`	`}`