mirrors/PMTiles
1
0
Fork 0
mirror of https://github.com/protomaps/PMTiles.git synced 2026-02-04 10:51:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename Cache to SharedPromiseCache and make Cache interface

Browse Source
This commit is contained in:
Brandon Liu
2022-10-04 11:07:08 +08:00
parent 93ff392e6f
commit 6d6e931f1d
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
js/v3.test.ts
View File

@@ -11,7 +11,7 @@ import {
tileIdToZxy, tileIdToZxy,
findTile, findTile,
readVarint, readVarint,
Cache, SharedPromiseCache,
BufferPosition, BufferPosition,
Source, Source,
RangeResponse, RangeResponse,
@@ -145,7 +145,7 @@ class TestNodeFileSource implements Source {
// echo '{"type":"Polygon","coordinates":[[[0,0],[0,1],[1,1],[1,0],[0,0]]]}' | ./tippecanoe -zg -o test_fixture_1.pmtiles // echo '{"type":"Polygon","coordinates":[[[0,0],[0,1],[1,1],[1,0],[0,0]]]}' | ./tippecanoe -zg -o test_fixture_1.pmtiles
test("cache getHeader", async (assertion) => { test("cache getHeader", async (assertion) => {
const source = new TestNodeFileSource("test_fixture_1.pmtiles", "1"); const source = new TestNodeFileSource("test_fixture_1.pmtiles", "1");
const cache = new Cache(); const cache = new SharedPromiseCache();
const header = await cache.getHeader(source); const header = await cache.getHeader(source);
assertion.eq(header.rootDirectoryOffset, 122); assertion.eq(header.rootDirectoryOffset, 122);
assertion.eq(header.rootDirectoryLength, 25); assertion.eq(header.rootDirectoryLength, 25);
@@ -172,7 +172,7 @@ test("cache getHeader", async (assertion) => {
test("cache check against empty", async (assertion) => { test("cache check against empty", async (assertion) => {
const source = new TestNodeFileSource("empty.pmtiles", "1"); const source = new TestNodeFileSource("empty.pmtiles", "1");
const cache = new Cache(); const cache = new SharedPromiseCache();
try { try {
await cache.getHeader(source); await cache.getHeader(source);
assertion.fail("Should have thrown"); assertion.fail("Should have thrown");
@@ -183,7 +183,7 @@ test("cache check against empty", async (assertion) => {
test("cache check magic number", async (assertion) => { test("cache check magic number", async (assertion) => {
const source = new TestNodeFileSource("invalid.pmtiles", "1"); const source = new TestNodeFileSource("invalid.pmtiles", "1");
const cache = new Cache(); const cache = new SharedPromiseCache();
try { try {
await cache.getHeader(source); await cache.getHeader(source);
assertion.fail("Should have thrown"); assertion.fail("Should have thrown");
@@ -196,11 +196,11 @@ test("cache check magic number", async (assertion) => {
test("cache getDirectory", async (assertion) => { test("cache getDirectory", async (assertion) => {
const source = new TestNodeFileSource("test_fixture_1.pmtiles", "1"); const source = new TestNodeFileSource("test_fixture_1.pmtiles", "1");
let cache = new Cache(6400, false); let cache = new SharedPromiseCache(6400, false);
let header = await cache.getHeader(source); let header = await cache.getHeader(source);
assertion.eq(cache.cache.size, 1); assertion.eq(cache.cache.size, 1);
cache = new Cache(6400, true); cache = new SharedPromiseCache(6400, true);
header = await cache.getHeader(source); header = await cache.getHeader(source);
// prepopulates the root directory // prepopulates the root directory
@@ -225,7 +225,7 @@ test("cache getDirectory", async (assertion) => {
}); });
test("multiple sources in a single cache", async (assertion) => { test("multiple sources in a single cache", async (assertion) => {
const cache = new Cache(); const cache = new SharedPromiseCache();
const source1 = new TestNodeFileSource("test_fixture_1.pmtiles", "1"); const source1 = new TestNodeFileSource("test_fixture_1.pmtiles", "1");
const source2 = new TestNodeFileSource("test_fixture_1.pmtiles", "2"); const source2 = new TestNodeFileSource("test_fixture_1.pmtiles", "2");
await cache.getHeader(source1); await cache.getHeader(source1);
@@ -235,7 +235,7 @@ test("multiple sources in a single cache", async (assertion) => {
}); });
test("etags are part of key", async (assertion) => { test("etags are part of key", async (assertion) => {
const cache = new Cache(6400, false); const cache = new SharedPromiseCache(6400, false);
const source = new TestNodeFileSource("test_fixture_1.pmtiles", "1"); const source = new TestNodeFileSource("test_fixture_1.pmtiles", "1");
source.etag = "etag_1"; source.etag = "etag_1";
let header = await cache.getHeader(source); let header = await cache.getHeader(source);
@@ -267,7 +267,7 @@ test("etags are part of key", async (assertion) => {
}); });
test("cache pruning by byte size", async (assertion) => { test("cache pruning by byte size", async (assertion) => {
const cache = new Cache(1000, false); const cache = new SharedPromiseCache(1000, false);
cache.cache.set("0", { lastUsed: 0, data: Promise.resolve([]), size: 400 }); cache.cache.set("0", { lastUsed: 0, data: Promise.resolve([]), size: 400 });
cache.cache.set("1", { lastUsed: 1, data: Promise.resolve([]), size: 200 }); cache.cache.set("1", { lastUsed: 1, data: Promise.resolve([]), size: 200 });
cache.cache.set("2", { lastUsed: 2, data: Promise.resolve([]), size: 900 }); cache.cache.set("2", { lastUsed: 2, data: Promise.resolve([]), size: 900 });

15
js/v3.ts
View File

@@ -370,11 +370,22 @@ function deserializeIndex(buffer: ArrayBuffer): Entry[] {
export class VersionMismatch extends Error {} export class VersionMismatch extends Error {}
export interface Cache {
getHeader: (source: Source) => Promise<Header>;
getDirectory: (
source: Source,
offset: number,
length: number,
header: Header
) => Promise<Entry[]>;
invalidate: (source: Source) => void;
}
// a "dumb" bag of bytes. // a "dumb" bag of bytes.
// only caches headers and directories // only caches headers and directories
// deduplicates simultaneous responses // deduplicates simultaneous responses
// (estimates) the maximum size of the cache. // (estimates) the maximum size of the cache.
export class Cache { export class SharedPromiseCache {
cache: Map<string, CacheEntry>; cache: Map<string, CacheEntry>;
sizeBytes: number; sizeBytes: number;
maxSizeBytes: number; maxSizeBytes: number;
@@ -526,7 +537,7 @@ export class PMTiles {
if (cache) { if (cache) {
this.cache = cache; this.cache = cache;
} else { } else {
this.cache = new Cache(); this.cache = new SharedPromiseCache();
} }
} }