clean up obsolete

Author: KSDaemon

packages/cubejs-query-orchestrator/src/orchestrator/QueryCache.ts

@@ -300,7 +300,7 @@ export class QueryCache {
       );
     }
 
-    if (!this.options.backgroundRenew) {
+    if (!this.options.backgroundRenew && queryBody.cacheMode !== 'stale-while-revalidate') {
       const resultPromise = this.renewQuery(
         query,
         values,
@@ -760,42 +760,6 @@ export class QueryCache {
     });
   }
 
-  public async startBackgroundRefreshForQuery(queryBody: QueryBody, preAggregationsTablesToTempTables: PreAggTableToTempTable[]) {
-    const replacePreAggregationTableNames =
-      (queryAndParams: string | QueryWithParams) => (
-        QueryCache.replacePreAggregationTableNames(
-          queryAndParams,
-          preAggregationsTablesToTempTables,
-        )
-      );
-
-    const query = replacePreAggregationTableNames(queryBody.query);
-    const { values } = queryBody;
-
-    const cacheKeyQueries = this
-      .cacheKeyQueriesFrom(queryBody)
-      .map(replacePreAggregationTableNames);
-
-    const renewalThreshold = queryBody.cacheKeyQueries?.renewalThreshold;
-    const expireSecs = this.getExpireSecs(queryBody);
-    const cacheKey = QueryCache.queryCacheKey(queryBody);
-
-    this.startRenewCycle(
-      query,
-      values,
-      cacheKeyQueries,
-      expireSecs,
-      cacheKey,
-      renewalThreshold,
-      {
-        external: queryBody.external,
-        requestId: queryBody.requestId,
-        dataSource: queryBody.dataSource,
-        persistent: false, // We don't need stream back as there will be no consumer
-      }
-    );
-  }
-
   public renewQuery(
     query: string | QueryWithParams,
     values: string[],

packages/cubejs-query-orchestrator/src/orchestrator/QueryOrchestrator.ts

@@ -143,29 +143,6 @@ export class QueryOrchestrator {
     return this.preAggregations;
   }
 
-  /**
-   * Starts background refresh cycle for a query.
-   */
-  public async startBackgroundRefresh(queryBody: QueryBody): Promise<void> {
-    if (!queryBody.query) {
-      return;
-    }
-
-    const {
-      preAggregationsTablesToTempTables,
-      values,
-    } = await this.preAggregations.loadAllPreAggregationsIfNeeded(queryBody);
-
-    if (values) {
-      queryBody = {
-        ...queryBody,
-        values
-      };
-    }
-
-    await this.queryCache.startBackgroundRefreshForQuery(queryBody, preAggregationsTablesToTempTables);
-  }
-
   /**
    * Force reconcile queue logic to be executed.
    */

packages/cubejs-server-core/src/core/OrchestratorApi.ts

@@ -140,7 +140,7 @@ export class OrchestratorApi {
           .orchestrator
           .resultFromCacheIfExists(query);
 
-        if (query.cacheMode === 'stale-if-slow' && fromCache) {
+        if ((query.cacheMode === 'stale-if-slow' || query.cacheMode === 'stale-while-revalidate') && fromCache) {
           this.logger('Slow Query Warning', {
             query: queryForLog,
             requestId: query.requestId,
@@ -155,22 +155,6 @@ export class OrchestratorApi {
           };
         }
 
-        if (query.cacheMode === 'stale-while-revalidate' && fromCache) {
-          // Start background refresh
-          this.orchestrator.startBackgroundRefresh(query).catch(e => {
-            this.logger('Error starting background refresh', {
-              query: queryForLog,
-              requestId: query.requestId,
-              error: ((e as Error).stack || e)
-            });
-          });
-
-          return {
-            ...fromCache,
-            slowQuery: true
-          };
-        }
-
         throw {
           error: 'Continue wait',
           stage: await this.orchestrator.queryStage(query)