Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 73b0300

Browse files
committed
Move the HTSU_Result enum definition into snapshot.h, to avoid including
tqual.h into heapam.h. This makes all inclusion of tqual.h explicit. I also sorted alphabetically the includes on some source files.
1 parent 78f02ca commit 73b0300

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+138
-79
lines changed

contrib/dblink/dblink.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Darko Prenosil <Darko.Prenosil@finteh.hr>
99
* Shridhar Daithankar <shridhar_daithankar@persistent.co.in>
1010
*
11-
* $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.70 2008/03/25 22:42:41 tgl Exp $
11+
* $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.71 2008/03/26 21:10:36 alvherre Exp $
1212
* Copyright (c) 2001-2008, PostgreSQL Global Development Group
1313
* ALL RIGHTS RESERVED;
1414
*
@@ -37,7 +37,6 @@
3737
#include "libpq-fe.h"
3838
#include "fmgr.h"
3939
#include "funcapi.h"
40-
#include "miscadmin.h"
4140
#include "access/genam.h"
4241
#include "access/heapam.h"
4342
#include "access/tupdesc.h"
@@ -48,6 +47,7 @@
4847
#include "executor/executor.h"
4948
#include "executor/spi.h"
5049
#include "lib/stringinfo.h"
50+
#include "miscadmin.h"
5151
#include "nodes/execnodes.h"
5252
#include "nodes/nodes.h"
5353
#include "nodes/pg_list.h"
@@ -60,8 +60,9 @@
6060
#include "utils/fmgroids.h"
6161
#include "utils/hsearch.h"
6262
#include "utils/lsyscache.h"
63-
#include "utils/syscache.h"
6463
#include "utils/memutils.h"
64+
#include "utils/syscache.h"
65+
#include "utils/tqual.h"
6566

6667
#include "dblink.h"
6768

contrib/pgrowlocks/pgrowlocks.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/pgrowlocks/pgrowlocks.c,v 1.8 2007/11/30 21:22:53 tgl Exp $
2+
* $PostgreSQL: pgsql/contrib/pgrowlocks/pgrowlocks.c,v 1.9 2008/03/26 21:10:36 alvherre Exp $
33
*
44
* Copyright (c) 2005-2006 Tatsuo Ishii
55
*
@@ -33,6 +33,7 @@
3333
#include "storage/procarray.h"
3434
#include "utils/acl.h"
3535
#include "utils/builtins.h"
36+
#include "utils/tqual.h"
3637

3738

3839
PG_MODULE_MAGIC;

contrib/pgstattuple/pgstattuple.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.32 2008/01/14 02:53:31 tgl Exp $
2+
* $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.33 2008/03/26 21:10:36 alvherre Exp $
33
*
44
* Copyright (c) 2001,2002 Tatsuo Ishii
55
*
@@ -32,6 +32,7 @@
3232
#include "funcapi.h"
3333
#include "miscadmin.h"
3434
#include "utils/builtins.h"
35+
#include "utils/tqual.h"
3536

3637

3738
PG_MODULE_MAGIC;

src/backend/access/heap/heapam.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.253 2008/03/26 18:48:58 alvherre Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.254 2008/03/26 21:10:37 alvherre Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -58,6 +58,7 @@
5858
#include "utils/relcache.h"
5959
#include "utils/snapmgr.h"
6060
#include "utils/syscache.h"
61+
#include "utils/tqual.h"
6162

6263

6364
/* GUC variable */

src/backend/access/heap/pruneheap.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/heap/pruneheap.c,v 1.8 2008/03/13 18:00:32 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/heap/pruneheap.c,v 1.9 2008/03/26 21:10:37 alvherre Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -19,6 +19,7 @@
1919
#include "miscadmin.h"
2020
#include "pgstat.h"
2121
#include "utils/inval.h"
22+
#include "utils/tqual.h"
2223

2324

2425
/* Working data for heap_page_prune and subroutines */

