From 571697fee7d8930217c2901afdcf8d150e7ff798 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Thu, 25 Jan 2024 10:07:57 +0200 Subject: [PATCH] Remove unnecessary UpdateProgress() wrappers (#433) Now that we require PostgreSQL v12, we can use pgstat_progress_update_param directly. --- src/hnswbuild.c | 6 ++---- src/ivfbuild.c | 12 +++++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/hnswbuild.c b/src/hnswbuild.c index f2c6509..84e95d0 100644 --- a/src/hnswbuild.c +++ b/src/hnswbuild.c @@ -65,8 +65,6 @@ #define CALLBACK_ITEM_POINTER HeapTuple hup #endif -#define UpdateProgress(index, val) pgstat_progress_update_param(index, val) - #if PG_VERSION_NUM >= 140000 #include "utils/backend_status.h" #include "utils/wait_event.h" @@ -587,7 +585,7 @@ BuildCallback(Relation index, CALLBACK_ITEM_POINTER, Datum *values, { /* Update progress */ SpinLockAcquire(&graph->lock); - UpdateProgress(PROGRESS_CREATEIDX_TUPLES_DONE, ++graph->indtuples); + pgstat_progress_update_param(PROGRESS_CREATEIDX_TUPLES_DONE, ++graph->indtuples); SpinLockRelease(&graph->lock); } @@ -1048,7 +1046,7 @@ BuildGraph(HnswBuildState * buildstate, ForkNumber forkNum) { int parallel_workers = 0; - UpdateProgress(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_HNSW_PHASE_LOAD); + pgstat_progress_update_param(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_HNSW_PHASE_LOAD); /* Calculate parallel workers */ if (buildstate->heap != NULL) diff --git a/src/ivfbuild.c b/src/ivfbuild.c index 3c9ae1e..e31f370 100644 --- a/src/ivfbuild.c +++ b/src/ivfbuild.c @@ -29,8 +29,6 @@ #define CALLBACK_ITEM_POINTER HeapTuple hup #endif -#define UpdateProgress(index, val) pgstat_progress_update_param(index, val) - #if PG_VERSION_NUM >= 140000 #include "utils/backend_status.h" #include "utils/wait_event.h" @@ -262,9 +260,9 @@ InsertTuples(Relation index, IvfflatBuildState * buildstate, ForkNumber forkNum) TupleTableSlot *slot = MakeSingleTupleTableSlot(buildstate->tupdesc, &TTSOpsMinimalTuple); TupleDesc tupdesc = RelationGetDescr(index); - UpdateProgress(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_IVFFLAT_PHASE_LOAD); + pgstat_progress_update_param(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_IVFFLAT_PHASE_LOAD); - UpdateProgress(PROGRESS_CREATEIDX_TUPLES_TOTAL, buildstate->indtuples); + pgstat_progress_update_param(PROGRESS_CREATEIDX_TUPLES_TOTAL, buildstate->indtuples); GetNextTuple(buildstate->sortstate, tupdesc, slot, &itup, &list); @@ -300,7 +298,7 @@ InsertTuples(Relation index, IvfflatBuildState * buildstate, ForkNumber forkNum) pfree(itup); - UpdateProgress(PROGRESS_CREATEIDX_TUPLES_DONE, ++inserted); + pgstat_progress_update_param(PROGRESS_CREATEIDX_TUPLES_DONE, ++inserted); GetNextTuple(buildstate->sortstate, tupdesc, slot, &itup, &list); } @@ -400,7 +398,7 @@ ComputeCenters(IvfflatBuildState * buildstate) { int numSamples; - UpdateProgress(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_IVFFLAT_PHASE_KMEANS); + pgstat_progress_update_param(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_IVFFLAT_PHASE_KMEANS); /* Target 50 samples per list, with at least 10000 samples */ /* The number of samples has a large effect on index build time */ @@ -921,7 +919,7 @@ AssignTuples(IvfflatBuildState * buildstate) Oid sortCollations[] = {InvalidOid}; bool nullsFirstFlags[] = {false}; - UpdateProgress(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_IVFFLAT_PHASE_ASSIGN); + pgstat_progress_update_param(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_IVFFLAT_PHASE_ASSIGN); /* Calculate parallel workers */ if (buildstate->heap != NULL)