From 38710a374ea9a29159ff12af7dbecd2959476447 Mon Sep 17 00:00:00 2001 From: Fujii Masao Date: Fri, 22 Jan 2016 01:22:56 +0900 Subject: [PATCH] Remove unused argument from ginInsertCleanup() It's an oversight in commit dc943ad. --- src/backend/access/gin/ginfast.c | 8 ++------ src/backend/access/gin/ginvacuum.c | 6 +++--- src/include/access/gin_private.h | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c index 88e36211ed..681ce09814 100644 --- 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 index f0a246f3f3..6a4b98a4e7 100644 --- 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 index fe04aaa6ef..695959c5b1 100644 --- 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 */ -- 2.40.0