From 87b6cb4090ff35274c5be8acfd18db9b633358bc Mon Sep 17 00:00:00 2001 From: ThearchyHelios Date: Wed, 14 Oct 2026 08:35:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9B=AE=E5=BD=95=E9=97=AD?= =?UTF-8?q?=E7=8E=AF=E7=AC=AC=E4=B8=80=E6=AD=A5=EF=BC=88=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=20A=EF=BC=89=EF=BC=9A=E5=AE=BD=E8=A1=A8=E6=94=B6=E5=B0=BE?= =?UTF-8?q?=E9=82=A3=E6=AC=A1=E5=86=99=E4=B8=8D=E8=BF=9B=E5=8E=BB=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=86=99=E8=BF=9B=E7=9B=AE=E5=BD=95=E7=9A=84=E6=AE=B5?= =?UTF-8?q?=E6=95=B0=E7=85=A7=E5=BA=93=E9=87=8C=E9=80=90=E6=AE=B5=E5=86=99?= =?UTF-8?q?=E8=BF=9B=E5=8E=BB=E7=9A=84=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 整张表收尾的写入一直撞上别人刚改过（写入冲突）时，最后一段没进目录：parts_written 不再按引擎写出来的段数虚报，留着逐段写入时记下的数 --- backend/app/data/catalog_jobs.py | 7 +++++-- backend/tests/test_catalog_draft_jobs.py | 23 +++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/backend/app/data/catalog_jobs.py b/backend/app/data/catalog_jobs.py index 555c5256..a721cf58 100644 --- a/backend/app/data/catalog_jobs.py +++ b/backend/app/data/catalog_jobs.py @@ -693,8 +693,11 @@ class _JobRun: if result.version: values["version"] = result.version if outcome is not None: - values.update(parts_done=outcome.parts_done, parts_written=outcome.parts_written, - chunks_total=outcome.chunks_total, chunks_done=outcome.chunks_done) + values.update(parts_done=outcome.parts_done, chunks_total=outcome.chunks_total, + chunks_done=outcome.chunks_done) + if not result.error: + # 收尾写进去了：写出内容的段都在目录里了。没写进去（一直撞上别人刚改过）的照库里逐段写进去的段数 + values["parts_written"] = outcome.parts_written await session.execute(self._task(CatalogDraftTask.table_name == table, CatalogDraftTask.status.in_(_OPEN)) .values(**values)) await session.commit() diff --git a/backend/tests/test_catalog_draft_jobs.py b/backend/tests/test_catalog_draft_jobs.py index d69704b7..29bbee8d 100644 --- a/backend/tests/test_catalog_draft_jobs.py +++ b/backend/tests/test_catalog_draft_jobs.py @@ -1012,3 +1012,26 @@ async def test_a_sync_draft_and_draft_jobs_exclude_each_other(client, monkeypatc after = await client.post(f"{_base(sid)}/draft-jobs", json={"tables": ["gates"]}) assert after.status_code == 202, after.text await finished(after.json()["job"]["id"]) + + +async def test_a_wide_table_whose_closing_write_fails_keeps_the_count_of_parts_on_disk(client, monkeypatch): + """整张表收尾那一次写不进去（一直撞上别人刚改过）：已经逐段写进去的段留着，写进目录的段数照库里的记，不按引擎写出来 + 的段数虚报。""" + monkeypatch.setattr(catalog, "MODEL_CONCURRENCY", 1) # 一段一段来：最后一段只在收尾那次写 + sid = await _source(_wide()) + use(monkeypatch, FakeModel(_wide_reply())) + real = catalog.write_draft + + async def conflicted(session, source, table, modeled=None, *, at, actor): + result = await real(session, source, table, None, at=at, actor=actor) + result.error, result.status = catalog.WRITE_CONFLICT_ERROR, "failed" + result.added = result.updated = result.removed = 0 + return result + + monkeypatch.setattr(catalog, "write_draft", conflicted) + job = (await client.post(f"{_base(sid)}/draft-jobs", json={"tables": ["wide"], "use_model": True})).json()["job"] + await finished(job["id"]) + task = await _task(client, sid, job["id"], "wide") + assert task["status"] == "failed" and task["error"] == catalog.WRITE_CONFLICT_ERROR + assert task["parts_written"] == 3, "最后一段没写进去" + assert len((await client.get(f"{_base(sid)}/wide")).json()["notes"]["columns"]) == 64