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

Commit 9a7fda5

Browse files
scrappyscrappy
committed
-Wall'd
1 parent aa907f7 commit 9a7fda5

File tree

4 files changed

+207
-109
lines changed

4 files changed

+207
-109
lines changed

‎src/backend/commands/async.c

Lines changed: 42 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.3 1996/10/18 05:59:15 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.4 1996/10/21 09:37:20 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -59,51 +59,63 @@
5959
*
6060
*/
6161

62-
#include <string.h>
63-
#include <signal.h>
64-
#include <errno.h>
6562
#include "postgres.h"
6663

67-
#include "access/attnum.h"
68-
#include "access/heapam.h"
69-
#include "access/htup.h"
70-
#include "access/relscan.h"
64+
#include "catalog/pg_attribute.h"
65+
#include "access/attnum.h"
66+
#include "nodes/pg_list.h"
67+
#include "access/tupdesc.h"
68+
#include "storage/fd.h"
69+
#include "catalog/pg_am.h"
70+
#include "catalog/pg_class.h"
71+
#include "nodes/nodes.h"
72+
#include "rewrite/prs2lock.h"
7173
#include "access/skey.h"
72-
#include "utils/builtins.h"
74+
#include "access/strat.h"
75+
#include "utils/rel.h"
76+
77+
#include "storage/block.h"
78+
#include "storage/off.h"
79+
#include "storage/itemptr.h"
80+
#include <time.h>
81+
#include "utils/nabstime.h"
82+
#include "access/htup.h"
83+
7384
#include "utils/tqual.h"
85+
#include "storage/buf.h"
86+
#include "access/relscan.h"
87+
7488
#include "access/xact.h"
7589

76-
#include "commands/async.h"
77-
#include "commands/copy.h"
78-
#include "storage/buf.h"
79-
#include "storage/itemptr.h"
80-
#include "miscadmin.h"
81-
#include "utils/portal.h"
82-
#include "utils/excid.h"
83-
#include "utils/elog.h"
84-
#include "utils/mcxt.h"
90+
#include "lib/dllist.h"
91+
8592
#include "utils/palloc.h"
86-
#include "utils/rel.h"
8793

88-
#include "nodes/pg_list.h"
8994
#include "tcop/dest.h"
90-
#include "commands/command.h"
91-
92-
#include "catalog/catname.h"
93-
#include "utils/syscache.h"
94-
#include "catalog/pg_attribute.h"
9595
#include "catalog/pg_proc.h"
96-
#include "catalog/pg_class.h"
97-
#include "catalog/pg_type.h"
96+
#include "catalog/catname.h"
9897
#include "catalog/pg_listener.h"
9998

100-
#include "executor/execdefs.h"
101-
/* #include "executor/execdesc.h"*/
99+
#include "access/heapam.h"
102100

101+
#include <stdio.h>
102+
#include "storage/ipc.h"
103103
#include "storage/bufmgr.h"
104-
#include "lib/dllist.h"
104+
105+
#include "nodes/memnodes.h"
106+
#include "utils/mcxt.h"
107+
#include "commands/async.h"
108+
109+
#include <unistd.h>
110+
#include <signal.h>
111+
#include <string.h>
112+
#include <errno.h>
113+
114+
#include <netinet/in.h>
115+
#include "libpq/pqcomm.h"
105116
#include "libpq/libpq.h"
106117

118+
#include "utils/syscache.h"
107119

108120
static int notifyFrontEndPending = 0;
109121
static int notifyIssued = 0;

‎src/backend/commands/command.c

Lines changed: 58 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.2 1996/08/19 01:53:37 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.3 1996/10/21 09:37:23 scrappy Exp $
1111
*
1212
* NOTES
1313
* The PortalExecutorHeapMemory crap needs to be eliminated
@@ -20,58 +20,80 @@
2020
*
2121
*-------------------------------------------------------------------------
2222
*/
23-
#include <string.h>
2423
#include "postgres.h"
2524

