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

Jump to bottom

Use new KeyValueCache and friends from @apollo/utils.keyvaluecache #6522

Merged
merged 11 commits into from Jun 7, 2022
Merged

Use new KeyValueCache and friends from @apollo/utils.keyvaluecache #6522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a94eb03
checkpoint
trevor-scheer Jun 1, 2022
7bceb25
Checkpoint - tests passing but flaky
trevor-scheer Jun 3, 2022
c5842a5
Use stub ttl cache, lru-cache is being stubborn with mocked timers
trevor-scheer Jun 3, 2022
73b9f13
cleanup
trevor-scheer Jun 3, 2022
0fdf0be
Restore and update comment
trevor-scheer Jun 3, 2022
8d1d84a
Calculate ttl expiration in a more typical way
trevor-scheer Jun 5, 2022
97dcb80
Use Keyv as default cache, preserve unbounded behavior
trevor-scheer Jun 5, 2022
4b3fd6a
Spell check
trevor-scheer Jun 5, 2022
20a46c5
Implement TTLs using deadlines, easier to grok
trevor-scheer Jun 7, 2022
d9b56cb
Changelog entry
trevor-scheer Jun 7, 2022
713f5cc
Merge branch 'release-3.9.0' into trevor/keyvaluecache-update
trevor-scheer Jun 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .prettierignore
View file
Open in desktop
Expand Up @@ -10,3 +10,5 @@ docs/.cache/

# Don't format generated files!
**/generated/**

.volta
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Expand Up @@ -7,8 +7,11 @@ The version headers in this history reflect the versions of Apollo Server itself
- [`@apollo/gateway`](https://github.com/apollographql/federation/blob/HEAD/gateway-js/CHANGELOG.md)
- [`@apollo/federation`](https://github.com/apollographql/federation/blob/HEAD/federation-js/CHANGELOG.md)


## vNEXT

- Remove internal dependency on `apollo-server-caching`, switch over to `@apollo/utils.keyvaluecache`. This PR specifically also introduces Keyv as an unbounded cache solution, but will replace with our own simple implementation in a follow-up PR targeting this minor version release. [PR #6522](https://github.com/apollographql/apollo-server/pull/6522)

## v3.8.2

- `apollo-server-core`: Fix usage reporting plugin "willResolveField called after stopTiming!" error caused by a race condition related to null bubbling. [Issue #4472](https://github.com/apollographql/apollo-server/issues/4472) [PR #6398](https://github.com/apollographql/apollo-server/pull/6398)
Expand Down Expand Up @@ -92,7 +95,7 @@ The version headers in this history reflect the versions of Apollo Server itself
new ApolloServer({
documentStore: new InMemoryLRUCache<DocumentNode>({
maxSize: Math.pow(2, 20) * approximateDocumentStoreMiB,
sizeCalculator: InMemoryLRUCache.jsonBytesSizeCalculator,
sizeCalculator: InMemoryLRUCache.sizeCalculator,
}),
...moreOptions,
})
Expand Down
2 changes: 2 additions & 0 deletions cspell-dict.txt
View file
Open in desktop
Expand Up @@ -79,6 +79,8 @@ iteratees
josephg
jsdelivr
keyv
keyvadapter
keyvaluecache
KHTML
Kubernetes
linearizability
Expand Down
4 changes: 2 additions & 2 deletions docs/source/api/apollo-server.mdx
View file
Open in desktop
Expand Up @@ -209,12 +209,12 @@ To use `InMemoryLRUCache` but change its size to an amount `approximateDocumentS
<div style="max-width: 400px;">

```typescript
import { InMemoryLRUCache } from 'apollo-server-caching';
import { InMemoryLRUCache } from '@apollo/utils.keyvaluecache';
import type { DocumentNode } from 'graphql';
new ApolloServer({
documentStore: new InMemoryLRUCache<DocumentNode>({
maxSize: Math.pow(2, 20) * approximateDocumentStoreMiB,
sizeCalculator: InMemoryLRUCache.jsonBytesSizeCalculator,
sizeCalculation: InMemoryLRUCache.sizeCalculation,
}),
// ...
})
Expand Down