cubestore cache driver earlier exit

cube-js · Oct 24, 2022 · 08e577e · 08e577e
1 parent b579c27
commit 08e577e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -32,9 +32,9 @@
     "@typescript-eslint/eslint-plugin": "^4.17.0",
     "core-js": "^3.6.5",
     "lerna": "^3.13.1",
+    "patch-package": "^6.4.7",
     "ramda": "^0.27.0",
     "rollup-plugin-dts": "^1.1.8",
-    "patch-package": "^6.4.7",
     "whatwg-fetch": "^3.0.0"
   },
   "files": [

diff --git a/packages/cubejs-cubestore-driver/src/CubeStoreCacheDriver.ts b/packages/cubejs-cubestore-driver/src/CubeStoreCacheDriver.ts
@@ -24,6 +24,10 @@ export class CubeStoreCacheDriver implements CacheDriverInterface {
 
     const rows = await this.connection.query(`CACHE SET NX TTL ${expiration} ? ?`, [key, '1']);
     if (rows && rows.length === 1 && rows[0]?.success === 'true') {
+      if (tkn.isCanceled()) {
+        return false;
+      }
+
       try {
         await tkn.with(cb());
       } finally {

diff --git a/packages/cubejs-query-orchestrator/src/orchestrator/RedisCacheDriver.ts b/packages/cubejs-query-orchestrator/src/orchestrator/RedisCacheDriver.ts
@@ -52,6 +52,10 @@ export class RedisCacheDriver implements CacheDriverInterface {
       );
 
       if (response === 'OK') {
+        if (tkn.isCanceled()) {
+          return false;
+        }
+
         try {
           await tkn.with(cb());
         } finally {