Refactor `GraphLayersBuilder::link_new_point` by xzfc · Pull Request #6161 · qdrant/qdrant

xzfc · 2025-03-12T19:01:03Z

The GraphLayersBuilder::link_new_point method is 156 lines long, making it inconvenient to work with. This PR splits it into a set of smaller methods:

pub fn link_new_point()
fn link_new_point_on_level()
fn link_with_heuristic()
fn link_without_heuristic()

coderabbitai · 2025-03-12T19:03:10Z

📝 Walkthrough

Walkthrough

The changes update the logic in the GraphLayersBuilder module responsible for linking new points in the index. The implementation now uses an if let statement instead of a match statement to handle the presence of an entry point. When an entry point is present, its level is compared with the new point’s level to decide whether to search for the closest point at the same level or to directly initialize linking parameters. The process then iterates through the levels from the minimal common level down to zero. If no entry point exists, the code records the new point as an empty entry and exits. Additionally, the operations that mark the new point as ready and update the entry points list have been repositioned to run unconditionally. Two new methods, link_with_heuristic and link_without_heuristic, have been added to handle linking with or without using a heuristic, and the logic of link_new_point has been updated accordingly.

Tip

⚡🧪 Multi-step agentic review comment chat (experimental)

We're introducing multi-step agentic chat in review comments. This experimental feature enhances review discussions with the CodeRabbit agentic chat by enabling advanced interactions, including the ability to create pull requests directly from comments.
- To enable this feature, set early_access to true under in the settings.

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 6a52a87 and 9bc38f0.

📒 Files selected for processing (1)

lib/segment/src/index/hnsw_index/graph_layers_builder.rs (1 hunks)

⏰ Context from checks skipped due to timeout of 90000ms (13)

GitHub Check: Basic TLS/HTTPS tests
GitHub Check: test-snapshot-operations-s3-minio
GitHub Check: test-shard-snapshot-api-s3-minio
GitHub Check: test-low-resources
GitHub Check: test-consensus-compose
GitHub Check: test (macos-latest)
GitHub Check: test-consistency
GitHub Check: test (windows-latest)
GitHub Check: test-consensus
GitHub Check: test
GitHub Check: test (ubuntu-latest)
GitHub Check: test
GitHub Check: test

🔇 Additional comments (5)

lib/segment/src/index/hnsw_index/graph_layers_builder.rs (5)

373-405: Improved control flow by refactoring conditional logic

The refactoring from a match statement to an if let statement makes the code more readable and the control flow clearer. It's now easier to follow the logic for handling entry points.

406-411: Good code organization with unconditional operations

Moving these operations outside the conditional structure ensures that a new point is always marked as ready and added to the entry points list, regardless of whether an entry point was initially found. This simplifies the logic and makes the code more robust.

414-453: Well-structured decomposition with clear method semantics

The extraction of link_new_point_on_level method successfully modularizes the code, with a clear purpose and return value. This method effectively orchestrates the linking process at a specific level and returns an entry point for the level below, making the code easier to understand and maintain.

455-514: Effective separation of linking with heuristic

The link_with_heuristic method neatly encapsulates the complex logic for heuristic-based linking, making the code more modular and easier to understand. The implementation maintains the original algorithm while improving maintainability.

516-536: Clean implementation of non-heuristic linking

The link_without_heuristic method provides a simple and clear implementation for linking points without using a heuristic. This separation helps in understanding the two different linking strategies and makes future modifications easier.

✨ Finishing Touches

📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Generate unit testing code for this file.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit testing code for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and generate unit testing code.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate docstrings to generate docstrings for this PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

timvisee

Am I right that this does not have any logic changes at all? In that case I'm happy to approve 👍

* Extract `link_with_heuristic` and `link_without_heuristic` * Extract `link_new_point_on_level` * Replace `match` with `if let`

xzfc added 3 commits March 12, 2025 18:48

Extract link_with_heuristic and link_without_heuristic

e8a3d2c

Extract link_new_point_on_level

b985ba0

Replace match with if let

9bc38f0

xzfc requested review from IvanPleshkov, generall and timvisee March 12, 2025 19:01

timvisee approved these changes Mar 13, 2025

View reviewed changes

IvanPleshkov approved these changes Mar 13, 2025

View reviewed changes

generall merged commit 2a389d2 into dev Mar 13, 2025
17 checks passed

generall deleted the graph-layers-builder-split branch March 13, 2025 11:09

timvisee pushed a commit that referenced this pull request Mar 21, 2025

Refactor GraphLayersBuilder::link_new_point (#6161)

9499f56

* Extract `link_with_heuristic` and `link_without_heuristic` * Extract `link_new_point_on_level` * Replace `match` with `if let`

This was referenced Oct 14, 2025

Refactor: merge _search_on_level into search_on_level #7403

Merged

Add ACORN-1 search #7414

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor `GraphLayersBuilder::link_new_point`#6161

Refactor `GraphLayersBuilder::link_new_point`#6161
generall merged 3 commits intodevfrom
graph-layers-builder-split

xzfc commented Mar 12, 2025 •

edited

Loading

Uh oh!

coderabbitai bot commented Mar 12, 2025

Walkthrough

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

Uh oh!

timvisee left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

xzfc commented Mar 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coderabbitai bot commented Mar 12, 2025

Walkthrough

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

timvisee left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

xzfc commented Mar 12, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)