Movatterモバイル変換

Skip to content

postgrespro/postgresproPublic

NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commita7801b6

tglsfdc

committed

Move Timestamp/Interval typedefs and basic macros into datatype/timestamp.h.

As per my recent proposal, this refactors things so that these typedefs andmacros are available in a header that can be included in frontend-ish code.I also changed various headers that were undesirably includingutils/timestamp.h to include datatype/timestamp.h instead. Unsurprisingly,this showed that half the system was getting utils/timestamp.h by way ofxlog.h.No actual code changes here, just header refactoring.

1 parentd63de33 commita7801b6Copy full SHA for a7801b6

File tree

43 files changed

+213

-150

lines changed

contrib
- btree_gist
  - btree_utils_num.c
- spi
  - moddatetime.c
doc/src/sgml
- xfunc.sgml
src
- backend
  - access/transam
  - commands
  - libpq
    - crypt.c
  - parser
    - parse_node.c
  - postmaster
    - autovacuum.c
    - pgstat.c
  - replication
    - walreceiver.c
    - walsender.c
  - storage
    - buffer
      - bufmgr.c
    - ipc
      - standby.c
    - lmgr
      - proc.c
  - tcop
    - postgres.c
  - utils
    - adt
    - mmgr
      - portalmem.c
- include
  - access
  - commands
    - sequence.h
  - datatype
    - timestamp.h
  - libpq
    - libpq-be.h
  - pgstat.h
  - replication
    - walprotocol.h
    - walsender.h
  - storage
    - proc.h
  - utils

Some content is hidden

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

43 files changed

+213

-150

lines changed

`‎contrib/btree_gist/btree_utils_num.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`#include"btree_utils_num.h"`
`8`	`8`	`#include"utils/cash.h"`
`9`	`9`	`#include"utils/date.h"`
	`10`	`+#include"utils/timestamp.h"`
`10`	`11`
`11`	`12`
`12`	`13`	`GISTENTRY*`

`‎contrib/spi/moddatetime.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ OH, me, I'm Terry Mackintosh <terry@terrym.com>`
`19`	`19`	`#include"executor/spi.h"`
`20`	`20`	`#include"commands/trigger.h"`
`21`	`21`	`#include"utils/rel.h"`
	`22`	`+#include"utils/timestamp.h"`
`22`	`23`
`23`	`24`	`PG_MODULE_MAGIC;`
`24`	`25`

`‎doc/src/sgml/xfunc.sgml`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1904,7 +1904,7 @@ memcpy(destination->data, buffer, 40);`
`1904`	`1904`	`<row>`
`1905`	`1905`	`<entry><type>interval</type></entry>`
`1906`	`1906`	`<entry><type>Interval*</type></entry>`
`1907`		`- <entry><filename>utils/timestamp.h</filename></entry>`
	`1907`	`+ <entry><filename>datatype/timestamp.h</filename></entry>`
`1908`	`1908`	`</row>`
`1909`	`1909`	`<row>`
`1910`	`1910`	`<entry><type>lseg</type></entry>`
`@@ -1969,7 +1969,7 @@ memcpy(destination->data, buffer, 40);`
`1969`	`1969`	`<row>`
`1970`	`1970`	`<entry><type>timestamp</type></entry>`
`1971`	`1971`	`<entry><type>Timestamp*</type></entry>`
`1972`		`- <entry><filename>utils/timestamp.h</filename></entry>`
	`1972`	`+ <entry><filename>datatype/timestamp.h</filename></entry>`
`1973`	`1973`	`</row>`
`1974`	`1974`	`<row>`
`1975`	`1975`	`<entry><type>tinterval</type></entry>`

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@`
`64`	`64`	`#include"storage/smgr.h"`
`65`	`65`	`#include"utils/builtins.h"`
`66`	`66`	`#include"utils/memutils.h"`
	`67`	`+#include"utils/timestamp.h"`
`67`	`68`
`68`	`69`
`69`	`70`	`/*`

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@`
`49`	`49`	`#include"utils/memutils.h"`
`50`	`50`	`#include"utils/relmapper.h"`
`51`	`51`	`#include"utils/snapmgr.h"`
	`52`	`+#include"utils/timestamp.h"`
