Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 17 additions & 34 deletions src/browser/cdp/selectivity/hash-writer.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { memoize } from "lodash";
import path from "node:path";
import lockfile from "proper-lockfile";
import { HashProvider } from "./hash-provider";
import { getSelectivityHashesPath, readHashFileContents, shallowSortObject } from "./utils";
import { writeJsonWithCompression } from "./json-utils";
Expand Down Expand Up @@ -138,44 +137,28 @@ export class HashWriter {
...Object.values(this._stagedPatternHashes),
]);

const releaseLock = await lockfile.lock(this._selectivityHashesPath, {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only removed this line and "releaseLock" usage

stale: 5000,
update: 1000,
retries: { minTimeout: 100, maxTimeout: 1000, retries: 15 },
realpath: false,
});

try {
const existingHashesContent = await readHashFileContents(this._selectivityHashesPath, this._compresion);

const [updatedModules, updatedFiles, updatedPatterns] = await Promise.all([
filterMatchingHashes(stagedModuleNames, this._stagedModuleHashes, existingHashesContent.modules),
filterMatchingHashes(stagedFileNames, this._stagedFileHashes, existingHashesContent.files),
filterMatchingHashes(stagedPatternNames, this._stagedPatternHashes, existingHashesContent.patterns),
]);

if (!updatedFiles.length && !updatedModules.length && !updatedPatterns.length) {
await releaseLock();
return;
}
const existingHashesContent = await readHashFileContents(this._selectivityHashesPath, this._compresion);

await Promise.all([
writeTo(updatedModules, this._stagedModuleHashes, existingHashesContent.modules),
writeTo(updatedFiles, this._stagedFileHashes, existingHashesContent.files),
writeTo(updatedPatterns, this._stagedPatternHashes, existingHashesContent.patterns),
]);
const [updatedModules, updatedFiles, updatedPatterns] = await Promise.all([
filterMatchingHashes(stagedModuleNames, this._stagedModuleHashes, existingHashesContent.modules),
filterMatchingHashes(stagedFileNames, this._stagedFileHashes, existingHashesContent.files),
filterMatchingHashes(stagedPatternNames, this._stagedPatternHashes, existingHashesContent.patterns),
]);

await writeJsonWithCompression(this._selectivityHashesPath, existingHashesContent, this._compresion);
if (!updatedFiles.length && !updatedModules.length && !updatedPatterns.length) {
return;
}

await releaseLock();
await Promise.all([
writeTo(updatedModules, this._stagedModuleHashes, existingHashesContent.modules),
writeTo(updatedFiles, this._stagedFileHashes, existingHashesContent.files),
writeTo(updatedPatterns, this._stagedPatternHashes, existingHashesContent.patterns),
]);

markAsCommited(updatedModules, this._stagedModuleHashes);
markAsCommited(updatedFiles, this._stagedFileHashes);
} catch (err) {
await releaseLock();
await writeJsonWithCompression(this._selectivityHashesPath, existingHashesContent, this._compresion);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • It existed in order to protect "hashes.json" file from writing from multiple concurrent threads (when it was the case)
  • It is HashWriter.commit method
  • Its only used in "updateSelectivityHashes" function
  • "updateSelectivityHashes" is only run in src/testplane.ts in master
  • So, we dont need this lock


throw err;
}
markAsCommited(updatedModules, this._stagedModuleHashes);
markAsCommited(updatedFiles, this._stagedFileHashes);
}
}

Expand Down
Loading