refactor: impl the sub index trait for HNSW and clean code #2462
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: BubbleCal <bubble-cal@outlook.com>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2462 +/- ##
==========================================
+ Coverage 79.94% 80.01% +0.07%
==========================================
Files 207 207
Lines 58657 58735 +78
Branches 58657 58735 +78
==========================================
+ Hits 46893 46997 +104
+ Misses 9005 8982 -23
+ Partials 2759 2756 -3
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Signed-off-by: BubbleCal <bubble-cal@outlook.com>
westonpace
approved these changes
Jun 13, 2024
| use lance_table::io::manifest::ManifestDescribing; | ||
|
|
||
| use lance_linalg::distance::DistanceType; | ||
| use rayon::prelude::*; |
There was a problem hiding this comment.
What is rayon used for?
There was a problem hiding this comment.
it's used to do parallel insert for building HNSW
Comment on lines
562
to
568
| let ids = batch | ||
| .column_by_name(VECTOR_ID_COL) | ||
| .ok_or(Error::Index { | ||
| message: format!("{} column not found in HNSW file", VECTOR_ID_COL), | ||
| location: location!(), | ||
| })? | ||
| .as_primitive::<UInt32Type>(); |
There was a problem hiding this comment.
Might be simpler to just do:
let ids = batch[VECTOR_ID_COL].as_primitive::<UInt32Type>();
It's a panic instead of an error but users won't be able to understand or handle the error anyways.
Signed-off-by: BubbleCal <bubble-cal@outlook.com>
renovate bot
referenced
this pull request
in spiraldb/vortex
Jun 13, 2024
[](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [lance](https://togithub.com/lancedb/lance) | dependencies | patch | `0.12.1` -> `0.12.2` | --- ### Release Notes <details> <summary>lancedb/lance (lance)</summary> ### [`v0.12.2`](https://togithub.com/lancedb/lance/releases/tag/v0.12.2) [Compare Source](https://togithub.com/lancedb/lance/compare/v0.12.1...v0.12.2) <!-- Release notes generated using configuration in .github/release.yml at v0.12.2 --> #### What's Changed ##### New Features 🎉 - feat: support IVF_FLAT index by [@​BubbleCal](https://togithub.com/BubbleCal) in [https://github.com/lancedb/lance/pull/2418](https://togithub.com/lancedb/lance/pull/2418) - feat: add support for arbitrary global buffers to the v2 reader/writer by [@​westonpace](https://togithub.com/westonpace) in [https://github.com/lancedb/lance/pull/2445](https://togithub.com/lancedb/lance/pull/2445) - feat: add pushdown to the read path by [@​westonpace](https://togithub.com/westonpace) in [https://github.com/lancedb/lance/pull/2444](https://togithub.com/lancedb/lance/pull/2444) - feat: scan with stable row id by [@​wjones127](https://togithub.com/wjones127) in [https://github.com/lancedb/lance/pull/2441](https://togithub.com/lancedb/lance/pull/2441) - feat(java): add lance spark connector for read by [@​LuQQiu](https://togithub.com/LuQQiu) in [https://github.com/lancedb/lance/pull/2429](https://togithub.com/lancedb/lance/pull/2429) - feat: pickle the manifest when pickling a dataset by [@​westonpace](https://togithub.com/westonpace) in [https://github.com/lancedb/lance/pull/2459](https://togithub.com/lancedb/lance/pull/2459) - feat: store IVF in global buffer by [@​BubbleCal](https://togithub.com/BubbleCal) in [https://github.com/lancedb/lance/pull/2449](https://togithub.com/lancedb/lance/pull/2449) ##### Bug Fixes 🐛 - fix: lance.torch.LanceDataset spelt readahead wrong by [@​wjones127](https://togithub.com/wjones127) in [https://github.com/lancedb/lance/pull/2453](https://togithub.com/lancedb/lance/pull/2453) - fix: respect storage options on `create_index` by [@​joshua-auchincloss](https://togithub.com/joshua-auchincloss) in [https://github.com/lancedb/lance/pull/2460](https://togithub.com/lancedb/lance/pull/2460) - fix: incorrect logic when decoding manifest from last block by [@​westonpace](https://togithub.com/westonpace) in [https://github.com/lancedb/lance/pull/2464](https://togithub.com/lancedb/lance/pull/2464) ##### Documentation 📚 - docs: add spark-lance-connector readme by [@​LuQQiu](https://togithub.com/LuQQiu) in [https://github.com/lancedb/lance/pull/2456](https://togithub.com/lancedb/lance/pull/2456) ##### Performance Improvements 🚀 - perf: speed up hnsw build by [@​eddyxu](https://togithub.com/eddyxu) in [https://github.com/lancedb/lance/pull/2448](https://togithub.com/lancedb/lance/pull/2448) - perf: better L2 code generation by [@​eddyxu](https://togithub.com/eddyxu) in [https://github.com/lancedb/lance/pull/2450](https://togithub.com/lancedb/lance/pull/2450) ##### Other Changes - refactor: pull row_id and deletion vector out of v1 file reader by [@​wjones127](https://togithub.com/wjones127) in [https://github.com/lancedb/lance/pull/2436](https://togithub.com/lancedb/lance/pull/2436) - refactor: move Prefilter to a trait and move VectorIndex to lance-vector by [@​eddyxu](https://togithub.com/eddyxu) in [https://github.com/lancedb/lance/pull/2442](https://togithub.com/lancedb/lance/pull/2442) - refactor: move hnsw from lance crate to lance-index crate by [@​eddyxu](https://togithub.com/eddyxu) in [https://github.com/lancedb/lance/pull/2446](https://togithub.com/lancedb/lance/pull/2446) - refactor: impl the sub index trait for HNSW and clean code by [@​BubbleCal](https://togithub.com/BubbleCal) in [https://github.com/lancedb/lance/pull/2462](https://togithub.com/lancedb/lance/pull/2462) #### New Contributors - [@​joshua-auchincloss](https://togithub.com/joshua-auchincloss) made their first contribution in [https://github.com/lancedb/lance/pull/2460](https://togithub.com/lancedb/lance/pull/2460) **Full Changelog**: lancedb/lance@v0.12.1...v0.12.2 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/spiraldb/vortex). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zOTMuMCIsInVwZGF0ZWRJblZlciI6IjM3LjM5My4wIiwidGFyZ2V0QnJhbmNoIjoiZGV2ZWxvcCIsImxhYmVscyI6W119--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
AdamGS
referenced
this pull request
in AdamGS/vortex
Jun 14, 2024
](https://renovatebot.com){kind=link}
[](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [lance](https://togithub.com/lancedb/lance) | dependencies | patch | `0.12.1` -> `0.12.2` | --- ### Release Notes <details> <summary>lancedb/lance (lance)</summary> ### [`v0.12.2`](https://togithub.com/lancedb/lance/releases/tag/v0.12.2) [Compare Source](https://togithub.com/lancedb/lance/compare/v0.12.1...v0.12.2) <!-- Release notes generated using configuration in .github/release.yml at v0.12.2 --> #### What's Changed ##### New Features 🎉 - feat: support IVF_FLAT index by [@​BubbleCal](https://togithub.com/BubbleCal) in [https://github.com/lancedb/lance/pull/2418](https://togithub.com/lancedb/lance/pull/2418) - feat: add support for arbitrary global buffers to the v2 reader/writer by [@​westonpace](https://togithub.com/westonpace) in [https://github.com/lancedb/lance/pull/2445](https://togithub.com/lancedb/lance/pull/2445) - feat: add pushdown to the read path by [@​westonpace](https://togithub.com/westonpace) in [https://github.com/lancedb/lance/pull/2444](https://togithub.com/lancedb/lance/pull/2444) - feat: scan with stable row id by [@​wjones127](https://togithub.com/wjones127) in [https://github.com/lancedb/lance/pull/2441](https://togithub.com/lancedb/lance/pull/2441) - feat(java): add lance spark connector for read by [@​LuQQiu](https://togithub.com/LuQQiu) in [https://github.com/lancedb/lance/pull/2429](https://togithub.com/lancedb/lance/pull/2429) - feat: pickle the manifest when pickling a dataset by [@​westonpace](https://togithub.com/westonpace) in [https://github.com/lancedb/lance/pull/2459](https://togithub.com/lancedb/lance/pull/2459) - feat: store IVF in global buffer by [@​BubbleCal](https://togithub.com/BubbleCal) in [https://github.com/lancedb/lance/pull/2449](https://togithub.com/lancedb/lance/pull/2449) ##### Bug Fixes 🐛 - fix: lance.torch.LanceDataset spelt readahead wrong by [@​wjones127](https://togithub.com/wjones127) in [https://github.com/lancedb/lance/pull/2453](https://togithub.com/lancedb/lance/pull/2453) - fix: respect storage options on `create_index` by [@​joshua-auchincloss](https://togithub.com/joshua-auchincloss) in [https://github.com/lancedb/lance/pull/2460](https://togithub.com/lancedb/lance/pull/2460) - fix: incorrect logic when decoding manifest from last block by [@​westonpace](https://togithub.com/westonpace) in [https://github.com/lancedb/lance/pull/2464](https://togithub.com/lancedb/lance/pull/2464) ##### Documentation 📚 - docs: add spark-lance-connector readme by [@​LuQQiu](https://togithub.com/LuQQiu) in [https://github.com/lancedb/lance/pull/2456](https://togithub.com/lancedb/lance/pull/2456) ##### Performance Improvements 🚀 - perf: speed up hnsw build by [@​eddyxu](https://togithub.com/eddyxu) in [https://github.com/lancedb/lance/pull/2448](https://togithub.com/lancedb/lance/pull/2448) - perf: better L2 code generation by [@​eddyxu](https://togithub.com/eddyxu) in [https://github.com/lancedb/lance/pull/2450](https://togithub.com/lancedb/lance/pull/2450) ##### Other Changes - refactor: pull row_id and deletion vector out of v1 file reader by [@​wjones127](https://togithub.com/wjones127) in [https://github.com/lancedb/lance/pull/2436](https://togithub.com/lancedb/lance/pull/2436) - refactor: move Prefilter to a trait and move VectorIndex to lance-vector by [@​eddyxu](https://togithub.com/eddyxu) in [https://github.com/lancedb/lance/pull/2442](https://togithub.com/lancedb/lance/pull/2442) - refactor: move hnsw from lance crate to lance-index crate by [@​eddyxu](https://togithub.com/eddyxu) in [https://github.com/lancedb/lance/pull/2446](https://togithub.com/lancedb/lance/pull/2446) - refactor: impl the sub index trait for HNSW and clean code by [@​BubbleCal](https://togithub.com/BubbleCal) in [https://github.com/lancedb/lance/pull/2462](https://togithub.com/lancedb/lance/pull/2462) #### New Contributors - [@​joshua-auchincloss](https://togithub.com/joshua-auchincloss) made their first contribution in [https://github.com/lancedb/lance/pull/2460](https://togithub.com/lancedb/lance/pull/2460) **Full Changelog**: lancedb/lance@v0.12.1...v0.12.2 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/spiraldb/vortex). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zOTMuMCIsInVwZGF0ZWRJblZlciI6IjM3LjM5My4wIiwidGFyZ2V0QnJhbmNoIjoiZGV2ZWxvcCIsImxhYmVscyI6W119--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
IvfSubIndexfor HNSWResultreturn type for some HNSW methods