`52`	`53`	`#include"pg_trace.h"`
`53`	`54`
`54`	`55`

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@`
`58`	`58`	`#include"utils/guc.h"`
`59`	`59`	`#include"utils/ps_status.h"`
`60`	`60`	`#include"utils/relmapper.h"`
	`61`	`+#include"utils/timestamp.h"`
`61`	`62`	`#include"pg_trace.h"`
`62`	`63`
`63`	`64`

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@`
`48`	`48`	`#include"utils/pg_rusage.h"`
`49`	`49`	`#include"utils/syscache.h"`
`50`	`50`	`#include"utils/tuplesort.h"`
	`51`	`+#include"utils/timestamp.h"`
`51`	`52`	`#include"utils/tqual.h"`
`52`	`53`
`53`	`54`

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,7 @@`
`132`	`132`	`#include"utils/builtins.h"`
`133`	`133`	`#include"utils/memutils.h"`
`134`	`134`	`#include"utils/ps_status.h"`
	`135`	`+#include"utils/timestamp.h"`
`135`	`136`
`136`	`137`
`137`	`138`	`/*`

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`#include"tcop/utility.h"`
`32`	`32`	`#include"utils/builtins.h"`
`33`	`33`	`#include"utils/snapmgr.h"`
	`34`	`+#include"utils/timestamp.h"`
`34`	`35`
`35`	`36`
`36`	`37`	`/*`

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`	`#include"utils/builtins.h"`
`34`	`34`	`#include"utils/fmgroids.h"`
`35`	`35`	`#include"utils/syscache.h"`
	`36`	`+#include"utils/timestamp.h"`
`36`	`37`	`#include"utils/tqual.h"`
`37`	`38`
`38`	`39`	`/* Potentially set by contrib/pg_upgrade_support functions */`

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@`
`53`	`53`	`#include"utils/lsyscache.h"`
`54`	`54`	`#include"utils/memutils.h"`
`55`	`55`	`#include"utils/pg_rusage.h"`
	`56`	`+#include"utils/timestamp.h"`
`56`	`57`	`#include"utils/tqual.h"`
`57`	`58`
`58`	`59`

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`#include"utils/builtins.h"`
`27`	`27`	`#include"utils/syscache.h"`
`28`	`28`	`#include"utils/snapmgr.h"`
	`29`	`+#include"utils/timestamp.h"`
`29`	`30`	`#include"mb/pg_wchar.h"`
`30`	`31`
`31`	`32`	`/*`

`‎src/backend/libpq/crypt.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`#include"miscadmin.h"`
`27`	`27`	`#include"utils/builtins.h"`
`28`	`28`	`#include"utils/syscache.h"`
	`29`	`+#include"utils/timestamp.h"`
`29`	`30`
`30`	`31`
`31`	`32`	`int`

`‎src/backend/parser/parse_node.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`#include"parser/parse_expr.h"`
`25`	`25`	`#include"parser/parse_relation.h"`
`26`	`26`	`#include"utils/builtins.h"`
	`27`	`+#include"utils/int8.h"`
`27`	`28`	`#include"utils/lsyscache.h"`
`28`	`29`	`#include"utils/syscache.h"`
`29`	`30`	`#include"utils/varbit.h"`

`‎src/backend/postmaster/autovacuum.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@`
`97`	`97`	`#include"utils/rel.h"`
`98`	`98`	`#include"utils/snapmgr.h"`
`99`	`99`	`#include"utils/syscache.h"`
	`100`	`+#include"utils/timestamp.h"`
`100`	`101`	`#include"utils/tqual.h"`
`101`	`102`
`102`	`103`

`‎src/backend/postmaster/pgstat.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@`
`62`	`62`	`#include"utils/memutils.h"`
`63`	`63`	`#include"utils/ps_status.h"`
`64`	`64`	`#include"utils/rel.h"`
	`65`	`+#include"utils/timestamp.h"`
`65`	`66`	`#include"utils/tqual.h"`
`66`	`67`
`67`	`68`

