fix(messages): 聊天记录大对话超时——DESC首屏+keyset游标+群聊直达索引

用户报:聊天记录多时「聊天记录加载失败：请求失败 (ECONNABORTED)」(2026-09-07)。服务器 EXPLAIN ANALYZE 实测两级根因: - 单聊 1 万条:ASC 末页 OFFSET 10486 逐条回表 2515ms(DESC LIMIT 15ms,167 倍); - 群聊 16,290 条:查询刻意不带 owner(chat_group 去重后 owner 错位),现有 (channel,owner,room,timestamp) 索引被 owner 挡住,退化到 room 单列索引+ filter+filesort——count 4.7s/首页 5.1s/末页 10.7s;真凶群 53132846289@chatroom 40,863 条,三段串行 ~40s 必撞前端 axios 15s 超时。修法(不动共享 MySQL 配置,沿用既往修复模式): 1. 迁移 e6f7a8b9c0d1:message 补 (channel, room_id, timestamp) 索引,群查询 seek+排序直达+覆盖 count;模型侧双声明防 autogenerate 反 DROP。 2. /api/messages 加 order=asc|desc(默认 asc 不变)与 before_ts/before_id keyset 游标(成对,单传 422)——排序列 (timestamp,msg_id) 全序,平手按 msg_id 决胜,游标页恒 O(page_size)。 3. 前端 ChatMain/ChatTimeline 首屏改「order=desc 取最新 50 反转」单请求 (原 page1 拿 total+深 OFFSET 末页两请求),「加载更多」改游标上翻; hasMoreOlder=已加载<总数。SessionPane 搜索等 order=asc 默认路径不受影响。本地实测(37,532 条群):desc 首页 0.39s、游标上翻 0.24s,浏览器真机渲染+上翻 150 条无错。测试 8 增(desc/游标/平手边界/422/窗口叠加/ 前端流程不变式),全量 601 绿。 Co-Authored-By: Claude Code <noreply@anthropic.com>
2026-09-07 16:59:04 +08:00
parent 085a9b4fd3
commit 9d3cc8e76e
7 changed files with 348 additions and 77 deletions
@@ -476,3 +476,162 @@ async def test_msg_type_and_q_combine(make_client):
    assert r.status_code == 200
    body = r.json()
    assert [it["msg_id"] for it in body["items"]] == ["ty_transfer"]
