NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit2076db2

committed

Move the backup-block logic from XLogInsert to a new file, xloginsert.c.

xlog.c is huge, this makes it a little bit smaller, which is nice. Functionsrelated to putting together the WAL record are in xloginsert.c, and thelower level stuff for managing WAL buffers and such are in xlog.c.Also move the definition of XLogRecord to a separate header file. Thiscauses churn in the #includes of all the files that write WAL records, andredo routines, but it avoids pulling in xlog.h into most places.Reviewed by Michael Paquier, Alvaro Herrera, Andres Freund and Amit Kapila.

1 parentd2b8a2c commit2076db2Copy full SHA for 2076db2

File tree

84 files changed

+1123

-856

lines changed

contrib/pg_xlogdump
- pg_xlogdump.c
doc/src/sgml
- wal.sgml
src
- backend
  - access
    - gin
    - gist
      - gistbuild.c
      - gistxlog.c
    - heap
    - nbtree
    - spgist
    - transam
  - catalog
  - commands
  - storage
    - buffer
      - bufmgr.c
    - file
      - fd.c
    - ipc
      - procarray.c
      - standby.c
    - lmgr
      - lock.c
      - predicate.c
  - tcop
    - utility.c
  - utils
    - adt
      - txid.c
    - cache
      - relcache.c
      - relmapper.c
    - init
      - postinit.c
    - sort
      - tuplestore.c
    - time
      - tqual.c
- bin/pg_resetxlog
  - pg_resetxlog.c
- include
  - access
  - catalog
    - storage_xlog.h
  - commands
  - replication
    - decode.h
  - storage
    - standby.h
  - utils
    - relmapper.h

Some content is hidden

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

84 files changed

+1123

-856

lines changed

`‎contrib/pg_xlogdump/pg_xlogdump.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@`
`15`	`15`	`#include<dirent.h>`
`16`	`16`	`#include<unistd.h>`
`17`	`17`
`18`		`-#include"access/xlog.h"`
`19`	`18`	`#include"access/xlogreader.h"`
	`19`	`+#include"access/xlogrecord.h"`
`20`	`20`	`#include"access/transam.h"`
`21`	`21`	`#include"common/fe_memutils.h"`
`22`	`22`	`#include"getopt_long.h"`

`‎doc/src/sgml/wal.sgml`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -578,12 +578,12 @@`
`578`	`578`
`579`	`579`	`<para>`
`580`	`580`	`There are two commonly used internal <acronym>WAL</acronym> functions:`
`581`		`- <function>XLogInsert</function> and <function>XLogFlush</function>.`
`582`		`- <function>XLogInsert</function> is used to place a new record into`
	`581`	`+ <function>XLogInsertRecord</function> and <function>XLogFlush</function>.`
	`582`	`+ <function>XLogInsertRecord</function> is used to place a new record into`
`583`	`583`	`the <acronym>WAL</acronym> buffers in shared memory. If there is no`
`584`		`- space for the new record, <function>XLogInsert</function> will have`
	`584`	`+ space for the new record, <function>XLogInsertRecord</function> will have`
`585`	`585`	`to write (move to kernel cache) a few filled <acronym>WAL</acronym>`
`586`		`- buffers. This is undesirable because <function>XLogInsert</function>`
	`586`	`+ buffers. This is undesirable because <function>XLogInsertRecord</function>`
`587`	`587`	`is used on every database low level modification (for example, row`
`588`	`588`	`insertion) at a time when an exclusive lock is held on affected`
`589`	`589`	`data pages, so the operation needs to be as fast as possible. What`
`@@ -594,7 +594,7 @@`
`594`	`594`	`made, for the most part, at transaction commit time to ensure that`
`595`	`595`	`transaction records are flushed to permanent storage. On systems`
`596`	`596`	`with high log output, <function>XLogFlush</function> requests might`
`597`		`- not occur often enough to prevent <function>XLogInsert</function>`
	`597`	`+ not occur often enough to prevent <function>XLogInsertRecord</function>`
`598`	`598`	`from having to do writes. On such systems`
`599`	`599`	`one should increase the number of <acronym>WAL</acronym> buffers by`
`600`	`600`	`modifying the <xref linkend="guc-wal-buffers"> parameter. When`
`@@ -683,7 +683,7 @@`
`683`	`683`	`Enabling the <xref linkend="guc-wal-debug"> configuration parameter`
`684`	`684`	`(provided that <productname>PostgreSQL</productname> has been`
`685`	`685`	`compiled with support for it) will result in each`
`686`		`- <function>XLogInsert</function> and <function>XLogFlush</function>`
	`686`	`+ <function>XLogInsertRecord</function> and <function>XLogFlush</function>`
`687`	`687`	`<acronym>WAL</acronym> call being logged to the server log. This`
`688`	`688`	`option might be replaced by a more general mechanism in the future.`
`689`	`689`	`</para>`
`@@ -708,7 +708,7 @@`
`708`	`708`	`building the server). Each segment is divided into pages, normally`
`709`	`709`	`8 kB each (this size can be changed via the <option>--with-wal-blocksize</>`
`710`	`710`	`configure option). The log record headers are described in`
`711`		`- <filename>access/xlog.h</filename>; the record content is dependent`
	`711`	`+ <filename>access/xlogrecord.h</filename>; the record content is dependent`
`712`	`712`	`on the type of event that is being logged. Segment files are given`
`713`	`713`	`ever-increasing numbers as names, starting at`
`714`	`714`	`<filename>000000010000000000000000</filename>. The numbers do not wrap,`

`‎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/xloginsert.h"`
`18`	`19`	`#include"miscadmin.h"`
`19`	`20`	`#include"utils/rel.h"`
`20`	`21`

