@atlaspack/cache 3.0.2-canary.2 → 3.0.2-canary.4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaspack/cache
 
+## 3.1.0
+
+### Minor Changes
+
+- [#525](https://github.com/atlassian-labs/atlaspack/pull/525) [`cb9da16`](https://github.com/atlassian-labs/atlaspack/commit/cb9da16fb2648e7f53c64df0313f60d5fb8970cc) Thanks [@yamadapc](https://github.com/yamadapc)! - Fix issues with large blob cache writes, run cache writes in a write transaction
+
+### Patch Changes
+
+- Updated dependencies [[`1a2c14c`](https://github.com/atlassian-labs/atlaspack/commit/1a2c14c3cd4587551cc12e94d0680c8b71ea12bf), [`cb9da16`](https://github.com/atlassian-labs/atlaspack/commit/cb9da16fb2648e7f53c64df0313f60d5fb8970cc)]:
+  - @atlaspack/rust@3.2.0
+  - @atlaspack/fs@2.14.4
+  - @atlaspack/logger@2.14.4
+  - @atlaspack/utils@2.14.4
+
 ## 3.0.1
 
 ### Patch Changes

package/lib/LMDBLiteCache.js

@@ -12,6 +12,13 @@ function _buildCache() {
   };
   return data;
 }
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 function _rust() {
   const data = require("@atlaspack/rust");
   _rust = function () {
@@ -60,6 +67,12 @@ class LmdbWrapper {
       this.lmdb.close();
     };
   }
+  has(key) {
+    return this.lmdb.hasSync(key);
+  }
+  async delete(key) {
+    await this.lmdb.delete(key);
+  }
   get(key) {
     return this.lmdb.getSync(key);
   }
@@ -99,7 +112,9 @@ class LMDBLiteCache {
     return this.store.lmdb;
   }
   async ensure() {
-    await this.fsCache.ensure();
+    if (!(0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
+      await this.fsCache.ensure();
+    }
     return Promise.resolve();
   }
   serialize() {
@@ -111,7 +126,7 @@ class LMDBLiteCache {
     return new LMDBLiteCache(cache.dir);
   }
   has(key) {
-    return Promise.resolve(this.store.get(key) != null);
+    return Promise.resolve(this.store.has(key));
   }
   get(key) {
     let data = this.store.get(key);
@@ -151,20 +166,40 @@ class LMDBLiteCache {
     return _path().default.join(this.dir, `${key}-${index}`);
   }
   hasLargeBlob(key) {
-    return this.fs.exists(this.#getFilePath(key, 0));
+    if (!(0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
+      return this.fsCache.hasLargeBlob(key);
+    }
+    return this.has(key);
   }
 
-  // eslint-disable-next-line require-await
-  async getLargeBlob(key) {
-    return this.fsCache.getLargeBlob(key);
+  /**
+   * @deprecated Use getBlob instead.
+   */
+  getLargeBlob(key) {
+    if (!(0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
+      return this.fsCache.getLargeBlob(key);
+    }
+    return Promise.resolve(this.getBlobSync(key));
   }
 
-  // eslint-disable-next-line require-await
-  async setLargeBlob(key, contents, options) {
-    return this.fsCache.setLargeBlob(key, contents, options);
+  /**
+   * @deprecated Use setBlob instead.
+   */
+  setLargeBlob(key, contents, options) {
+    if (!(0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
+      return this.fsCache.setLargeBlob(key, contents, options);
+    }
+    return this.setBlob(key, contents);
   }
+
+  /**
+   * @deprecated Use store.delete instead.
+   */
   deleteLargeBlob(key) {
-    return this.fsCache.deleteLargeBlob(key);
+    if (!(0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
+      return this.fsCache.deleteLargeBlob(key);
+    }
+    return this.store.delete(key);
   }
   refresh() {
     // Reset the read transaction for the store. This guarantees that

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@atlaspack/cache",
   "description": "Interface for defining caches and file-system, IDB and LMDB implementations.",
-  "version": "3.0.2-canary.2+1a2c14c3c",
+  "version": "3.0.2-canary.4+9dee30885",
   "license": "(MIT OR Apache-2.0)",
   "type": "commonjs",
   "publishConfig": {
@@ -23,11 +23,12 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.3-canary.65+1a2c14c3c",
-    "@atlaspack/fs": "2.14.4-canary.2+1a2c14c3c",
-    "@atlaspack/logger": "2.14.4-canary.2+1a2c14c3c",
-    "@atlaspack/rust": "3.1.2-canary.2+1a2c14c3c",
-    "@atlaspack/utils": "2.14.4-canary.2+1a2c14c3c"
+    "@atlaspack/build-cache": "2.13.3-canary.67+9dee30885",
+    "@atlaspack/feature-flags": "2.14.1-canary.67+9dee30885",
+    "@atlaspack/fs": "2.14.4-canary.4+9dee30885",
+    "@atlaspack/logger": "2.14.4-canary.4+9dee30885",
+    "@atlaspack/rust": "3.1.2-canary.4+9dee30885",
+    "@atlaspack/utils": "2.14.4-canary.4+9dee30885"
   },
   "devDependencies": {
     "idb": "^5.0.8"
@@ -35,5 +36,5 @@
   "browser": {
     "./src/IDBCache.js": "./src/IDBCache.browser.js"
   },
-  "gitHead": "1a2c14c3cd4587551cc12e94d0680c8b71ea12bf"
+  "gitHead": "9dee30885fc8c0f3654d54151d75f1e89907dafd"
 }

package/src/LMDBLiteCache.js

@@ -5,6 +5,7 @@ import {
   registerSerializableClass,
   serialize,
 } from '@atlaspack/build-cache';
+import {getFeatureFlag} from '@atlaspack/feature-flags';
 import {Lmdb} from '@atlaspack/rust';
 import type {FilePath} from '@atlaspack/types';
 import type {Cache} from './types';
@@ -41,6 +42,14 @@ export class LmdbWrapper {
     };
   }
 
+  has(key: string): boolean {
+    return this.lmdb.hasSync(key);
+  }
+
+  async delete(key: string): Promise<void> {
+    await this.lmdb.delete(key);
+  }
+
   get(key: string): Buffer | null {
     return this.lmdb.getSync(key);
   }
@@ -105,7 +114,9 @@ export class LMDBLiteCache implements Cache {
   }
 
   async ensure(): Promise<void> {
-    await this.fsCache.ensure();
+    if (!getFeatureFlag('cachePerformanceImprovements')) {
+      await this.fsCache.ensure();
+    }
     return Promise.resolve();
   }
 
@@ -120,7 +131,7 @@ export class LMDBLiteCache implements Cache {
   }
 
   has(key: string): Promise<boolean> {
-    return Promise.resolve(this.store.get(key) != null);
+    return Promise.resolve(this.store.has(key));
   }
 
   get<T>(key: string): Promise<?T> {
@@ -173,25 +184,45 @@ export class LMDBLiteCache implements Cache {
   }
 
   hasLargeBlob(key: string): Promise<boolean> {
-    return this.fs.exists(this.#getFilePath(key, 0));
+    if (!getFeatureFlag('cachePerformanceImprovements')) {
+      return this.fsCache.hasLargeBlob(key);
+    }
+    return this.has(key);
   }
 
-  // eslint-disable-next-line require-await
-  async getLargeBlob(key: string): Promise<Buffer> {
-    return this.fsCache.getLargeBlob(key);
+  /**
+   * @deprecated Use getBlob instead.
+   */
+  getLargeBlob(key: string): Promise<Buffer> {
+    if (!getFeatureFlag('cachePerformanceImprovements')) {
+      return this.fsCache.getLargeBlob(key);
+    }
+    return Promise.resolve(this.getBlobSync(key));
   }
 
-  // eslint-disable-next-line require-await
-  async setLargeBlob(
+  /**
+   * @deprecated Use setBlob instead.
+   */
+  setLargeBlob(
     key: string,
     contents: Buffer | string,
     options?: {|signal?: AbortSignal|},
   ): Promise<void> {
-    return this.fsCache.setLargeBlob(key, contents, options);
+    if (!getFeatureFlag('cachePerformanceImprovements')) {
+      return this.fsCache.setLargeBlob(key, contents, options);
+    }
+    return this.setBlob(key, contents);
   }
 
+  /**
+   * @deprecated Use store.delete instead.
+   */
   deleteLargeBlob(key: string): Promise<void> {
-    return this.fsCache.deleteLargeBlob(key);
+    if (!getFeatureFlag('cachePerformanceImprovements')) {
+      return this.fsCache.deleteLargeBlob(key);
+    }
+
+    return this.store.delete(key);
   }
 
   refresh(): void {