NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit8da9a22

committed

Split index xlog headers from other private index headers.

The xlog-specific headers need to be included in both frontend code -specifically, pg_waldump - and the backend, but the remainder of theprivate headers for each index are only needed by the backend. Bysplitting the xlog stuff out into separate headers, pg_waldump pullsin fewer backend headers, which is a good thing.Patch by me, reviewed by Michael Paquier and Andres Freund, per acomplaint from Dilip Kumar.Discussion:http://postgr.es/m/CA+TgmoZ=F=GkxV0YEv-A8tb+AEGy_Qa7GSiJ8deBKFATnzfEug@mail.gmail.com

1 parentfb47544 commit8da9a22Copy full SHA for 8da9a22

File tree

35 files changed

+1159

-1055

lines changed

src
- backend/access
  - gin
  - gist
    - gistbuild.c
    - gistxlog.c
  - nbtree
  - rmgrdesc
  - spgist
  - transam
    - rmgr.c
- bin/pg_waldump
  - rmgrdesc.c
- include/access

35 files changed

+1159

-1055

lines changed

`‎src/backend/access/gin/ginbtree.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`#include"postgres.h"`
`16`	`16`
`17`	`17`	`#include"access/gin_private.h"`
	`18`	`+#include"access/ginxlog.h"`
`18`	`19`	`#include"access/xloginsert.h"`
`19`	`20`	`#include"miscadmin.h"`
`20`	`21`	`#include"utils/memutils.h"`

`‎src/backend/access/gin/gindatapage.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`#include"postgres.h"`
`16`	`16`
`17`	`17`	`#include"access/gin_private.h"`
	`18`	`+#include"access/ginxlog.h"`
`18`	`19`	`#include"access/xloginsert.h"`
`19`	`20`	`#include"lib/ilist.h"`
`20`	`21`	`#include"miscadmin.h"`

`‎src/backend/access/gin/ginentrypage.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`#include"postgres.h"`
`16`	`16`
`17`	`17`	`#include"access/gin_private.h"`
	`18`	`+#include"access/ginxlog.h"`
`18`	`19`	`#include"access/xloginsert.h"`
`19`	`20`	`#include"miscadmin.h"`
`20`	`21`	`#include"utils/rel.h"`

`‎src/backend/access/gin/ginfast.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`#include"postgres.h"`
`20`	`20`
`21`	`21`	`#include"access/gin_private.h"`
	`22`	`+#include"access/ginxlog.h"`
`22`	`23`	`#include"access/xloginsert.h"`
`23`	`24`	`#include"access/xlog.h"`
`24`	`25`	`#include"commands/vacuum.h"`

`‎src/backend/access/gin/gininsert.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`#include"postgres.h"`
`16`	`16`
`17`	`17`	`#include"access/gin_private.h"`
	`18`	`+#include"access/ginxlog.h"`
`18`	`19`	`#include"access/xloginsert.h"`
`19`	`20`	`#include"catalog/index.h"`
`20`	`21`	`#include"miscadmin.h"`

`‎src/backend/access/gin/ginutil.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`#include"postgres.h"`
`16`	`16`
`17`	`17`	`#include"access/gin_private.h"`
	`18`	`+#include"access/ginxlog.h"`
`18`	`19`	`#include"access/reloptions.h"`
`19`	`20`	`#include"access/xloginsert.h"`
`20`	`21`	`#include"catalog/pg_collation.h"`

`‎src/backend/access/gin/ginvacuum.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`#include"postgres.h"`
`16`	`16`
`17`	`17`	`#include"access/gin_private.h"`
	`18`	`+#include"access/ginxlog.h"`
`18`	`19`	`#include"access/xloginsert.h"`
`19`	`20`	`#include"commands/vacuum.h"`
`20`	`21`	`#include"miscadmin.h"`

`‎src/backend/access/gin/ginxlog.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`
`16`	`16`	`#include"access/bufmask.h"`
`17`	`17`	`#include"access/gin_private.h"`
	`18`	`+#include"access/ginxlog.h"`
`18`	`19`	`#include"access/xlogutils.h"`
`19`	`20`	`#include"utils/memutils.h"`
`20`	`21`

`‎src/backend/access/gist/gistbuild.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`
`19`	`19`	`#include"access/genam.h"`
`20`	`20`	`#include"access/gist_private.h"`
	`21`	`+#include"access/gistxlog.h"`