`‎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/xloginsert.h"`
`18`	`19`	`#include"lib/ilist.h"`
`19`	`20`	`#include"miscadmin.h"`
`20`	`21`	`#include"utils/memutils.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/xloginsert.h"`
`18`	`19`	`#include"miscadmin.h"`
`19`	`20`	`#include"utils/rel.h"`
`20`	`21`

`‎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/xloginsert.h"`
`22`	`23`	`#include"commands/vacuum.h"`
`23`	`24`	`#include"miscadmin.h"`
`24`	`25`	`#include"utils/memutils.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/xloginsert.h"`
`18`	`19`	`#include"catalog/index.h"`
`19`	`20`	`#include"miscadmin.h"`
`20`	`21`	`#include"storage/bufmgr.h"`

`‎src/backend/access/gin/ginutil.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/gin_private.h"`
`18`	`18`	`#include"access/reloptions.h"`
	`19`	`+#include"access/xloginsert.h"`
`19`	`20`	`#include"catalog/pg_collation.h"`
`20`	`21`	`#include"catalog/pg_type.h"`
`21`	`22`	`#include"miscadmin.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/xloginsert.h"`
`18`	`19`	`#include"commands/vacuum.h"`
`19`	`20`	`#include"miscadmin.h"`
`20`	`21`	`#include"postmaster/autovacuum.h"`

`‎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/xloginsert.h"`
`21`	`22`	`#include"catalog/index.h"`
`22`	`23`	`#include"miscadmin.h"`
`23`	`24`	`#include"optimizer/cost.h"`

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

Lines changed: 1 addition & 0 deletions

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

`‎src/backend/access/heap/heapam.c`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,8 @@`
`51`	`51`	`#include"access/valid.h"`
`52`	`52`	`#include"access/visibilitymap.h"`
`53`	`53`	`#include"access/xact.h"`
	`54`	`+#include"access/xlog.h"`
	`55`	`+#include"access/xloginsert.h"`
`54`	`56`	`#include"access/xlogutils.h"`
`55`	`57`	`#include"catalog/catalog.h"`
`56`	`58`	`#include"catalog/namespace.h"`

`‎src/backend/access/heap/pruneheap.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/heapam_xlog.h"`
`19`	`19`	`#include"access/transam.h"`
`20`	`20`	`#include"access/htup_details.h"`
	`21`	`+#include"access/xlog.h"`
`21`	`22`	`#include"catalog/catalog.h"`
`22`	`23`	`#include"miscadmin.h"`
`23`	`24`	`#include"pgstat.h"`

`‎src/backend/access/heap/rewriteheap.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,7 @@`
`113`	`113`	`#include"access/transam.h"`
`114`	`114`	`#include"access/tuptoaster.h"`
`115`	`115`	`#include"access/xact.h"`
	`116`	`+#include"access/xloginsert.h"`
`116`	`117`
`117`	`118`	`#include"catalog/catalog.h"`
`118`	`119`

`‎src/backend/access/heap/visibilitymap.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@`
`84`	`84`
`85`	`85`	`#include"access/heapam_xlog.h"`
`86`	`86`	`#include"access/visibilitymap.h"`
	`87`	`+#include"access/xlog.h"`
`87`	`88`	`#include"miscadmin.h"`
`88`	`89`	`#include"storage/bufmgr.h"`
`89`	`90`	`#include"storage/lmgr.h"`

`‎src/backend/access/nbtree/nbtinsert.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/heapam.h"`
`19`	`19`	`#include"access/nbtree.h"`
`20`	`20`	`#include"access/transam.h"`
	`21`	`+#include"access/xloginsert.h"`
`21`	`22`	`#include"miscadmin.h"`
`22`	`23`	`#include"storage/lmgr.h"`
`23`	`24`	`#include"storage/predicate.h"`

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

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@`
`24`	`24`
`25`	`25`	`#include"access/nbtree.h"`
`26`	`26`	`#include"access/transam.h"`
	`27`	`+#include"access/xlog.h"`
	`28`	`+#include"access/xloginsert.h"`
`27`	`29`	`#include"miscadmin.h"`
`28`	`30`	`#include"storage/indexfsm.h"`
`29`	`31`	`#include"storage/lmgr.h"`

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`
`21`	`21`	`#include"access/nbtree.h"`
`22`	`22`	`#include"access/relscan.h"`
	`23`	`+#include"access/xlog.h"`
`23`	`24`	`#include"catalog/index.h"`
`24`	`25`	`#include"commands/vacuum.h"`
`25`	`26`	`#include"storage/indexfsm.h"`

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

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,8 @@`
`67`	`67`	`#include"postgres.h"`
`68`	`68`
`69`	`69`	`#include"access/nbtree.h"`
	`70`	`+#include"access/xlog.h"`
	`71`	`+#include"access/xloginsert.h"`
`70`	`72`	`#include"miscadmin.h"`
`71`	`73`	`#include"storage/smgr.h"`
`72`	`74`	`#include"tcop/tcopprot.h"`

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

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`#include"access/heapam_xlog.h"`
`18`	`18`	`#include"access/nbtree.h"`
`19`	`19`	`#include"access/transam.h"`
	`20`	`+#include"access/xlog.h"`
	`21`	`+#include"access/xlogutils.h"`
`20`	`22`	`#include"storage/procarray.h"`
`21`	`23`	`#include"miscadmin.h"`
`22`	`24`

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

Lines changed: 1 addition & 0 deletions

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

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

Lines changed: 2 additions & 0 deletions

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

`‎src/backend/access/spgist/spgvacuum.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/genam.h"`
`19`	`19`	`#include"access/spgist_private.h"`
`20`	`20`	`#include"access/transam.h"`
	`21`	`+#include"access/xloginsert.h"`
`21`	`22`	`#include"catalog/storage_xlog.h"`
`22`	`23`	`#include"commands/vacuum.h"`
`23`	`24`	`#include"miscadmin.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/spgist_private.h"`
`18`	`18`	`#include"access/transam.h"`
	`19`	`+#include"access/xlog.h"`
`19`	`20`	`#include"access/xlogutils.h"`
`20`	`21`	`#include"storage/standby.h"`
`21`	`22`	`#include"utils/memutils.h"`

`‎src/backend/access/transam/Makefile`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global`
`14`	`14`
`15`	`15`	`OBJS = clog.o transam.o varsup.o xact.o rmgr.o slru.o subtrans.o multixact.o\`
`16`	`16`	`timeline.o twophase.o twophase_rmgr.o xlog.o xlogarchive.o xlogfuncs.o\`
`17`		`-xlogreader.o xlogutils.o`
	`17`	`+xloginsert.oxlogreader.o xlogutils.o`
`18`	`18`
`19`	`19`	`include$(top_srcdir)/src/backend/common.mk`
`20`	`20`

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

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,9 @@`
`35`	`35`	`#include"access/clog.h"`
`36`	`36`	`#include"access/slru.h"`
`37`	`37`	`#include"access/transam.h"`
	`38`	`+#include"access/xlog.h"`
	`39`	`+#include"access/xloginsert.h"`
	`40`	`+#include"access/xlogutils.h"`
`38`	`41`	`#include"miscadmin.h"`
`39`	`42`	`#include"pg_trace.h"`
`40`	`43`

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

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,8 @@`
`72`	`72`	`#include"access/twophase.h"`
`73`	`73`	`#include"access/twophase_rmgr.h"`
`74`	`74`	`#include"access/xact.h"`
	`75`	`+#include"access/xlog.h"`
	`76`	`+#include"access/xloginsert.h"`
`75`	`77`	`#include"catalog/pg_type.h"`
`76`	`78`	`#include"commands/dbcommands.h"`
`77`	`79`	`#include"funcapi.h"`

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@`
`48`	`48`	`#include"access/twophase_rmgr.h"`
`49`	`49`	`#include"access/xact.h"`
`50`	`50`	`#include"access/xlog.h"`
	`51`	`+#include"access/xloginsert.h"`
`51`	`52`	`#include"access/xlogutils.h"`
`52`	`53`	`#include"catalog/pg_type.h"`
`53`	`54`	`#include"catalog/storage.h"`

`‎src/backend/access/transam/varsup.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/subtrans.h"`
`18`	`18`	`#include"access/transam.h"`
`19`	`19`	`#include"access/xact.h"`
	`20`	`+#include"access/xlog.h"`
`20`	`21`	`#include"commands/dbcommands.h"`
`21`	`22`	`#include"miscadmin.h"`
`22`	`23`	`#include"postmaster/autovacuum.h"`

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

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@`
`25`	`25`	`#include"access/transam.h"`
`26`	`26`	`#include"access/twophase.h"`
`27`	`27`	`#include"access/xact.h"`
	`28`	`+#include"access/xlog.h"`
	`29`	`+#include"access/xloginsert.h"`
`28`	`30`	`#include"access/xlogutils.h"`
`29`	`31`	`#include"catalog/catalog.h"`
`30`	`32`	`#include"catalog/namespace.h"`

0 commit comments

Comments

(0)

Movatterモバイル変換

File tree

84 files changed

Some content is hidden

84 files changed

0 commit comments