lib/shard/src/update.rs (1)

294-298: Include op_num in debug assertion for faster forensics

Adding the operation number helps correlate with WAL/logs when this ever fires.

-    debug_assert!(
-        segment.has_point(point_id),
-        "the point {point_id} should be present immediately after the upsert"
-    );
+    debug_assert!(
+        segment.has_point(point_id),
+        "point {point_id} should exist right after upsert, op={op_num}"
+    );

lib/collection/tests/integration/continuous_snapshot_test.rs (3)

151-169: Strengthen retrieval check by asserting the returned ID

This guards against accidental duplicates/mismatches during the snapshot window.

-                for i in 0..points_count {
-                    let retrieve_point = PointRequestInternal {
-                        ids: vec![i.into()],
+                for i in 0..points_count {
+                    let expected_id = i.into();
+                    let retrieve_point = PointRequestInternal {
+                        ids: vec![expected_id],
                         with_payload: None,
                         with_vector: WithVector::Bool(false),
                     };
                     let hw_counter = HwMeasurementAcc::disposable();
                     let retrieve_result = collection
                         .retrieve(
                             retrieve_point,
                             None,
                             &ShardSelectorInternal::All,
                             None,
                             hw_counter,
                         )
                         .await?;
                     assert_eq!(retrieve_result.len(), 1);
+                    assert_eq!(retrieve_result[0].id, expected_id);
                 }

---

171-194: Optional: Validate payload persistence

After SetPayload, consider retrieving the same point once (with payload requested) and asserting the fields to catch regressions end-to-end.

---

12-16: Imports look good; minor style note

If you prefer stricter explicitness, you can replace i.into() in this test with PointIdType::from(i) and extend the import to include PointIdType. Pure style; no functional change.

Also applies to: 24-27

lib/shard/src/segment_holder/mod.rs (2)

1002-1015: Make the “keep one proxy” guard more self-explanatory

A tiny readability tweak clarifies intent and avoids mental math during reviews.

-            let remaining = proxies.len() - unproxied_segment_ids.len();
-            if remaining > 1 {
+            let is_last_proxy = unproxied_segment_ids.len() + 1 == proxies.len();
+            // Keep at least one proxy alive until the final unproxy pass.
+            if !is_last_proxy {
                 match Self::try_unproxy_segment(segments_lock, *segment_id, proxy_segment.clone()) {
                     Ok(lock) => {
                         segments_lock = lock;
                         unproxied_segment_ids.push(*segment_id);
                     }
                     Err(lock) => segments_lock = lock,
                 }
             }

---

1017-1017: Avoid O(n²) retain by using a set

For many segments, this reduces retain’s per-check cost.

-proxies.retain(|(id, _)| !unproxied_segment_ids.contains(id));
+let removed: HashSet<_> = unproxied_segment_ids.iter().copied().collect();
+proxies.retain(|(id, _)| !removed.contains(id));

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

Learnt from: generall
PR: qdrant/qdrant#7006
File: lib/collection/src/operations/verification/update.rs:158-174
Timestamp: 2025-08-10T18:30:02.986Z
Learning: In Qdrant's strict mode verification code (lib/collection/src/operations/verification/update.rs), exhaustive pattern matching without `..` is intentionally used for structs like PointsBatch and PointsList. This design pattern ensures compilation fails when new fields are added, forcing developers to explicitly consider how new fields should be handled in the indexed_filter_write method. This provides visibility and compile-time safety for struct evolution.