`21`	`22`	`#include"access/xloginsert.h"`
`22`	`23`	`#include"catalog/index.h"`
`23`	`24`	`#include"miscadmin.h"`

`‎src/backend/access/gist/gistxlog.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`
`16`	`16`	`#include"access/bufmask.h"`
`17`	`17`	`#include"access/gist_private.h"`
	`18`	`+#include"access/gistxlog.h"`
`18`	`19`	`#include"access/xloginsert.h"`
`19`	`20`	`#include"access/xlogutils.h"`
`20`	`21`	`#include"utils/memutils.h"`

`‎src/backend/access/nbtree/nbtinsert.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`
`18`	`18`	`#include"access/heapam.h"`
`19`	`19`	`#include"access/nbtree.h"`
	`20`	`+#include"access/nbtxlog.h"`
`20`	`21`	`#include"access/transam.h"`
`21`	`22`	`#include"access/xloginsert.h"`
`22`	`23`	`#include"miscadmin.h"`

`‎src/backend/access/nbtree/nbtpage.c`

Lines changed: 1 addition & 0 deletions

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

`‎src/backend/access/nbtree/nbtxlog.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`#include"access/bufmask.h"`
`18`	`18`	`#include"access/heapam_xlog.h"`
`19`	`19`	`#include"access/nbtree.h"`
	`20`	`+#include"access/nbtxlog.h"`
`20`	`21`	`#include"access/transam.h"`
`21`	`22`	`#include"access/xlog.h"`
`22`	`23`	`#include"access/xlogutils.h"`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*/`
`15`	`15`	`#include"postgres.h"`
`16`	`16`
`17`		`-#include"access/gin_private.h"`
	`17`	`+#include"access/ginxlog.h"`
`18`	`18`	`#include"access/xlogutils.h"`
`19`	`19`	`#include"lib/stringinfo.h"`
`20`	`20`	`#include"storage/relfilenode.h"`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*/`
`15`	`15`	`#include"postgres.h"`
`16`	`16`
`17`		`-#include"access/gist_private.h"`
	`17`	`+#include"access/gistxlog.h"`
`18`	`18`	`#include"lib/stringinfo.h"`
`19`	`19`	`#include"storage/relfilenode.h"`
`20`	`20`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*/`
`15`	`15`	`#include"postgres.h"`
`16`	`16`
`17`		`-#include"access/nbtree.h"`
	`17`	`+#include"access/nbtxlog.h"`
`18`	`18`
`19`	`19`	`void`
`20`	`20`	`btree_desc(StringInfobuf,XLogReaderState*record)`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*/`
`15`	`15`	`#include"postgres.h"`
`16`	`16`
`17`		`-#include"access/spgist_private.h"`
	`17`	`+#include"access/spgxlog.h"`
`18`	`18`
`19`	`19`	`void`
`20`	`20`	`spg_desc(StringInfobuf,XLogReaderState*record)`

`‎src/backend/access/spgist/spgdoinsert.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`
`18`	`18`	`#include"access/genam.h"`
`19`	`19`	`#include"access/spgist_private.h"`
	`20`	`+#include"access/spgxlog.h"`
`20`	`21`	`#include"access/xloginsert.h"`
`21`	`22`	`#include"miscadmin.h"`
`22`	`23`	`#include"storage/bufmgr.h"`

`‎src/backend/access/spgist/spginsert.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`
`19`	`19`	`#include"access/genam.h"`
`20`	`20`	`#include"access/spgist_private.h"`
	`21`	`+#include"access/spgxlog.h"`
`21`	`22`	`#include"access/xlog.h"`
`22`	`23`	`#include"access/xloginsert.h"`
`23`	`24`	`#include"catalog/index.h"`

`‎src/backend/access/spgist/spgvacuum.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`
`18`	`18`	`#include"access/genam.h"`
`19`	`19`	`#include"access/spgist_private.h"`
	`20`	`+#include"access/spgxlog.h"`
`20`	`21`	`#include"access/transam.h"`
`21`	`22`	`#include"access/xloginsert.h"`
`22`	`23`	`#include"catalog/storage_xlog.h"`

`‎src/backend/access/spgist/spgxlog.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`
`17`	`17`	`#include"access/bufmask.h"`
`18`	`18`	`#include"access/spgist_private.h"`
	`19`	`+#include"access/spgxlog.h"`
