Movatterモバイル変換

Skip to content

postgrespro/postgresPublic

forked frompostgres/postgres

NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitaf1a949

tglsfdc

committed

Further cleanup of client dependencies on src/include/catalog headers.

In commit9c0a0de, I'd failed to notice that catalog/catalog.hshould also be considered a frontend-unsafe header, because it includes(and needs) the full form of pg_class.h, not to mention relcache.h.However, various frontend code was depending on it to getTABLESPACE_VERSION_DIRECTORY, so refactoring of some sort is called for.The cleanest answer seems to be to move TABLESPACE_VERSION_DIRECTORY,as well as the OIDCHARS symbol, to common/relpath.h. Do that, and mop upinclusions as necessary. (I found that quite a few current users ofcatalog/catalog.h don't seem to need it at all anymore, apparently as aresult of the refactorings that created common/relpath.[hc]. Andinitdb.c needed it only as a route to pg_class_d.h.)Discussion:https://postgr.es/m/6629.1523294509@sss.pgh.pa.us

1 parentf5543d4 commitaf1a949Copy full SHA for af1a949

File tree

21 files changed

+17

-29

lines changed

contrib
- pageinspect
  - rawpage.c
- pg_prewarm
  - pg_prewarm.c
src
- backend
  - access
    - index
      - indexam.c
    - rmgrdesc
      - smgrdesc.c
      - xactdesc.c
    - transam
  - catalog
    - storage.c
  - commands
    - vacuumlazy.c
  - replication
    - basebackup.c
  - storage
    - file
      - fd.c
      - reinit.c
    - smgr
      - md.c
- bin
  - initdb
    - initdb.c
  - pg_rewind
- common
  - relpath.c
- include
  - catalog
    - catalog.h
  - common
    - relpath.h

21 files changed

+17

-29

lines changed

`‎contrib/pageinspect/rawpage.c‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`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"`

`‎contrib/pg_prewarm/pg_prewarm.c‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`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"`

`‎src/backend/access/index/indexam.c‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,6 @@`
`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"`

`‎src/backend/access/rmgrdesc/smgrdesc.c‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`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`

`‎src/backend/access/rmgrdesc/xactdesc.c‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`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"`

`‎src/backend/access/transam/xact.c‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@`
`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"`

`‎src/backend/access/transam/xlogfuncs.c‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`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"`

`‎src/backend/access/transam/xlogutils.c‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@`
`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"`

`‎src/backend/catalog/storage.c‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@`
`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"`

`‎src/backend/commands/vacuumlazy.c‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@`
`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"`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp