tests/openapi/test_strictmode.py (1)

2131-2244: Complete validation of multitenant payload index with strict mode fullscans.

This comprehensive test covers the core functionality of this PR by validating that:

1. Filtered queries work initially with disabled HNSW indexes
2. Enabling strict mode prevents filtered queries when both vector and payload HNSW are disabled
3. Adding standard or multitenant payload indexes alone doesn't allow queries in strict mode
4. Enabling HNSW payload-based indexing (payload_m=1) allows filtered queries to succeed

The test thoroughly verifies all combinations, ensuring the feature works as expected.

Consider adding a few inline comments explaining the key test stages, especially for the multitenant payload index verification steps, to make the test's logic more immediately clear to future readers.

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

lib/collection/src/operations/verification/query.rs (3)

73-77: Consider adding a comment explaining the .flatten() operation

The .flatten() method is used to simplify the nested Option structure that results from the vector configuration. While the code is correct, adding a clarifying comment would help explain the double-option unwrapping pattern you're using.

 let vector_hnsw_m = vector_hnsw_config
     .map(|hnsw_config| hnsw_config.m)
-    .flatten()
+    .flatten() // Flatten nested Option from hnsw_config.m
     .unwrap_or(config.hnsw_config.m);

---

78-81: Consider adding a comment to explain the fallback logic for payload_m

The fallback logic for vector_hnsw_payload_m is intuitive but somewhat complex. Adding a comment would help future maintainers understand why we fall back to vector_hnsw_m if the payload-specific setting isn't found.

 let vector_hnsw_payload_m = vector_hnsw_config
     .map(|hnsw_config| hnsw_config.payload_m)
     .flatten()
-    .unwrap_or(config.hnsw_config.payload_m.unwrap_or(vector_hnsw_m));
+    .unwrap_or(config.hnsw_config.payload_m.unwrap_or(vector_hnsw_m)); // Fall back to global payload_m or vector_hnsw_m

---

116-124: Fix comment on line 117

The comment on line 117 states "HNSW disabled AND no filters" which is incorrect at this point in the code. By the time we reach this check, we've already confirmed that a multitenant filter exists (passed the check on line 106).

 if vector_hnsw_payload_m == 0 {
-    // HNSW disabled AND no filters
+    // HNSW disabled even with multitenant filter present
     return Err(CollectionError::strict_mode(
         format!(
             "Request is forbidden{vector_error_label} because vector indexing is disabled (hnsw_config.m = 0 and hnsw_config.payload_m = 0)"
         ),
         "Enable vector indexing, use a prefetch query with indexed vectors or enable strict mode `search_allow_exact` option",
     ));
 }

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

tests/openapi/test_strictmode.py (2)

2237-2260: Consider adding descriptive comments for test sections

While the test is well-structured, adding comments that explain the purpose of each section would improve readability and make it easier for future developers to understand the test's intent.

 def test_strict_mode_multitenant_full_scan(full_collection_name):
     collection_name = full_collection_name
 
+    # Helper function that performs a filtered query using city=Berlin
     def filtered_query():
         return request_with_validation(
             api='/collections/{collection_name}/points/query',
             method="POST",
             path_params={'collection_name': collection_name},
             body={
                 "query": 2,
                 "filter": {
                     "must": [
                         {
                             "key": "city",
                             "match": {
                                 "value": "Berlin"
                             }
                         }
                     ]
                 },
                 "using": "dense-multi",
                 "limit": 5
             }
         )

---

2310-2324: Consider verifying the index state after configuration

Adding assertions to verify that the multitenant payload index was successfully created would make the test more robust against potential configuration failures.

     # add multitenant payload index
-    request_with_validation(
+    response = request_with_validation(
         api='/collections/{collection_name}/index',
         method="PUT",
         path_params={'collection_name': collection_name},
         query_params={'wait': 'true'},
         body={
             "field_name": "city",
             "field_schema": {
                 "type": "keyword",
                 "is_tenant": True,
             }
         }
-    ).raise_for_status()
+    )
+    assert response.ok
+    
+    # Verify the index was created with multitenant flag
+    indices_response = request_with_validation(
+        api='/collections/{collection_name}/indexes',
+        method="GET",
+        path_params={'collection_name': collection_name},
+    )
+    assert indices_response.ok
+    city_index = next((idx for idx in indices_response.json()['result'] if idx['field_name'] == 'city'), None)
+    assert city_index is not None
+    assert city_index['options'].get('is_tenant', False) is True

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