mirror of
https://github.com/postgres/postgres.git
synced 2025-07-11 10:01:57 +03:00
Replace the pg_listener-based LISTEN/NOTIFY mechanism with an in-memory queue.
In addition, add support for a "payload" string to be passed along with each notify event. This implementation should be significantly more efficient than the old one, and is also more compatible with Hot Standby usage. There is not yet any facility for HS slaves to receive notifications generated on the master, although such a thing is possible in future. Joachim Wieland, reviewed by Jeff Davis; also hacked on by me.
This commit is contained in:
Tom Lane
@ -41,7 +41,7 @@
|
||||
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/backend/access/transam/slru.c,v 1.48 2010/01/02 16:57:35 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/access/transam/slru.c,v 1.49 2010/02/16 22:34:43 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -59,25 +59,6 @@
|
||||
#include "miscadmin.h"
|
||||
|
||||
|
||||
/*
|
||||
* Define segment size. A page is the same BLCKSZ as is used everywhere
|
||||
* else in Postgres. The segment size can be chosen somewhat arbitrarily;
|
||||
* we make it 32 pages by default, or 256Kb, i.e. 1M transactions for CLOG
|
||||
* or 64K transactions for SUBTRANS.
|
||||
*
|
||||
* Note: because TransactionIds are 32 bits and wrap around at 0xFFFFFFFF,
|
||||
* page numbering also wraps around at 0xFFFFFFFF/xxxx_XACTS_PER_PAGE (where
|
||||
* xxxx is CLOG or SUBTRANS, respectively), and segment numbering at
|
||||
* 0xFFFFFFFF/xxxx_XACTS_PER_PAGE/SLRU_PAGES_PER_SEGMENT. We need
|
||||
* take no explicit notice of that fact in this module, except when comparing
|
||||
* segment and page numbers in SimpleLruTruncate (see PagePrecedes()).
|
||||
*
|
||||
* Note: this file currently assumes that segment file names will be four
|
||||
* hex digits. This sets a lower bound on the segment size (64K transactions
|
||||
* for 32-bit TransactionIds).
|
||||
*/
|
||||
#define SLRU_PAGES_PER_SEGMENT 32
|
||||
|
||||
#define SlruFileName(ctl, path, seg) \
|
||||
snprintf(path, MAXPGPATH, "%s/%04X", (ctl)->Dir, seg)
|
||||
|
||||
@ -183,6 +164,8 @@ SimpleLruInit(SlruCtl ctl, const char *name, int nslots, int nlsns,
|
||||
shared = (SlruShared) ShmemInitStruct(name,
|
||||
SimpleLruShmemSize(nslots, nlsns),
|
||||
&found);
|
||||
if (!shared)
|
||||
elog(ERROR, "out of shared memory");
|
||||
|
||||
if (!IsUnderPostmaster)
|
||||
{
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/access/transam/twophase_rmgr.c,v 1.12 2010/01/02 16:57:35 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/access/transam/twophase_rmgr.c,v 1.13 2010/02/16 22:34:43 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -16,7 +16,6 @@
|
||||
|
||||
#include "access/multixact.h"
|
||||
#include "access/twophase_rmgr.h"
|
||||
#include "commands/async.h"
|
||||
#include "pgstat.h"
|
||||
#include "storage/lock.h"
|
||||
|
||||
@ -25,7 +24,6 @@ const TwoPhaseCallback twophase_recover_callbacks[TWOPHASE_RM_MAX_ID + 1] =
|
||||
{
|
||||
NULL, /* END ID */
|
||||
lock_twophase_recover, /* Lock */
|
||||
NULL, /* notify/listen */
|
||||
NULL, /* pgstat */
|
||||
multixact_twophase_recover /* MultiXact */
|
||||
};
|
||||
@ -34,7 +32,6 @@ const TwoPhaseCallback twophase_postcommit_callbacks[TWOPHASE_RM_MAX_ID + 1] =
|
||||
{
|
||||
NULL, /* END ID */
|
||||
lock_twophase_postcommit, /* Lock */
|
||||
notify_twophase_postcommit, /* notify/listen */
|
||||
pgstat_twophase_postcommit, /* pgstat */
|
||||
multixact_twophase_postcommit /* MultiXact */
|
||||
};
|
||||
@ -43,7 +40,6 @@ const TwoPhaseCallback twophase_postabort_callbacks[TWOPHASE_RM_MAX_ID + 1] =
|
||||
{
|
||||
NULL, /* END ID */
|
||||
lock_twophase_postabort, /* Lock */
|
||||
NULL, /* notify/listen */
|
||||
pgstat_twophase_postabort, /* pgstat */
|
||||
multixact_twophase_postabort /* MultiXact */
|
||||
};
|
||||
@ -52,7 +48,6 @@ const TwoPhaseCallback twophase_standby_recover_callbacks[TWOPHASE_RM_MAX_ID + 1
|
||||
{
|
||||
NULL, /* END ID */
|
||||
lock_twophase_standby_recover, /* Lock */
|
||||
NULL, /* notify/listen */
|
||||
NULL, /* pgstat */
|
||||
NULL /* MultiXact */
|
||||
};
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.285 2010/02/13 16:15:46 sriggs Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.286 2010/02/16 22:34:43 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -1736,8 +1736,12 @@ CommitTransaction(void)
|
||||
/* close large objects before lower-level cleanup */
|
||||
AtEOXact_LargeObject(true);
|
||||
|
||||
/* NOTIFY commit must come before lower-level cleanup */
|
||||
AtCommit_Notify();
|
||||
/*
|
||||
* Insert notifications sent by NOTIFY commands into the queue. This
|
||||
* should be late in the pre-commit sequence to minimize time spent
|
||||
* holding the notify-insertion lock.
|
||||
*/
|
||||
PreCommit_Notify();
|
||||
|
||||
/* Prevent cancel/die interrupt while cleaning up */
|
||||
HOLD_INTERRUPTS();
|
||||
@ -1825,6 +1829,7 @@ CommitTransaction(void)
|
||||
/* Check we've released all catcache entries */
|
||||
AtEOXact_CatCache(true);
|
||||
|
||||
AtCommit_Notify();
|
||||
AtEOXact_GUC(true, 1);
|
||||
AtEOXact_SPI(true);
|
||||
AtEOXact_on_commit_actions(true);
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#
|
||||
# Makefile for backend/catalog
|
||||
#
|
||||
# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.76 2010/01/06 19:56:29 tgl Exp $
|
||||
# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.77 2010/02/16 22:34:43 tgl Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
@ -30,7 +30,7 @@ POSTGRES_BKI_SRCS = $(addprefix $(top_srcdir)/src/include/catalog/,\
|
||||
pg_attrdef.h pg_constraint.h pg_inherits.h pg_index.h pg_operator.h \
|
||||
pg_opfamily.h pg_opclass.h pg_am.h pg_amop.h pg_amproc.h \
|
||||
pg_language.h pg_largeobject_metadata.h pg_largeobject.h pg_aggregate.h \
|
||||
pg_statistic.h pg_rewrite.h pg_trigger.h pg_listener.h pg_description.h \
|
||||
pg_statistic.h pg_rewrite.h pg_trigger.h pg_description.h \
|
||||
pg_cast.h pg_enum.h pg_namespace.h pg_conversion.h pg_depend.h \
|
||||
pg_database.h pg_db_role_setting.h pg_tablespace.h pg_pltemplate.h \
|
||||
pg_authid.h pg_auth_members.h pg_shdepend.h pg_shdescription.h \
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -15,7 +15,7 @@
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.461 2010/02/12 17:33:20 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.462 2010/02/16 22:34:43 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -2777,6 +2777,7 @@ _copyNotifyStmt(NotifyStmt *from)
|
||||
NotifyStmt *newnode = makeNode(NotifyStmt);
|
||||
|
||||
COPY_STRING_FIELD(conditionname);
|
||||
COPY_STRING_FIELD(payload);
|
||||
|
||||
return newnode;
|
||||
}
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.382 2010/02/12 17:33:20 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.383 2010/02/16 22:34:43 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -1325,6 +1325,7 @@ static bool
|
||||
_equalNotifyStmt(NotifyStmt *a, NotifyStmt *b)
|
||||
{
|
||||
COMPARE_STRING_FIELD(conditionname);
|
||||
COMPARE_STRING_FIELD(payload);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.382 2010/02/12 17:33:20 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.383 2010/02/16 22:34:43 tgl Exp $
|
||||
*
|
||||
* NOTES
|
||||
* Every node type that can appear in stored rules' parsetrees *must*
|
||||
@ -1820,6 +1820,7 @@ _outNotifyStmt(StringInfo str, NotifyStmt *node)
|
||||
WRITE_NODE_TYPE("NOTIFY");
|
||||
|
||||
WRITE_STRING_FIELD(conditionname);
|
||||
WRITE_STRING_FIELD(payload);
|
||||
}
|
||||
|
||||
static void
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/nodes/readfuncs.c,v 1.231 2010/02/12 17:33:20 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/nodes/readfuncs.c,v 1.232 2010/02/16 22:34:43 tgl Exp $
|
||||
*
|
||||
* NOTES
|
||||
* Path and Plan nodes do not have any readfuncs support, because we
|
||||
@ -231,6 +231,7 @@ _readNotifyStmt(void)
|
||||
READ_LOCALS(NotifyStmt);
|
||||
|
||||
READ_STRING_FIELD(conditionname);
|
||||
READ_STRING_FIELD(payload);
|
||||
|
||||
READ_DONE();
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.708 2010/02/12 17:33:20 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.709 2010/02/16 22:34:49 tgl Exp $
|
||||
*
|
||||
* HISTORY
|
||||
* AUTHOR DATE MAJOR EVENT
|
||||
@ -400,7 +400,7 @@ static TypeName *TableFuncTypeName(List *columns);
|
||||
|
||||
%type <ival> Iconst SignedIconst
|
||||
%type <list> Iconst_list
|
||||
%type <str> Sconst comment_text
|
||||
%type <str> Sconst comment_text notify_payload
|
||||
%type <str> RoleId opt_granted_by opt_boolean ColId_or_Sconst
|
||||
%type <list> var_list
|
||||
%type <str> ColId ColLabel var_name type_function_name param_name
|
||||
@ -6123,14 +6123,20 @@ DropRuleStmt:
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
NotifyStmt: NOTIFY ColId
|
||||
NotifyStmt: NOTIFY ColId notify_payload
|
||||
{
|
||||
NotifyStmt *n = makeNode(NotifyStmt);
|
||||
n->conditionname = $2;
|
||||
n->payload = $3;
|
||||
$$ = (Node *)n;
|
||||
}
|
||||
;
|
||||
|
||||
notify_payload:
|
||||
',' Sconst { $$ = $2; }
|
||||
| /*EMPTY*/ { $$ = NULL; }
|
||||
;
|
||||
|
||||
ListenStmt: LISTEN ColId
|
||||
{
|
||||
ListenStmt *n = makeNode(ListenStmt);
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/storage/ipc/ipci.c,v 1.103 2010/01/15 09:19:03 heikki Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/storage/ipc/ipci.c,v 1.104 2010/02/16 22:34:50 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -20,6 +20,7 @@
|
||||
#include "access/nbtree.h"
|
||||
#include "access/subtrans.h"
|
||||
#include "access/twophase.h"
|
||||
#include "commands/async.h"
|
||||
#include "miscadmin.h"
|
||||
#include "pgstat.h"
|
||||
#include "postmaster/autovacuum.h"
|
||||
@ -122,6 +123,7 @@ CreateSharedMemoryAndSemaphores(bool makePrivate, int port)
|
||||
size = add_size(size, WalRcvShmemSize());
|
||||
size = add_size(size, BTreeShmemSize());
|
||||
size = add_size(size, SyncScanShmemSize());
|
||||
size = add_size(size, AsyncShmemSize());
|
||||
#ifdef EXEC_BACKEND
|
||||
size = add_size(size, ShmemBackendArraySize());
|
||||
#endif
|
||||
@ -225,6 +227,7 @@ CreateSharedMemoryAndSemaphores(bool makePrivate, int port)
|
||||
*/
|
||||
BTreeShmemInit();
|
||||
SyncScanShmemInit();
|
||||
AsyncShmemInit();
|
||||
|
||||
#ifdef EXEC_BACKEND
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/storage/lmgr/lwlock.c,v 1.55 2010/01/02 16:57:52 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/storage/lmgr/lwlock.c,v 1.56 2010/02/16 22:34:50 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -24,6 +24,7 @@
|
||||
#include "access/clog.h"
|
||||
#include "access/multixact.h"
|
||||
#include "access/subtrans.h"
|
||||
#include "commands/async.h"
|
||||
#include "miscadmin.h"
|
||||
#include "pg_trace.h"
|
||||
#include "storage/ipc.h"
|
||||
@ -174,6 +175,9 @@ NumLWLocks(void)
|
||||
/* multixact.c needs two SLRU areas */
|
||||
numLocks += NUM_MXACTOFFSET_BUFFERS + NUM_MXACTMEMBER_BUFFERS;
|
||||
|
||||
/* async.c needs one per Async buffer */
|
||||
numLocks += NUM_ASYNC_BUFFERS;
|
||||
|
||||
/*
|
||||
* Add any requested by loadable modules; for backwards-compatibility
|
||||
* reasons, allocate at least NUM_USER_DEFINED_LWLOCKS of them even if
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.589 2010/02/16 20:15:14 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.590 2010/02/16 22:34:50 tgl Exp $
|
||||
*
|
||||
* NOTES
|
||||
* this is the "main" module of the postgres backend and
|
||||
@ -3779,7 +3779,8 @@ PostgresMain(int argc, char *argv[], const char *username)
|
||||
* collector, and to update the PS stats display. We avoid doing
|
||||
* those every time through the message loop because it'd slow down
|
||||
* processing of batched messages, and because we don't want to report
|
||||
* uncommitted updates (that confuses autovacuum).
|
||||
* uncommitted updates (that confuses autovacuum). The notification
|
||||
* processor wants a call too, if we are not in a transaction block.
|
||||
*/
|
||||
if (send_ready_for_query)
|
||||
{
|
||||
@ -3795,6 +3796,7 @@ PostgresMain(int argc, char *argv[], const char *username)
|
||||
}
|
||||
else
|
||||
{
|
||||
ProcessCompletedNotifies();
|
||||
pgstat_report_stat(false);
|
||||
|
||||
set_ps_display("idle", false);
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.332 2010/02/14 18:42:15 rhaas Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.333 2010/02/16 22:34:50 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -926,17 +926,17 @@ standard_ProcessUtility(Node *parsetree,
|
||||
case T_NotifyStmt:
|
||||
{
|
||||
NotifyStmt *stmt = (NotifyStmt *) parsetree;
|
||||
PreventCommandDuringRecovery();
|
||||
|
||||
Async_Notify(stmt->conditionname);
|
||||
PreventCommandDuringRecovery();
|
||||
Async_Notify(stmt->conditionname, stmt->payload);
|
||||
}
|
||||
break;
|
||||
|
||||
case T_ListenStmt:
|
||||
{
|
||||
ListenStmt *stmt = (ListenStmt *) parsetree;
|
||||
PreventCommandDuringRecovery();
|
||||
|
||||
PreventCommandDuringRecovery();
|
||||
CheckRestrictedOperation("LISTEN");
|
||||
Async_Listen(stmt->conditionname);
|
||||
}
|
||||
@ -945,8 +945,8 @@ standard_ProcessUtility(Node *parsetree,
|
||||
case T_UnlistenStmt:
|
||||
{
|
||||
UnlistenStmt *stmt = (UnlistenStmt *) parsetree;
|
||||
PreventCommandDuringRecovery();
|
||||
|
||||
PreventCommandDuringRecovery();
|
||||
CheckRestrictedOperation("UNLISTEN");
|
||||
if (stmt->conditionname)
|
||||
Async_Unlisten(stmt->conditionname);
|
||||
@ -1105,8 +1105,8 @@ standard_ProcessUtility(Node *parsetree,
|
||||
case T_ReindexStmt:
|
||||
{
|
||||
ReindexStmt *stmt = (ReindexStmt *) parsetree;
|
||||
PreventCommandDuringRecovery();
|
||||
|
||||
PreventCommandDuringRecovery();
|
||||
switch (stmt->kind)
|
||||
{
|
||||
case OBJECT_INDEX:
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.322 2010/02/14 18:42:16 rhaas Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.323 2010/02/16 22:34:50 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -3465,6 +3465,11 @@ get_utility_query_def(Query *query, deparse_context *context)
|
||||
0, PRETTYINDENT_STD, 1);
|
||||
appendStringInfo(buf, "NOTIFY %s",
|
||||
quote_identifier(stmt->conditionname));
|
||||
if (stmt->payload)
|
||||
{
|
||||
appendStringInfoString(buf, ", ");
|
||||
simple_quote_literal(buf, stmt->payload);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
* Portions taken from FreeBSD.
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.184 2010/01/26 16:18:12 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.185 2010/02/16 22:34:50 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -2458,6 +2458,7 @@ main(int argc, char *argv[])
|
||||
"pg_xlog",
|
||||
"pg_xlog/archive_status",
|
||||
"pg_clog",
|
||||
"pg_notify",
|
||||
"pg_subtrans",
|
||||
"pg_twophase",
|
||||
"pg_multixact/members",
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
*
|
||||
* Copyright (c) 2000-2010, PostgreSQL Global Development Group
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.143 2010/01/02 16:57:59 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.144 2010/02/16 22:34:50 tgl Exp $
|
||||
*/
|
||||
#include "postgres_fe.h"
|
||||
#include "common.h"
|
||||
@ -555,8 +555,13 @@ PrintNotifications(void)
|
||||
|
||||
while ((notify = PQnotifies(pset.db)))
|
||||
{
|
||||
fprintf(pset.queryFout, _("Asynchronous notification \"%s\" received from server process with PID %d.\n"),
|
||||
notify->relname, notify->be_pid);
|
||||
/* for backward compatibility, only show payload if nonempty */
|
||||
if (notify->extra[0])
|
||||
fprintf(pset.queryFout, _("Asynchronous notification \"%s\" with payload \"%s\" received from server process with PID %d.\n"),
|
||||
notify->relname, notify->extra, notify->be_pid);
|
||||
else
|
||||
fprintf(pset.queryFout, _("Asynchronous notification \"%s\" received from server process with PID %d.\n"),
|
||||
notify->relname, notify->be_pid);
|
||||
fflush(pset.queryFout);
|
||||
PQfreemem(notify);
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
*
|
||||
* Copyright (c) 2000-2010, PostgreSQL Global Development Group
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.193 2010/02/15 02:55:01 itagaki Exp $
|
||||
* $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.194 2010/02/16 22:34:50 tgl Exp $
|
||||
*/
|
||||
|
||||
/*----------------------------------------------------------------------
|
||||
@ -1864,7 +1864,7 @@ psql_completion(char *text, int start, int end)
|
||||
|
||||
/* NOTIFY */
|
||||
else if (pg_strcasecmp(prev_wd, "NOTIFY") == 0)
|
||||
COMPLETE_WITH_QUERY("SELECT pg_catalog.quote_ident(relname) FROM pg_catalog.pg_listener WHERE substring(pg_catalog.quote_ident(relname),1,%d)='%s'");
|
||||
COMPLETE_WITH_QUERY("SELECT pg_catalog.quote_ident(channel) FROM pg_catalog.pg_listening_channels() AS channel WHERE substring(pg_catalog.quote_ident(channel),1,%d)='%s'");
|
||||
|
||||
/* OPTIONS */
|
||||
else if (pg_strcasecmp(prev_wd, "OPTIONS") == 0)
|
||||
@ -2105,7 +2105,7 @@ psql_completion(char *text, int start, int end)
|
||||
|
||||
/* UNLISTEN */
|
||||
else if (pg_strcasecmp(prev_wd, "UNLISTEN") == 0)
|
||||
COMPLETE_WITH_QUERY("SELECT pg_catalog.quote_ident(relname) FROM pg_catalog.pg_listener WHERE substring(pg_catalog.quote_ident(relname),1,%d)='%s' UNION SELECT '*'");
|
||||
COMPLETE_WITH_QUERY("SELECT pg_catalog.quote_ident(channel) FROM pg_catalog.pg_listening_channels() AS channel WHERE substring(pg_catalog.quote_ident(channel),1,%d)='%s' UNION SELECT '*'");
|
||||
|
||||
/* UPDATE */
|
||||
/* If prev. word is UPDATE suggest a list of tables */
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/include/access/slru.h,v 1.25 2010/01/02 16:58:00 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/include/access/slru.h,v 1.26 2010/02/16 22:34:50 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -17,6 +17,25 @@
|
||||
#include "storage/lwlock.h"
|
||||
|
||||
|
||||
/*
|
||||
* Define SLRU segment size. A page is the same BLCKSZ as is used everywhere
|
||||
* else in Postgres. The segment size can be chosen somewhat arbitrarily;
|
||||
* we make it 32 pages by default, or 256Kb, i.e. 1M transactions for CLOG
|
||||
* or 64K transactions for SUBTRANS.
|
||||
*
|
||||
* Note: because TransactionIds are 32 bits and wrap around at 0xFFFFFFFF,
|
||||
* page numbering also wraps around at 0xFFFFFFFF/xxxx_XACTS_PER_PAGE (where
|
||||
* xxxx is CLOG or SUBTRANS, respectively), and segment numbering at
|
||||
* 0xFFFFFFFF/xxxx_XACTS_PER_PAGE/SLRU_PAGES_PER_SEGMENT. We need
|
||||
* take no explicit notice of that fact in slru.c, except when comparing
|
||||
* segment and page numbers in SimpleLruTruncate (see PagePrecedes()).
|
||||
*
|
||||
* Note: slru.c currently assumes that segment file names will be four hex
|
||||
* digits. This sets a lower bound on the segment size (64K transactions
|
||||
* for 32-bit TransactionIds).
|
||||
*/
|
||||
#define SLRU_PAGES_PER_SEGMENT 32
|
||||
|
||||
/*
|
||||
* Page status codes. Note that these do not include the "dirty" bit.
|
||||
* page_dirty can be TRUE only in the VALID or WRITE_IN_PROGRESS states;
|
||||
@ -55,8 +74,8 @@ typedef struct SlruSharedData
|
||||
/*
|
||||
* Optional array of WAL flush LSNs associated with entries in the SLRU
|
||||
* pages. If not zero/NULL, we must flush WAL before writing pages (true
|
||||
* for pg_clog, false for multixact and pg_subtrans). group_lsn[] has
|
||||
* lsn_groups_per_page entries per buffer slot, each containing the
|
||||
* for pg_clog, false for multixact, pg_subtrans, pg_notify). group_lsn[]
|
||||
* has lsn_groups_per_page entries per buffer slot, each containing the
|
||||
* highest LSN known for a contiguous group of SLRU entries on that slot's
|
||||
* page.
|
||||
*/
|
||||
@ -94,7 +113,7 @@ typedef struct SlruCtlData
|
||||
|
||||
/*
|
||||
* This flag tells whether to fsync writes (true for pg_clog and multixact
|
||||
* stuff, false for pg_subtrans).
|
||||
* stuff, false for pg_subtrans and pg_notify).
|
||||
*/
|
||||
bool do_fsync;
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/include/access/twophase_rmgr.h,v 1.11 2010/01/02 16:58:00 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/include/access/twophase_rmgr.h,v 1.12 2010/02/16 22:34:50 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -23,9 +23,8 @@ typedef uint8 TwoPhaseRmgrId;
|
||||
*/
|
||||
#define TWOPHASE_RM_END_ID 0
|
||||
#define TWOPHASE_RM_LOCK_ID 1
|
||||
#define TWOPHASE_RM_NOTIFY_ID 2
|
||||
#define TWOPHASE_RM_PGSTAT_ID 3
|
||||
#define TWOPHASE_RM_MULTIXACT_ID 4
|
||||
#define TWOPHASE_RM_PGSTAT_ID 2
|
||||
#define TWOPHASE_RM_MULTIXACT_ID 3
|
||||
#define TWOPHASE_RM_MAX_ID TWOPHASE_RM_MULTIXACT_ID
|
||||
|
||||
extern const TwoPhaseCallback twophase_recover_callbacks[];
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.584 2010/02/12 17:33:20 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.585 2010/02/16 22:34:54 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -53,6 +53,6 @@
|
||||
*/
|
||||
|
||||
/* yyyymmddN */
|
||||
#define CATALOG_VERSION_NO 201002121
|
||||
#define CATALOG_VERSION_NO 201002161
|
||||
|
||||
#endif
|
||||
|
||||
@ -1,59 +0,0 @@
|
||||
/*-------------------------------------------------------------------------
|
||||
*
|
||||
* pg_listener.h
|
||||
* Asynchronous notification
|
||||
*
|
||||
*
|
||||
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/include/catalog/pg_listener.h,v 1.28 2010/01/05 01:06:56 tgl Exp $
|
||||
*
|
||||
* NOTES
|
||||
* the genbki.pl script reads this file and generates .bki
|
||||
* information from the DATA() statements.
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
#ifndef PG_LISTENER_H
|
||||
#define PG_LISTENER_H
|
||||
|
||||
#include "catalog/genbki.h"
|
||||
|
||||
/* ----------------------------------------------------------------
|
||||
* pg_listener definition.
|
||||
*
|
||||
* cpp turns this into typedef struct FormData_pg_listener
|
||||
* ----------------------------------------------------------------
|
||||
*/
|
||||
#define ListenerRelationId 2614
|
||||
|
||||
CATALOG(pg_listener,2614) BKI_WITHOUT_OIDS
|
||||
{
|
||||
NameData relname;
|
||||
int4 listenerpid;
|
||||
int4 notification;
|
||||
} FormData_pg_listener;
|
||||
|
||||
/* ----------------
|
||||
* Form_pg_listener corresponds to a pointer to a tuple with
|
||||
* the format of pg_listener relation.
|
||||
* ----------------
|
||||
*/
|
||||
typedef FormData_pg_listener *Form_pg_listener;
|
||||
|
||||
/* ----------------
|
||||
* compiler constants for pg_listener
|
||||
* ----------------
|
||||
*/
|
||||
#define Natts_pg_listener 3
|
||||
#define Anum_pg_listener_relname 1
|
||||
#define Anum_pg_listener_listenerpid 2
|
||||
#define Anum_pg_listener_notification 3
|
||||
|
||||
/* ----------------
|
||||
* initial contents of pg_listener are NOTHING.
|
||||
* ----------------
|
||||
*/
|
||||
|
||||
#endif /* PG_LISTENER_H */
|
||||
@ -7,7 +7,7 @@
|
||||
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.568 2010/02/07 20:48:11 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.569 2010/02/16 22:34:56 tgl Exp $
|
||||
*
|
||||
* NOTES
|
||||
* The script catalog/genbki.pl reads this file and generates .bki
|
||||
@ -4131,8 +4131,12 @@ DATA(insert OID = 2599 ( pg_timezone_abbrevs PGNSP PGUID 12 1 1000 0 f f f t t
|
||||
DESCR("get the available time zone abbreviations");
|
||||
DATA(insert OID = 2856 ( pg_timezone_names PGNSP PGUID 12 1 1000 0 f f f t t s 0 0 2249 "" "{25,25,1186,16}" "{o,o,o,o}" "{name,abbrev,utc_offset,is_dst}" _null_ pg_timezone_names _null_ _null_ _null_ ));
|
||||
DESCR("get the available time zone names");
|
||||
DATA(insert OID = 2730 ( pg_get_triggerdef PGNSP PGUID 12 1 0 0 f f f t f s 2 0 25 "26 16" _null_ _null_ _null_ _null_ pg_get_triggerdef_ext _null_ _null_ _null_ ));
|
||||
DATA(insert OID = 2730 ( pg_get_triggerdef PGNSP PGUID 12 1 0 0 f f f t f s 2 0 25 "26 16" _null_ _null_ _null_ _null_ pg_get_triggerdef_ext _null_ _null_ _null_ ));
|
||||
DESCR("trigger description with pretty-print option");
|
||||
DATA(insert OID = 3035 ( pg_listening_channels PGNSP PGUID 12 1 10 0 f f f t t s 0 0 25 "" _null_ _null_ _null_ _null_ pg_listening_channels _null_ _null_ _null_ ));
|
||||
DESCR("get the channels that the current backend listens to");
|
||||
DATA(insert OID = 3036 ( pg_notify PGNSP PGUID 12 1 0 0 f f f f f v 2 0 2278 "25 25" _null_ _null_ _null_ _null_ pg_notify _null_ _null_ _null_ ));
|
||||
DESCR("send a notification event");
|
||||
|
||||
/* non-persistent series generator */
|
||||
DATA(insert OID = 1066 ( generate_series PGNSP PGUID 12 1 1000 0 f f f t t i 3 0 23 "23 23 23" _null_ _null_ _null_ _null_ generate_series_step_int4 _null_ _null_ _null_ ));
|
||||
|
||||
@ -6,28 +6,44 @@
|
||||
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/include/commands/async.h,v 1.39 2010/01/02 16:58:03 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/include/commands/async.h,v 1.40 2010/02/16 22:34:57 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
#ifndef ASYNC_H
|
||||
#define ASYNC_H
|
||||
|
||||
#include "fmgr.h"
|
||||
|
||||
/*
|
||||
* The number of SLRU page buffers we use for the notification queue.
|
||||
*/
|
||||
#define NUM_ASYNC_BUFFERS 8
|
||||
|
||||
extern bool Trace_notify;
|
||||
|
||||
extern Size AsyncShmemSize(void);
|
||||
extern void AsyncShmemInit(void);
|
||||
|
||||
/* notify-related SQL statements */
|
||||
extern void Async_Notify(const char *relname);
|
||||
extern void Async_Listen(const char *relname);
|
||||
extern void Async_Unlisten(const char *relname);
|
||||
extern void Async_Notify(const char *channel, const char *payload);
|
||||
extern void Async_Listen(const char *channel);
|
||||
extern void Async_Unlisten(const char *channel);
|
||||
extern void Async_UnlistenAll(void);
|
||||
|
||||
/* notify-related SQL functions */
|
||||
extern Datum pg_listening_channels(PG_FUNCTION_ARGS);
|
||||
extern Datum pg_notify(PG_FUNCTION_ARGS);
|
||||
|
||||
/* perform (or cancel) outbound notify processing at transaction commit */
|
||||
extern void PreCommit_Notify(void);
|
||||
extern void AtCommit_Notify(void);
|
||||
extern void AtAbort_Notify(void);
|
||||
extern void AtSubStart_Notify(void);
|
||||
extern void AtSubCommit_Notify(void);
|
||||
extern void AtSubAbort_Notify(void);
|
||||
extern void AtPrepare_Notify(void);
|
||||
extern void ProcessCompletedNotifies(void);
|
||||
|
||||
/* signal handler for inbound notifies (PROCSIG_NOTIFY_INTERRUPT) */
|
||||
extern void HandleNotifyInterrupt(void);
|
||||
@ -40,7 +56,4 @@ extern void HandleNotifyInterrupt(void);
|
||||
extern void EnableNotifyInterrupt(void);
|
||||
extern bool DisableNotifyInterrupt(void);
|
||||
|
||||
extern void notify_twophase_postcommit(TransactionId xid, uint16 info,
|
||||
void *recdata, uint32 len);
|
||||
|
||||
#endif /* ASYNC_H */
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.429 2010/02/12 17:33:20 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.430 2010/02/16 22:34:57 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -2097,6 +2097,7 @@ typedef struct NotifyStmt
|
||||
{
|
||||
NodeTag type;
|
||||
char *conditionname; /* condition name to notify */
|
||||
char *payload; /* the payload string, or NULL if none */
|
||||
} NotifyStmt;
|
||||
|
||||
/* ----------------------
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/include/storage/lwlock.h,v 1.44 2010/02/07 20:48:13 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/include/storage/lwlock.h,v 1.45 2010/02/16 22:34:57 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -68,6 +68,8 @@ typedef enum LWLockId
|
||||
AutovacuumScheduleLock,
|
||||
SyncScanLock,
|
||||
RelationMappingLock,
|
||||
AsyncCtlLock,
|
||||
AsyncQueueLock,
|
||||
/* Individual lock IDs end here */
|
||||
FirstBufMappingLock,
|
||||
FirstLockMgrLock = FirstBufMappingLock + NUM_BUFFER_PARTITIONS,
|
||||
|
||||
@ -532,9 +532,9 @@ CREATE TEMP TABLE tmp_foo (data text) ON COMMIT DELETE ROWS;
|
||||
CREATE ROLE temp_reset_user;
|
||||
SET SESSION AUTHORIZATION temp_reset_user;
|
||||
-- look changes
|
||||
SELECT relname FROM pg_listener;
|
||||
relname
|
||||
-----------
|
||||
SELECT pg_listening_channels();
|
||||
pg_listening_channels
|
||||
-----------------------
|
||||
foo_event
|
||||
(1 row)
|
||||
|
||||
@ -571,9 +571,9 @@ SELECT current_user = 'temp_reset_user';
|
||||
-- discard everything
|
||||
DISCARD ALL;
|
||||
-- look again
|
||||
SELECT relname FROM pg_listener;
|
||||
relname
|
||||
---------
|
||||
SELECT pg_listening_channels();
|
||||
pg_listening_channels
|
||||
-----------------------
|
||||
(0 rows)
|
||||
|
||||
SELECT name FROM pg_prepared_statements;
|
||||
|
||||
@ -107,7 +107,6 @@ SELECT relname, relhasindex
|
||||
pg_language | t
|
||||
pg_largeobject | t
|
||||
pg_largeobject_metadata | t
|
||||
pg_listener | f
|
||||
pg_namespace | t
|
||||
pg_opclass | t
|
||||
pg_operator | t
|
||||
@ -154,7 +153,7 @@ SELECT relname, relhasindex
|
||||
timetz_tbl | f
|
||||
tinterval_tbl | f
|
||||
varchar_tbl | f
|
||||
(143 rows)
|
||||
(142 rows)
|
||||
|
||||
--
|
||||
-- another sanity check: every system catalog that has OIDs should have
|
||||
|
||||
@ -165,7 +165,7 @@ CREATE TEMP TABLE tmp_foo (data text) ON COMMIT DELETE ROWS;
|
||||
CREATE ROLE temp_reset_user;
|
||||
SET SESSION AUTHORIZATION temp_reset_user;
|
||||
-- look changes
|
||||
SELECT relname FROM pg_listener;
|
||||
SELECT pg_listening_channels();
|
||||
SELECT name FROM pg_prepared_statements;
|
||||
SELECT name FROM pg_cursors;
|
||||
SHOW vacuum_cost_delay;
|
||||
@ -174,7 +174,7 @@ SELECT current_user = 'temp_reset_user';
|
||||
-- discard everything
|
||||
DISCARD ALL;
|
||||
-- look again
|
||||
SELECT relname FROM pg_listener;
|
||||
SELECT pg_listening_channels();
|
||||
SELECT name FROM pg_prepared_statements;
|
||||
SELECT name FROM pg_cursors;
|
||||
SHOW vacuum_cost_delay;
|
||||
|
||||
Reference in New Issue
Block a user