2 files changed, 26 insertions, 56 deletions

diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c
index 2a56a6573a4..6a2bd7dc932 100644
--- a/src/backend/commands/command.c
+++ b/src/backend/commands/command.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.133 2001/06/12 05:55:49 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.134 2001/06/14 01:09:22 tgl Exp $
  *
  * NOTES
  *	  The PerformAddAttribute() code, like most of the relation
@@ -19,40 +19,36 @@
  */
 #include "postgres.h"
 
+#include "access/genam.h"
 #include "access/tuptoaster.h"
 #include "catalog/catalog.h"
 #include "catalog/catname.h"
+#include "catalog/heap.h"
 #include "catalog/index.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_attrdef.h"
+#include "catalog/pg_index.h"
 #include "catalog/pg_opclass.h"
-#include "catalog/pg_rewrite.h"
+#include "catalog/pg_type.h"
 #include "commands/command.h"
-#include "executor/spi.h"
-#include "catalog/heap.h"
+#include "commands/trigger.h"
+#include "executor/execdefs.h"
+#include "executor/executor.h"
 #include "miscadmin.h"
+#include "optimizer/clauses.h"
+#include "optimizer/planmain.h"
 #include "optimizer/prep.h"
-#include "utils/acl.h"
-#include "utils/fmgroids.h"
-#include "commands/trigger.h"
-
+#include "parser/parse.h"
 #include "parser/parse_expr.h"
-#include "parser/parse_clause.h"
-#include "parser/parse_relation.h"
 #include "parser/parse_oper.h"
-#include "nodes/makefuncs.h"
-#include "optimizer/planmain.h"
-#include "optimizer/clauses.h"
-#include "rewrite/rewriteSupport.h"
-#include "commands/view.h"
-#include "utils/temprel.h"
-#include "executor/spi_priv.h"
-#include "catalog/pg_index.h"
-#include "catalog/pg_shadow.h"
+#include "parser/parse_relation.h"
+#include "utils/acl.h"
+#include "utils/builtins.h"
+#include "utils/fmgroids.h"
+#include "utils/lsyscache.h"
+#include "utils/syscache.h"
 #include "utils/relcache.h"
-
-#include "parser/parse.h"
-#include "access/genam.h"
+#include "utils/temprel.h"
 
 
 static void drop_default(Oid relid, int16 attnum);
@@ -1689,13 +1685,7 @@ AlterTableOwner(const char *relationName, const char *newOwnerName)
 	/*
 	 * look up the new owner in pg_shadow and get the sysid
 	 */
-	tuple = SearchSysCache(SHADOWNAME,
-						   PointerGetDatum(newOwnerName),
-						   0, 0, 0);
-	if (!HeapTupleIsValid(tuple))
-		elog(ERROR, "ALTER TABLE: user \"%s\" not found", newOwnerName);
-	newOwnerSysid = ((Form_pg_shadow) GETSTRUCT(tuple))->usesysid;
-	ReleaseSysCache(tuple);
+	newOwnerSysid = get_usesysid(newOwnerName);
 
 	/*
 	 * find the table's entry in pg_class and make a modifiable copy
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 74990ce1b92..3d003616c09 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.76 2001/06/12 05:55:49 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.77 2001/06/14 01:09:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,6 +29,7 @@
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
+#include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
 
@@ -728,16 +729,9 @@ CreateGroup(CreateGroupStmt *stmt)
 		const char *groupuser = strVal(lfirst(item));
 		Value	   *v;
 
-		tuple = SearchSysCache(SHADOWNAME,
-							   PointerGetDatum(groupuser),
-							   0, 0, 0);
-		if (!HeapTupleIsValid(tuple))
-			elog(ERROR, "CREATE GROUP: user \"%s\" does not exist", groupuser);
-
-		v = makeInteger(((Form_pg_shadow) GETSTRUCT(tuple))->usesysid);
+		v = makeInteger(get_usesysid(groupuser));
 		if (!member(v, newlist))
 			newlist = lcons(v, newlist);
-		ReleaseSysCache(tuple);
 	}
 
 	/* build an array to insert */
@@ -879,18 +873,10 @@ AlterGroup(AlterGroupStmt *stmt, const char *tag)
 			if (strcmp(tag, "ALTER GROUP") == 0)
 			{
 				/* Get the uid of the proposed user to add. */
-				tuple = SearchSysCache(SHADOWNAME,
-								   PointerGetDatum(strVal(lfirst(item))),
-									   0, 0, 0);
-				if (!HeapTupleIsValid(tuple))
-					elog(ERROR, "%s: user \"%s\" does not exist",
-						 tag, strVal(lfirst(item)));
-				v = makeInteger(((Form_pg_shadow) GETSTRUCT(tuple))->usesysid);
-				ReleaseSysCache(tuple);
+				v = makeInteger(get_usesysid(strVal(lfirst(item))));
 			}
 			else if (strcmp(tag, "CREATE USER") == 0)
 			{
-
 				/*
 				 * in this case we already know the uid and it wouldn't be
 				 * in the cache anyway yet
@@ -906,12 +892,12 @@ AlterGroup(AlterGroupStmt *stmt, const char *tag)
 			if (!member(v, newlist))
 				newlist = lcons(v, newlist);
 			else
-
 				/*
 				 * we silently assume here that this error will only come
 				 * up in a ALTER GROUP statement
 				 */
-				elog(NOTICE, "%s: user \"%s\" is already in group \"%s\"", tag, strVal(lfirst(item)), stmt->name);
+				elog(NOTICE, "%s: user \"%s\" is already in group \"%s\"",
+					 tag, strVal(lfirst(item)), stmt->name);
 		}
 
 		newarray = palloc(ARR_OVERHEAD(1) + length(newlist) * sizeof(int32));
@@ -1001,13 +987,7 @@ AlterGroup(AlterGroupStmt *stmt, const char *tag)
 				if (!is_dropuser)
 				{
 					/* Get the uid of the proposed user to drop. */
-					tuple = SearchSysCache(SHADOWNAME,
-								   PointerGetDatum(strVal(lfirst(item))),
-										   0, 0, 0);
-					if (!HeapTupleIsValid(tuple))
-						elog(ERROR, "ALTER GROUP: user \"%s\" does not exist", strVal(lfirst(item)));
-					v = makeInteger(((Form_pg_shadow) GETSTRUCT(tuple))->usesysid);
-					ReleaseSysCache(tuple);
+					v = makeInteger(get_usesysid(strVal(lfirst(item))));
 				}
 				else
 				{