Fence asynchronous import preparation before synchronous publication
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import {validateImportFileRetention,type FileRetirement,type PreviousImportFile} from './import-file-retention.ts';
|
||||
import { validateDuplicateCheckpoint, type DuplicateCheckpoint } from '../canvas-core/duplicate-checkpoint.ts';
|
||||
import type { Change, Id, Json, Result, Target, Point } from '../canvas-core/types.ts';
|
||||
import type { Change, Id, Json, Result, Target, Point, Availability } from '../canvas-core/types.ts';
|
||||
import { selectImportGroups } from './import-groups.ts';
|
||||
import { clone, equal, fault, freeze, validJson } from '../canvas-core/values.ts';
|
||||
|
||||
@@ -104,6 +104,8 @@ export type ImportRunnerPorts={
|
||||
prepare(line:ImportLine,job:ImportJob,reserve:(sourceKey:string)=>Id):ImportUnit;
|
||||
/** Publish all document changes AND next job in the same StateRoot, or publish nothing. */
|
||||
commit(units:readonly ImportUnit[],next:ImportJob,expectedGeneration:number):Result;
|
||||
/** Optional async, read-only preparation; commit remains synchronous and generation-fenced. */
|
||||
beforeCommit?(units:readonly ImportUnit[],job:ImportJob,signal:AbortSignal):Promise<Availability>;
|
||||
persist():Promise<void>;onError(error:unknown):void;
|
||||
/** Host must durably gate every network write on the same document/job cut. */
|
||||
optimisticLocal?:boolean;
|
||||
@@ -144,6 +146,13 @@ export function createImportRunner(ports:ImportRunnerPorts){
|
||||
function commit(units:readonly ImportUnit[],job:ImportJob,value:ImportJob){const start=now(),result=ports.commit(units,value,job.generation),cost=Math.max(.01,(now()-start)/units.length);costPerUnit=costPerUnit===undefined?cost:Math.max(cost,costPerUnit*.8+cost*.2);if(!['applied','rejected'].includes(result?.status)||!equal(current(),result.status==='applied'?value:job))throw fault('invalid_import_commit');return result;}
|
||||
async function pump(signal:AbortSignal){
|
||||
let frame=now(),didWork=false;
|
||||
async function attempt(units:readonly ImportUnit[],job:ImportJob,proposed:ImportJob):Promise<Result|undefined>{
|
||||
let availability:Availability={enabled:true};
|
||||
if(ports.beforeCommit)try{availability=await ports.beforeCommit(units,job,signal);}catch(error){availability={enabled:false,code:(error as {code?:string}).code??'import_preparation_failed',targets:[]};}
|
||||
if(closed||signal.aborted||holds.size||current().generation!==job.generation||current().status!=='running')return;
|
||||
if(!availability.enabled)return{status:'rejected',code:availability.code??'import_preparation_failed',targets:availability.targets??[]};
|
||||
return commit(units,job,proposed);
|
||||
}
|
||||
type ReadResult={kind:'line';line:ImportLine|null}|{kind:'error';error:unknown};
|
||||
let reading:{cursor:number;result:Promise<ReadResult>}|undefined;
|
||||
const decoded=new Map<string,{unit:ImportUnit;digest:string;bytes:number}>();let decodedBytes=0;
|
||||
@@ -181,7 +190,7 @@ export function createImportRunner(ports:ImportRunnerPorts){
|
||||
units.push(value.unit);
|
||||
}
|
||||
let proposed=completed(job,units,job.pending.filter(unit=>!chosen.includes(unit)));
|
||||
let result=commit(units,job,proposed);
|
||||
let result=await attempt(units,job,proposed);if(!result)return;
|
||||
if(result.status==='rejected'){
|
||||
// Reject a reference cycle as a whole; isolate only independent SCCs.
|
||||
const byKey=new Map(units.map(unit=>[unit.key,unit]));
|
||||
@@ -189,7 +198,7 @@ export function createImportRunner(ports:ImportRunnerPorts){
|
||||
job=current();const internal=new Set(group.map(row=>row.key)),members=group.map(row=>byKey.get(row.key)!);
|
||||
if(!members.every(unit=>unit.dependencies.every(key=>internal.has(key)||job.committedSourceKeys.includes(key))))continue;
|
||||
proposed=completed(job,members,job.pending.filter(value=>!internal.has(value.key)));
|
||||
result=commit(members,job,proposed);
|
||||
result=await attempt(members,job,proposed);if(!result)return;
|
||||
if(result.status==='rejected'){const code=result.code;publish(job,{pending:job.pending.filter(value=>!internal.has(value.key)),failures:[...job.failures,...group.map(row=>({key:row.key,cursor:row.cursor,code}))]});}
|
||||
await checkpoint();if(closed||signal.aborted||current().status!=='running')return;
|
||||
if(now()-frame>=budget){await(ports.yieldTask??yieldTask)();frame=now();}
|
||||
|
||||
Reference in New Issue
Block a user