Reviewing files that changed from the base of the PR and between 6a52a87 and 67f0091.

• Cargo.lock is excluded by !**/*.lock

• lib/common/common/Cargo.toml (1 hunks)
• lib/common/common/src/ext.rs (2 hunks)
• lib/segment/src/common/mmap_bitslice_buffered_update_wrapper.rs (2 hunks)
• lib/segment/src/id_tracker/id_tracker_base.rs (3 hunks)
• lib/segment/src/id_tracker/immutable_id_tracker.rs (2 hunks)
• lib/segment/src/index/field_index/bool_index/simple_bool_index.rs (2 hunks)
• lib/segment/src/index/field_index/numeric_index/immutable_numeric_index.rs (3 hunks)
• lib/segment/src/index/hnsw_index/hnsw.rs (2 hunks)
• lib/segment/src/segment/formula_rescore.rs (2 hunks)
• lib/segment/src/vector_storage/async_raw_scorer.rs (2 hunks)
• lib/segment/src/vector_storage/dense/mmap_dense_vectors.rs (2 hunks)
• lib/segment/src/vector_storage/dense/simple_dense_vector_storage.rs (2 hunks)
• lib/segment/src/vector_storage/multi_dense/simple_multi_dense_vector_storage.rs (2 hunks)
• lib/segment/src/vector_storage/raw_scorer.rs (2 hunks)
• lib/segment/src/vector_storage/sparse/simple_sparse_vector_storage.rs (2 hunks)

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

lib/common/common/Cargo.toml (1)

19-19: Adding bitvec dependency looks good.

This new dependency is necessary to support the BitSliceExt trait implementation that will be used throughout the codebase for simplifying bit operations.

lib/segment/src/vector_storage/async_raw_scorer.rs (2)

5-5: Importing the new BitSliceExt trait.

Good addition of the trait import needed for the get_bit method.

---

127-131: Improved deletion checks using get_bit.

This change simplifies the vector deletion checks by using the new get_bit method instead of the more verbose pattern with get, as_deref(), and copied(). The code is now more readable while maintaining the same logic and default behaviors.

lib/segment/src/index/hnsw_index/hnsw.rs (2)

14-14: Importing the new BitSliceExt trait.

Correctly importing the extension trait to enable the get_bit method.

---

549-549: Simplified deletion check in filter condition.

This change improves readability by replacing a chain of method calls with the more direct get_bit method, maintaining the same behavior of checking if a point is deleted in the filter condition.

lib/segment/src/index/field_index/numeric_index/immutable_numeric_index.rs (3)

7-7: Importing the new BitSliceExt trait.

Correctly importing the extension trait to enable the get_bit method.

---

119-119: Simplified deletion check in iterator's next method.

This change improves the readability of the code by replacing the chain of method calls with the more direct get_bit method, maintaining the same behavior for checking if an item is deleted.

---

134-134: Simplified deletion check in iterator's next_back method.

Similar to the change in the next method, this simplifies the deletion check in the next_back method, making the code more readable while preserving the same behavior.

lib/segment/src/vector_storage/dense/simple_dense_vector_storage.rs (2)

9-9: Appropriate trait import for the BitSliceExt extension

The new import uses the underscore pattern (as _) which is ideal for trait extensions that are only used for their methods and not directly referenced elsewhere in the code.

---

287-287: Improved readability with get_bit method

The new get_bit method provides a cleaner way to retrieve a boolean value from a BitSlice compared to the previous approach, which likely required multiple steps with as_deref() and copied(). This change simplifies the code while maintaining the same functionality.

lib/segment/src/segment/formula_rescore.rs (2)

6-6: Appropriate trait import for BitSliceExt extension

Importing the BitSliceExt trait with the underscore pattern allows its methods to be used on BitSlice instances without bringing the trait name into scope.

---

42-44: Streamlined bit checking with get_bit method

This change simplifies the code for checking if a point is marked as deleted in a wrapped segment. The new get_bit method provides a more direct way to retrieve the boolean value compared to the previous implementation, making the code cleaner and easier to understand.

lib/segment/src/id_tracker/immutable_id_tracker.rs (2)

9-9: Appropriate trait import for BitSliceExt extension

The BitSliceExt trait is imported with the underscore pattern, which is the recommended approach for using extension traits without bringing the trait name into scope.

---

118-118: Simplified bit retrieval with get_bit method

The new get_bit method provides a more direct way to check if a point is deleted compared to the previous approach. This change improves code readability while maintaining the same functionality of returning false if the value is not present.

lib/segment/src/vector_storage/dense/mmap_dense_vectors.rs (2)

8-8: Appropriate trait import for BitSliceExt extension

The BitSliceExt trait is imported with the underscore pattern, which is ideal for extension traits that are only used for their methods.

---

185-185: Simplified bit retrieval with get_bit method

The new get_bit method provides a cleaner way to check if a vector is deleted compared to the previous implementation. This change is consistent with the other files in this PR and improves code readability while maintaining the same functionality.

lib/segment/src/vector_storage/raw_scorer.rs (2)

5-5: LGTM: Adding the BitSliceExt import

This import brings in the necessary trait implementation for the get_bit method used later in the file.

---

1066-1070: Good simplification with get_bit

The new implementation using get_bit is cleaner and more direct than the previous approach that likely required mapping and dereferencing. The semantics of the function remain unchanged, with proper handling of default values:

• Default to not deleted if deletion flags failed to grow
• Default to deleted if the point mapping was removed from ID tracker

lib/segment/src/common/mmap_bitslice_buffered_update_wrapper.rs (2)

5-5: LGTM: Adding the BitSliceExt import

This import brings in the necessary trait implementation for the get_bit method used later in the file.

---

47-47: Good simplification with get_bit

Replacing self.bitslice.read().get(index).as_deref().copied() with self.bitslice.read().get_bit(index) makes the code more concise while maintaining the same functionality. This is a cleaner way to retrieve a boolean value from a BitSlice.

lib/segment/src/vector_storage/multi_dense/simple_multi_dense_vector_storage.rs (2)

8-8: LGTM: Adding the BitSliceExt import

This import brings in the necessary trait implementation for the get_bit method used later in the file.

---

426-426: Good simplification with get_bit

Replacing the multi-step approach with a direct get_bit call simplifies the code while maintaining the same behavior. This makes the deletion check more readable and concise.

lib/segment/src/vector_storage/sparse/simple_sparse_vector_storage.rs (2)

7-7: LGTM: Adding the BitSliceExt import

This import brings in the necessary trait implementation for the get_bit method used later in the file.

---

260-260: Good simplification with get_bit

Replacing the multi-step approach with a direct get_bit call simplifies the code while maintaining the same behavior. This makes the deletion check more readable and concise.

lib/segment/src/id_tracker/id_tracker_base.rs (3)

5-5: Good addition of the BitSliceExt trait import

Adding this import allows the use of the new get_bit method throughout the file, which will simplify bit retrieval operations.

---

93-96: Improved code clarity with get_bit

The refactoring of this method using the new get_bit method from BitSliceExt simplifies the code by replacing what was likely a chain of get, as_deref, and copied calls with a single, more intuitive method call. This improves readability while maintaining the same functionality.

---

146-152: Simplified bit retrieval with get_bit

Using the get_bit method here streamlines the bit retrieval from the deleted vector bitslice. The code now directly captures the value and uses a more concise method call, making the logic clearer while preserving the same behavior.

lib/segment/src/index/field_index/bool_index/simple_bool_index.rs (2)

25-25: Added BitSliceExt trait import

This import brings in the new get_bit extension method that will simplify bit retrievals from BitVec instances.

---

96-97: Improved boolean value retrieval with get_bit

The code now uses the more direct get_bit method instead of the previous approach (likely using get followed by map(|v| *v)). This simplifies the code and makes it more readable while maintaining the same functionality.

lib/common/common/src/ext.rs (3)

1-3: Added necessary imports for BitSliceExt

These imports bring in the required bitvec types for the new extension trait being defined.

---

19-23: Well-designed BitSliceExt trait with clear documentation

The new trait is well-documented and provides a clear description of its purpose as a convenience wrapper around BitSlice::get. The method signature clearly indicates it returns an Option<bool> which aligns with the PR objective of simplifying boolean value retrieval.

---

25-30: Concise implementation of get_bit

The implementation elegantly combines as_deref().copied() into a single, reusable method. This abstraction will reduce code duplication and improve readability across the codebase whenever bit values need to be retrieved from a BitSlice.

The implementation correctly handles the conversion from Option<&bool> to Option<bool> by using as_deref().copied(), which is exactly what was needed based on the PR objectives.