src/backend/access/heap/tuptoaster.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/heap/tuptoaster.c,v 1.84 2008/03/07 23:20:21 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/heap/tuptoaster.c,v 1.85 2008/03/26 21:10:37 alvherre Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -38,6 +38,7 @@
3838
#include "utils/fmgroids.h"
3939
#include "utils/pg_lzcompress.h"
4040
#include "utils/typcache.h"
41+
#include "utils/tqual.h"
4142

4243

4344
#undef TOAST_DEBUG

src/backend/access/index/genam.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/index/genam.c,v 1.64 2008/01/01 19:45:46 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/index/genam.c,v 1.65 2008/03/26 21:10:37 alvherre Exp $
1212
*
1313
* NOTES
1414
* many of the old access method routines have been turned into
@@ -24,6 +24,7 @@
2424
#include "access/transam.h"
2525
#include "miscadmin.h"
2626
#include "pgstat.h"
27+
#include "utils/tqual.h"
2728

2829

2930
/* ----------------------------------------------------------------

src/backend/access/index/indexam.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/index/indexam.c,v 1.103 2008/03/26 18:48:59 alvherre Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/index/indexam.c,v 1.104 2008/03/26 21:10:37 alvherre Exp $
1212
*
1313
* INTERFACE ROUTINES
1414
* index_open - open an index relation by relation OID
@@ -68,6 +68,7 @@
6868
#include "pgstat.h"
6969
#include "utils/relcache.h"
7070
#include "utils/snapmgr.h"
71+
#include "utils/tqual.h"
7172

7273

7374
/* ----------------------------------------------------------------

src/backend/access/nbtree/nbtinsert.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.164 2008/01/01 19:45:46 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.165 2008/03/26 21:10:37 alvherre Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -20,6 +20,7 @@
2020
#include "access/transam.h"
2121
#include "miscadmin.h"
2222
#include "utils/inval.h"
23+
#include "utils/tqual.h"
2324

2425

2526
typedef struct

src/backend/bootstrap/bootstrap.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.239 2008/02/17 04:21:05 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.240 2008/03/26 21:10:37 alvherre Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -41,6 +41,7 @@
4141
#include "utils/fmgroids.h"
4242
#include "utils/memutils.h"
4343
#include "utils/ps_status.h"
44+
#include "utils/tqual.h"
4445

4546
extern int optind;
4647
extern char *optarg;

src/backend/catalog/aclchk.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/catalog/aclchk.c,v 1.144 2008/03/24 19:12:49 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/aclchk.c,v 1.145 2008/03/26 21:10:37 alvherre Exp $
1212
*
1313
* NOTES
1414
* See acl.h.
@@ -43,6 +43,7 @@
4343
#include "utils/fmgroids.h"
4444
#include "utils/lsyscache.h"
4545
#include "utils/syscache.h"
46+
#include "utils/tqual.h"
4647

4748

4849
static void ExecGrant_Relation(InternalGrant *grantStmt);

src/backend/catalog/dependency.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.69 2008/01/01 19:45:48 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.70 2008/03/26 21:10:37 alvherre Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -61,6 +61,7 @@
6161
#include "utils/fmgroids.h"
6262
#include "utils/lsyscache.h"
6363
#include "utils/syscache.h"
64+
#include "utils/tqual.h"
6465

6566

6667
/* expansible list of ObjectAddresses */

src/backend/catalog/heap.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.330 2008/03/26 18:48:59 alvherre Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.331 2008/03/26 21:10:37 alvherre Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -59,8 +59,9 @@
5959
#include "utils/inval.h"
6060
#include "utils/lsyscache.h"
6161
#include "utils/relcache.h"
62-
#include "utils/syscache.h"
6362
#include "utils/snapmgr.h"
63+
#include "utils/syscache.h"
64+
#include "utils/tqual.h"
6465

6566

6667
static void AddNewRelationTuple(Relation pg_class_desc,

src/backend/catalog/index.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.295 2008/03/26 18:48:59 alvherre Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.296 2008/03/26 21:10:37 alvherre Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -56,6 +56,7 @@
5656
#include "utils/syscache.h"
5757
#include "utils/tuplesort.h"
5858
#include "utils/snapmgr.h"
59+
#include "utils/tqual.h"
5960

6061

6162
/* state info for validate_index bulkdelete callback */

src/backend/catalog/pg_constraint.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/catalog/pg_constraint.c,v 1.39 2008/03/25 22:42:42 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/pg_constraint.c,v 1.40 2008/03/26 21:10:37 alvherre Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -27,6 +27,7 @@
2727
#include "utils/fmgroids.h"
2828
#include "utils/lsyscache.h"
2929
#include "utils/syscache.h"
30+
#include "utils/tqual.h"
3031

3132

3233
/*

src/backend/catalog/pg_conversion.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/catalog/pg_conversion.c,v 1.40 2008/01/01 19:45:48 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/pg_conversion.c,v 1.41 2008/03/26 21:10:37 alvherre Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -22,11 +22,12 @@
2222
#include "catalog/pg_namespace.h"
2323
#include "catalog/pg_proc.h"
2424
#include "mb/pg_wchar.h"
25+
#include "miscadmin.h"
26+
#include "utils/acl.h"
2527
#include "utils/builtins.h"
2628
#include "utils/fmgroids.h"
2729
#include "utils/syscache.h"
28-
#include "utils/acl.h"
29-
#include "miscadmin.h"
30+
#include "utils/tqual.h"
3031

3132
/*
3233
* ConversionCreate

src/backend/catalog/pg_depend.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/catalog/pg_depend.c,v 1.26 2008/01/01 19:45:48 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/pg_depend.c,v 1.27 2008/03/26 21:10:37 alvherre Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -23,6 +23,7 @@
2323
#include "miscadmin.h"
2424
#include "utils/fmgroids.h"
2525
#include "utils/lsyscache.h"
26+
#include "utils/tqual.h"
2627

2728

2829
static bool isObjectPinned(const ObjectAddress *object, Relation rel);

src/backend/catalog/pg_enum.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/catalog/pg_enum.c,v 1.5 2008/01/20 17:50:41 alvherre Exp $
10+
* $PostgreSQL: pgsql/src/backend/catalog/pg_enum.c,v 1.6 2008/03/26 21:10:37 alvherre Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -20,6 +20,7 @@
2020
#include "catalog/pg_enum.h"
2121
#include "utils/builtins.h"
2222
#include "utils/fmgroids.h"
23+
#include "utils/tqual.h"
2324

2425
static int oid_cmp(const void *p1, const void *p2);
2526

src/backend/catalog/pg_largeobject.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/catalog/pg_largeobject.c,v 1.28 2008/01/01 19:45:48 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/pg_largeobject.c,v 1.29 2008/03/26 21:10:37 alvherre Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -20,6 +20,7 @@
2020
#include "catalog/pg_largeobject.h"
2121
#include "utils/builtins.h"
2222
#include "utils/fmgroids.h"
23+
#include "utils/tqual.h"
2324

2425

2526
/*

src/backend/catalog/pg_shdepend.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/catalog/pg_shdepend.c,v 1.25 2008/03/24 19:47:35 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/pg_shdepend.c,v 1.26 2008/03/26 21:10:37 alvherre Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -39,6 +39,7 @@
3939
#include "utils/acl.h"
4040
#include "utils/fmgroids.h"
4141
#include "utils/syscache.h"
42+
#include "utils/tqual.h"
4243

4344

4445
typedef enum

src/backend/commands/analyze.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.115 2008/02/20 14:31:35 alvherre Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.116 2008/03/26 21:10:37 alvherre Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -40,6 +40,7 @@
4040
#include "utils/pg_rusage.h"
4141
#include "utils/syscache.h"
4242
#include "utils/tuplesort.h"
43+
#include "utils/tqual.h"
4344

4445

4546
/* Data structure for Algorithm S from Knuth 3.4.2 */

src/backend/commands/async.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/commands/async.c,v 1.139 2008/03/12 20:11:46 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/commands/async.c,v 1.140 2008/03/26 21:10:37 alvherre Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -101,6 +101,7 @@
101101
#include "utils/fmgroids.h"
102102
#include "utils/memutils.h"
103103
#include "utils/ps_status.h"
104+
#include "utils/tqual.h"
104105

105106

106107
/*

0 commit comments

Comments
 (0)