From: Shigeru Hanada <hanada@metrosystems.co.jp>
Date: Wed, 27 Oct 2010 04:31:55 +0000 (+0900)
Subject: Remove unnecessary variables from postgresql_fdw.
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=16fde76286bf7c46b25371bb50a7e216e3cddf8d;p=users%2Fhanada%2Fpostgres.git

Remove unnecessary variables from postgresql_fdw.
---

diff --git a/contrib/postgresql_fdw/fsconnection.c b/contrib/postgresql_fdw/fsconnection.c
index 3d55599ca3..214a3b4a23 100644
--- a/contrib/postgresql_fdw/fsconnection.c
+++ b/contrib/postgresql_fdw/fsconnection.c
@@ -29,8 +29,6 @@ typedef struct ConnCacheEntry
 {
 	/* hash key must be first */
 	char			name[NAMEDATALEN];	/* connection name; used as hash key */
-	Oid				serverid;			/* oid of foreign server */
-	Oid				userid;				/* oid of user (0 means PUBLIC) */
 	FdwRoutine	   *routine;
 	PGconn		   *conn;				/* foreign server connection */
 } ConnCacheEntry;
@@ -48,7 +46,6 @@ static HTAB *FSConnectionHash;
 void
 RegisterConnection(PGconn *conn,
 				   ForeignServer *server,
-				   UserMapping *user,
 				   const char *conname)
 {
 	ForeignDataWrapper *wrapper;
@@ -58,7 +55,6 @@ RegisterConnection(PGconn *conn,
 
 	AssertArg(conn != NULL);
 	AssertArg(server != NULL);
-	AssertArg(user != NULL);
 	AssertArg(conname != NULL);
 	AssertArg(strlen(conname) < NAMEDATALEN);
 
@@ -71,8 +67,6 @@ RegisterConnection(PGconn *conn,
 				(errcode(ERRCODE_DUPLICATE_OBJECT),
 				 errmsg("connection \"%s\" already exists", conname)));
 
-	entry->serverid = server->serverid;
-	entry->userid = user->userid;
 	entry->routine = routine;
 	entry->conn = conn;
 }
diff --git a/contrib/postgresql_fdw/fsconnection.h b/contrib/postgresql_fdw/fsconnection.h
index de6606df11..ab685d800b 100644
--- a/contrib/postgresql_fdw/fsconnection.h
+++ b/contrib/postgresql_fdw/fsconnection.h
@@ -15,7 +15,7 @@
 #include "libpq-fe.h"
 
 /* managing connection cache */
-extern void RegisterConnection(PGconn *conn, ForeignServer *server, UserMapping *user, const char *conname);
+extern void RegisterConnection(PGconn *conn, ForeignServer *server, const char *conname);
 extern PGconn *GetConnectionByName(const char *conname);
 extern PGconn *UnregisterConnection(const char *conname);
 extern void DisconnectAll(void);
diff --git a/contrib/postgresql_fdw/postgresql_fdw.c b/contrib/postgresql_fdw/postgresql_fdw.c
index 63434f9b67..c319daa14a 100644
--- a/contrib/postgresql_fdw/postgresql_fdw.c
+++ b/contrib/postgresql_fdw/postgresql_fdw.c
@@ -154,7 +154,7 @@ pgConnectServer(ForeignServer *server, UserMapping *user)
 	pfree(values);
 
 	/* register the connection into connection cache. */
-	RegisterConnection(conn, server, user, server->servername);
+	RegisterConnection(conn, server, server->servername);
 
 	return (FSConnection *) conn;
 }