Skip to content
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

Jump to bottom

[ENH] Query merging #2066

Merged
merged 47 commits into from
May 3, 2024
Merged

[ENH] Query merging #2066

merged 47 commits into from
May 3, 2024

Conversation

HammadB
Copy link
Collaborator

@HammadB HammadB commented Apr 26, 2024 •
edited
Loading

Description of changes

Summarize the changes made by this PR.

  • Improvements & Bug fixes
    • /
  • New functionality
    • Completes the query merging flow by adding an HSNW operator and merge results operator that will rehydrate from the record segment blockfile.

Test plan

How are these changes tested?

  • Tests pass locally with pytest for python, yarn test for js, cargo test for rust

Documentation Changes

None

This was referenced Apr 26, 2024
Merged
Merged
@HammadB Graphite App
Copy link
Collaborator Author

HammadB commented Apr 26, 2024 •
edited
Loading

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @HammadB and the rest of your teammates on Graphite Graphite

@HammadB HammadB mentioned this pull request Apr 26, 2024
Merged
1 task
@github-actions GitHub Actions
Copy link

Reviewer Checklist

Please leverage this checklist to ensure your code review is thorough before approving

Testing, Bugs, Errors, Logs, Documentation

  • Can you think of any use case in which the code does not behave as intended? Have they been tested?
  • Can you think of any inputs or external events that could break the code? Is user input validated and safe? Have they been tested?
  • If appropriate, are there adequate property based tests?
  • If appropriate, are there adequate unit tests?
  • Should any logging, debugging, tracing information be added or removed?
  • Are error messages user-friendly?
  • Have all documentation changes needed been made?
  • Have all non-obvious changes been commented?

System Compatibility

  • Are there any potential impacts on other parts of the system or backward compatibility?
  • Does this change intersect with any items on our roadmap, and if so, is there a plan for fitting them together?

Quality

  • Is this code of a unexpectedly high quality (Readability, Modularity, Intuitiveness)

HammadB
HammadB commented Apr 26, 2024
View reviewed changes
chromadb/api/segment.py Outdated
@@ -684,9 +684,8 @@ def _query(
for embedding in query_embeddings:
self._validate_dimension(coll, len(embedding), update=False)

metadata_reader = self._manager.get_segment(collection_id, MetadataReader)

if where or where_document:
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes it so that we don't touch the metadata segment unless its needed

@HammadB HammadB force-pushed the hammad/data_record_support_in_blockfile branch from 1295539 to adce836 Compare April 26, 2024 16:28
@HammadB HammadB force-pushed the hammad/data_record_support_in_blockfile branch from adce836 to 716fc6f Compare April 26, 2024 16:31
@HammadB HammadB force-pushed the hammad/query_hnsw branch 2 times, most recently from 8671cf0 to 1c8b0d1 Compare April 26, 2024 17:43
@HammadB HammadB force-pushed the hammad/data_record_support_in_blockfile branch from df37229 to 233a63d Compare April 26, 2024 23:41
@vercel Vercel
Copy link

vercel bot commented May 2, 2024 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
chroma ✅ Ready (Inspect) Visit Preview 💬 Add feedback May 2, 2024 11:56pm

@HammadB HammadB changed the base branch from hammad/data_record_support_in_blockfile to main May 2, 2024 16:16
@HammadB HammadB merged commit c95edd1 into main May 3, 2024
125 of 126 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@HammadB