Change pg_listener attribute number constants to match the usual pattern

It appears that, for no particularly good reason, pg_listener.h deviates from
the usual convention for declaring attribute number constants.  Normally, it's

#define Anum_{catalog-name}_{column-name}  {attribute-number}

pg_listener.h, however substitutes a different string that is similar, but not
the same as, the column name.  This change fixes that.

Author: Robert Haas <[email protected]>

diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 9da815d4811679e1de88f2679145efe1917968cf..de09872cd7ee637c1add091ab53a6715991de991 100644 (file)
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/commands/async.c,v 1.147 2009/06/11 14:48:55 momjian Exp $
+ *   $PostgreSQL: pgsql/src/backend/commands/async.c,v 1.148 2009/07/21 20:24:51 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -486,8 +486,8 @@ Exec_Listen(Relation lRel, const char *relname)
 
    namestrcpy(&condname, relname);
    values[Anum_pg_listener_relname - 1] = NameGetDatum(&condname);
-   values[Anum_pg_listener_pid - 1] = Int32GetDatum(MyProcPid);
-   values[Anum_pg_listener_notify - 1] = Int32GetDatum(0);     /* no notifies pending */
+   values[Anum_pg_listener_listenerpid - 1] = Int32GetDatum(MyProcPid);
+   values[Anum_pg_listener_notification - 1] = Int32GetDatum(0);       /* no notifies pending */
 
    tuple = heap_form_tuple(RelationGetDescr(lRel), values, nulls);
 
@@ -567,7 +567,7 @@ Exec_UnlistenAll(Relation lRel)
 
    /* Find and delete all entries with my listenerPID */
    ScanKeyInit(&key[0],
-               Anum_pg_listener_pid,
+               Anum_pg_listener_listenerpid,
                BTEqualStrategyNumber, F_INT4EQ,
                Int32GetDatum(MyProcPid));
    scan = heap_beginscan(lRel, SnapshotNow, 1, key);
@@ -598,9 +598,9 @@ Send_Notify(Relation lRel)
    /* preset data to update notify column to MyProcPid */
    memset(nulls, false, sizeof(nulls));
    memset(repl, false, sizeof(repl));
-   repl[Anum_pg_listener_notify - 1] = true;
+   repl[Anum_pg_listener_notification - 1] = true;
    memset(value, 0, sizeof(value));
-   value[Anum_pg_listener_notify - 1] = Int32GetDatum(MyProcPid);
+   value[Anum_pg_listener_notification - 1] = Int32GetDatum(MyProcPid);
 
    scan = heap_beginscan(lRel, SnapshotNow, 0, NULL);
 
@@ -978,7 +978,7 @@ ProcessIncomingNotify(void)
 
    /* Scan only entries with my listenerPID */
    ScanKeyInit(&key[0],
-               Anum_pg_listener_pid,
+               Anum_pg_listener_listenerpid,
                BTEqualStrategyNumber, F_INT4EQ,
                Int32GetDatum(MyProcPid));
    scan = heap_beginscan(lRel, SnapshotNow, 1, key);
@@ -986,9 +986,9 @@ ProcessIncomingNotify(void)
    /* Prepare data for rewriting 0 into notification field */
    memset(nulls, false, sizeof(nulls));
    memset(repl, false, sizeof(repl));
-   repl[Anum_pg_listener_notify - 1] = true;
+   repl[Anum_pg_listener_notification - 1] = true;
    memset(value, 0, sizeof(value));
-   value[Anum_pg_listener_notify - 1] = Int32GetDatum(0);
+   value[Anum_pg_listener_notification - 1] = Int32GetDatum(0);
 
    while ((lTuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
    {

diff --git a/src/include/catalog/pg_listener.h b/src/include/catalog/pg_listener.h
index 503506d44ae764661ec46225e89adea469e9f42b..6bc38286bdf5fd12aae429d85b7300972b71101f 100644 (file)
--- a/src/include/catalog/pg_listener.h
+++ b/src/include/catalog/pg_listener.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_listener.h,v 1.25 2009/01/01 17:23:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_listener.h,v 1.26 2009/07/21 20:24:51 petere Exp $
  *
  * NOTES
  *   the genbki.sh script reads this file and generates .bki
@@ -48,8 +48,8 @@ typedef FormData_pg_listener *Form_pg_listener;
  */
 #define Natts_pg_listener                      3
 #define Anum_pg_listener_relname               1
-#define Anum_pg_listener_pid                   2
-#define Anum_pg_listener_notify                    3
+#define Anum_pg_listener_listenerpid           2
+#define Anum_pg_listener_notification          3
 
 /* ----------------
  *     initial contents of pg_listener are NOTHING.