Skip to content

fix: remve emtpy merge#496

Merged
MaojiaSheng merged 1 commit intomainfrom
fix_err_log
Mar 9, 2026
Merged

fix: remve emtpy merge#496
MaojiaSheng merged 1 commit intomainfrom
fix_err_log

Conversation

@zhoujh01
Copy link
Collaborator

@zhoujh01 zhoujh01 commented Mar 9, 2026

Description

Related Issue

Type of Change

  • Bug fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update
  • Refactoring (no functional changes)
  • Performance improvement
  • Test update

Changes Made

Testing

  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • I have tested this on the following platforms:
    • Linux
    • macOS
    • Windows

Checklist

  • My code follows the project's coding style
  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • Any dependent changes have been merged and published

Screenshots (if applicable)

Additional Notes

@github-actions
Copy link

github-actions bot commented Mar 9, 2026

PR Reviewer Guide 🔍

Here are some key observations to aid the review process:

⏱️ Estimated effort to review: 2 🔵🔵⚪⚪⚪
🧪 No relevant tests
🔒 No security concerns identified
⚡ Recommended focus areas for review

Possible Regression

The code now returns None directly from _build_scope_filter when merged is None, instead of returning a default RawDSL({"op": "and", "conds": []}). This may break callers that expect a valid filter object instead of None.

merged = self._merge_filters(*filters)
return merged

@github-actions
Copy link

github-actions bot commented Mar 9, 2026

PR Code Suggestions ✨

Explore these optional code suggestions:

CategorySuggestion                                                                                                                                    Impact
Possible issue
Restore None check for merged filter

The change removes the check that ensures a valid filter is returned even when
_merge_filters returns None. This may break downstream code that expects a filter
object (not None). Restore the check to return an empty "and" filter when no merged
filter exists.

openviking/storage/viking_vector_index_backend.py [497-498]

 merged = self._merge_filters(*filters)
+if merged is None:
+    return RawDSL({"op": "and", "conds": []})
 return merged
Suggestion importance[1-10]: 8

__

Why: The PR removed the check that returns a valid empty filter when _merge_filters returns None, which could break downstream code expecting a filter object. Restoring this check fixes a potential regression, making this a high-impact correct suggestion.

Medium

@MaojiaSheng MaojiaSheng merged commit 4877fd5 into main Mar 9, 2026
6 checks passed
@MaojiaSheng MaojiaSheng deleted the fix_err_log branch March 9, 2026 12:33
@github-project-automation github-project-automation bot moved this from Backlog to Done in OpenViking project Mar 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants