fix(query-orchestrator): queues reconciliation logic (#6286)

Author: buntarb

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

@@ -182,21 +182,6 @@ export class QueryCache {
     }
   }
 
-  /**
-   * Force reconcile queue logic to be executed.
-   */
-  public async forceReconcile(datasource = 'default') {
-    if (!this.externalQueue) {
-      // We don't need to reconcile external queue, because Cube Store
-      // uses its internal queue which managed separately.
-      return;
-    }
-    const queue = await this.getQueue(datasource);
-    if (queue) {
-      await queue.reconcileQueue();
-    }
-  }
-
   /**
    * Generates from the `queryBody` the final `sql` query and push it to
    * the queue. Returns promise which will be resolved by the different

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

@@ -172,7 +172,17 @@ export class QueryOrchestrator {
    * Force reconcile queue logic to be executed.
    */
   public async forceReconcile(datasource = 'default') {
-    await this.queryCache.forceReconcile(datasource);
+    // pre-aggregations queue reconcile
+    const preaggsQueue = await this.preAggregations.getQueue(datasource);
+    if (preaggsQueue) {
+      await preaggsQueue.reconcileQueue();
+    }
+
+    // queries queue reconcile
+    const queryQueue = await this.queryCache.getQueue(datasource);
+    if (queryQueue) {
+      await queryQueue.reconcileQueue();
+    }
   }
 
   /**