File tree 21 files changed +17
-29
lines changed
21 files changed +17
-29
lines changed Original file line number Diff line number Diff line change 18
18
#include "pageinspect.h"
19
19
20
20
#include "access/htup_details.h"
21
- #include "catalog/catalog.h"
22
21
#include "catalog/namespace.h"
23
22
#include "catalog/pg_type.h"
24
23
#include "funcapi.h"
Original file line number Diff line number Diff line change 16
16
#include <unistd.h>
17
17
18
18
#include "access/heapam.h"
19
- #include "catalog/catalog.h"
20
19
#include "fmgr.h"
21
20
#include "miscadmin.h"
22
21
#include "storage/bufmgr.h"
Original file line number Diff line number Diff line change 73
73
#include "access/relscan.h"
74
74
#include "access/transam.h"
75
75
#include "access/xlog.h"
76
- #include "catalog/catalog.h"
77
76
#include "catalog/index.h"
78
77
#include "pgstat.h"
79
78
#include "storage/bufmgr.h"
Original file line number Diff line number Diff line change 14
14
*/
15
15
#include "postgres.h"
16
16
17
- #include "catalog/catalog.h"
18
17
#include "catalog/storage_xlog.h"
19
18
20
19
Original file line number Diff line number Diff line change 16
16
17
17
#include "access/transam.h"
18
18
#include "access/xact.h"
19
- #include "catalog/catalog.h"
20
19
#include "storage/sinval.h"
21
20
#include "storage/standbydefs.h"
22
21
#include "utils/timestamp.h"
Original file line number Diff line number Diff line change 30
30
#include "access/xlog.h"
31
31
#include "access/xloginsert.h"
32
32
#include "access/xlogutils.h"
33
- #include "catalog/catalog.h"
34
33
#include "catalog/namespace.h"
35
34
#include "catalog/storage.h"
36
35
#include "commands/async.h"
Original file line number Diff line number Diff line change 20
20
#include "access/xlog.h"
21
21
#include "access/xlog_internal.h"
22
22
#include "access/xlogutils.h"
23
- #include "catalog/catalog.h"
24
23
#include "catalog/pg_type.h"
25
24
#include "funcapi.h"
26
25
#include "miscadmin.h"
Original file line number Diff line number Diff line change 23
23
#include "access/xlog.h"
24
24
#include "access/xlog_internal.h"
25
25
#include "access/xlogutils.h"
26
- #include "catalog/catalog.h"
27
26
#include "miscadmin.h"
28
27
#include "pgstat.h"
29
28
#include "storage/smgr.h"
Original file line number Diff line number Diff line change 24
24
#include "access/xlog.h"
25
25
#include "access/xloginsert.h"
26
26
#include "access/xlogutils.h"
27
- #include "catalog/catalog.h"
28
27
#include "catalog/storage.h"
29
28
#include "catalog/storage_xlog.h"
30
29
#include "storage/freespace.h"
Original file line number Diff line number Diff line change 44
44
#include "access/transam.h"
45
45
#include "access/visibilitymap.h"
46
46
#include "access/xlog.h"
47
- #include "catalog/catalog.h"
48
47
#include "catalog/storage.h"
49
48
#include "commands/dbcommands.h"
50
49
#include "commands/progress.h"
Original file line number Diff line number Diff line change 17
17
#include <time.h>
18
18
19
19
#include "access/xlog_internal.h" /* for pg_start/stop_backup */
20
- #include "catalog/catalog.h"
21
20
#include "catalog/pg_type.h"
22
21
#include "common/file_perm.h"
23
22
#include "lib/stringinfo.h"
Original file line number Diff line number Diff line change 82
82
#include "miscadmin.h"
83
83
#include "access/xact.h"
84
84
#include "access/xlog.h"
85
- #include "catalog/catalog.h"
86
85
#include "catalog/pg_tablespace.h"
87
86
#include "common/file_perm.h"
88
87
#include "pgstat.h"
Original file line number Diff line number Diff line change 16
16
17
17
#include <unistd.h>
18
18
19
- #include "catalog/catalog.h"
20
19
#include "common/relpath.h"
21
20
#include "storage/copydir.h"
22
21
#include "storage/fd.h"
Original file line number Diff line number Diff line change 27
27
28
28
#include "miscadmin.h"
29
29
#include "access/xlog.h"
30
- #include "catalog/catalog.h"
31
30
#include "pgstat.h"
32
31
#include "portability/instr_time.h"
33
32
#include "postmaster/bgwriter.h"
Original file line number Diff line number Diff line change 60
60
#endif
61
61
62
62
#include "access/xlog_internal.h"
63
- #include "catalog/catalog.h"
64
63
#include "catalog/pg_authid_d.h"
64
+ #include "catalog/pg_class_d.h" /* pgrminclude ignore */
65
65
#include "catalog/pg_collation_d.h"
66
66
#include "common/file_perm.h"
67
67
#include "common/file_utils.h"
Original file line number Diff line number Diff line change 21
21
#include "logging.h"
22
22
#include "pg_rewind.h"
23
23
24
- #include "catalog/catalog.h"
25
-
26
24
static void recurse_dir (const char * datadir , const char * path ,
27
25
process_file_callback_t callback );
28
26
Original file line number Diff line number Diff line change 19
19
#include "pg_rewind.h"
20
20
21
21
#include "common/string.h"
22
- #include "catalog/catalog.h"
23
22
#include "catalog/pg_tablespace_d.h"
24
23
#include "storage/fd.h"
25
24
Original file line number Diff line number Diff line change 22
22
#include "logging.h"
23
23
24
24
#include "libpq-fe.h"
25
- #include "catalog/catalog.h"
26
25
#include "catalog/pg_type_d.h"
27
26
#include "fe_utils/connect.h"
28
27
#include "port/pg_bswap.h"
Original file line number Diff line number Diff line change 18
18
#include "postgres_fe.h"
19
19
#endif
20
20
21
- #include "catalog/catalog.h"
22
21
#include "catalog/pg_tablespace_d.h"
23
22
#include "common/relpath.h"
24
23
#include "storage/backendid.h"
Original file line number Diff line number Diff line change 14
14
#ifndef CATALOG_H
15
15
#define CATALOG_H
16
16
17
- /*
18
- * 'pgrminclude ignore' needed here because CppAsString2() does not throw
19
- * an error if the symbol is not defined.
20
- */
21
- #include "catalog/catversion.h" /* pgrminclude ignore */
22
17
#include "catalog/pg_class.h"
23
18
#include "utils/relcache.h"
24
19
25
- #define OIDCHARS 10 /* max chars printed by %u */
26
- #define TABLESPACE_VERSION_DIRECTORY "PG_" PG_MAJORVERSION "_" \
27
- CppAsString2(CATALOG_VERSION_NO)
28
-
29
20
30
21
extern bool IsSystemRelation (Relation relation );
31
22
extern bool IsToastRelation (Relation relation );
Original file line number Diff line number Diff line change 13
13
#ifndef RELPATH_H
14
14
#define RELPATH_H
15
15
16
+ /*
17
+ * 'pgrminclude ignore' needed here because CppAsString2() does not throw
18
+ * an error if the symbol is not defined.
19
+ */
20
+ #include "catalog/catversion.h" /* pgrminclude ignore */
21
+
22
+
23
+ /*
24
+ * Name of major-version-specific tablespace subdirectories
25
+ */
26
+ #define TABLESPACE_VERSION_DIRECTORY "PG_" PG_MAJORVERSION "_" \
27
+ CppAsString2(CATALOG_VERSION_NO)
28
+
29
+ /* Characters to allow for an OID in a relation path */
30
+ #define OIDCHARS 10 /* max chars printed by %u */
31
+
16
32
/*
17
33
* Stuff for fork names.
18
34
*
You can’t perform that action at this time.
0 commit comments