`‎src/backend/replication/walreceiver.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@`
`50`	`50`	`#include"utils/guc.h"`
`51`	`51`	`#include"utils/ps_status.h"`
`52`	`52`	`#include"utils/resowner.h"`
	`53`	`+#include"utils/timestamp.h"`
`53`	`54`
`54`	`55`	`/* Global variable to indicate if this process is a walreceiver process */`
`55`	`56`	`boolam_walreceiver;`

`‎src/backend/replication/walsender.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@`
`62`	`62`	`#include"utils/memutils.h"`
`63`	`63`	`#include"utils/ps_status.h"`
`64`	`64`	`#include"utils/resowner.h"`
	`65`	`+#include"utils/timestamp.h"`
`65`	`66`
`66`	`67`
`67`	`68`	`/* Array of WalSnds in shared memory */`

`‎src/backend/storage/buffer/bufmgr.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@`
`47`	`47`	`#include"storage/standby.h"`
`48`	`48`	`#include"utils/rel.h"`
`49`	`49`	`#include"utils/resowner.h"`
	`50`	`+#include"utils/timestamp.h"`
`50`	`51`
`51`	`52`
`52`	`53`	`/* Note: these two macros only work on shared buffers, not local ones! */`

`‎src/backend/storage/ipc/standby.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`#include"storage/sinvaladt.h"`
`29`	`29`	`#include"storage/standby.h"`
`30`	`30`	`#include"utils/ps_status.h"`
	`31`	`+#include"utils/timestamp.h"`
`31`	`32`
`32`	`33`	`/* User-settable GUC parameters */`
`33`	`34`	`intvacuum_defer_cleanup_age;`

`‎src/backend/storage/lmgr/proc.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@`
`47`	`47`	`#include"storage/procarray.h"`
`48`	`48`	`#include"storage/procsignal.h"`
`49`	`49`	`#include"storage/spin.h"`
	`50`	`+#include"utils/timestamp.h"`
`50`	`51`
`51`	`52`
`52`	`53`	`/* GUC variables */`

`‎src/backend/tcop/postgres.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@`
`72`	`72`	`#include"utils/memutils.h"`
`73`	`73`	`#include"utils/ps_status.h"`
`74`	`74`	`#include"utils/snapmgr.h"`
	`75`	`+#include"utils/timestamp.h"`
`75`	`76`	`#include"mb/pg_wchar.h"`
`76`	`77`
`77`	`78`

`‎src/backend/utils/adt/date.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`#include"utils/array.h"`
`28`	`28`	`#include"utils/builtins.h"`
`29`	`29`	`#include"utils/date.h"`
	`30`	`+#include"utils/datetime.h"`
`30`	`31`	`#include"utils/nabstime.h"`
`31`	`32`
`32`	`33`	`/*`

`‎src/backend/utils/adt/genfile.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`#include"storage/fd.h"`
`29`	`29`	`#include"utils/builtins.h"`
`30`	`30`	`#include"utils/memutils.h"`
	`31`	`+#include"utils/timestamp.h"`
`31`	`32`
`32`	`33`	`typedefstruct`
`33`	`34`	`{`

`‎src/backend/utils/adt/misc.c`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@`
`20`	`20`	`#include<math.h>`
`21`	`21`
`22`	`22`	`#include"catalog/catalog.h"`
`23`		`-#include"catalog/pg_type.h"`
`24`	`23`	`#include"catalog/pg_tablespace.h"`
	`24`	`+#include"catalog/pg_type.h"`
`25`	`25`	`#include"commands/dbcommands.h"`
`26`	`26`	`#include"funcapi.h"`
`27`	`27`	`#include"miscadmin.h"`
`@@ -30,8 +30,9 @@`
`30`	`30`	`#include"storage/fd.h"`
`31`	`31`	`#include"storage/pmsignal.h"`
`32`	`32`	`#include"storage/procarray.h"`
`33`		`-#include"utils/builtins.h"`
`34`	`33`	`#include"tcop/tcopprot.h"`
	`34`	`+#include"utils/builtins.h"`
	`35`	`+#include"utils/timestamp.h"`
