chore: fix

Author: ovr

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

@@ -115,7 +115,7 @@ export interface QueryCacheOptions {
   }>;
   cubeStoreDriverFactory?: () => Promise<CubeStoreDriver>,
   continueWaitTimeout?: number;
-  cacheAndQueueDriver?: CacheAndQueryDriverType;
+  cacheAndQueueDriver: CacheAndQueryDriverType;
   maxInMemoryCacheEntries?: number;
   skipExternalCacheAndQueue?: boolean;
 }
@@ -133,9 +133,9 @@ export class QueryCache {
     protected readonly redisPrefix: string,
     protected readonly driverFactory: DriverFactoryByDataSource,
     protected readonly logger: any,
-    public readonly options: QueryCacheOptions = {}
+    public readonly options: QueryCacheOptions
   ) {
-    switch (options.cacheAndQueueDriver || 'memory') {
+    switch (options.cacheAndQueueDriver) {
       case 'memory':
         this.cacheDriver = new LocalCacheDriver();
         break;

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

@@ -15,6 +15,7 @@ import { TimeoutError } from './TimeoutError';
 import { ContinueWaitError } from './ContinueWaitError';
 import { LocalQueueDriver } from './LocalQueueDriver';
 import { QueryStream } from './QueryStream';
+import {CacheAndQueryDriverType} from "./QueryOrchestrator";
 
 export type CancelHandlerFn = (query: QueryDef) => Promise<void>;
 export type QueryHandlerFn = (query: QueryDef, cancelHandler: CancelHandlerFn) => Promise<unknown>;
@@ -29,7 +30,7 @@ export type ExecuteInQueueOptions = Omit<AddToQueueOptions, 'queueId'> & {
 };
 
 export type QueryQueueOptions = {
-  cacheAndQueueDriver: string;
+  cacheAndQueueDriver: CacheAndQueryDriverType;
   logger: (message, event) => void;
   sendCancelMessageFn?: SendCancelMessageFn;
   sendProcessMessageFn?: SendProcessMessageFn;

packages/cubejs-query-orchestrator/test/unit/QueryCache.abstract.ts

@@ -8,7 +8,7 @@ export type QueryCacheTestOptions = QueryCacheOptions & {
   afterAll?: () => Promise<void>,
 };
 
-export const QueryCacheTest = (name: string, options?: QueryCacheTestOptions) => {
+export const QueryCacheTest = (name: string, options: QueryCacheTestOptions) => {
   describe(`QueryQueue${name}`, () => {
     const cache = new QueryCache(
       crypto.randomBytes(16).toString('hex'),

packages/cubejs-query-orchestrator/test/unit/QueryCache.test.ts

@@ -1,3 +1,5 @@
 import { QueryCacheTest } from './QueryCache.abstract';
 
-QueryCacheTest('Local');
+QueryCacheTest('Local', {
+  cacheAndQueueDriver: 'memory',
+});

packages/cubejs-query-orchestrator/test/unit/QueryQueue.test.ts

@@ -1,5 +1,5 @@
 import { QueryQueueTest } from './QueryQueue.abstract';
 
 QueryQueueTest('Local', {
-  cacheAndQueueDriver: 'local',
+  cacheAndQueueDriver: 'memory',
 });