Skip to content

fix(vector): use index metric and efc for post-build HNSW inserts #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adsharma merged 1 commit into from
Sep 25, 2026
Merged

fix(vector): use index metric and efc for post-build HNSW inserts #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion vector/src/include/index/hnsw_index.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ class OnDiskHNSWIndex final : public HNSWIndex {
HNSWInsertState(main::ClientContext* context, catalog::TableCatalogEntry* nodeTableEntry,
catalog::TableCatalogEntry* upperRelTableEntry,
catalog::TableCatalogEntry* lowerRelTableEntry, storage::NodeTable& nodeTable,
common::column_id_t columnID, uint64_t degree);
common::column_id_t columnID, uint64_t degree, const HNSWIndexConfig& indexConfig);
};

struct HNSWUpdateState final : UpdateState {
Expand Down
17 changes: 12 additions & 5 deletions vector/src/index/hnsw_index.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,13 +482,19 @@ HNSWSearchState::HNSWSearchState(main::ClientContext* context,
upperGraph = std::make_unique<graph::OnDiskGraph>(context, std::move(upperGraphEntry));
}

static QueryHNSWConfig getInsertQueryConfig(const HNSWIndexConfig& indexConfig) {
QueryHNSWConfig queryConfig;
queryConfig.efs = indexConfig.efc;
return queryConfig;
}

OnDiskHNSWIndex::HNSWInsertState::HNSWInsertState(main::ClientContext* context,
catalog::TableCatalogEntry* nodeTableEntry, catalog::TableCatalogEntry* upperRelTableEntry,
catalog::TableCatalogEntry* lowerRelTableEntry, NodeTable& nodeTable,
common::column_id_t columnID, uint64_t degree)
common::column_id_t columnID, uint64_t degree, const HNSWIndexConfig& indexConfig)
: searchState{context, nodeTableEntry, upperRelTableEntry, lowerRelTableEntry, nodeTable,
columnID, nodeTable.getNumTotalRows(Transaction::Get(*context)), degree,
QueryHNSWConfig{}, HNSWIndexConfig{}, false} {
getInsertQueryConfig(indexConfig), indexConfig, false} {
std::vector<common::LogicalType> insertTypes;
insertTypes.push_back(common::LogicalType::INTERNAL_ID());
insertTypes.push_back(common::LogicalType::INTERNAL_ID());
Expand Down Expand Up @@ -722,7 +728,7 @@ std::unique_ptr<Index::InsertState> OnDiskHNSWIndex::initInsertState(main::Clien
auto [nodeTableEntry, upperRelTableEntry, lowerRelTableEntry] =
getIndexTableCatalogEntries(catalog::Catalog::Get(*context), transaction, indexInfo);
return std::make_unique<HNSWInsertState>(context, nodeTableEntry, upperRelTableEntry,
lowerRelTableEntry, nodeTable, indexInfo.columnIDs[0], config.ml);
lowerRelTableEntry, nodeTable, indexInfo.columnIDs[0], config.ml, config);
}

class CommitInsertEmbeddingScanState final : public GetEmbeddingsScanState {
Expand Down Expand Up @@ -823,8 +829,9 @@ void OnDiskHNSWIndex::finalize(main::ClientContext* context) {
const auto embeddingDim = typeInfo.constPtrCast<common::ArrayTypeInfo>()->getNumElements();
const auto scanState = std::make_unique<OnDiskEmbeddingScanState>(transaction, mm, nodeTable,
indexInfo.columnIDs[0], embeddingDim);
const auto insertState = std::make_unique<HNSWInsertState>(context, nodeTableEntry,
upperRelTableEntry, lowerRelTableEntry, nodeTable, indexInfo.columnIDs[0], config.ml);
const auto insertState =
std::make_unique<HNSWInsertState>(context, nodeTableEntry, upperRelTableEntry,
lowerRelTableEntry, nodeTable, indexInfo.columnIDs[0], config.ml, config);
std::unique_ptr<TableBackedQuantizedEmbeddings> quantizedEmbeddings;
if (config.quantization != QuantizationType::NONE) {
DASSERT(quantizedEmbeddingsTable != nullptr);
Expand Down
Loading