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

Improved debugging for HNSW locks [skip ci]

Browse Source
This commit is contained in:
Andrew Kane
2024-03-11 16:15:06 -07:00
parent 62350b1589
commit fb2782c9f6
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/hnsw.c
View File

@@ -17,7 +17,10 @@
#endif #endif
int hnsw_ef_search; int hnsw_ef_search;
int hnsw_lock_tranche_id; int hnsw_entry_lock_tranche_id;
int hnsw_allocator_lock_tranche_id;
int hnsw_flush_lock_tranche_id;
int hnsw_element_lock_tranche_id;
static relopt_kind hnsw_relopt_kind; static relopt_kind hnsw_relopt_kind;
/* /*
@@ -36,16 +39,27 @@ HnswInitLockTranche(void)
bool found; bool found;
LWLockAcquire(AddinShmemInitLock, LW_EXCLUSIVE); LWLockAcquire(AddinShmemInitLock, LW_EXCLUSIVE);
tranche_ids = ShmemInitStruct("hnsw LWLock ids", tranche_ids = ShmemInitStruct("hnsw LWLock ids v2",
sizeof(int) * 1, sizeof(int) * 4,
&found); &found);
if (!found) if (!found)
{
tranche_ids[0] = LWLockNewTrancheId(); tranche_ids[0] = LWLockNewTrancheId();
hnsw_lock_tranche_id = tranche_ids[0]; tranche_ids[1] = LWLockNewTrancheId();
tranche_ids[2] = LWLockNewTrancheId();
tranche_ids[3] = LWLockNewTrancheId();
}
hnsw_entry_lock_tranche_id = tranche_ids[0];
hnsw_allocator_lock_tranche_id = tranche_ids[1];
hnsw_flush_lock_tranche_id = tranche_ids[2];
hnsw_element_lock_tranche_id = tranche_ids[3];
LWLockRelease(AddinShmemInitLock); LWLockRelease(AddinShmemInitLock);
/* Per-backend registration of the tranche ID */ /* Per-backend registration of the tranche ID */
LWLockRegisterTranche(hnsw_lock_tranche_id, "HnswBuild"); LWLockRegisterTranche(hnsw_entry_lock_tranche_id, "HnswEntry");
LWLockRegisterTranche(hnsw_allocator_lock_tranche_id, "HnswAllocator");
LWLockRegisterTranche(hnsw_flush_lock_tranche_id, "HnswFlush");
LWLockRegisterTranche(hnsw_element_lock_tranche_id, "HnswElement");
} }
/* /*

5
src/hnsw.h
View File

@@ -113,7 +113,10 @@
/* Variables */ /* Variables */
extern int hnsw_ef_search; extern int hnsw_ef_search;
extern int hnsw_lock_tranche_id; extern int hnsw_entry_lock_tranche_id;
extern int hnsw_allocator_lock_tranche_id;
extern int hnsw_flush_lock_tranche_id;
extern int hnsw_element_lock_tranche_id;
typedef struct HnswElementData HnswElementData; typedef struct HnswElementData HnswElementData;
typedef struct HnswNeighborArray HnswNeighborArray; typedef struct HnswNeighborArray HnswNeighborArray;

8
src/hnswbuild.c
View File

@@ -548,7 +548,7 @@ InsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heaptid, Hn
HnswPtrStore(base, element->value, valuePtr); HnswPtrStore(base, element->value, valuePtr);
/* Create a lock for the element */ /* Create a lock for the element */
LWLockInitialize(&element->lock, hnsw_lock_tranche_id); LWLockInitialize(&element->lock, hnsw_element_lock_tranche_id);
/* Insert tuple */ /* Insert tuple */
InsertTupleInMemory(buildstate, element); InsertTupleInMemory(buildstate, element);
@@ -611,9 +611,9 @@ InitGraph(HnswGraph * graph, char *base, long memoryTotal)
graph->flushed = false; graph->flushed = false;
graph->indtuples = 0; graph->indtuples = 0;
SpinLockInit(&graph->lock); SpinLockInit(&graph->lock);
LWLockInitialize(&graph->entryLock, hnsw_lock_tranche_id); LWLockInitialize(&graph->entryLock, hnsw_entry_lock_tranche_id);
LWLockInitialize(&graph->allocatorLock, hnsw_lock_tranche_id); LWLockInitialize(&graph->allocatorLock, hnsw_allocator_lock_tranche_id);
LWLockInitialize(&graph->flushLock, hnsw_lock_tranche_id); LWLockInitialize(&graph->flushLock, hnsw_flush_lock_tranche_id);
} }
/* /*