`19`	`20`	`#include"access/transam.h"`
`20`	`21`	`#include"access/xlog.h"`
`21`	`22`	`#include"access/xlogutils.h"`

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

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,15 +9,15 @@`
`9`	`9`
`10`	`10`	`#include"access/clog.h"`
`11`	`11`	`#include"access/commit_ts.h"`
`12`		`-#include"access/gin.h"`
`13`		`-#include"access/gist_private.h"`
	`12`	`+#include"access/ginxlog.h"`
	`13`	`+#include"access/gistxlog.h"`
`14`	`14`	`#include"access/generic_xlog.h"`
`15`	`15`	`#include"access/hash_xlog.h"`
`16`	`16`	`#include"access/heapam_xlog.h"`
`17`	`17`	`#include"access/brin_xlog.h"`
`18`	`18`	`#include"access/multixact.h"`
`19`		`-#include"access/nbtree.h"`
`20`		`-#include"access/spgist.h"`
	`19`	`+#include"access/nbtxlog.h"`
	`20`	`+#include"access/spgxlog.h"`
`21`	`21`	`#include"access/xact.h"`
`22`	`22`	`#include"access/xlog_internal.h"`
`23`	`23`	`#include"catalog/storage_xlog.h"`

`‎src/bin/pg_waldump/rmgrdesc.c`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,14 +12,14 @@`
`12`	`12`	`#include"access/clog.h"`
`13`	`13`	`#include"access/commit_ts.h"`
`14`	`14`	`#include"access/generic_xlog.h"`
`15`		`-#include"access/gin.h"`
`16`		`-#include"access/gist_private.h"`
	`15`	`+#include"access/ginxlog.h"`
	`16`	`+#include"access/gistxlog.h"`
`17`	`17`	`#include"access/hash_xlog.h"`
`18`	`18`	`#include"access/heapam_xlog.h"`
`19`	`19`	`#include"access/multixact.h"`
`20`		`-#include"access/nbtree.h"`
	`20`	`+#include"access/nbtxlog.h"`
`21`	`21`	`#include"access/rmgr.h"`
`22`		`-#include"access/spgist.h"`
	`22`	`+#include"access/spgxlog.h"`
`23`	`23`	`#include"access/xact.h"`
`24`	`24`	`#include"access/xlog_internal.h"`
`25`	`25`	`#include"catalog/storage_xlog.h"`

`‎src/include/access/gin.h`

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -73,12 +73,4 @@ extern intgin_pending_list_limit;`
`73`	`73`	`externvoidginGetStats(Relationindex,GinStatsData*stats);`
`74`	`74`	`externvoidginUpdateStats(Relationindex,constGinStatsData*stats);`
`75`	`75`
`76`		`-/* ginxlog.c */`
`77`		`-externvoidgin_redo(XLogReaderState*record);`
`78`		`-externvoidgin_desc(StringInfobuf,XLogReaderState*record);`
`79`		`-externconstchar*gin_identify(uint8info);`
`80`		`-externvoidgin_xlog_startup(void);`
`81`		`-externvoidgin_xlog_cleanup(void);`
`82`		`-externvoidgin_mask(char*pagedata,BlockNumberblkno);`
`83`		`-`
`84`	`76`	`#endif/* GIN_H */`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit8da9a22

File tree

35 files changed

35 files changed

`‎src/backend/access/gin/ginbtree.c`

`‎src/backend/access/gin/gindatapage.c`

`‎src/backend/access/gin/ginentrypage.c`

`‎src/backend/access/gin/ginfast.c`

`‎src/backend/access/gin/gininsert.c`

`‎src/backend/access/gin/ginutil.c`

`‎src/backend/access/gin/ginvacuum.c`

`‎src/backend/access/gin/ginxlog.c`

`‎src/backend/access/gist/gistbuild.c`

`‎src/backend/access/gist/gistxlog.c`

`‎src/backend/access/nbtree/nbtinsert.c`

`‎src/backend/access/nbtree/nbtpage.c`

`‎src/backend/access/nbtree/nbtxlog.c`

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

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

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

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

`‎src/backend/access/spgist/spgdoinsert.c`

`‎src/backend/access/spgist/spginsert.c`

`‎src/backend/access/spgist/spgvacuum.c`

`‎src/backend/access/spgist/spgxlog.c`

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

`‎src/bin/pg_waldump/rmgrdesc.c`

`‎src/include/access/gin.h`

0 commit comments