From: Shigeru Hanada Date: Tue, 23 Nov 2010 05:46:30 +0000 (+0900) Subject: Revert unnecessary chenges to make patch smaller. X-Git-Url: http://git.postgresql.org/gitweb/review?a=commitdiff_plain;h=ff0d72c2b4f9300ec6bde64259711e1ea5b0122f;p=users%2Fhanada%2Fpostgres.git Revert unnecessary chenges to make patch smaller. --- diff --git a/src/backend/commands/foreigncmds.c b/src/backend/commands/foreigncmds.c index 8149f343e7..f393b2fef4 100644 --- a/src/backend/commands/foreigncmds.c +++ b/src/backend/commands/foreigncmds.c @@ -353,13 +353,13 @@ lookup_fdw_handler_func(DefElem *handler) } static void -parse_fdw_options(List *fdw_options, DefElem **validator, DefElem **handler) +parse_func_options(List *func_options, DefElem **validator, DefElem **handler) { ListCell *cell; *validator = NULL; *handler = NULL; - foreach (cell, fdw_options) + foreach (cell, func_options) { DefElem *def = lfirst(cell); @@ -433,7 +433,7 @@ CreateForeignDataWrapper(CreateFdwStmt *stmt) values[Anum_pg_foreign_data_wrapper_fdwowner - 1] = ObjectIdGetDatum(ownerId); /* determin which validator to be used (or not used at all) */ - parse_fdw_options(stmt->fdw_options, &defvalidator, &defhandler); + parse_func_options(stmt->func_options, &defvalidator, &defhandler); fdwvalidator = lookup_fdw_validator_func(defvalidator); fdwhandler = lookup_fdw_handler_func(defhandler); @@ -444,7 +444,7 @@ CreateForeignDataWrapper(CreateFdwStmt *stmt) fdwoptions = transformGenericOptions(ForeignDataWrapperRelationId, PointerGetDatum(NULL), - stmt->gen_options, + stmt->options, fdwvalidator); if (PointerIsValid(DatumGetPointer(fdwoptions))) @@ -596,7 +596,7 @@ AlterForeignDataWrapper(AlterFdwStmt *stmt) memset(repl_null, false, sizeof(repl_null)); memset(repl_repl, false, sizeof(repl_repl)); - parse_fdw_options(stmt->fdw_options, &defvalidator, &defhandler); + parse_func_options(stmt->func_options, &defvalidator, &defhandler); if (defvalidator) { @@ -665,7 +665,7 @@ AlterForeignDataWrapper(AlterFdwStmt *stmt) /* * Options specified, validate and update. */ - if (stmt->gen_options) + if (stmt->options) { /* Extract the current options */ datum = SysCacheGetAttr(FOREIGNDATAWRAPPEROID, @@ -678,7 +678,7 @@ AlterForeignDataWrapper(AlterFdwStmt *stmt) /* Transform the options */ datum = transformGenericOptions(ForeignDataWrapperRelationId, datum, - stmt->gen_options, + stmt->options, fdwvalidator); if (PointerIsValid(DatumGetPointer(datum))) diff --git a/src/backend/foreign/foreign.c b/src/backend/foreign/foreign.c index bbf04759fc..61486b5984 100644 --- a/src/backend/foreign/foreign.c +++ b/src/backend/foreign/foreign.c @@ -26,7 +26,6 @@ #include "utils/acl.h" #include "utils/array.h" #include "utils/builtins.h" -#include "utils/hsearch.h" #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/syscache.h" @@ -38,7 +37,7 @@ extern Datum postgresql_fdw_validator(PG_FUNCTION_ARGS); /* - * GetForeignDataWrapper - look up the foreign-data wrapper by OID. + * GetForeignDataWrapper - look up the foreign-data wrapper by OID. */ ForeignDataWrapper * GetForeignDataWrapper(Oid fdwid) @@ -133,8 +132,6 @@ GetForeignServer(Oid serverid) server = palloc(sizeof(ForeignServer)); server->serverid = serverid; - server->fdwid = serverform->srvfdw; - server->owner = serverform->srvowner; server->servername = pstrdup(NameStr(serverform->srvname)); server->owner = serverform->srvowner; server->fdwid = serverform->srvfdw; diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index 526456f9de..2e0e1ea6b2 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -3203,8 +3203,8 @@ _copyCreateFdwStmt(CreateFdwStmt *from) CreateFdwStmt *newnode = makeNode(CreateFdwStmt); COPY_STRING_FIELD(fdwname); - COPY_NODE_FIELD(fdw_options); - COPY_NODE_FIELD(gen_options); + COPY_NODE_FIELD(func_options); + COPY_NODE_FIELD(options); return newnode; } @@ -3215,8 +3215,8 @@ _copyAlterFdwStmt(AlterFdwStmt *from) AlterFdwStmt *newnode = makeNode(AlterFdwStmt); COPY_STRING_FIELD(fdwname); - COPY_NODE_FIELD(fdw_options); - COPY_NODE_FIELD(gen_options); + COPY_NODE_FIELD(func_options); + COPY_NODE_FIELD(options); return newnode; } diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c index a237595489..64b906ff8e 100644 --- a/src/backend/nodes/equalfuncs.c +++ b/src/backend/nodes/equalfuncs.c @@ -1626,8 +1626,8 @@ static bool _equalCreateFdwStmt(CreateFdwStmt *a, CreateFdwStmt *b) { COMPARE_STRING_FIELD(fdwname); - COMPARE_NODE_FIELD(fdw_options); - COMPARE_NODE_FIELD(gen_options); + COMPARE_NODE_FIELD(func_options); + COMPARE_NODE_FIELD(options); return true; } @@ -1636,8 +1636,8 @@ static bool _equalAlterFdwStmt(AlterFdwStmt *a, AlterFdwStmt *b) { COMPARE_STRING_FIELD(fdwname); - COMPARE_NODE_FIELD(fdw_options); - COMPARE_NODE_FIELD(gen_options); + COMPARE_NODE_FIELD(func_options); + COMPARE_NODE_FIELD(options); return true; } diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 7d088f7395..666a189cf7 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -306,7 +306,7 @@ static RangeVar *makeRangeVarFromAnyName(List *names, int position, core_yyscan_ create_generic_options alter_generic_options relation_expr_list dostmt_opt_list -%type opt_fdw_options fdw_options +%type opt_func_options func_options %type fdw_option %type OptTempTableName @@ -3222,12 +3222,12 @@ DropTableSpaceStmt: DROP TABLESPACE name * *****************************************************************************/ -CreateFdwStmt: CREATE FOREIGN DATA_P WRAPPER name opt_fdw_options create_generic_options +CreateFdwStmt: CREATE FOREIGN DATA_P WRAPPER name opt_func_options create_generic_options { CreateFdwStmt *n = makeNode(CreateFdwStmt); n->fdwname = $5; - n->fdw_options = $6; - n->gen_options = $7; + n->func_options = $6; + n->options = $7; $$ = (Node *) n; } ; @@ -3239,13 +3239,13 @@ fdw_option: | NO HANDLER { $$ = makeDefElem("handler", NULL); } ; -fdw_options: +func_options: fdw_option { $$ = list_make1($1); } - | fdw_options fdw_option { $$ = lappend($1, $2); } + | func_options fdw_option { $$ = lappend($1, $2); } ; -opt_fdw_options: - fdw_options { $$ = $1; } +opt_func_options: + func_options { $$ = $1; } | /*EMPTY*/ { $$ = NIL; } ; @@ -3281,20 +3281,20 @@ DropFdwStmt: DROP FOREIGN DATA_P WRAPPER name opt_drop_behavior * ****************************************************************************/ -AlterFdwStmt: ALTER FOREIGN DATA_P WRAPPER name opt_fdw_options alter_generic_options +AlterFdwStmt: ALTER FOREIGN DATA_P WRAPPER name opt_func_options alter_generic_options { AlterFdwStmt *n = makeNode(AlterFdwStmt); n->fdwname = $5; - n->fdw_options = $6; - n->gen_options = $7; + n->func_options = $6; + n->options = $7; $$ = (Node *) n; } - | ALTER FOREIGN DATA_P WRAPPER name fdw_options + | ALTER FOREIGN DATA_P WRAPPER name func_options { AlterFdwStmt *n = makeNode(AlterFdwStmt); n->fdwname = $5; - n->fdw_options = $6; - n->gen_options = NIL; + n->func_options = $6; + n->options = NIL; $$ = (Node *) n; } ; diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 5b353dada1..eb3360fc9e 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -1535,16 +1535,16 @@ typedef struct CreateFdwStmt { NodeTag type; char *fdwname; /* foreign-data wrapper name */ - List *fdw_options; /* VALIDATOR/HANDLER conbination */ - List *gen_options; /* generic options to FDW */ + List *func_options; /* VALIDATOR/HANDLER conbination */ + List *options; /* generic options to FDW */ } CreateFdwStmt; typedef struct AlterFdwStmt { NodeTag type; char *fdwname; /* foreign-data wrapper name */ - List *fdw_options; /* VALIDATOR/HANDLER conbination */ - List *gen_options; /* generic options to FDW */ + List *func_options; /* VALIDATOR/HANDLER conbination */ + List *options; /* generic options to FDW */ } AlterFdwStmt; typedef struct DropFdwStmt