feat: Add option to run in production without redis

Fixes #110
cube-js · Jun 7, 2019 · a7de417 · a7de417
1 parent 659c24c
commit a7de417
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/packages/cubejs-query-orchestrator/orchestrator/PreAggregations.js b/packages/cubejs-query-orchestrator/orchestrator/PreAggregations.js
@@ -372,7 +372,7 @@ class PreAggregations {
     this.queryCache = queryCache;
     this.refreshErrors = {}; // TODO should be in redis
     this.tablesUsedInQuery = {}; // TODO should be in redis
-    this.cacheDriver = process.env.NODE_ENV === 'production' || process.env.REDIS_URL ?
+    this.cacheDriver = options.cacheAndQueueDriver === 'redis' ?
       new RedisCacheDriver() :
       new LocalCacheDriver();
     this.externalDriverFactory = options.externalDriverFactory;
@@ -416,7 +416,12 @@ class PreAggregations {
           new PreAggregationLoadCache(this.redisPrefix, this.driverFactory, this.queryCache, this)
         );
         return loader.refresh(newVersionEntry)(client);
-      }, { concurrency: 1, logger: this.logger, ...this.options.queueOptions });
+      }, {
+        concurrency: 1,
+        logger: this.logger,
+        cacheAndQueueDriver: this.options.cacheAndQueueDriver,
+        ...this.options.queueOptions
+      });
     }
     return this.queue;
   }

diff --git a/packages/cubejs-query-orchestrator/orchestrator/QueryCache.js b/packages/cubejs-query-orchestrator/orchestrator/QueryCache.js
@@ -11,7 +11,7 @@ class QueryCache {
     this.driverFactory = clientFactory;
     this.externalDriverFactory = options.externalDriverFactory;
     this.logger = logger;
-    this.cacheDriver = process.env.NODE_ENV === 'production' || process.env.REDIS_URL ?
+    this.cacheDriver = options.cacheAndQueueDriver === 'redis' ?
       new RedisCacheDriver() :
       new LocalCacheDriver();
   }
@@ -101,8 +101,11 @@ class QueryCache {
       this.queue = QueryCache.createQueue(
         `SQL_QUERY_${this.redisPrefix}`,
         this.driverFactory,
-        (client, q) => client.query(q.query, q.values),
-        { logger: this.logger, ...this.options.queueOptions }
+        (client, q) => client.query(q.query, q.values), {
+          logger: this.logger,
+          cacheAndQueueDriver: this.options.cacheAndQueueDriver,
+          ...this.options.queueOptions
+        }
       );
     }
     return this.queue;
@@ -117,6 +120,7 @@ class QueryCache {
         {
           logger: this.logger,
           concurrency: 6,
+          cacheAndQueueDriver: this.options.cacheAndQueueDriver,
           ...this.options.externalQueueOptions
         }
       );

diff --git a/packages/cubejs-query-orchestrator/orchestrator/QueryOrchestrator.js b/packages/cubejs-query-orchestrator/orchestrator/QueryOrchestrator.js
@@ -8,15 +8,24 @@ class QueryOrchestrator {
     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`);
+    }
+
     this.queryCache = new QueryCache(
       this.redisPrefix, this.driverFactory, this.logger, {
         externalDriverFactory,
+        cacheAndQueueDriver,
         ...options.queryCacheOptions,
       }
     );
     this.preAggregations = new PreAggregations(
       this.redisPrefix, this.driverFactory, this.logger, this.queryCache, {
         externalDriverFactory,
+        cacheAndQueueDriver,
         ...options.preAggregationsOptions
       }
     );

diff --git a/packages/cubejs-query-orchestrator/orchestrator/QueryQueue.js b/packages/cubejs-query-orchestrator/orchestrator/QueryQueue.js
@@ -25,7 +25,7 @@ class QueryQueue {
       heartBeatTimeout: this.heartBeatInterval * 4,
       createRedisClient: options.createRedisClient
     };
-    this.queueDriver = process.env.NODE_ENV === 'production' || process.env.REDIS_URL || !!options.createRedisClient ?
+    this.queueDriver = options.cacheAndQueueDriver === 'redis' ?
       new RedisQueueDriver(queueDriverOptions) :
       new LocalQueueDriver(queueDriverOptions);
   }