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

tglsfdc · tglsfdc · commit a7801b62f21b · 2011-09-09T13:23:41.000-04:00
As per my recent proposal, this refactors things so that these typedefs and
macros are available in a header that can be included in frontend-ish code.
I also changed various headers that were undesirably including
utils/timestamp.h to include datatype/timestamp.h instead.  Unsurprisingly,
this showed that half the system was getting utils/timestamp.h by way of
xlog.h.

No actual code changes here, just header refactoring.
diff --git a/contrib/btree_gist/btree_utils_num.c b/contrib/btree_gist/btree_utils_num.c
@@ -7,6 +7,7 @@
 #include "btree_utils_num.h"
 #include "utils/cash.h"
 #include "utils/date.h"
+#include "utils/timestamp.h"
 
 
 GISTENTRY *
diff --git a/contrib/spi/moddatetime.c b/contrib/spi/moddatetime.c
@@ -19,6 +19,7 @@ OH, me, I'm Terry Mackintosh <terry@terrym.com>
 #include "executor/spi.h"
 #include "commands/trigger.h"
 #include "utils/rel.h"
+#include "utils/timestamp.h"
 
 PG_MODULE_MAGIC;
 
diff --git a/doc/src/sgml/xfunc.sgml b/doc/src/sgml/xfunc.sgml
@@ -1904,7 +1904,7 @@ memcpy(destination->data, buffer, 40);
         <row>
          <entry><type>interval</type></entry>
          <entry><type>Interval*</type></entry>
-         <entry><filename>utils/timestamp.h</filename></entry>
+         <entry><filename>datatype/timestamp.h</filename></entry>
         </row>
         <row>
          <entry><type>lseg</type></entry>
@@ -1969,7 +1969,7 @@ memcpy(destination->data, buffer, 40);
         <row>
          <entry><type>timestamp</type></entry>
          <entry><type>Timestamp*</type></entry>
-         <entry><filename>utils/timestamp.h</filename></entry>
+         <entry><filename>datatype/timestamp.h</filename></entry>
         </row>
         <row>
          <entry><type>tinterval</type></entry>
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
@@ -64,6 +64,7 @@
 #include "storage/smgr.h"
 #include "utils/builtins.h"
 #include "utils/memutils.h"
+#include "utils/timestamp.h"
 
 
 /*
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -49,6 +49,7 @@
 #include "utils/memutils.h"
 #include "utils/relmapper.h"
 #include "utils/snapmgr.h"
+#include "utils/timestamp.h"
 #include "pg_trace.h"
 
 
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -58,6 +58,7 @@
 #include "utils/guc.h"
 #include "utils/ps_status.h"
 #include "utils/relmapper.h"
+#include "utils/timestamp.h"
 #include "pg_trace.h"
 
 
diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
@@ -48,6 +48,7 @@
 #include "utils/pg_rusage.h"
 #include "utils/syscache.h"
 #include "utils/tuplesort.h"
+#include "utils/timestamp.h"
 #include "utils/tqual.h"
 
 
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
@@ -132,6 +132,7 @@
 #include "utils/builtins.h"
 #include "utils/memutils.h"
 #include "utils/ps_status.h"
+#include "utils/timestamp.h"
 
 
 /*
diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c
@@ -31,6 +31,7 @@
 #include "tcop/utility.h"
 #include "utils/builtins.h"
 #include "utils/snapmgr.h"
+#include "utils/timestamp.h"
 
 
 /*
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
@@ -33,6 +33,7 @@
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
 #include "utils/syscache.h"
+#include "utils/timestamp.h"
 #include "utils/tqual.h"
 
 /* Potentially set by contrib/pg_upgrade_support functions */
diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c
@@ -53,6 +53,7 @@
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/pg_rusage.h"
+#include "utils/timestamp.h"
 #include "utils/tqual.h"
 
 
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
@@ -26,6 +26,7 @@
 #include "utils/builtins.h"
 #include "utils/syscache.h"
 #include "utils/snapmgr.h"
+#include "utils/timestamp.h"
 #include "mb/pg_wchar.h"
 
 /*
diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c
@@ -26,6 +26,7 @@
 #include "miscadmin.h"
 #include "utils/builtins.h"
 #include "utils/syscache.h"
+#include "utils/timestamp.h"
 
 
 int
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
@@ -24,6 +24,7 @@
 #include "parser/parse_expr.h"
 #include "parser/parse_relation.h"
 #include "utils/builtins.h"
+#include "utils/int8.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 #include "utils/varbit.h"
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
@@ -97,6 +97,7 @@
 #include "utils/rel.h"
 #include "utils/snapmgr.h"
 #include "utils/syscache.h"
+#include "utils/timestamp.h"
 #include "utils/tqual.h"
 
 
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
@@ -62,6 +62,7 @@
 #include "utils/memutils.h"
 #include "utils/ps_status.h"
 #include "utils/rel.h"
+#include "utils/timestamp.h"
 #include "utils/tqual.h"
 
 
diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c
@@ -50,6 +50,7 @@
 #include "utils/guc.h"
 #include "utils/ps_status.h"
 #include "utils/resowner.h"
+#include "utils/timestamp.h"
 
 /* Global variable to indicate if this process is a walreceiver process */
 bool		am_walreceiver;
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
@@ -62,6 +62,7 @@
 #include "utils/memutils.h"
 #include "utils/ps_status.h"
 #include "utils/resowner.h"
+#include "utils/timestamp.h"
 
 
 /* Array of WalSnds in shared memory */
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
@@ -47,6 +47,7 @@
 #include "storage/standby.h"
 #include "utils/rel.h"
 #include "utils/resowner.h"
+#include "utils/timestamp.h"
 
 
 /* Note: these two macros only work on shared buffers, not local ones! */
diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c
@@ -28,6 +28,7 @@
 #include "storage/sinvaladt.h"
 #include "storage/standby.h"
 #include "utils/ps_status.h"
+#include "utils/timestamp.h"
 
 /* User-settable GUC parameters */
 int			vacuum_defer_cleanup_age;
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
@@ -47,6 +47,7 @@
 #include "storage/procarray.h"
 #include "storage/procsignal.h"
 #include "storage/spin.h"
+#include "utils/timestamp.h"
 
 
 /* GUC variables */
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
@@ -72,6 +72,7 @@
 #include "utils/memutils.h"
 #include "utils/ps_status.h"
 #include "utils/snapmgr.h"
+#include "utils/timestamp.h"
 #include "mb/pg_wchar.h"
 
 
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
@@ -27,6 +27,7 @@
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/date.h"
+#include "utils/datetime.h"
 #include "utils/nabstime.h"
 
 /*
diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c
@@ -28,6 +28,7 @@
 #include "storage/fd.h"
 #include "utils/builtins.h"
 #include "utils/memutils.h"
+#include "utils/timestamp.h"
 
 typedef struct
 {
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
@@ -20,8 +20,8 @@
 #include <math.h>
 
 #include "catalog/catalog.h"
-#include "catalog/pg_type.h"
 #include "catalog/pg_tablespace.h"
+#include "catalog/pg_type.h"
 #include "commands/dbcommands.h"
 #include "funcapi.h"
 #include "miscadmin.h"
@@ -30,8 +30,9 @@
 #include "storage/fd.h"
 #include "storage/pmsignal.h"
 #include "storage/procarray.h"
-#include "utils/builtins.h"
 #include "tcop/tcopprot.h"
+#include "utils/builtins.h"
+#include "utils/timestamp.h"
 
 #define atooid(x)  ((Oid) strtoul((x), NULL, 10))
 
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
@@ -25,6 +25,7 @@
 #include "libpq/pqformat.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
+#include "utils/datetime.h"
 #include "utils/nabstime.h"
 
 #define MIN_DAYNUM (-24856)		/* December 13, 1901 */
diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c
@@ -14,13 +14,14 @@
  */
 #include "postgres.h"
 
+#include "catalog/pg_type.h"
 #include "funcapi.h"
+#include "libpq/ip.h"
 #include "miscadmin.h"
 #include "pgstat.h"
-#include "catalog/pg_type.h"
 #include "utils/builtins.h"
 #include "utils/inet.h"
-#include "libpq/ip.h"
+#include "utils/timestamp.h"
 
 /* bogus ... these externs should be in a header file */
 extern Datum pg_stat_get_numscans(PG_FUNCTION_ARGS);
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
@@ -124,6 +124,7 @@
 #include "utils/selfuncs.h"
 #include "utils/spccache.h"
 #include "utils/syscache.h"
+#include "utils/timestamp.h"
 #include "utils/tqual.h"
 
 
diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
@@ -24,6 +24,7 @@
 #include "miscadmin.h"
 #include "utils/builtins.h"
 #include "utils/memutils.h"
+#include "utils/timestamp.h"
 
 /*
  * Estimate of the maximum number of open portals a user would have,
diff --git a/src/include/access/gist_private.h b/src/include/access/gist_private.h
@@ -16,6 +16,7 @@
 
 #include "access/gist.h"
 #include "access/itup.h"
+#include "fmgr.h"
 #include "storage/bufmgr.h"
 #include "storage/buffile.h"
 #include "utils/rbtree.h"
diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h
@@ -13,10 +13,10 @@
 
 #include "access/rmgr.h"
 #include "access/xlogdefs.h"
+#include "datatype/timestamp.h"
 #include "lib/stringinfo.h"
 #include "storage/buf.h"
 #include "utils/pg_crc.h"
-#include "utils/timestamp.h"
 
 /*
  * The overall layout of an XLOG record is:
diff --git a/src/include/access/xlog_internal.h b/src/include/access/xlog_internal.h
@@ -17,6 +17,8 @@
 #define XLOG_INTERNAL_H
 
 #include "access/xlog.h"
+#include "fmgr.h"
+#include "pgtime.h"
 #include "storage/block.h"
 #include "storage/relfilenode.h"
 
diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h
@@ -13,9 +13,10 @@
 #ifndef SEQUENCE_H
 #define SEQUENCE_H
 
+#include "access/xlog.h"
+#include "fmgr.h"
 #include "nodes/parsenodes.h"
 #include "storage/relfilenode.h"
-#include "access/xlog.h"
 
 
 typedef struct FormData_pg_sequence
diff --git a/src/include/datatype/timestamp.h b/src/include/datatype/timestamp.h
diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h
diff --git a/src/include/pgstat.h b/src/include/pgstat.h
diff --git a/src/include/replication/walprotocol.h b/src/include/replication/walprotocol.h
diff --git a/src/include/replication/walsender.h b/src/include/replication/walsender.h
diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h
diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h
diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h
diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h
