Modify the test to test all the sort branches and fix the untested branch

crates/meilisearch/tests/documents/get_documents.rs

@@ -1347,21 +1347,17 @@ async fn test_fetch_documents_pagination_with_sorting() {
     let (task, _code) = index.create(None).await;
     server.wait_task(task.uid()).await.succeeded();
 
-    // Add documents as described in the bug report
+    // Set name as sortable attribute
-    let documents = json!([
+    let (task, code) = index.update_settings_sortable_attributes(json!(["name"])).await;
-        {"id": 1, "name": "a"},
-        {"id": 2, "name": "b"},
-        {"id": 3, "name": "c"},
-        {"id": 4, "name": "d"},
-        {"id": 5, "name": "e"},
-        {"id": 6, "name": "f"}
-    ]);
-    let (task, code) = index.add_documents(documents, None).await;
     assert_eq!(code, 202);
     server.wait_task(task.uid()).await.succeeded();
 
-    // Set name as sortable attribute
+    let documents = json!((0..50)
-    let (task, code) = index.update_settings_sortable_attributes(json!(["name"])).await;
+        .map(|i| json!({"id": i, "name": format!("doc_{:05}", std::cmp::min(i, 5))}))
+        .collect::<Vec<_>>());
+
+    // Add documents as described in the bug report
+    let (task, code) = index.add_documents(documents, None).await;
     assert_eq!(code, 202);
     server.wait_task(task.uid()).await.succeeded();
 
@@ -1375,18 +1371,18 @@ async fn test_fetch_documents_pagination_with_sorting() {
         .await;
     assert_eq!(code, 200);
     let results = response["results"].as_array().unwrap();
-    snapshot!(json_string!(results), @r#"
+    snapshot!(json_string!(results), @r###"
     [
       {
-        "id": 1,
+        "id": 0,
-        "name": "a"
+        "name": "doc_00000"
       },
       {
-        "id": 2,
+        "id": 1,
-        "name": "b"
+        "name": "doc_00001"
       }
     ]
-    "#);
+    "###);
 
     // Request 2 (second page): offset 2, limit 2
     let (response, code) = index
@@ -1401,12 +1397,12 @@ async fn test_fetch_documents_pagination_with_sorting() {
     snapshot!(json_string!(results), @r###"
     [
       {
-        "id": 3,
+        "id": 2,
-        "name": "c"
+        "name": "doc_00002"
       },
       {
-        "id": 4,
+        "id": 3,
-        "name": "d"
+        "name": "doc_00003"
       }
     ]
     "###);
@@ -1421,16 +1417,39 @@ async fn test_fetch_documents_pagination_with_sorting() {
         .await;
     assert_eq!(code, 200);
     let results = response["results"].as_array().unwrap();
-    snapshot!(json_string!(results), @r#"
+    snapshot!(json_string!(results), @r###"
     [
       {
-        "id": 5,
+        "id": 4,
-        "name": "e"
+        "name": "doc_00004"
       },
       {
-        "id": 6,
+        "id": 5,
-        "name": "f"
+        "name": "doc_00005"
       }
     ]
-    "#);
+    "###);
+
+    // Request 4 (fourth page): offset 6, limit 2
+    let (response, code) = index
+        .fetch_documents(json!({
+            "offset": 6,
+            "limit": 2,
+            "sort": ["name:asc"]
+        }))
+        .await;
+    assert_eq!(code, 200);
+    let results = response["results"].as_array().unwrap();
+    snapshot!(json_string!(results), @r###"
+    [
+      {
+        "id": 6,
+        "name": "doc_00005"
+      },
+      {
+        "id": 7,
+        "name": "doc_00005"
+      }
+    ]
+    "###);
 }

crates/milli/src/documents/sort.rs

@@ -108,7 +108,7 @@ impl Iterator for SortedDocumentsIterator<'_> {
                 continue;
             } else {
                 // The current iterator is large enough, so we can forward the call to it.
-                return inner.nth(to_skip + 1);
+                return inner.nth(to_skip);
             }
         }