26-
#include "access/attnum.h"
27-
#include "access/heapam.h"
28-
#include "access/htup.h"
29-
#include "access/relscan.h"
25+
#include "catalog/pg_attribute.h"
26+
#include "access/attnum.h"
27+
#include "nodes/pg_list.h"
28+
#include "access/tupdesc.h"
29+
#include "storage/fd.h"
30+
#include "catalog/pg_am.h"
31+
#include "catalog/pg_class.h"
32+
#include "nodes/nodes.h"
33+
#include "rewrite/prs2lock.h"
3034
#include "access/skey.h"
31-
#include "utils/builtins.h"
32-
#include "utils/tqual.h"
33-
34-
#include "commands/copy.h"
35+
#include "access/strat.h"
36+
#include "utils/rel.h"
3537

36-
#include "storage/buf.h"
38+
#include "storage/block.h"
39+
#include "storage/off.h"
3740
#include "storage/itemptr.h"
41+
#include <time.h>
42+
#include "utils/nabstime.h"
43+
#include "access/htup.h"
3844

39-
#include "miscadmin.h"
40-
41-
#include "utils/portal.h"
42-
#include "utils/excid.h"
43-
#include "utils/elog.h"
44-
#include "utils/mcxt.h"
45-
#include "utils/palloc.h"
46-
#include "utils/rel.h"
45+
#include "utils/tqual.h"
46+
#include "storage/buf.h"
47+
#include "access/relscan.h"
4748

48-
#include "nodes/pg_list.h"
49+
#include "nodes/memnodes.h"
4950
#include "nodes/primnodes.h"
50-
#include "tcop/dest.h"
51+
#include "nodes/parsenodes.h"
52+
#include "nodes/params.h"
53+
#include "access/sdir.h"
54+
#include "executor/hashjoin.h"
55+
#include "executor/tuptable.h"
56+
#include "access/funcindex.h"
57+
#include "nodes/execnodes.h"
58+
#include "nodes/plannodes.h"
59+
#include "tcop/dest.h"
60+
#include "executor/execdesc.h"
61+
#include "utils/portal.h"
62+
5163
#include "commands/command.h"
5264

53-
#include "catalog/catalog.h"
54-
#include "catalog/catname.h"
55-
#include "utils/syscache.h"
56-
#include "catalog/pg_attribute.h"
57-
#include "catalog/pg_proc.h"
58-
#include "catalog/pg_class.h"
59-
#include "catalog/pg_type.h"
60-
#include "catalog/indexing.h"
65+
#include "utils/mcxt.h"
6166

67+
#include <stdio.h>
68+
#include "catalog/pg_index.h"
69+
#include "access/itup.h"
6270
#include "executor/executor.h"
71+
6372
#include "executor/execdefs.h"
64-
#include "executor/execdesc.h"
6573

66-
#include "optimizer/internal.h"
67-
#include "optimizer/prep.h" /* for find_all_inheritors */
74+
#include "catalog/indexing.h"
75+
76+
#include "utils/syscache.h"
77+
78+
#include "catalog/catalog.h"
6879

80+
#include "access/heapam.h"
6981

70-
#ifndef NO_SECURITY
71-
#include "miscadmin.h"
82+
#include "utils/array.h"
7283
#include "utils/acl.h"
73-
#include "utils/syscache.h"
74-
#endif /* !NO_SECURITY */
84+
85+
#include "optimizer/prep.h"
86+
87+
#include "catalog/catname.h"
88+
89+
#include "catalog/pg_proc.h"
90+
91+
#include "utils/palloc.h"
92+
93+
#include "catalog/pg_type.h"
94+
95+
#include "utils/geo-decls.h"
96+
#include "utils/builtins.h"
7597

