github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-23 23:26:30 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Remove unneeded function

Browse Source
This commit is contained in:
Ian Barwick
2015-02-09 18:31:18 +09:00
parent 1369fe5c79
commit 94bc5bdf80
3 changed files with 1 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
repmgr.c
View File

@@ -2312,22 +2312,6 @@ create_schema(PGconn *conn)
} }
PQclear(res); PQclear(res);
// ZZZ no longer needed
sqlquery_snprintf(sqlquery,
"CREATE OR REPLACE FUNCTION %s.repmgr_get_primary_conninfo() "
" RETURNS text "
" AS '$libdir/repmgr_funcs', 'repmgr_get_primary_conninfo' "
" LANGUAGE C STRICT ",
get_repmgr_schema_quoted(conn));
res = PQexec(conn, sqlquery);
if (!res || PQresultStatus(res) != PGRES_COMMAND_OK)
{
fprintf(stderr, "Cannot create the function repmgr_get_primary_conninfo: %s\n",
PQerrorMessage(conn));
return false;
}
PQclear(res);
return true; return true;
} }

18
sql/repmgr_funcs.c
View File

@@ -58,8 +58,7 @@ Datum repmgr_get_last_updated(PG_FUNCTION_ARGS);
PG_FUNCTION_INFO_V1(repmgr_update_last_updated); PG_FUNCTION_INFO_V1(repmgr_update_last_updated);
PG_FUNCTION_INFO_V1(repmgr_get_last_updated); PG_FUNCTION_INFO_V1(repmgr_get_last_updated);
Datum repmgr_get_primary_conninfo(PG_FUNCTION_ARGS);
PG_FUNCTION_INFO_V1(repmgr_get_primary_conninfo);
/* /*
* Module load callback * Module load callback
@@ -235,18 +234,3 @@ repmgr_get_last_updated(PG_FUNCTION_ARGS)
} }
/*
* get the `primary_conninfo` string used by walreceiver,
* which is the value parsed from recovery.conf at startup
*
* XXX is there a better way of doing this?
*/
Datum
repmgr_get_primary_conninfo(PG_FUNCTION_ARGS)
{
/* use volatile pointer to prevent code rearrangement */
volatile WalRcvData *walrcv = WalRcv;
PG_RETURN_TEXT_P(cstring_to_text((const char *)walrcv->conninfo));
}

4
sql/repmgr_funcs.sql.in
View File

@@ -21,7 +21,3 @@ LANGUAGE C STRICT;
CREATE FUNCTION repmgr_get_last_updated() RETURNS TIMESTAMP WITH TIME ZONE CREATE FUNCTION repmgr_get_last_updated() RETURNS TIMESTAMP WITH TIME ZONE
AS 'MODULE_PATHNAME', 'repmgr_get_last_updated' AS 'MODULE_PATHNAME', 'repmgr_get_last_updated'
LANGUAGE C STRICT; LANGUAGE C STRICT;
CREATE FUNCTION repmgr_get_primary_conninfo() RETURNS TEXT
AS 'MODULE_PATHNAME', 'repmgr_get_primary_conninfo'
LANGUAGE C STRICT;