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

Updated AddToVisited to use HnswElementPtr

Browse Source
This commit is contained in:
Andrew Kane
2024-09-19 02:41:20 -07:00
parent 8dde14a736
commit 16ca608f42
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/hnswutils.c
View File

@@ -669,11 +669,11 @@ InitVisited(char *base, visited_hash * v, Relation index, int ef, int m)
* Add to visited * Add to visited
*/ */
static inline void static inline void
AddToVisited(char *base, visited_hash * v, HnswCandidate * hc, Relation index, bool *found) AddToVisited(char *base, visited_hash * v, HnswElementPtr elementPtr, Relation index, bool *found)
{ {
if (index != NULL) if (index != NULL)
{ {
HnswElement element = HnswPtrAccess(base, hc->element); HnswElement element = HnswPtrAccess(base, elementPtr);
ItemPointerData indextid; ItemPointerData indextid;
ItemPointerSet(&indextid, element->blkno, element->offno); ItemPointerSet(&indextid, element->blkno, element->offno);
@@ -682,21 +682,21 @@ AddToVisited(char *base, visited_hash * v, HnswCandidate * hc, Relation index, b
else if (base != NULL) else if (base != NULL)
{ {
#if PG_VERSION_NUM >= 130000 #if PG_VERSION_NUM >= 130000
HnswElement element = HnswPtrAccess(base, hc->element); HnswElement element = HnswPtrAccess(base, elementPtr);
offsethash_insert_hash(v->offsets, HnswPtrOffset(hc->element), element->hash, found); offsethash_insert_hash(v->offsets, HnswPtrOffset(elementPtr), element->hash, found);
#else #else
offsethash_insert(v->offsets, HnswPtrOffset(hc->element), found); offsethash_insert(v->offsets, HnswPtrOffset(elementPtr), found);
#endif #endif
} }
else else
{ {
#if PG_VERSION_NUM >= 130000 #if PG_VERSION_NUM >= 130000
HnswElement element = HnswPtrAccess(base, hc->element); HnswElement element = HnswPtrAccess(base, elementPtr);
pointerhash_insert_hash(v->pointers, (uintptr_t) HnswPtrPointer(hc->element), element->hash, found); pointerhash_insert_hash(v->pointers, (uintptr_t) HnswPtrPointer(elementPtr), element->hash, found);
#else #else
pointerhash_insert(v->pointers, (uintptr_t) HnswPtrPointer(hc->element), found); pointerhash_insert(v->pointers, (uintptr_t) HnswPtrPointer(elementPtr), found);
#endif #endif
} }
} }
@@ -738,7 +738,7 @@ HnswLoadUnvisitedFromMemory(char *base, HnswElement element, HnswElement * unvis
HnswCandidate *hc = &neighborhood->items[i]; HnswCandidate *hc = &neighborhood->items[i];
bool found; bool found;
AddToVisited(base, v, hc, NULL, &found); AddToVisited(base, v, hc->element, NULL, &found);
if (!found) if (!found)
unvisited[(*unvisitedLength)++] = HnswPtrAccess(base, hc->element); unvisited[(*unvisitedLength)++] = HnswPtrAccess(base, hc->element);
@@ -820,7 +820,7 @@ HnswSearchLayer(char *base, Datum q, List *ep, int ef, int lc, Relation index, F
bool found; bool found;
HnswPairingHeapNode *node; HnswPairingHeapNode *node;
AddToVisited(base, &v, hc, index, &found); AddToVisited(base, &v, hc->element, index, &found);
node = CreatePairingHeapNode(hc); node = CreatePairingHeapNode(hc);
pairingheap_add(C, &node->c_node); pairingheap_add(C, &node->c_node);