7698
/* ----------------
7799
* PortalExecutorHeapMemory stuff

‎src/backend/commands/copy.c

Lines changed: 68 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,43 +6,87 @@
66
*
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.8 1996/10/18 05:59:17 scrappy Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.9 1996/10/21 09:37:26 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313

14-
#include "config.h"
14+
#include "postgres.h"
15+
16+
#include "catalog/pg_attribute.h"
17+
#include "access/attnum.h"
18+
#include "nodes/pg_list.h"
19+
#include "access/tupdesc.h"
20+
#include "storage/fd.h"
21+
#include "catalog/pg_am.h"
22+
#include "catalog/pg_class.h"
23+
#include "nodes/nodes.h"
24+
#include "rewrite/prs2lock.h"
25+
#include "access/skey.h"
26+
#include "access/strat.h"
27+
#include "utils/rel.h"
28+
29+
#include "storage/block.h"
30+
#include "storage/off.h"
31+
#include "storage/itemptr.h"
32+
#include <time.h>
33+
#include "utils/nabstime.h"
34+
#include "access/htup.h"
35+
36+
#include "utils/tqual.h"
37+
#include "storage/buf.h"
38+
#include "access/relscan.h"
39+
#include "access/heapam.h"
40+
41+
#include "access/itup.h"
1542

1643
#include <stdio.h>
17-
#include <sys/types.h> /* for mode_t */
18-
#include <sys/stat.h> /* for umask(2) prototype */
1944

20-
#include "postgres.h"
45+
#include "tcop/dest.h"
46+
47+
#include "fmgr.h"
48+
49+
#include "utils/palloc.h"
50+
2151
#include "miscadmin.h"
52+
53+
#include "utils/geo-decls.h"
2254
#include "utils/builtins.h"
23-
#include "utils/syscache.h"
24-
#include "catalog/pg_type.h"
25-
#include "catalog/pg_index.h"
26-
#include "catalog/index.h"
2755

28-
#include "storage/bufmgr.h"
29-
#include "access/heapam.h"
30-
#include "access/htup.h"
31-
#include "access/itup.h"
32-
#include "access/relscan.h"
56+
#include <sys/stat.h>
57+
3358
#include "access/funcindex.h"
34-
#include "access/transam.h"
35-
#include "access/tupdesc.h"
36-
#include "nodes/execnodes.h"
37-
#include "nodes/plannodes.h"
38-
#include "nodes/pg_list.h"
59+
60+
#include "catalog/pg_index.h"
61+
62+
#include "utils/syscache.h"
63+
64+
#include "nodes/params.h"
65+
#include "access/sdir.h"
66+
#include "executor/hashjoin.h"
67+
#include "nodes/primnodes.h"
68+
#include "nodes/memnodes.h"
3969
#include "executor/tuptable.h"
40-
#include "executor/executor.h"
41-
#include "utils/rel.h"
42-
#include "utils/elog.h"
70+
#include "nodes/execnodes.h"
71+
4372
#include "utils/memutils.h"
44-
#include "utils/palloc.h"
45-
#include "fmgr.h"
73+
74+
#include "nodes/plannodes.h"
75+
#include "nodes/parsenodes.h"
76+
#include "executor/execdesc.h"
77+
#include "executor/executor.h"
78+
79+
#include "storage/ipc.h"
80+
#include "storage/bufmgr.h"
81+
#include "access/transam.h"
82+
83+
#include "catalog/index.h"
84+
85+
#include "access/genam.h"
86+
87+
#include "catalog/pg_type.h"
88+
89+
#include "catalog/catname.h"
4690

4791
#define ISOCTAL(c) (((c) >= '0') && ((c) <= '7'))
4892
#define VALUE(c) ((c) - '0')
@@ -240,7 +284,6 @@ static void
240284
CopyFrom(Relation rel, bool binary, bool oids, FILE *fp, char *delim)
241285
{
242286
HeapTuple tuple;
243-
IndexTuple ituple;
244287
AttrNumber attr_count;
245288
AttributeTupleForm *attr;
246289
func_ptr *in_functions;

0 commit comments

Comments
 (0)