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

Fixed crash with empty index [skip ci]

Browse Source
This commit is contained in:
Andrew Kane
2024-09-23 09:42:31 -07:00
parent a8e699c927
commit b2fa625255
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/hnswscan.c
View File

@@ -117,6 +117,8 @@ hnswbeginscan(Relation index, int nkeys, int norderbys)
so = (HnswScanOpaque) palloc(sizeof(HnswScanOpaqueData)); so = (HnswScanOpaque) palloc(sizeof(HnswScanOpaqueData));
so->typeInfo = HnswGetTypeInfo(index); so->typeInfo = HnswGetTypeInfo(index);
so->first = true; so->first = true;
so->v.tids = NULL;
so->discarded = NULL;
so->tmpCtx = AllocSetContextCreate(CurrentMemoryContext, so->tmpCtx = AllocSetContextCreate(CurrentMemoryContext,
"Hnsw scan temporary context", "Hnsw scan temporary context",
ALLOCSET_DEFAULT_SIZES); ALLOCSET_DEFAULT_SIZES);
@@ -139,11 +141,12 @@ hnswrescan(IndexScanDesc scan, ScanKey keys, int nkeys, ScanKey orderbys, int no
{ {
HnswScanOpaque so = (HnswScanOpaque) scan->opaque; HnswScanOpaque so = (HnswScanOpaque) scan->opaque;
if (!so->first) if (so->v.tids != NULL)
{
pairingheap_reset(so->discarded);
tidhash_reset(so->v.tids); tidhash_reset(so->v.tids);
}
if (so->discarded != NULL)
pairingheap_reset(so->discarded);
so->first = true; so->first = true;
so->tuples = 0; so->tuples = 0;
MemoryContextReset(so->tmpCtx); MemoryContextReset(so->tmpCtx);
@@ -219,6 +222,10 @@ hnswgettuple(IndexScanDesc scan, ScanDirection dir)
if (!hnsw_streaming) if (!hnsw_streaming)
break; break;
/* Empty index */
if (so->discarded == NULL)
break;
/* Reached max number of additional tuples */ /* Reached max number of additional tuples */
if (hnsw_ef_stream != -1 && so->tuples >= hnsw_ef_search + hnsw_ef_stream) if (hnsw_ef_stream != -1 && so->tuples >= hnsw_ef_search + hnsw_ef_stream)
{ {