@cubejs-backend/query-orchestrator 0.23.3 → 0.24.2

package/orchestrator/QueryCache.js

@@ -1,384 +1,8 @@
-const crypto = require('crypto');
-const QueryQueue = require('./QueryQueue');
-const ContinueWaitError = require('./ContinueWaitError');
-const RedisCacheDriver = require('./RedisCacheDriver');
-const LocalCacheDriver = require('./LocalCacheDriver');
+const { QueryCache } = require('../dist/src/orchestrator/QueryCache');
 
-class QueryCache {
-  constructor(redisPrefix, clientFactory, logger, options) {
-    this.options = options || {};
-    this.redisPrefix = redisPrefix;
-    this.driverFactory = clientFactory;
-    this.externalDriverFactory = options.externalDriverFactory;
-    this.logger = logger;
-    this.cacheDriver = options.cacheAndQueueDriver === 'redis' ?
-      new RedisCacheDriver({ pool: options.redisPool }) :
-      new LocalCacheDriver();
-  }
-
-  async cachedQueryResult(queryBody, preAggregationsTablesToTempTables) {
-    const replacePreAggregationTableNames = (queryAndParams) => QueryCache.replacePreAggregationTableNames(
-      queryAndParams, preAggregationsTablesToTempTables
-    );
-
-    const query = replacePreAggregationTableNames(queryBody.query);
-    let queuePriority = 10;
-    if (Number.isInteger(queryBody.queuePriority)) {
-      // eslint-disable-next-line prefer-destructuring
-      queuePriority = queryBody.queuePriority;
-    }
-    const forceNoCache = queryBody.forceNoCache || false;
-    const { values } = queryBody;
-    const cacheKeyQueries =
-      (
-        queryBody.cacheKeyQueries && queryBody.cacheKeyQueries.queries ||
-        queryBody.cacheKeyQueries ||
-        []
-      ).map(replacePreAggregationTableNames);
-
-    const renewalThreshold = queryBody.cacheKeyQueries && queryBody.cacheKeyQueries.renewalThreshold;
-    const refreshKeyRenewalThresholds = queryBody.cacheKeyQueries &&
-      queryBody.cacheKeyQueries.refreshKeyRenewalThresholds;
-
-    const expireSecs = queryBody.expireSecs || 24 * 3600;
-
-    if (!cacheKeyQueries) {
-      return {
-        data: await this.queryWithRetryAndRelease(query, values, {
-          external: queryBody.external,
-          requestId: queryBody.requestId
-        })
-      };
-    }
-    const cacheKey = QueryCache.queryCacheKey(queryBody);
-
-    if (queryBody.renewQuery) {
-      this.logger('Requested renew', { cacheKey, requestId: queryBody.requestId });
-      return this.renewQuery(query, values, cacheKeyQueries, expireSecs, cacheKey, renewalThreshold, {
-        external: queryBody.external,
-        requestId: queryBody.requestId,
-        refreshKeyRenewalThresholds
-      });
-    }
-
-    if (!this.options.backgroundRenew) {
-      const resultPromise = this.renewQuery(query, values, cacheKeyQueries, expireSecs, cacheKey, renewalThreshold, {
-        external: queryBody.external,
-        requestId: queryBody.requestId,
-        refreshKeyRenewalThresholds,
-        skipRefreshKeyWaitForRenew: true
-      });
-
-      this.startRenewCycle(query, values, cacheKeyQueries, expireSecs, cacheKey, renewalThreshold, {
-        external: queryBody.external,
-        requestId: queryBody.requestId,
-        refreshKeyRenewalThresholds
-      });
-
-      return resultPromise;
-    }
-
-    this.logger('Background fetch', { cacheKey, requestId: queryBody.requestId });
-
-    const mainPromise = this.cacheQueryResult(
-      query, values,
-      cacheKey,
-      expireSecs,
-      {
-        priority: queuePriority,
-        forceNoCache,
-        external: queryBody.external,
-        requestId: queryBody.requestId
-      }
-    );
-
-    if (!forceNoCache) {
-      this.startRenewCycle(query, values, cacheKeyQueries, expireSecs, cacheKey, renewalThreshold, {
-        external: queryBody.external,
-        requestId: queryBody.requestId,
-        refreshKeyRenewalThresholds
-      });
-    }
-
-    return {
-      data: await mainPromise,
-      lastRefreshTime: await this.lastRefreshTime(cacheKey)
-    };
-  }
-
-  static queryCacheKey(queryBody) {
-    return [queryBody.query, queryBody.values, (queryBody.preAggregations || []).map(p => p.loadSql)];
-  }
-
-  static replaceAll(replaceThis, withThis, inThis) {
-    withThis = withThis.replace(/\$/g, '$$$$');
-    return inThis.replace(
-      new RegExp(replaceThis.replace(/([/,!\\^${}[\]().*+?|<>\-&])/g, '\\$&'), 'g'),
-      withThis
-    );
-  }
-
-  static replacePreAggregationTableNames(queryAndParams, preAggregationsTablesToTempTables) {
-    const [keyQuery, params] = Array.isArray(queryAndParams) ? queryAndParams : [queryAndParams, []];
-    const replacedKeqQuery = preAggregationsTablesToTempTables.reduce(
-      (query, [tableName, { targetTableName }]) => QueryCache.replaceAll(tableName, targetTableName, query),
-      keyQuery
-    );
-    return Array.isArray(queryAndParams) ? [replacedKeqQuery, params] : replacedKeqQuery;
-  }
-
-  queryWithRetryAndRelease(query, values, {
-    priority, cacheKey, external, requestId
-  }) {
-    const queue = external ? this.getExternalQueue() : this.getQueue();
-    return queue.executeInQueue('query', cacheKey, {
-      queryKey: cacheKey, query, values, requestId
-    }, priority, {
-      stageQueryKey: cacheKey,
-      requestId
-    });
-  }
-
-  getQueue() {
-    if (!this.queue) {
-      this.queue = QueryCache.createQueue(
-        `SQL_QUERY_${this.redisPrefix}`,
-        this.driverFactory,
-        (client, q) => {
-          this.logger('Executing SQL', {
-            ...q
-          });
-          return client.query(q.query, q.values, q);
-        }, {
-          logger: this.logger,
-          cacheAndQueueDriver: this.options.cacheAndQueueDriver,
-          redisPool: this.options.redisPool,
-          ...this.options.queueOptions
-        }
-      );
-    }
-    return this.queue;
-  }
-
-  getExternalQueue() {
-    if (!this.externalQueue) {
-      this.externalQueue = QueryCache.createQueue(
-        `SQL_QUERY_EXT_${this.redisPrefix}`,
-        this.externalDriverFactory,
-        (client, q) => {
-          this.logger('Executing SQL', {
-            ...q
-          });
-          return client.query(q.query, q.values, q);
-        },
-        {
-          logger: this.logger,
-          cacheAndQueueDriver: this.options.cacheAndQueueDriver,
-          redisPool: this.options.redisPool,
-          ...this.options.externalQueueOptions
-        }
-      );
-    }
-    return this.externalQueue;
-  }
-
-  static createQueue(redisPrefix, clientFactory, executeFn, options) {
-    options = options || {};
-    const queue = new QueryQueue(redisPrefix, {
-      queryHandlers: {
-        query: async (q, setCancelHandle) => {
-          const client = await clientFactory();
-          const resultPromise = executeFn(client, q);
-          let handle;
-          if (resultPromise.cancel) {
-            queue.cancelHandlerCounter += 1;
-            handle = queue.cancelHandlerCounter;
-            queue.handles[handle] = resultPromise;
-            await setCancelHandle(handle);
-          }
-          const result = await resultPromise;
-          if (handle) {
-            delete queue.handles[handle];
-          }
-          return result;
-        }
-      },
-      cancelHandlers: {
-        query: async (q) => {
-          if (q.cancelHandler && queue.handles[q.cancelHandler]) {
-            await queue.handles[q.cancelHandler].cancel();
-            delete queue.handles[q.cancelHandler];
-          }
-        }
-      },
-      logger: (msg, params) => options.logger(msg, params),
-      ...options
-    });
-    queue.cancelHandlerCounter = 0;
-    queue.handles = {};
-    return queue;
-  }
-
-  startRenewCycle(query, values, cacheKeyQueries, expireSecs, cacheKey, renewalThreshold, options) {
-    this.renewQuery(
-      query, values, cacheKeyQueries, expireSecs, cacheKey, renewalThreshold, options
-    ).catch(e => {
-      if (!(e instanceof ContinueWaitError)) {
-        this.logger('Error while renew cycle', {
-          query, query_values: values, error: e.stack || e, requestId: options.requestId
-        });
-      }
-    });
-  }
-
-  renewQuery(query, values, cacheKeyQueries, expireSecs, cacheKey, renewalThreshold, options) {
-    options = options || {};
-    return Promise.all(
-      cacheKeyQueries.map((q, i) => this.cacheQueryResult(
-        Array.isArray(q) ? q[0] : q,
-        Array.isArray(q) ? q[1] : [],
-        q,
-        expireSecs,
-        {
-          renewalThreshold:
-            this.options.refreshKeyRenewalThreshold ||
-            (options.refreshKeyRenewalThresholds || [])[i] ||
-            2 * 60,
-          renewalKey: q,
-          waitForRenew: !options.skipRefreshKeyWaitForRenew,
-          requestId: options.requestId
-        }
-      ))
-    )
-      .catch(e => {
-        if (e instanceof ContinueWaitError) {
-          throw e;
-        }
-        this.logger('Error fetching cache key queries', { error: e.stack || e, requestId: options.requestId });
-        return [];
-      })
-      .then(async cacheKeyQueryResults => (
-        {
-          data: await this.cacheQueryResult(
-            query, values,
-            cacheKey,
-            expireSecs,
-            {
-              renewalThreshold: renewalThreshold || 6 * 60 * 60,
-              renewalKey: cacheKeyQueryResults && [
-                cacheKeyQueries, cacheKeyQueryResults, this.queryRedisKey([query, values])
-              ],
-              waitForRenew: true,
-              external: options.external,
-              requestId: options.requestId
-            }
-          ),
-          refreshKeyValues: cacheKeyQueryResults,
-          lastRefreshTime: await this.lastRefreshTime(cacheKey)
-        }
-      ));
-  }
-
-  cacheQueryResult(query, values, cacheKey, expiration, options) {
-    options = options || {};
-    const { renewalThreshold } = options;
-    const renewalKey = options.renewalKey && this.queryRedisKey(options.renewalKey);
-    const redisKey = this.queryRedisKey(cacheKey);
-    const fetchNew = () => (
-      this.queryWithRetryAndRelease(query, values, {
-        priority: options.priority, cacheKey, external: options.external, requestId: options.requestId
-      }).then(res => {
-        const result = {
-          time: (new Date()).getTime(),
-          result: res,
-          renewalKey
-        };
-        return this.cacheDriver.set(redisKey, result, expiration)
-          .then(() => {
-            this.logger('Renewed', { cacheKey, requestId: options.requestId });
-            return res;
-          });
-      }).catch(e => {
-        if (!(e instanceof ContinueWaitError)) {
-          this.logger('Dropping Cache', { cacheKey, error: e.stack || e, requestId: options.requestId });
-          this.cacheDriver.remove(redisKey)
-            .catch(err => this.logger('Error removing key', {
-              cacheKey,
-              error: err.stack || err,
-              requestId: options.requestId
-            }));
-        }
-        throw e;
-      })
-    );
-
-    if (options.forceNoCache) {
-      this.logger('Force no cache for', { cacheKey, requestId: options.requestId });
-      return fetchNew();
-    }
-
-    return this.cacheDriver.get(redisKey).then(res => {
-      if (res) {
-        const parsedResult = res;
-        const renewedAgo = (new Date()).getTime() - parsedResult.time;
-        this.logger('Found cache entry', {
-          cacheKey,
-          time: parsedResult.time,
-          renewedAgo,
-          renewalKey: parsedResult.renewalKey,
-          newRenewalKey: renewalKey,
-          renewalThreshold,
-          requestId: options.requestId
-        });
-        if (
-          renewalKey && (
-            !renewalThreshold ||
-            !parsedResult.time ||
-            renewedAgo > renewalThreshold * 1000 ||
-            parsedResult.renewalKey !== renewalKey
-          )
-        ) {
-          if (options.waitForRenew) {
-            this.logger('Waiting for renew', { cacheKey, renewalThreshold, requestId: options.requestId });
-            return fetchNew();
-          } else {
-            this.logger('Renewing existing key', { cacheKey, renewalThreshold, requestId: options.requestId });
-            fetchNew().catch(e => {
-              if (!(e instanceof ContinueWaitError)) {
-                this.logger('Error renewing', { cacheKey, error: e.stack || e, requestId: options.requestId });
-              }
-            });
-          }
-        }
-        this.logger('Using cache for', { cacheKey, requestId: options.requestId });
-        return parsedResult.result;
-      } else {
-        this.logger('Missing cache for', { cacheKey, requestId: options.requestId });
-        return fetchNew();
-      }
-    });
-  }
-
-  async lastRefreshTime(cacheKey) {
-    const cachedValue = await this.cacheDriver.get(this.queryRedisKey(cacheKey));
-    return cachedValue && new Date(cachedValue.time);
-  }
-
-  async resultFromCacheIfExists(queryBody) {
-    const cacheKey = QueryCache.queryCacheKey(queryBody);
-    const cachedValue = await this.cacheDriver.get(this.queryRedisKey(cacheKey));
-    if (cachedValue) {
-      return {
-        data: cachedValue.result,
-        lastRefreshTime: new Date(cachedValue.time)
-      };
-    }
-    return null;
-  }
-
-  queryRedisKey(cacheKey) {
-    return `SQL_QUERY_RESULT_${this.redisPrefix}_${crypto.createHash('md5').update(JSON.stringify(cacheKey)).digest('hex')}`;
-  }
-}
+process.emitWarning(
+  'Using absolute import with @cubejs-backend/query-orchestrator is deprecated',
+  'DeprecationWarning'
+);
 
 module.exports = QueryCache;

package/orchestrator/QueryOrchestrator.js

@@ -1,103 +1,8 @@
-const R = require('ramda');
-const QueryCache = require('./QueryCache');
-const PreAggregations = require('./PreAggregations');
-const RedisPool = require('./RedisPool');
+const { QueryOrchestrator } = require('../dist/src/orchestrator/QueryOrchestrator');
 
-class QueryOrchestrator {
-  constructor(redisPrefix, driverFactory, logger, options) {
-    options = options || {};
-    this.redisPrefix = redisPrefix;
-    this.driverFactory = driverFactory;
-    this.logger = logger;
-    const { externalDriverFactory } = options;
-    const cacheAndQueueDriver = options.cacheAndQueueDriver || process.env.CUBEJS_CACHE_AND_QUEUE_DRIVER || (
-      process.env.NODE_ENV === 'production' || process.env.REDIS_URL ? 'redis' : 'memory'
-    );
-    if (cacheAndQueueDriver !== 'redis' && cacheAndQueueDriver !== 'memory') {
-      throw new Error('Only \'redis\' or \'memory\' are supported for cacheAndQueueDriver option');
-    }
-    const redisPool = cacheAndQueueDriver === 'redis' ? new RedisPool() : undefined;
-
-    this.redisPool = redisPool;
-    this.queryCache = new QueryCache(
-      this.redisPrefix, this.driverFactory, this.logger, {
-        externalDriverFactory,
-        cacheAndQueueDriver,
-        redisPool,
-        ...options.queryCacheOptions,
-      }
-    );
-    this.preAggregations = new PreAggregations(
-      this.redisPrefix, this.driverFactory, this.logger, this.queryCache, {
-        externalDriverFactory,
-        cacheAndQueueDriver,
-        redisPool,
-        ...options.preAggregationsOptions
-      }
-    );
-    this.rollupOnlyMode = options.rollupOnlyMode;
-  }
-
-  async fetchQuery(queryBody) {
-    return this.preAggregations.loadAllPreAggregationsIfNeeded(queryBody)
-      .then(async preAggregationsTablesToTempTables => {
-        const usedPreAggregations = R.fromPairs(preAggregationsTablesToTempTables);
-        if (this.rollupOnlyMode && Object.keys(usedPreAggregations).length === 0) {
-          throw new Error('No pre-aggregation exists for that query');
-        }
-        if (!queryBody.query) {
-          return {
-            usedPreAggregations
-          };
-        }
-        const result = await this.queryCache.cachedQueryResult(
-          queryBody, preAggregationsTablesToTempTables
-        );
-        return {
-          ...result,
-          usedPreAggregations
-        };
-      });
-  }
-
-  async queryStage(queryBody) {
-    const queue = this.preAggregations.getQueue();
-    const preAggregationsQueryStageState = await queue.fetchQueryStageState();
-    const pendingPreAggregationIndex =
-      (await Promise.all(
-        (queryBody.preAggregations || [])
-          .map(p => queue.getQueryStage(
-            PreAggregations.preAggregationQueryCacheKey(p), 10, preAggregationsQueryStageState
-          ))
-      )).findIndex(p => !!p);
-    if (pendingPreAggregationIndex === -1) {
-      return this.queryCache.getQueue().getQueryStage(QueryCache.queryCacheKey(queryBody));
-    }
-    const preAggregation = queryBody.preAggregations[pendingPreAggregationIndex];
-    const preAggregationStage = await queue.getQueryStage(
-      PreAggregations.preAggregationQueryCacheKey(preAggregation), undefined, preAggregationsQueryStageState
-    );
-    if (!preAggregationStage) {
-      return undefined;
-    }
-    const stageMessage =
-      `Building pre-aggregation ${pendingPreAggregationIndex + 1}/${queryBody.preAggregations.length}`;
-    if (preAggregationStage.stage.indexOf('queue') !== -1) {
-      return { ...preAggregationStage, stage: `${stageMessage}: ${preAggregationStage.stage}` };
-    } else {
-      return { ...preAggregationStage, stage: stageMessage };
-    }
-  }
-
-  resultFromCacheIfExists(queryBody) {
-    return this.queryCache.resultFromCacheIfExists(queryBody);
-  }
-
-  async cleanup() {
-    if (this.redisPool) {
-      await this.redisPool.cleanup();
-    }
-  }
-}
+process.emitWarning(
+  'Using absolute import with @cubejs-backend/query-orchestrator is deprecated',
+  'DeprecationWarning'
+);
 
 module.exports = QueryOrchestrator;