Move vacuumlazy.c into access/heap.

anarazel · anarazel · commit 285d8e12055f · 2019-01-15T12:06:19.000-08:00
It's heap table storage specific code that can't realistically be generalized into table AM agnostic code. Author: Andres Freund Discussion: https://postgr.es/m/20180703070645.wchpu5muyto5n647@alap3.anarazel.de
diff --git a/src/backend/access/heap/Makefile b/src/backend/access/heap/Makefile
@@ -12,6 +12,7 @@ subdir = src/backend/access/heap
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = heapam.o hio.o pruneheap.o rewriteheap.o syncscan.o tuptoaster.o visibilitymap.o
+OBJS = heapam.o hio.o pruneheap.o rewriteheap.o syncscan.o tuptoaster.o \
+	vacuumlazy.o visibilitymap.o
 
 include $(top_srcdir)/src/backend/common.mk
diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c
@@ -28,7 +28,7 @@
  *
  *
  * IDENTIFICATION
- *	  src/backend/commands/vacuumlazy.c
+ *	  src/backend/access/heap/vacuumlazy.c
  *
  *-------------------------------------------------------------------------
  */
@@ -178,7 +178,7 @@ static bool heap_page_is_all_visible(Relation rel, Buffer buf,
 
 
 /*
- *	lazy_vacuum_rel() -- perform LAZY VACUUM for one heap relation
+ *	vacuum_heap_rel() -- perform VACUUM for one heap relation
  *
  *		This routine vacuums a single heap, cleans out its indexes, and
  *		updates its relpages and reltuples statistics.
@@ -187,7 +187,7 @@ static bool heap_page_is_all_visible(Relation rel, Buffer buf,
  *		and locked the relation.
  */
 void
-lazy_vacuum_rel(Relation onerel, int options, VacuumParams *params,
+heap_vacuum_rel(Relation onerel, int options, VacuumParams *params,
 				BufferAccessStrategy bstrategy)
 {
 	LVRelStats *vacrelstats;
diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile
@@ -20,6 +20,6 @@ OBJS = amcmds.o aggregatecmds.o alter.o analyze.o async.o cluster.o comment.o \
 	policy.o portalcmds.o prepare.o proclang.o publicationcmds.o \
 	schemacmds.o seclabel.o sequence.o statscmds.o subscriptioncmds.o \
 	tablecmds.o tablespace.o trigger.o tsearchcmds.o typecmds.o user.o \
-	vacuum.o vacuumlazy.o variable.o view.o
+	vacuum.o variable.o view.o
 
 include $(top_srcdir)/src/backend/common.mk
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
@@ -1711,7 +1711,7 @@ vacuum_rel(Oid relid, RangeVar *relation, int options, VacuumParams *params)
 		cluster_rel(relid, InvalidOid, cluster_options);
 	}
 	else
-		lazy_vacuum_rel(onerel, options, params, vac_strategy);
+		heap_vacuum_rel(onerel, options, params, vac_strategy);
 
 	/* Roll back any GUC changes executed by index functions */
 	AtEOXact_GUC(false, save_nestlevel);
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
@@ -186,4 +186,8 @@ extern BlockNumber ss_get_location(Relation rel, BlockNumber relnblocks);
 extern void SyncScanShmemInit(void);
 extern Size SyncScanShmemSize(void);
 
+/* in heap/vacuumlazy.c */
+struct VacuumParams;
+extern void heap_vacuum_rel(Relation onerel, int options,
+				struct VacuumParams *params, BufferAccessStrategy bstrategy);
 #endif							/* HEAPAM_H */
diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h
@@ -196,10 +196,6 @@ extern bool vacuum_is_relation_owner(Oid relid, Form_pg_class reltuple,
 extern Relation vacuum_open_relation(Oid relid, RangeVar *relation,
 					 VacuumParams *params, int options, LOCKMODE lmode);
 
-/* in commands/vacuumlazy.c */
-extern void lazy_vacuum_rel(Relation onerel, int options,
-				VacuumParams *params, BufferAccessStrategy bstrategy);
-
 /* in commands/analyze.c */
 extern void analyze_rel(Oid relid, RangeVar *relation, int options,
 			VacuumParams *params, List *va_cols, bool in_outer_xact,

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`*`
`29`	`29`	`*`
`30`	`30`	`* IDENTIFICATION`
`31`		`- * src/backend/commands/vacuumlazy.c`
	`31`	`+ * src/backend/access/heap/vacuumlazy.c`
`32`	`32`	`*`
`33`	`33`	`*-------------------------------------------------------------------------`
`34`	`34`	`*/`
`@@ -178,7 +178,7 @@ static bool heap_page_is_all_visible(Relation rel, Buffer buf,`
`178`	`178`
`179`	`179`
`180`	`180`	`/*`
`181`		`- * lazy_vacuum_rel() -- perform LAZY VACUUM for one heap relation`
	`181`	`+ * vacuum_heap_rel() -- perform VACUUM for one heap relation`
`182`	`182`	`*`
`183`	`183`	`* This routine vacuums a single heap, cleans out its indexes, and`
`184`	`184`	`* updates its relpages and reltuples statistics.`
`@@ -187,7 +187,7 @@ static bool heap_page_is_all_visible(Relation rel, Buffer buf,`
`187`	`187`	`* and locked the relation.`
`188`	`188`	`*/`
`189`	`189`	`void`
`190`		`-lazy_vacuum_rel(Relation onerel, int options, VacuumParams *params,`
	`190`	`+heap_vacuum_rel(Relation onerel, int options, VacuumParams *params,`
`191`	`191`	`BufferAccessStrategy bstrategy)`
`192`	`192`	`{`
`193`	`193`	`LVRelStats *vacrelstats;`
Original file line number	Diff line number	Diff line change
`@@ -1711,7 +1711,7 @@ vacuum_rel(Oid relid, RangeVar relation, int options, VacuumParams params)`
`1711`	`1711`	`cluster_rel(relid, InvalidOid, cluster_options);`
`1712`	`1712`	`}`
`1713`	`1713`	`else`
`1714`		`- lazy_vacuum_rel(onerel, options, params, vac_strategy);`
	`1714`	`+ heap_vacuum_rel(onerel, options, params, vac_strategy);`
`1715`	`1715`
`1716`	`1716`	`/* Roll back any GUC changes executed by index functions */`
`1717`	`1717`	`AtEOXact_GUC(false, save_nestlevel);`