Remove unused argument from ginInsertCleanup()

MasaoFujii · MasaoFujii · commit 38710a374ea9 · 2016-01-22T01:22:56.000+09:00
It's an oversight in commit dc943ad.
diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c
@@ -434,7 +434,7 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
 	END_CRIT_SECTION();
 
 	if (needCleanup)
-		ginInsertCleanup(ginstate, false, true, NULL);
+		ginInsertCleanup(ginstate, true, NULL);
 }
 
 /*
@@ -732,9 +732,6 @@ processPendingPage(BuildAccumulator *accum, KeyArray *ka,
  * action of removing a page from the pending list really needs exclusive
  * lock.
  *
- * vac_delay indicates that ginInsertCleanup should call
- * vacuum_delay_point() periodically.
- *
  * fill_fsm indicates that ginInsertCleanup should add deleted pages
  * to FSM otherwise caller is responsible to put deleted pages into
  * FSM.
@@ -743,8 +740,7 @@ processPendingPage(BuildAccumulator *accum, KeyArray *ka,
  */
 void
 ginInsertCleanup(GinState *ginstate,
-				 bool vac_delay, bool fill_fsm,
-				 IndexBulkDeleteResult *stats)
+				 bool fill_fsm, IndexBulkDeleteResult *stats)
 {
 	Relation	index = ginstate->index;
 	Buffer		metabuffer,
diff --git a/src/backend/access/gin/ginvacuum.c b/src/backend/access/gin/ginvacuum.c
@@ -541,7 +541,7 @@ ginbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
 		/* Yes, so initialize stats to zeroes */
 		stats = (IndexBulkDeleteResult *) palloc0(sizeof(IndexBulkDeleteResult));
 		/* and cleanup any pending inserts */
-		ginInsertCleanup(&gvs.ginstate, true, false, stats);
+		ginInsertCleanup(&gvs.ginstate, false, stats);
 	}
 
 	/* we'll re-count the tuples each time */
@@ -654,7 +654,7 @@ ginvacuumcleanup(IndexVacuumInfo *info, IndexBulkDeleteResult *stats)
 		if (IsAutoVacuumWorkerProcess())
 		{
 			initGinState(&ginstate, index);
-			ginInsertCleanup(&ginstate, true, true, stats);
+			ginInsertCleanup(&ginstate, true, stats);
 		}
 		return stats;
 	}
@@ -667,7 +667,7 @@ ginvacuumcleanup(IndexVacuumInfo *info, IndexBulkDeleteResult *stats)
 	{
 		stats = (IndexBulkDeleteResult *) palloc0(sizeof(IndexBulkDeleteResult));
 		initGinState(&ginstate, index);
-		ginInsertCleanup(&ginstate, true, false, stats);
+		ginInsertCleanup(&ginstate, false, stats);
 	}
 
 	memset(&idxStat, 0, sizeof(idxStat));
diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h
@@ -946,7 +946,7 @@ extern void ginHeapTupleFastCollect(GinState *ginstate,
 						OffsetNumber attnum, Datum value, bool isNull,
 						ItemPointer ht_ctid);
 extern void ginInsertCleanup(GinState *ginstate,
-				 bool vac_delay, bool fill_fsm, IndexBulkDeleteResult *stats);
+				 bool fill_fsm, IndexBulkDeleteResult *stats);
 
 /* ginpostinglist.c */
 

Original file line number	Diff line number	Diff line change
`@@ -541,7 +541,7 @@ ginbulkdelete(IndexVacuumInfo info, IndexBulkDeleteResult stats,`
`541`	`541`	`/* Yes, so initialize stats to zeroes */`
`542`	`542`	`stats = (IndexBulkDeleteResult *) palloc0(sizeof(IndexBulkDeleteResult));`
`543`	`543`	`/* and cleanup any pending inserts */`
`544`		`- ginInsertCleanup(&gvs.ginstate, true, false, stats);`
	`544`	`+ ginInsertCleanup(&gvs.ginstate, false, stats);`
`545`	`545`	`}`
`546`	`546`
`547`	`547`	`/* we'll re-count the tuples each time */`
`@@ -654,7 +654,7 @@ ginvacuumcleanup(IndexVacuumInfo info, IndexBulkDeleteResult stats)`
`654`	`654`	`if (IsAutoVacuumWorkerProcess())`
`655`	`655`	`{`
`656`	`656`	`initGinState(&ginstate, index);`
`657`		`- ginInsertCleanup(&ginstate, true, true, stats);`
	`657`	`+ ginInsertCleanup(&ginstate, true, stats);`
`658`	`658`	`}`
`659`	`659`	`return stats;`
`660`	`660`	`}`
`@@ -667,7 +667,7 @@ ginvacuumcleanup(IndexVacuumInfo info, IndexBulkDeleteResult stats)`
`667`	`667`	`{`
`668`	`668`	`stats = (IndexBulkDeleteResult *) palloc0(sizeof(IndexBulkDeleteResult));`
`669`	`669`	`initGinState(&ginstate, index);`
`670`		`- ginInsertCleanup(&ginstate, true, false, stats);`
	`670`	`+ ginInsertCleanup(&ginstate, false, stats);`
`671`	`671`	`}`
`672`	`672`
`673`	`673`	`memset(&idxStat, 0, sizeof(idxStat));`