Rename snapmgmt.c/h to snapmgr.c/h, for consistency with other files.

Per complaint from Tom Lane.

diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index e165446f362149085951f45328873bfdf1e08e96..df2e58da898599876be924d6f18a6d10374ba5c9 100644 (file)
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -56,7 +56,7 @@
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
 #include "utils/relcache.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 #include "utils/syscache.h"
 
 

diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index d4f3ccf2ac2a445d7dbb2ec14725c563d8a0b426..540c2e9df07c7138737a60f3070ca59ab88ae243 100644 (file)
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -67,7 +67,7 @@
 #include "access/transam.h"
 #include "pgstat.h"
 #include "utils/relcache.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 
 
 /* ----------------------------------------------------------------

diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index ceb44ed5726c0afae35bbeb170dc260c23d29216..ccb1fd9deab0e368008eff79deb2b6ace2406489 100644 (file)
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -28,7 +28,7 @@
 #include "storage/freespace.h"
 #include "storage/lmgr.h"
 #include "utils/inval.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 
 
 /*

diff --git a/src/backend/access/transam/subtrans.c b/src/backend/access/transam/subtrans.c
index d182d3a319e01d177c6bde25cb84494193e23b9f..a359123be8b4a3b6025dc9e1bc9b884df2951059 100644 (file)
--- a/src/backend/access/transam/subtrans.c
+++ b/src/backend/access/transam/subtrans.c
@@ -31,7 +31,7 @@
 #include "access/slru.h"
 #include "access/subtrans.h"
 #include "access/transam.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 
 
 /*

diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c
index 58d81fead38f8c6020a17b248afe3eb23f23fedc..ee6738084e1fc561e6930d67efb316e45426a347 100644 (file)
--- a/src/backend/access/transam/transam.c
+++ b/src/backend/access/transam/transam.c
@@ -22,7 +22,7 @@
 #include "access/clog.h"
 #include "access/subtrans.h"
 #include "access/transam.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 
 
 /*

diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index f28027b9cee5249390ecc19c1481f2096dfe4ca6..1a43e8d8d4eaa283afe6165078438e3e75242ecc 100644 (file)
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -45,7 +45,7 @@
 #include "utils/inval.h"
 #include "utils/memutils.h"
 #include "utils/relcache.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 #include "utils/xml.h"
 #include "pg_trace.h"
 

diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 365f6b121e342e3a21076a1640cdc4b999023eb3..0019ebeecf564833722cb4e90aa1618591e2d1b8 100644 (file)
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -60,7 +60,7 @@
 #include "utils/lsyscache.h"
 #include "utils/relcache.h"
 #include "utils/syscache.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 
 
 static void AddNewRelationTuple(Relation pg_class_desc,

diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 5d7f265e6de79896515efd26b36dd1147543a032..9a2e6e146fe8e9df4e17f2969c9b9fd6369d5834 100644 (file)
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -55,7 +55,7 @@
 #include "utils/relcache.h"
 #include "utils/syscache.h"
 #include "utils/tuplesort.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 
 
 /* state info for validate_index bulkdelete callback */

diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 2cb1938a00f1e10b858d80ce4d53ec25bb13b0a8..35bb9e8f69ddc38b8ae74b4afe584071f6377101 100644 (file)
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -41,7 +41,7 @@
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/relcache.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 #include "utils/syscache.h"
 
 

diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index b4aa68f391e60afc452b7ebea823644e73ca18ca..96c2cec2a75c2d81575a4eadbaa59c5614eaa29a 100644 (file)
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -40,7 +40,7 @@
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 
 
 #define ISOCTAL(c) (((c) >= '0') && ((c) <= '7'))

diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index b03b1b16ee5e25d15dec907888c97e710348ce07..7bbdfe73980ad7e6956c41704a383d6f441eb631 100644 (file)
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -31,7 +31,7 @@
 #include "utils/guc.h"
 #include "utils/lsyscache.h"
 #include "utils/tuplesort.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 
 
 /* Hook for plugins to get control in ExplainOneQuery() */

diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 4b9722c5304aa192d4385b632389374f121f2ac4..703f41f10318fd8f3e2d97668aa9d39c08baa1fd 100644 (file)
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -47,7 +47,7 @@
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/relcache.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 #include "utils/syscache.h"
 
 

diff --git a/src/backend/commands/portalcmds.c b/src/backend/commands/portalcmds.c
index 1dadcff964e45063ef1179f78e816c0ae5f2eddb..5e9fc7b1613ed08affd914a0c3a790947c6cc53a 100644 (file)
--- a/src/backend/commands/portalcmds.c
+++ b/src/backend/commands/portalcmds.c
@@ -28,7 +28,7 @@
 #include "executor/executor.h"
 #include "tcop/pquery.h"
 #include "utils/memutils.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 
 
 /*

diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c
index 0a135efa2e4940f88b68e0f5e684ea02f7b9175b..a823d6c8328e89674f0849a605ca14c85915d302 100644 (file)
--- a/src/backend/commands/prepare.c
+++ b/src/backend/commands/prepare.c
@@ -32,7 +32,7 @@
 #include "tcop/utility.h"
 #include "utils/builtins.h"
 #include "utils/memutils.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 
 
 /*

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 8e08cf0b896e68b833783d7f2b0d5ef65c234531..b53bfe8898fbebc0cde1f1477925810a62a6385b 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -65,7 +65,7 @@
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/relcache.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 #include "utils/syscache.h"
 
 

diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index fd27367cd85e89d707a86e5747128eb514777078..55bc0ea7bf7f9e19d591307c60c1b90a373eb4ae 100644 (file)
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -38,7 +38,7 @@
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 #include "utils/syscache.h"
 
 

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 97bfb1254e5e447035dd9995b84cd962a2e2a86d..1f03d99e60f5031c7027a12a933624b448b9f6cd 100644 (file)
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -48,7 +48,7 @@
 #include "utils/memutils.h"
 #include "utils/pg_rusage.h"
 #include "utils/relcache.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 #include "utils/syscache.h"
 #include "pgstat.h"
 

diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 1699752a04224c914e635c0c932746133a2169f1..57693986327d516275626c5c25176298999011bd 100644 (file)
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -25,7 +25,7 @@
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/syscache.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 #include "mb/pg_wchar.h"
 
 /*

diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index e686bf122f48729e6795420aa1d693026343d004..e28b456c5e794848462a41ad934f0e5f0b689c61 100644 (file)
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -28,7 +28,7 @@
 #include "utils/builtins.h"
 #include "utils/datum.h"
 #include "utils/lsyscache.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 #include "utils/syscache.h"
 #include "utils/typcache.h"
 

diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c
index eba4eae0440d2434b75df813fa383cdd84db16a3..4ff1f5fe4e1074fc7ffc041de3ea8b2f4693ddf4 100644 (file)
--- a/src/backend/executor/nodeBitmapHeapscan.c
+++ b/src/backend/executor/nodeBitmapHeapscan.c
@@ -40,7 +40,7 @@
 #include "executor/nodeBitmapHeapscan.h"
 #include "pgstat.h"
 #include "utils/memutils.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 
 
 static TupleTableSlot *BitmapHeapNext(BitmapHeapScanState *node);

diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index b081b82046a77854bf028e72497a3537a3f7f41a..419fb6c1b0bc4d8c093d3815dd6baab5d2333852 100644 (file)
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -20,7 +20,7 @@
 #include "executor/spi_priv.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 #include "utils/typcache.h"
 
 

diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index e4ed6af6cda4018ae1dece3bb542046b04ec5963..46c4cb5adf6406eeadd8b2cd91545156be307846 100644 (file)
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -33,7 +33,7 @@
 #include "utils/fmgroids.h"
 #include "utils/lsyscache.h"
 #include "utils/relcache.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 #include "utils/syscache.h"
 #include "catalog/catalog.h"
 #include "miscadmin.h"

diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
index c69a9675b64586df0a657f116b382c91ef8a1c3c..2036a57317c895d78a62d8bd20f76a13f01a3ca3 100644 (file)
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@ -37,7 +37,7 @@
 #include "access/twophase.h"
 #include "miscadmin.h"
 #include "storage/procarray.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 
 
 /* Our shared memory area */

diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 9696907660ab347734481afa7bb3fa217a971492..a7c1f0e7599959c729cf1b49de62fd12b1b95c80 100644 (file)
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -42,7 +42,7 @@
 #include "storage/large_object.h"
 #include "utils/fmgroids.h"
 #include "utils/resowner.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 
 
 /*

diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c
index 8e85587faf5aa473aca5ed0304ec3fb51fa4b4af..df3f73514ad9e1fcc58db0861285d87723731ee9 100644 (file)
--- a/src/backend/tcop/fastpath.c
+++ b/src/backend/tcop/fastpath.c
@@ -30,7 +30,7 @@
 #include "tcop/tcopprot.h"
 #include "utils/acl.h"
 #include "utils/lsyscache.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 #include "utils/syscache.h"
 
 

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index d7645910dfce0e52af43fb8bde2327fa0b197893..476c9f1aa588009b95fce4b9d41a020ab56c137e 100644 (file)
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -66,7 +66,7 @@
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/ps_status.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 #include "mb/pg_wchar.h"
 
 #include "pgstat.h"

diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index 7e59195626fc0718755ad36d02f948d5604b1a90..05fa4845d169a1dc3d6028cf70bf31df1465da92 100644 (file)
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -23,7 +23,7 @@
 #include "tcop/tcopprot.h"
 #include "tcop/utility.h"
 #include "utils/memutils.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 
 
 /*

diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
index d77dc7fdfa7717fd5bb549f6c793ad55f86c6803..20eb1b5455959a469fb1a81eeb90077c9fa1df45 100644 (file)
--- a/src/backend/utils/adt/ri_triggers.c
+++ b/src/backend/utils/adt/ri_triggers.c
@@ -41,7 +41,7 @@
 #include "utils/fmgroids.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 
 
 /* ----------

diff --git a/src/backend/utils/adt/txid.c b/src/backend/utils/adt/txid.c
index a0616d0af9cdae0e3d333b2537c07d37c0817f47..8124023a8eb228d58d6cca8d5c7d76caaa95da9a 100644 (file)
--- a/src/backend/utils/adt/txid.c
+++ b/src/backend/utils/adt/txid.c
@@ -26,7 +26,7 @@
 #include "funcapi.h"
 #include "libpq/pqformat.h"
 #include "utils/builtins.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 
 
 #ifndef INT64_IS_BUSTED

diff --git a/src/backend/utils/cache/plancache.c b/src/backend/utils/cache/plancache.c
index d1ff90e646a1e6bd7548baf7a03d6a7ba10bc679..19a51e41e81c57759a71e0268da12ef38aba7e7e 100644 (file)
--- a/src/backend/utils/cache/plancache.c
+++ b/src/backend/utils/cache/plancache.c
@@ -51,7 +51,7 @@
 #include "utils/inval.h"
 #include "utils/memutils.h"
 #include "utils/resowner.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 
 
 typedef struct

diff --git a/src/backend/utils/time/Makefile b/src/backend/utils/time/Makefile
index 83b451a5fb35a1ebc0ff8007d88090c23968aec4..8c76c472d6a82653200a30b3fdc8d4d9ba2fb116 100644 (file)
--- a/src/backend/utils/time/Makefile
+++ b/src/backend/utils/time/Makefile
@@ -12,6 +12,6 @@ subdir = src/backend/utils/time
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = combocid.o tqual.o snapmgmt.o
+OBJS = combocid.o tqual.o snapmgr.o
 
 include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/utils/time/snapmgmt.c b/src/backend/utils/time/snapmgr.c
similarity index 98%
rename from src/backend/utils/time/snapmgmt.c
rename to src/backend/utils/time/snapmgr.c
index 9ad65aed8d76f8f540706c98b4b808cdec222960..7885e52e83a3af9f7b1ad25f180cd75bd32b521f 100644 (file)
--- a/src/backend/utils/time/snapmgmt.c
+++ b/src/backend/utils/time/snapmgr.c
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
- * snapmgmt.c
- *             PostgreSQL snapshot management code.
+ * snapmgr.c
+ *             PostgreSQL snapshot manager
  *
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
@@ -15,7 +15,7 @@
 #include "access/xact.h"
 #include "access/transam.h"
 #include "storage/procarray.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 #include "utils/tqual.h"
 
 

diff --git a/src/include/utils/snapmgmt.h b/src/include/utils/snapmgr.h
similarity index 87%
rename from src/include/utils/snapmgmt.h
rename to src/include/utils/snapmgr.h
index dcadbcaabeab9c92297464370828e26ee6d0fdf1..f421df28eb626313c3fe70dc5213946b4f4e971e 100644 (file)
--- a/src/include/utils/snapmgmt.h
+++ b/src/include/utils/snapmgr.h
@@ -1,7 +1,7 @@
 /*-------------------------------------------------------------------------
  *
- * snapmgmt.h
- *       POSTGRES snapshot management definitions
+ * snapmgr.h
+ *       POSTGRES snapshot manager
  *
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
@@ -10,8 +10,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#ifndef SNAPMGMT_H
-#define SNAPMGMT_H
+#ifndef SNAPMGR_H
+#define SNAPMGR_H
 
 #include "utils/snapshot.h"
 
@@ -30,4 +30,4 @@ extern Snapshot CopySnapshot(Snapshot snapshot);
 extern void FreeSnapshot(Snapshot snapshot);
 extern void FreeXactSnapshot(void);
 
-#endif /* SNAPMGMT_H */
+#endif /* SNAPMGR_H */

diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index c953e72c5e0793ebe5004b5b9edf95a1f3b319d6..0f9d7cd826415b2db99f77f7dbbb63803698b193 100644 (file)
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -32,7 +32,7 @@
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
-#include "utils/snapmgmt.h"
+#include "utils/snapmgr.h"
 #include "utils/typcache.h"