Movatterモバイル変換

Skip to content

postgrespro/postgres_clusterPublic

NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit4c850ec

anarazel

committed

Don't include heapam.h from others headers.

heapam.h previously was included in a number of widely usedheaders (e.g. execnodes.h, indirectly in executor.h, ...). That'sproblematic on its own, as heapam.h contains a lot of low-leveldetails that don't need to be exposed that widely, but becomes moreproblematic with the upcoming introduction of pluggable table storage- it seems inappropriate for heapam.h to be included that widelyafterwards.heapam.h was largely only included in other headers to get theHeapScanDesc typedef (which was defined in heapam.h, even thoughHeapScanDescData is defined in relscan.h). The better solution hereseems to be to just use the underlying struct (forward declared wherenecessary). Similar for BulkInsertState.Another problem was that LockTupleMode was used in executor.h - partsof the file tried to cope without heapam.h, but due to the fact thatit indirectly included it, several subsequent violations of that goalwere not not noticed. We could just reuse the approach of declaringparameters as int, but it seems nicer to move LockTupleMode tolockoptions.h - that's not a perfect location, but also doesn't seembad.As a number of files relied on implicitly included heapam.h, asignificant number of files grew an explicit include. It's quiteprobably that a few external projects will need to do the same.Author: Andres FreundReviewed-By: Alvaro HerreraDiscussion:https://postgr.es/m/20190114000701.y4ttcb74jpskkcfb@alap3.anarazel.de

1 parent42e2a58 commit4c850ecCopy full SHA for 4c850ec

File tree

71 files changed

+91

-36

lines changed

contrib
- amcheck
  - verify_nbtree.c
- dblink
  - dblink.c
- file_fdw
  - file_fdw.c
- pageinspect
- pg_freespacemap
  - pg_freespacemap.c
- pg_visibility
  - pg_visibility.c
- pgrowlocks
  - pgrowlocks.c
- pgstattuple
  - pgstatapprox.c
  - pgstattuple.c
- postgres_fdw
  - postgres_fdw.c
- tsm_system_rows
  - tsm_system_rows.c
- tsm_system_time
  - tsm_system_time.c
src
- backend
  - access
    - brin
      - brin.c
    - common
      - indextuple.c
    - index
      - genam.c
      - indexam.c
    - nbtree
      - nbtsort.c
    - tablesample
      - system.c
  - bootstrap
    - bootstrap.c
  - catalog
  - commands
  - executor
  - optimizer/plan
    - planner.c
  - parser
    - parse_relation.c
    - parse_utilcmd.c
  - partitioning
    - partbounds.c
  - replication/logical
    - tablesync.c
    - worker.c
  - rewrite
    - rewriteHandler.c
  - utils
    - adt
    - cache
      - relcache.c
    - fmgr
      - funcapi.c
- include
  - access
  - catalog
    - index.h
  - executor
    - executor.h
  - nodes
    - execnodes.h
    - lockoptions.h

Some content is hidden

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

71 files changed

+91

-36

lines changed

`‎contrib/amcheck/verify_nbtree.c‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`*/`
`24`	`24`	`#include"postgres.h"`
`25`	`25`
	`26`	`+#include"access/heapam.h"`
`26`	`27`	`#include"access/htup_details.h"`
`27`	`28`	`#include"access/nbtree.h"`
`28`	`29`	`#include"access/transam.h"`

`‎contrib/dblink/dblink.c‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@`
`38`	`38`
`39`	`39`	`#include"access/htup_details.h"`
`40`	`40`	`#include"access/reloptions.h"`
	`41`	`+#include"access/heapam.h"`
`41`	`42`	`#include"catalog/indexing.h"`
`42`	`43`	`#include"catalog/namespace.h"`
`43`	`44`	`#include"catalog/pg_foreign_data_wrapper.h"`

`‎contrib/file_fdw/file_fdw.c‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`#include"access/htup_details.h"`
`19`	`19`	`#include"access/reloptions.h"`
`20`	`20`	`#include"access/sysattr.h"`
	`21`	`+#include"access/heapam.h"`
`21`	`22`	`#include"catalog/pg_authid.h"`
`22`	`23`	`#include"catalog/pg_foreign_table.h"`
`23`	`24`	`#include"commands/copy.h"`

`‎contrib/pageinspect/btreefuncs.c‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`#include"pageinspect.h"`
`31`	`31`
`32`	`32`	`#include"access/nbtree.h"`
	`33`	`+#include"access/heapam.h"`
`33`	`34`	`#include"catalog/namespace.h"`
`34`	`35`	`#include"catalog/pg_am.h"`
`35`	`36`	`#include"funcapi.h"`

`‎contrib/pageinspect/heapfuncs.c‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`
`28`	`28`	`#include"pageinspect.h"`
`29`	`29`
	`30`	`+#include"access/heapam.h"`
`30`	`31`	`#include"access/htup_details.h"`
`31`	`32`	`#include"funcapi.h"`
`32`	`33`	`#include"catalog/pg_type.h"`

`‎contrib/pageinspect/rawpage.c‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`#include"pageinspect.h"`
`19`	`19`
`20`	`20`	`#include"access/htup_details.h"`
	`21`	`+#include"access/heapam.h"`
`21`	`22`	`#include"catalog/namespace.h"`
`22`	`23`	`#include"catalog/pg_type.h"`
`23`	`24`	`#include"funcapi.h"`

`‎contrib/pg_freespacemap/pg_freespacemap.c‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`*/`
`9`	`9`	`#include"postgres.h"`
`10`	`10`
	`11`	`+#include"access/heapam.h"`
`11`	`12`	`#include"funcapi.h"`
`12`	`13`	`#include"storage/freespace.h"`
`13`	`14`

`‎contrib/pg_visibility/pg_visibility.c‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`*/`
`11`	`11`	`#include"postgres.h"`
`12`	`12`
	`13`	`+#include"access/heapam.h"`
`13`	`14`	`#include"access/htup_details.h"`
`14`	`15`	`#include"access/visibilitymap.h"`
`15`	`16`	`#include"catalog/pg_type.h"`

`‎contrib/pgrowlocks/pgrowlocks.c‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`
`25`	`25`	`#include"postgres.h"`
`26`	`26`
	`27`	`+#include"access/heapam.h"`
`27`	`28`	`#include"access/multixact.h"`
`28`	`29`	`#include"access/relscan.h"`
`29`	`30`	`#include"access/xact.h"`

`‎contrib/pgstattuple/pgstatapprox.c‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`#include"postgres.h"`
`14`	`14`
`15`	`15`	`#include"access/visibilitymap.h"`
	`16`	`+#include"access/heapam.h"`
`16`	`17`	`#include"access/transam.h"`
`17`	`18`	`#include"access/xact.h"`
`18`	`19`	`#include"access/multixact.h"`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp