diff options
| author | Michael P | 2010-04-01 01:09:52 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2011-05-19 16:38:44 +0000 |
| commit | 9b1cd1ef2e746b9d68085ecd37eabaa38e2a82f1 (patch) | |
| tree | f220dc274f1d69eb685e822b9079e829525f5d4a /src/include/utils | |
| parent | 4d53a2f9699547bdc12831d2860c9d44c465e805 (diff) | |
Postgres-XC version 0.9
Application of patch PGXC-PG_REL8_4_3.patch.gz
on PostgreSQL version 8.4.3
Diffstat (limited to 'src/include/utils')
| -rw-r--r-- | src/include/utils/guc_tables.h | 4 | ||||
| -rw-r--r-- | src/include/utils/rel.h | 7 | ||||
| -rw-r--r-- | src/include/utils/snapshot.h | 5 | ||||
| -rw-r--r-- | src/include/utils/syscache.h | 4 |
4 files changed, 19 insertions, 1 deletions
diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h index b50944a547..9c87386288 100644 --- a/src/include/utils/guc_tables.h +++ b/src/include/utils/guc_tables.h @@ -76,7 +76,9 @@ enum config_group COMPAT_OPTIONS_CLIENT, PRESET_OPTIONS, CUSTOM_OPTIONS, - DEVELOPER_OPTIONS + DEVELOPER_OPTIONS, + DATA_NODES, + GTM }; /* diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index ca9913bda3..5f3a482877 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.h @@ -6,6 +6,7 @@ * * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California + * Portions Copyright (c) 2010 Nippon Telegraph and Telephone Corporation * * $PostgreSQL: pgsql/src/include/utils/rel.h,v 1.114 2009/06/11 14:49:13 momjian Exp $ * @@ -20,6 +21,9 @@ #include "catalog/pg_index.h" #include "fmgr.h" #include "nodes/bitmapset.h" +#ifdef PGXC +#include "pgxc/locator.h" +#endif #include "rewrite/prs2lock.h" #include "storage/block.h" #include "storage/relfilenode.h" @@ -205,6 +209,9 @@ typedef struct RelationData /* use "struct" here to avoid needing to include pgstat.h: */ struct PgStat_TableStatus *pgstat_info; /* statistics collection area */ +#ifdef PGXC + RelationLocInfo *rd_locator_info; +#endif } RelationData; /* diff --git a/src/include/utils/snapshot.h b/src/include/utils/snapshot.h index e5003b669a..835ba95291 100644 --- a/src/include/utils/snapshot.h +++ b/src/include/utils/snapshot.h @@ -5,6 +5,7 @@ * * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California + * Portions Copyright (c) 2010 Nippon Telegraph and Telephone Corporation * * $PostgreSQL: pgsql/src/include/utils/snapshot.h,v 1.5 2009/06/11 14:49:13 momjian Exp $ * @@ -46,7 +47,11 @@ typedef struct SnapshotData */ TransactionId xmin; /* all XID < xmin are visible to me */ TransactionId xmax; /* all XID >= xmax are invisible to me */ + TransactionId recent_global_xmin; uint32 xcnt; /* # of xact ids in xip[] */ +#ifdef PGXC /* PGXC_COORD */ + uint32 max_xcnt; /* Max # of xact in xip[] */ +#endif TransactionId *xip; /* array of xact IDs in progress */ /* note: all ids in xip[] satisfy xmin <= xip[i] < xmax */ int32 subxcnt; /* # of xact ids in subxip[], -1 if overflow */ diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h index 1428b28d15..e038041519 100644 --- a/src/include/utils/syscache.h +++ b/src/include/utils/syscache.h @@ -8,6 +8,7 @@ * * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California + * Portions Copyright (c) 2010 Nippon Telegraph and Telephone Corporation * * $PostgreSQL: pgsql/src/include/utils/syscache.h,v 1.74 2009/01/01 17:24:02 momjian Exp $ * @@ -64,6 +65,9 @@ enum SysCacheIdentifier OPEROID, OPFAMILYAMNAMENSP, OPFAMILYOID, +#ifdef PGXC + PGXCCLASSRELID, +#endif PROCNAMEARGSNSP, PROCOID, RELNAMENSP, |