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

Changes from 1 commit
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
18 changes: 12 additions & 6 deletions packages/apollo-server-integration-testsuite/src/ApolloServer.ts
View file
Open in desktop
Expand Up @@ -2267,16 +2267,20 @@ export function testApolloServer<AS extends ApolloServerBase>(

it('basic caching', async () => {
class TTLTestingCache implements KeyValueCache<string> {
private fakeTime = 0;
constructor(
private cache: Map<
string,
{ value: string; ttl: number | null }
{ value: string; ttl: number | null; fakeTimeOnSet: number }
trevor-scheer marked this conversation as resolved.
Show resolved Hide resolved
> = new Map(),
) {}

async get(key: string) {
const entry = this.cache.get(key);
if (entry?.ttl && entry.ttl <= 0) {
if (
entry?.ttl &&
entry.ttl <= this.fakeTime - entry.fakeTimeOnSet
) {
await this.delete(key);
return undefined;
}
Expand All @@ -2288,17 +2292,19 @@ export function testApolloServer<AS extends ApolloServerBase>(
value: string,
{ ttl }: { ttl: number | null } = { ttl: null },
) {
this.cache.set(key, { value, ttl: ttl ? ttl * 1000 : null });
this.cache.set(key, {
value,
ttl: ttl ? ttl * 1000 : null,
fakeTimeOnSet: this.fakeTime,
});
}

async delete(key: string) {
this.cache.delete(key);
}

advanceTime(ms: number) {
[...this.cache.values()].forEach(
(value) => value.ttl && (value.ttl -= ms),
);
this.fakeTime += ms;
}
}
const typeDefs = gql`
Expand Down