+
+
+# ---------------------------------------------------------------------------
+# order=desc + before_ts/before_id 游标(2026-09-07 深分页超时修复:
+# 大对话 ASC 末页 OFFSET 数万行逐条回表 2.5s+,群聊 filesoort 10s+ 撞前端
+# 15s 超时 ECONNABORTED。DESC 首页+游标上翻每页恒 O(page_size))
+# ---------------------------------------------------------------------------
+
+
+async def _seed_desc(session: AsyncSession) -> None:
+    """t_a 会话 5 条,含两组同 timestamp 平手——验证 (timestamp, msg_id) 全序。
+
+    ASC 全序 = a1,a2,a3,a4,a5;DESC 全序 = a5,a4,a3,a2,a1。
+    """
+    rows = [("a1", 1000), ("a2", 1000), ("a3", 2000), ("a4", 3000), ("a5", 3000)]
+    session.add_all(
+        [
+            Message(
+                msg_id=mid,
+                channel="wechat",
+                owner_account_id="wx_owner_1",
+                talker_id="t_a",
+                type="text",
+                type_raw=1,
+                is_send=True,
+                timestamp=ts,
+            )
+            for mid, ts in rows
+        ]
+    )
+    await session.commit()
+
+
+async def test_order_desc_returns_newest_first(make_client):
+    """order=desc → 按 (timestamp, msg_id) 降序,平手时 msg_id 大者在前。"""
+    client = await make_client(_seed_desc)
+    r = await client.get(
+        "/api/messages", params={"talker_id": "t_a", "order": "desc"}
+    )
+    assert r.status_code == 200
+    body = r.json()
+    assert body["total"] == 5
+    assert [it["msg_id"] for it in body["items"]] == ["a5", "a4", "a3", "a2", "a1"]
+
+
+async def test_order_desc_pagination_from_newest(make_client):
+    """desc 的 page 从最新端数:page1=最新 slice(前端首屏即此页)。"""
+    client = await make_client(_seed_desc)
+    r1 = await client.get(
+        "/api/messages",
+        params={"talker_id": "t_a", "order": "desc", "page": 1, "page_size": 2},
+    )
+    assert [it["msg_id"] for it in r1.json()["items"]] == ["a5", "a4"]
+    r2 = await client.get(
+        "/api/messages",
+        params={"talker_id": "t_a", "order": "desc", "page": 2, "page_size": 2},
+    )
+    assert [it["msg_id"] for it in r2.json()["items"]] == ["a3", "a2"]
+
+
+async def test_order_invalid_rejected_422(make_client):
+    client = await make_client(_seed_desc)
+    r = await client.get("/api/messages", params={"order": "bogus"})
+    assert r.status_code == 422
+
+
+async def test_before_cursor_returns_preceding_slice(make_client):
+    """before=(3000,a4) → 严格早于该游标的消息按 desc 取,平手边界不含游标本行。"""
+    client = await make_client(_seed_desc)
+    r = await client.get(
+        "/api/messages",
+        params={
+            "talker_id": "t_a",
+            "order": "desc",
+            "page_size": 2,
+            "before_ts": 3000,
+            "before_id": "a4",
+        },
+    )
+    assert r.status_code == 200
+    body = r.json()
+    # 游标后剩余 a1/a2/a3;desc 前 2 条
+    assert [it["msg_id"] for it in body["items"]] == ["a3", "a2"]
+    assert body["total"] == 3
+
+
+async def test_before_cursor_tie_boundary_exclusive(make_client):
+    """before=(3000,a5):同 ts=3000 的 a4 因 msg_id<a5 仍在界内。"""
+    client = await make_client(_seed_desc)
+    r = await client.get(
+        "/api/messages",
+        params={"talker_id": "t_a", "order": "desc", "before_ts": 3000, "before_id": "a5"},
+    )
+    body = r.json()
+    assert [it["msg_id"] for it in body["items"]] == ["a4", "a3", "a2", "a1"]
+    assert body["total"] == 4
+
+
+async def test_before_requires_both_params_422(make_client):
+    """游标两参必须成对:单传任一 422,防止静默忽略半个游标查错页。"""
+    client = await make_client(_seed_desc)
+    r1 = await client.get("/api/messages", params={"before_ts": 3000})
+    assert r1.status_code == 422
+    r2 = await client.get("/api/messages", params={"before_id": "a5"})
+    assert r2.status_code == 422
+
+
+async def test_before_cursor_with_window_filter(make_client):
+    """游标与 start/end 过滤叠加(loadOlder 带日期窗场景)。"""
+    client = await make_client(_seed_desc)
+    r = await client.get(
+        "/api/messages",
+        params={"talker_id": "t_a", "order": "desc", "start": 1500},
+    )
+    assert [it["msg_id"] for it in r.json()["items"]] == ["a5", "a4", "a3"]
+    r2 = await client.get(
+        "/api/messages",
+        params={
+            "talker_id": "t_a",
+            "order": "desc",
+            "start": 1500,
+            "before_ts": 2000,
+            "before_id": "a3",
+        },
+    )
+    body = r2.json()
+    assert body["items"] == []
+    assert body["total"] == 0
+
+
+async def test_load_older_flow_reproduces_full_asc_order(make_client):
+    """前端新流程端到端不变式:desc 首页反转 + 逐游标上翻反转,拼接 = 全量 ASC。
+
+    这正是 ChatMain/ChatTimeline 的首屏+「加载更多」序列——顺序若与旧
+    ASC 分页不一致,时间线就会错乱。
+    """
+    client = await make_client(_seed_desc)
+    page_size = 2
+
+    async def fetch(**extra):
+        r = await client.get(
+            "/api/messages",
+            params={"talker_id": "t_a", "order": "desc", "page_size": page_size, **extra},
+        )
+        assert r.status_code == 200
+        return r.json()
+
+    displayed: list[str] = []
+    body = await fetch()
+    # 会话总数以首屏(无游标)响应为准;游标响应的 total 是「游标后剩余数」
+    conv_total = body["total"]
+    displayed = [it["msg_id"] for it in body["items"][::-1]]
+    while len(displayed) < conv_total:
+        oldest = body["items"][-1]
+        body = await fetch(before_ts=oldest["timestamp"], before_id=oldest["msg_id"])
+        assert body["items"], "游标还未走完 total 就断了"
+        displayed = [it["msg_id"] for it in body["items"][::-1]] + displayed
+
+    assert displayed == ["a1", "a2", "a3", "a4", "a5"]