Skip to content

Commit

Permalink
chore: format
Browse files Browse the repository at this point in the history
  • Loading branch information
mabels committed Feb 17, 2025
1 parent e611fc1 commit 1624af9
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion package-use-fireproof.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@fireproof/core": "from-package-json"
},
"peerDependencies": {
"react": ">=18.0.0!"
"react": ">=18.0.0!",
"@fireproof/core": "from-package-json"
},
"devDependencies": {},
Expand Down
4 changes: 2 additions & 2 deletions src/blockstore/loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,9 @@ export class Loader implements Loadable {
this.logger.Error().Err(e).Msg("error getting more readers");
}
this.carLog = [...uniqueCids([meta.cars, ...this.carLog, ...carHeader.cars], this.seenCompacted)];
console.log(">>>>> pre applyMeta", this.ebOpts.applyMeta.toString())
console.log(">>>>> pre applyMeta", this.ebOpts.applyMeta.toString());
await this.ebOpts.applyMeta?.(carHeader.meta);
console.log(">>>>> post applyMeta")
console.log(">>>>> post applyMeta");
} finally {
this.isCompacting = false;
}
Expand Down
38 changes: 19 additions & 19 deletions src/crdt-clock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,57 +101,57 @@ export class CRDTClockImpl {
// throw new Error("missing head");
// }

console.log("int_applyHead:1")
console.log("int_applyHead:1");
const noLoader = !localUpdates;

// console.log("int_applyHead", this.applyHeadQueue.size(), this.head, newHead, prevHead, localUpdates);
const ogHead = sortClockHead(this.head);
console.log("int_applyHead:2")
console.log("int_applyHead:2");
newHead = sortClockHead(newHead);
console.log("int_applyHead:3")
console.log("int_applyHead:3");
if (compareClockHeads(ogHead, newHead)) {
console.log("int_applyHead:4")
console.log("int_applyHead:4");
return;
}
console.log("int_applyHead:5")
console.log("int_applyHead:5");
const ogPrev = sortClockHead(prevHead);
console.log("int_applyHead:6")
console.log("int_applyHead:6");
if (compareClockHeads(ogHead, ogPrev)) {
console.log("int_applyHead:7")
console.log("int_applyHead:7");
this.setHead(newHead);
return;
}

// const noLoader = this.head.length === 1 && !updates?.length
console.log("int_applyHead:8")
console.log("int_applyHead:8");
if (!this.blockstore) {
throw this.logger.Error().Msg("missing blockstore").AsError();
}
console.log("int_applyHead:9")
console.log("int_applyHead:9");
await validateBlocks(this.logger, newHead, this.blockstore);
console.log("int_applyHead:10")
console.log("int_applyHead:10");
if (!this.transaction) {
this.transaction = this.blockstore.openTransaction({ noLoader, add: false });
}
const tblocks = this.transaction;

console.log("int_applyHead:11")
console.log("int_applyHead:11");
const advancedHead = await advanceBlocks(this.logger, newHead, tblocks, this.head);
console.log("int_applyHead:12", tblocks, advancedHead)
console.log("int_applyHead:12", tblocks, advancedHead);
const result = await root(tblocks, advancedHead);
console.log("int_applyHead:12.x", result.additions.length)
console.log("int_applyHead:12.x", result.additions.length);
for (const { cid, bytes } of [
...result.additions,
// ...result.removals
]) {
console.log("int_applyHead:12.y", result.additions.length)
console.log("int_applyHead:12.y", result.additions.length);
tblocks.putSync(cid, bytes);
}
console.log("int_applyHead:12.1")
console.log("int_applyHead:12.1");
if (!noLoader) {
console.log("int_applyHead:13")
console.log("int_applyHead:13");
await this.blockstore.commitTransaction(tblocks, { head: advancedHead }, { add: false, noLoader });
console.log("int_applyHead:14")
console.log("int_applyHead:14");
this.transaction = undefined;
}
this.setHead(advancedHead);
Expand Down Expand Up @@ -180,9 +180,9 @@ function compareClockHeads(head1: ClockHead, head2: ClockHead) {
async function advanceBlocks(logger: Logger, newHead: ClockHead, tblocks: CarTransaction, head: ClockHead) {
for (const cid of newHead) {
try {
console.log("advanceBlocks:1", cid.toString(), newHead.length)
console.log("advanceBlocks:1", cid.toString(), newHead.length);
head = await advance(tblocks, head, cid);
console.log("advanceBlocks:2", cid.toString(), head)
console.log("advanceBlocks:2", cid.toString(), head);
} catch (e) {
logger.Error().Err(e).Msg("failed to advance head");
// console.log('failed to advance head:', cid.toString(), e)
Expand Down

0 comments on commit 1624af9

Please sign in to comment.