Skip to content

cache: more efficient pruning #4139

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

Closed
ronag wants to merge 1 commit into from
Closed

cache: more efficient pruning #4139

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
70 changes: 22 additions & 48 deletions lib/cache/sqlite-cache-store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,13 @@ module.exports = class SqliteCacheStore {
*/
#deleteByUrlQuery

/**
* @type {import('node:sqlite').StatementSync}
*/
#countEntriesQuery

/**
* @type {import('node:sqlite').StatementSync | null}
*/
#deleteOldValuesQuery

#pruneInterval

/**
* @param {import('../../types/cache-interceptor.d.ts').default.SqliteCacheStoreOpts | undefined} opts
*/
Expand Down Expand Up @@ -196,10 +193,6 @@ module.exports = class SqliteCacheStore {
`DELETE FROM cacheInterceptorV${VERSION} WHERE url = ?`
)

this.#countEntriesQuery = this.#db.prepare(
`SELECT COUNT(*) AS total FROM cacheInterceptorV${VERSION}`
)

this.#deleteExpiredValuesQuery = this.#db.prepare(
`DELETE FROM cacheInterceptorV${VERSION} WHERE deleteAt <= ?`
)
Expand All @@ -213,12 +206,17 @@ module.exports = class SqliteCacheStore {
id
FROM cacheInterceptorV${VERSION}
ORDER BY cachedAt DESC
LIMIT ?
OFFSET ${this.#maxCount}
Copy link
Copy Markdown
Member Author

@ronag ronag Apr 2, 2025

Choose a reason for hiding this comment

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

This is also problematic...

)
`)

this.#pruneInterval = setInterval(() => {
this.#prune()
}, 10e3)
}

close () {
clearInterval(this.#pruneInterval)
this.#db.close()
}

Expand All @@ -232,7 +230,7 @@ module.exports = class SqliteCacheStore {
const value = this.#findValue(key)
return value
? {
body: value.body ? Buffer.from(value.body.buffer, value.body.byteOffset, value.body.byteLength) : undefined,
body: value.body ? Buffer.from(value.body.buffer) : undefined,
statusCode: value.statusCode,
statusMessage: value.statusMessage,
headers: value.headers ? JSON.parse(value.headers) : undefined,
Expand Down Expand Up @@ -279,7 +277,6 @@ module.exports = class SqliteCacheStore {
existingValue.id
)
} else {
this.#prune()
// New response, let's insert it
this.#insertValueQuery.run(
url,
Expand Down Expand Up @@ -346,36 +343,12 @@ module.exports = class SqliteCacheStore {
}

#prune () {
if (this.size <= this.#maxCount) {
return 0
}

{
const removed = this.#deleteExpiredValuesQuery.run(Date.now()).changes
if (removed) {
return removed
}
}

{
const removed = this.#deleteOldValuesQuery?.run(Math.max(Math.floor(this.#maxCount * 0.1), 1)).changes
if (removed) {
return removed
}
}
this.#deleteExpiredValuesQuery.run(Date.now())
this.#deleteOldValuesQuery?.run()

return 0
}

/**
* Counts the number of rows in the cache
* @returns {Number}
*/
get size () {
const { total } = this.#countEntriesQuery.get()
return total
}

/**
* @param {import('../../types/cache-interceptor.d.ts').default.CacheKey} key
* @returns {string}
Expand Down Expand Up @@ -411,6 +384,10 @@ module.exports = class SqliteCacheStore {
let matches = true

if (value.vary) {
if (!headers) {
return undefined
}

const vary = JSON.parse(value.vary)

for (const header in vary) {
Expand All @@ -436,21 +413,18 @@ module.exports = class SqliteCacheStore {
* @returns {boolean}
*/
function headerValueEquals (lhs, rhs) {
if (lhs == null && rhs == null) {
return true
}

if ((lhs == null && rhs != null) ||
(lhs != null && rhs == null)) {
return false
}

if (Array.isArray(lhs) && Array.isArray(rhs)) {
if (lhs.length !== rhs.length) {
return false
}

return lhs.every((x, i) => x === rhs[i])
for (let i = 0; i < lhs.length; i++) {
if (rhs.includes(lhs[i])) {
return false
}
}

return true
}

return lhs === rhs
Expand Down
Loading