liuyu/pgvector
1
0
Fork 0
mirror of https://github.com/pgvector/pgvector.git synced 2026-07-07 13:10:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed recall for HNSW after vacuuming

Browse Source
This commit is contained in:
Andrew Kane
2023-08-13 15:37:47 -07:00
parent dc8d467ba5
commit 23cb79c1dc
2 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/hnswutils.c
View File

@@ -606,10 +606,6 @@ HnswSearchLayer(Datum q, List *ep, int ef, int lc, Relation index, FmgrInfo *pro
if (e->element->deleted) if (e->element->deleted)
continue; continue;
/* Skip for inserts if deleting */
if (inserting && list_length(e->element->heaptids) == 0)
continue;
/* Skip self for vacuuming update */ /* Skip self for vacuuming update */
if (skipElement != NULL && e->element->neighborPage == skipElement->neighborPage && e->element->neighborOffno == skipElement->neighborOffno) if (skipElement != NULL && e->element->neighborPage == skipElement->neighborPage && e->element->neighborOffno == skipElement->neighborOffno)
continue; continue;
@@ -628,6 +624,8 @@ HnswSearchLayer(Datum q, List *ep, int ef, int lc, Relation index, FmgrInfo *pro
pairingheap_add(C, &(CreatePairingHeapNode(ec)->ph_node)); pairingheap_add(C, &(CreatePairingHeapNode(ec)->ph_node));
pairingheap_add(W, &(CreatePairingHeapNode(ec)->ph_node)); pairingheap_add(W, &(CreatePairingHeapNode(ec)->ph_node));
/* TODO Possibly don't count elements being deleted in wlen */
wlen++; wlen++;
/* No need to decrement wlen */ /* No need to decrement wlen */
@@ -889,6 +887,26 @@ HnswUpdateConnection(HnswElement element, HnswCandidate * hc, int m, int lc, int
} }
} }
/*
* Remove elements being deleted
*/
static List *
RemoveElementsBeingDeleted(List *w)
{
ListCell *lc2;
List *w2;
foreach(lc2, w)
{
HnswCandidate *hc = (HnswCandidate *) lfirst(lc2);
if (list_length(hc->element->heaptids) != 0)
w2 = lappend(w2, hc);
}
return w2;
}
/* /*
* Algorithm 1 from paper * Algorithm 1 from paper
*/ */
@@ -901,7 +919,6 @@ HnswInsertElement(HnswElement element, HnswElement entryPoint, Relation index, F
int entryLevel; int entryLevel;
Datum q = PointerGetDatum(element->vec); Datum q = PointerGetDatum(element->vec);
HnswElement skipElement = existing ? element : NULL; HnswElement skipElement = existing ? element : NULL;
bool removeEntryPoint;
HnswCandidate *entryCandidate; HnswCandidate *entryCandidate;
/* No neighbors if no entry point */ /* No neighbors if no entry point */
@@ -912,7 +929,6 @@ HnswInsertElement(HnswElement element, HnswElement entryPoint, Relation index, F
entryCandidate = HnswEntryCandidate(entryPoint, q, index, procinfo, collation, true); entryCandidate = HnswEntryCandidate(entryPoint, q, index, procinfo, collation, true);
ep = lappend(ep, entryCandidate); ep = lappend(ep, entryCandidate);
entryLevel = entryPoint->level; entryLevel = entryPoint->level;
removeEntryPoint = existing && list_length(entryPoint->heaptids) == 0;
/* 1st phase: greedy search to insert level */ /* 1st phase: greedy search to insert level */
for (int lc = entryLevel; lc >= level + 1; lc--) for (int lc = entryLevel; lc >= level + 1; lc--)
@@ -932,9 +948,10 @@ HnswInsertElement(HnswElement element, HnswElement entryPoint, Relation index, F
w = HnswSearchLayer(q, ep, efConstruction, lc, index, procinfo, collation, true, skipElement); w = HnswSearchLayer(q, ep, efConstruction, lc, index, procinfo, collation, true, skipElement);
/* Remove entry point if it's being deleted */ /* Elements being deleted can help with search */
if (removeEntryPoint) /* but should be removed before selecting neighbors */
w = list_delete_ptr(w, entryCandidate); if (index != NULL)
w = RemoveElementsBeingDeleted(w);
neighbors = SelectNeighbors(w, lm, lc, procinfo, collation, NULL); neighbors = SelectNeighbors(w, lm, lc, procinfo, collation, NULL);

5
src/hnswvacuum.c
View File

@@ -174,6 +174,11 @@ NeedsUpdated(HnswVacuumState * vacuumstate, HnswElement element)
} }
} }
/* Also update if layer 0 is not full */
/* This could indicate too many candidates being deleted during insert */
if (!needsUpdated)
needsUpdated = !ItemPointerIsValid(&ntup->indextids[ntup->count - 1]);
UnlockReleaseBuffer(buf); UnlockReleaseBuffer(buf);
return needsUpdated; return needsUpdated;