Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(gatsby): use lmdb for resultHash cache so shared across workers #34925

Merged
merged 10 commits into from
Mar 11, 2022
Merged

fix(gatsby): use lmdb for resultHash cache so shared across workers #34925

Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4ea379e
use lmdb for resultHash cache so shared across workers
KyleAMathews Oct 26, 2021
553235a
Clear lmdb before workers start processes queries
imjoshin Feb 24, 2022
2456be7
Pull db name into const
imjoshin Feb 24, 2022
e223d80
Merge branch 'master' into lmdb-resulthash-cache
imjoshin Mar 7, 2022
bcb0f37
Undo reset changes, as it's not actually needed
imjoshin Mar 8, 2022
b107769
Undo accidental e2e change
imjoshin Mar 8, 2022
4a9d9b5
Add to pagepaths if component path/id was modified
imjoshin Mar 9, 2022
146ac20
Update snapshots
imjoshin Mar 9, 2022
1a65568
Move lmdb creation into function
imjoshin Mar 10, 2022
cc30e3e
require -> import
pieh Mar 11, 2022
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
10 changes: 7 additions & 3 deletions packages/gatsby/src/query/query-runner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ import { GraphQLRunner } from "./graphql-runner"
import { IExecutionResult, PageContext } from "./types"
import { pageDataExists, savePageQueryResult } from "../utils/page-data"

const resultHashes = new Map()
const GatsbyCacheLmdbImpl = require(`../utils/cache-lmdb`).default
pieh marked this conversation as resolved.
Show resolved Hide resolved
const resultHashCache = new GatsbyCacheLmdbImpl({
name: `query-result-hashes`,
encoding: `string`,
}).init()
pieh marked this conversation as resolved.
Show resolved Hide resolved

export interface IQueryJob {
id: string
Expand Down Expand Up @@ -172,11 +176,11 @@ export async function queryRunner(
.digest(`base64`)

if (
resultHash !== resultHashes.get(queryJob.id) ||
resultHash !== (await resultHashCache.get(queryJob.id)) ||
(queryJob.isPage &&
!pageDataExists(path.join(program.directory, `public`), queryJob.id))
) {
resultHashes.set(queryJob.id, resultHash)
resultHashCache.set(queryJob.id, resultHash)
pieh marked this conversation as resolved.
Show resolved Hide resolved

if (queryJob.isPage) {
// We need to save this temporarily in cache because
Expand Down