On Thu, Feb 20, 2014 at 8:55 AM, Andres Freund <and...@2ndquadrant.com> wrote: > On 2014-02-19 12:47:40 -0500, Robert Haas wrote: >> On Wed, Feb 5, 2014 at 9:26 PM, Michael Paquier >> <michael.paqu...@gmail.com> wrote: >> >> Yes, that's a good precedent in multiple ways. >> > Here are updated patches to use pg_lsn instead of pglsn... >> >> OK, so I think this stuff is all committed now, with assorted changes. >> Thanks for your work on this. > > cool, thanks you two. > > I wonder if pg_stat_replication shouldn't be updated to use it as well? > SELECT * FROM pg_attribute WHERE attname ~ '(location|lsn)'; only shows > that as names that are possible candidates for conversion. I was sure to have forgotten some views or functions in the previous patch... Please find attached a patch making pg_stat_replication use pg_lsn instead of the existing text fields. Regards, -- Michael
diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml index a37e6b6..370857a 100644 --- a/doc/src/sgml/monitoring.sgml +++ b/doc/src/sgml/monitoring.sgml @@ -1490,24 +1490,24 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re </row> <row> <entry><structfield>sent_location</></entry> - <entry><type>text</></entry> + <entry><type>pg_lsn</></entry> <entry>Last transaction log position sent on this connection</entry> </row> <row> <entry><structfield>write_location</></entry> - <entry><type>text</></entry> + <entry><type>pg_lsn</></entry> <entry>Last transaction log position written to disk by this standby server</entry> </row> <row> <entry><structfield>flush_location</></entry> - <entry><type>text</></entry> + <entry><type>pg_lsn</></entry> <entry>Last transaction log position flushed to disk by this standby server</entry> </row> <row> <entry><structfield>replay_location</></entry> - <entry><type>text</></entry> + <entry><type>pg_lsn</></entry> <entry>Last transaction log position replayed into the database on this standby server</entry> </row> diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index 06b22e2..048367a 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -67,6 +67,7 @@ #include "utils/builtins.h" #include "utils/guc.h" #include "utils/memutils.h" +#include "utils/pg_lsn.h" #include "utils/ps_status.h" #include "utils/resowner.h" #include "utils/timeout.h" @@ -2137,7 +2138,6 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS) { /* use volatile pointer to prevent code rearrangement */ volatile WalSnd *walsnd = &WalSndCtl->walsnds[i]; - char location[MAXFNAMELEN]; XLogRecPtr sentPtr; XLogRecPtr write; XLogRecPtr flush; @@ -2171,28 +2171,19 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS) else { values[1] = CStringGetTextDatum(WalSndGetStateString(state)); - - snprintf(location, sizeof(location), "%X/%X", - (uint32) (sentPtr >> 32), (uint32) sentPtr); - values[2] = CStringGetTextDatum(location); + values[2] = LSNGetDatum(sentPtr); if (write == 0) nulls[3] = true; - snprintf(location, sizeof(location), "%X/%X", - (uint32) (write >> 32), (uint32) write); - values[3] = CStringGetTextDatum(location); + values[3] = LSNGetDatum(write); if (flush == 0) nulls[4] = true; - snprintf(location, sizeof(location), "%X/%X", - (uint32) (flush >> 32), (uint32) flush); - values[4] = CStringGetTextDatum(location); + values[4] = LSNGetDatum(flush); if (apply == 0) nulls[5] = true; - snprintf(location, sizeof(location), "%X/%X", - (uint32) (apply >> 32), (uint32) apply); - values[5] = CStringGetTextDatum(location); + values[5] = LSNGetDatum(apply); values[6] = Int32GetDatum(sync_priority[i]); diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index 11c1e1a..a2cc19f 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -2634,7 +2634,7 @@ DATA(insert OID = 1936 ( pg_stat_get_backend_idset PGNSP PGUID 12 1 100 0 0 f DESCR("statistics: currently active backend IDs"); DATA(insert OID = 2022 ( pg_stat_get_activity PGNSP PGUID 12 1 100 0 0 f f f f f t s 1 0 2249 "23" "{23,26,23,26,25,25,25,16,1184,1184,1184,1184,869,25,23}" "{i,o,o,o,o,o,o,o,o,o,o,o,o,o,o}" "{pid,datid,pid,usesysid,application_name,state,query,waiting,xact_start,query_start,backend_start,state_change,client_addr,client_hostname,client_port}" _null_ pg_stat_get_activity _null_ _null_ _null_ )); DESCR("statistics: information about currently active backends"); -DATA(insert OID = 3099 ( pg_stat_get_wal_senders PGNSP PGUID 12 1 10 0 0 f f f f f t s 0 0 2249 "" "{23,25,25,25,25,25,23,25}" "{o,o,o,o,o,o,o,o}" "{pid,state,sent_location,write_location,flush_location,replay_location,sync_priority,sync_state}" _null_ pg_stat_get_wal_senders _null_ _null_ _null_ )); +DATA(insert OID = 3099 ( pg_stat_get_wal_senders PGNSP PGUID 12 1 10 0 0 f f f f f t s 0 0 2249 "" "{23,25,3220,3220,3220,3220,23,25}" "{o,o,o,o,o,o,o,o}" "{pid,state,sent_location,write_location,flush_location,replay_location,sync_priority,sync_state}" _null_ pg_stat_get_wal_senders _null_ _null_ _null_ )); DESCR("statistics: information about currently active replication"); DATA(insert OID = 2026 ( pg_backend_pid PGNSP PGUID 12 1 0 0 0 f f f f t f s 0 0 23 "" _null_ _null_ _null_ _null_ pg_backend_pid _null_ _null_ _null_ )); DESCR("statistics: current backend PID");
-- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers