From 44b90be45273c6ecb47a8babd0adbc2f093c42e7 Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Mon, 22 Jan 2024 19:02:33 -0800 Subject: [PATCH] Made variable name consistent across functions [skip ci] --- src/hnsw.h | 2 +- src/hnswutils.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/hnsw.h b/src/hnsw.h index 783a345..a1ea020 100644 --- a/src/hnsw.h +++ b/src/hnsw.h @@ -351,7 +351,7 @@ void HnswUpdateNeighborPages(Relation index, FmgrInfo *procinfo, Oid collation, void HnswLoadElementFromTuple(HnswElement element, HnswElementTuple etup, bool loadHeaptids, bool loadVec); void HnswLoadElement(HnswElement element, float *distance, Datum *q, Relation index, FmgrInfo *procinfo, Oid collation, bool loadVec); void HnswSetElementTuple(HnswElementTuple etup, HnswElement element); -void HnswUpdateConnection(HnswElement element, HnswCandidate * hc, int m, int lc, int *updateIdx, Relation index, FmgrInfo *procinfo, Oid collation); +void HnswUpdateConnection(HnswElement element, HnswCandidate * hc, int lm, int lc, int *updateIdx, Relation index, FmgrInfo *procinfo, Oid collation); void HnswLoadNeighbors(HnswElement element, Relation index, int m); PGDLLEXPORT void HnswParallelBuildMain(dsm_segment *seg, shm_toc *toc); diff --git a/src/hnswutils.c b/src/hnswutils.c index 9a206b3..a53f606 100644 --- a/src/hnswutils.c +++ b/src/hnswutils.c @@ -821,7 +821,7 @@ CheckElementCloser(HnswCandidate * e, List *r, int lc, FmgrInfo *procinfo, Oid c * Algorithm 4 from paper */ static List * -SelectNeighbors(List *c, int m, int lc, FmgrInfo *procinfo, Oid collation, HnswElement e2, HnswCandidate * newCandidate, HnswCandidate * *pruned, bool sortCandidates) +SelectNeighbors(List *c, int lm, int lc, FmgrInfo *procinfo, Oid collation, HnswElement e2, HnswCandidate * newCandidate, HnswCandidate * *pruned, bool sortCandidates) { List *r = NIL; List *w = list_copy(c); @@ -831,7 +831,7 @@ SelectNeighbors(List *c, int m, int lc, FmgrInfo *procinfo, Oid collation, HnswE List *added = NIL; bool removedAny = false; - if (list_length(w) <= m) + if (list_length(w) <= lm) return w; wd = pairingheap_allocate(CompareNearestCandidates, NULL); @@ -840,7 +840,7 @@ SelectNeighbors(List *c, int m, int lc, FmgrInfo *procinfo, Oid collation, HnswE if (sortCandidates) list_sort(w, CompareCandidateDistances); - while (list_length(w) > 0 && list_length(r) < m) + while (list_length(w) > 0 && list_length(r) < lm) { /* Assumes w is already ordered desc */ HnswCandidate *e = llast(w); @@ -894,7 +894,7 @@ SelectNeighbors(List *c, int m, int lc, FmgrInfo *procinfo, Oid collation, HnswE neighbors->closerSet = sortCandidates; /* Keep pruned connections */ - while (!pairingheap_is_empty(wd) && list_length(r) < m) + while (!pairingheap_is_empty(wd) && list_length(r) < lm) r = lappend(r, ((HnswPairingHeapNode *) pairingheap_remove_first(wd))->inner); /* Return pruned for update connections */ @@ -926,7 +926,7 @@ AddConnections(HnswElement element, List *neighbors, int lc) * Update connections */ void -HnswUpdateConnection(HnswElement element, HnswCandidate * hc, int m, int lc, int *updateIdx, Relation index, FmgrInfo *procinfo, Oid collation) +HnswUpdateConnection(HnswElement element, HnswCandidate * hc, int lm, int lc, int *updateIdx, Relation index, FmgrInfo *procinfo, Oid collation) { HnswNeighborArray *currentNeighbors = HnswGetNeighbors(hc->element, lc); @@ -935,7 +935,7 @@ HnswUpdateConnection(HnswElement element, HnswCandidate * hc, int m, int lc, int hc2.element = element; hc2.distance = hc->distance; - if (currentNeighbors->length < m) + if (currentNeighbors->length < lm) { currentNeighbors->items[currentNeighbors->length++] = hc2; @@ -980,7 +980,7 @@ HnswUpdateConnection(HnswElement element, HnswCandidate * hc, int m, int lc, int c = lappend(c, ¤tNeighbors->items[i]); c = lappend(c, &hc2); - SelectNeighbors(c, m, lc, procinfo, collation, hc->element, &hc2, &pruned, true); + SelectNeighbors(c, lm, lc, procinfo, collation, hc->element, &hc2, &pruned, true); /* Should not happen */ if (pruned == NULL)