`35`	`36`
`36`	`37`	`#defineatooid(x) ((Oid) strtoul((x), NULL, 10))`
`37`	`38`

`‎src/backend/utils/adt/nabstime.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`#include"libpq/pqformat.h"`
`26`	`26`	`#include"miscadmin.h"`
`27`	`27`	`#include"utils/builtins.h"`
	`28`	`+#include"utils/datetime.h"`
`28`	`29`	`#include"utils/nabstime.h"`
`29`	`30`
`30`	`31`	`#defineMIN_DAYNUM (-24856)/* December 13, 1901 */`

`‎src/backend/utils/adt/pgstatfuncs.c`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,14 @@`
`14`	`14`	`*/`
`15`	`15`	`#include"postgres.h"`
`16`	`16`
	`17`	`+#include"catalog/pg_type.h"`
`17`	`18`	`#include"funcapi.h"`
	`19`	`+#include"libpq/ip.h"`
`18`	`20`	`#include"miscadmin.h"`
`19`	`21`	`#include"pgstat.h"`
`20`		`-#include"catalog/pg_type.h"`
`21`	`22`	`#include"utils/builtins.h"`
`22`	`23`	`#include"utils/inet.h"`
`23`		`-#include"libpq/ip.h"`
	`24`	`+#include"utils/timestamp.h"`
`24`	`25`
`25`	`26`	`/* bogus ... these externs should be in a header file */`
`26`	`27`	`externDatumpg_stat_get_numscans(PG_FUNCTION_ARGS);`

`‎src/backend/utils/adt/selfuncs.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,7 @@`
`124`	`124`	`#include"utils/selfuncs.h"`
`125`	`125`	`#include"utils/spccache.h"`
`126`	`126`	`#include"utils/syscache.h"`
	`127`	`+#include"utils/timestamp.h"`
`127`	`128`	`#include"utils/tqual.h"`
`128`	`129`
`129`	`130`

`‎src/backend/utils/mmgr/portalmem.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`#include"miscadmin.h"`
`25`	`25`	`#include"utils/builtins.h"`
`26`	`26`	`#include"utils/memutils.h"`
	`27`	`+#include"utils/timestamp.h"`
`27`	`28`
`28`	`29`	`/*`
`29`	`30`	`* Estimate of the maximum number of open portals a user would have,`

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

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/gist.h"`
`18`	`18`	`#include"access/itup.h"`
	`19`	`+#include"fmgr.h"`
`19`	`20`	`#include"storage/bufmgr.h"`
`20`	`21`	`#include"storage/buffile.h"`
`21`	`22`	`#include"utils/rbtree.h"`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,10 @@`
`13`	`13`
`14`	`14`	`#include"access/rmgr.h"`
`15`	`15`	`#include"access/xlogdefs.h"`
	`16`	`+#include"datatype/timestamp.h"`
`16`	`17`	`#include"lib/stringinfo.h"`
`17`	`18`	`#include"storage/buf.h"`
`18`	`19`	`#include"utils/pg_crc.h"`
`19`		`-#include"utils/timestamp.h"`
`20`	`20`
`21`	`21`	`/*`
`22`	`22`	`* The overall layout of an XLOG record is:`

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

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`#defineXLOG_INTERNAL_H`
`18`	`18`
`19`	`19`	`#include"access/xlog.h"`
	`20`	`+#include"fmgr.h"`
	`21`	`+#include"pgtime.h"`
`20`	`22`	`#include"storage/block.h"`
`21`	`23`	`#include"storage/relfilenode.h"`
`22`	`24`

`‎src/include/commands/sequence.h`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,10 @@`
`13`	`13`	`#ifndefSEQUENCE_H`
`14`	`14`	`#defineSEQUENCE_H`
`15`	`15`
	`16`	`+#include"access/xlog.h"`
	`17`	`+#include"fmgr.h"`
`16`	`18`	`#include"nodes/parsenodes.h"`
`17`	`19`	`#include"storage/relfilenode.h"`
`18`		`-#include"access/xlog.h"`
`19`	`20`
`20`	`21`
`21`	`22`	`typedefstructFormData_pg_sequence`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp