Skip to content

Commit

Permalink
refactor(github): Remove unused PR cache functionality (#17606)
Browse files Browse the repository at this point in the history
  • Loading branch information
zharinov committed Sep 4, 2022
1 parent c4127f9 commit b23b886
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 80 deletions.
79 changes: 18 additions & 61 deletions lib/modules/platform/github/api-cache.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { DateTime } from 'luxon';
import { ApiCache } from './api-cache';
import type { ApiPageItem } from './types';

describe('modules/platform/github/api-cache', () => {
const now = DateTime.fromISO('2000-01-01T00:00:00.000+00:00');
Expand Down Expand Up @@ -49,47 +48,9 @@ describe('modules/platform/github/api-cache', () => {
},
});

const res = apiCache.getItems(({ number }) => number);
const res = apiCache.getItems();

expect(res).toEqual([1, 2, 3]);
});

it('caches mapping results', () => {
const item1 = { number: 1, updated_at: t1 };
const item2 = { number: 2, updated_at: t2 };
const item3 = { number: 3, updated_at: t3 };
const apiCache = new ApiCache({
items: {
1: item1,
2: item2,
3: item3,
},
});

let numbersMapCalls = 0;
const mapNumbers = ({ number }: ApiPageItem) => {
numbersMapCalls += 1;
return number;
};

let datesMapCalls = 0;
const mapDates = ({ updated_at }: ApiPageItem) => {
datesMapCalls += 1;
return updated_at;
};

const numbers1 = apiCache.getItems(mapNumbers);
const numbers2 = apiCache.getItems(mapNumbers);
const dates1 = apiCache.getItems(mapDates);
const dates2 = apiCache.getItems(mapDates);

expect(numbers1).toEqual([1, 2, 3]);
expect(numbers1).toBe(numbers2);
expect(numbersMapCalls).toBe(3);

expect(dates1).toEqual([t1, t2, t3]);
expect(dates1).toBe(dates2);
expect(datesMapCalls).toBe(3);
expect(res).toMatchObject([{ number: 1 }, { number: 2 }, { number: 3 }]);
});

it('resets cache on item update', () => {
Expand All @@ -103,18 +64,16 @@ describe('modules/platform/github/api-cache', () => {
},
});

let numbersMapCalls = 0;
const mapNumbers = ({ number }: ApiPageItem) => {
numbersMapCalls += 1;
return number;
};
const numbers1 = apiCache.getItems(mapNumbers);
const numbers1 = apiCache.getItems();
apiCache.updateItem(item3);
const numbers2 = apiCache.getItems(mapNumbers);
const numbers2 = apiCache.getItems();

expect(numbers1).toEqual([1, 2]);
expect(numbers2).toEqual([1, 2, 3]);
expect(numbersMapCalls).toBe(5);
expect(numbers1).toMatchObject([{ number: 1 }, { number: 2 }]);
expect(numbers2).toMatchObject([
{ number: 1 },
{ number: 2 },
{ number: 3 },
]);
});

it('resets cache on page reconcile', () => {
Expand All @@ -128,18 +87,16 @@ describe('modules/platform/github/api-cache', () => {
},
});

let numbersMapCalls = 0;
const mapNumbers = ({ number }: ApiPageItem) => {
numbersMapCalls += 1;
return number;
};
const numbers1 = apiCache.getItems(mapNumbers);
const numbers1 = apiCache.getItems();
apiCache.reconcile([item3]);
const numbers2 = apiCache.getItems(mapNumbers);
const numbers2 = apiCache.getItems();

expect(numbers1).toEqual([1, 2]);
expect(numbers2).toEqual([1, 2, 3]);
expect(numbersMapCalls).toBe(5);
expect(numbers1).toMatchObject([{ number: 1 }, { number: 2 }]);
expect(numbers2).toMatchObject([
{ number: 1 },
{ number: 2 },
{ number: 3 },
]);
});
});

Expand Down
20 changes: 1 addition & 19 deletions lib/modules/platform/github/api-cache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import { DateTime } from 'luxon';
import type { ApiPageCache, ApiPageItem } from './types';

export class ApiCache<T extends ApiPageItem> {
private itemsMapCache = new WeakMap();

constructor(private cache: ApiPageCache<T>) {}

get etag(): string | null {
Expand All @@ -27,21 +25,7 @@ export class ApiCache<T extends ApiPageItem> {
return lastModified ? DateTime.fromISO(lastModified).toHTTP() : null;
}

getItems(): T[];
getItems<U = unknown>(mapFn: (_: T) => U): U[];
getItems<U = unknown>(mapFn?: (_: T) => U): T[] | U[] {
if (mapFn) {
const cachedResult = this.itemsMapCache.get(mapFn);
if (cachedResult) {
return cachedResult;
}

const items = Object.values(this.cache.items);
const mappedResult = items.map(mapFn);
this.itemsMapCache.set(mapFn, mappedResult);
return mappedResult;
}

getItems(): T[] {
const items = Object.values(this.cache.items);
return items;
}
Expand All @@ -58,7 +42,6 @@ export class ApiCache<T extends ApiPageItem> {
*/
updateItem(item: T): void {
this.cache.items[item.number] = item;
this.itemsMapCache = new WeakMap();
}

/**
Expand Down Expand Up @@ -88,7 +71,6 @@ export class ApiCache<T extends ApiPageItem> {

if (!dequal(oldItem, newItem)) {
items[number] = newItem;
this.itemsMapCache = new WeakMap();
}

needNextPage = itemOldTime ? itemOldTime < itemNewTime : true;
Expand Down

0 comments on commit b23b886

Please sign in to comment.