pass cache_mode from SqlApiLoadPayload

Author: KSDaemon

packages/cubejs-api-gateway/src/sql-server.ts

@@ -207,11 +207,9 @@ export class SQLServer {
           }
         });
       },
-      sqlApiLoad: async ({ request, session, query, queryKey, sqlQuery, streaming }) => {
+      sqlApiLoad: async ({ request, session, query, queryKey, sqlQuery, streaming, cacheMode }) => {
         const context = await contextByRequest(request, session);
 
-        // XXX: Should we pass cacheMode somehow?
-
         // eslint-disable-next-line no-async-promise-executor
         return new Promise(async (resolve, reject) => {
           try {
@@ -220,6 +218,7 @@ export class SQLServer {
               query,
               sqlQuery,
               streaming,
+              cacheMode,
               context,
               memberExpressions: true,
               res: (response) => {

packages/cubejs-backend-native/js/index.ts

@@ -78,12 +78,13 @@ export interface SqlPayload {
 }
 
 export interface SqlApiLoadPayload {
-  request: Request<LoadRequestMeta>,
-  session: SessionContext,
-  query: any,
-  queryKey: any,
-  sqlQuery: any,
-  streaming: boolean,
+  request: Request<LoadRequestMeta>;
+  session: SessionContext;
+  query: any;
+  queryKey: any;
+  sqlQuery: any;
+  streaming: boolean;
+  cacheMode: CacheMode;
 }
 
 export interface LogLoadEventPayload {

packages/cubejs-backend-native/src/transport.rs

@@ -13,7 +13,7 @@ use crate::{
 };
 use async_trait::async_trait;
 use cubesql::compile::engine::df::scan::{
-    convert_transport_response, transform_response, MemberField, RecordBatch, SchemaRef,
+    convert_transport_response, transform_response, CacheMode, MemberField, RecordBatch, SchemaRef,
 };
 use cubesql::compile::engine::df::wrapper::SqlQuery;
 use cubesql::transport::{
@@ -91,6 +91,8 @@ struct LoadRequest {
     streaming: bool,
     #[serde(rename = "queryKey", skip_serializing_if = "Option::is_none")]
     query_key: Option<serde_json::Value>,
+    #[serde(rename = "cacheMode", skip_serializing_if = "Option::is_none")]
+    cache_mode: Option<CacheMode>,
 }
 
 #[derive(Debug, Serialize)]
@@ -287,6 +289,7 @@ impl TransportService for NodeBridgeTransport {
             member_to_alias,
             expression_params,
             streaming: false,
+            cache_mode: None,
         })?;
 
         let response: serde_json::Value = call_js_with_channel_as_callback(
@@ -338,6 +341,7 @@ impl TransportService for NodeBridgeTransport {
         meta: LoadRequestMeta,
         schema: SchemaRef,
         member_fields: Vec<MemberField>,
+        cache_mode: Option<CacheMode>,
     ) -> Result<Vec<RecordBatch>, CubeError> {
         trace!("[transport] Request ->");
 
@@ -371,6 +375,7 @@ impl TransportService for NodeBridgeTransport {
                 member_to_alias: None,
                 expression_params: None,
                 streaming: false,
+                cache_mode: cache_mode.clone(),
             })?;
 
             let result = call_raw_js_with_channel_as_callback(
@@ -527,6 +532,7 @@ impl TransportService for NodeBridgeTransport {
                 member_to_alias: None,
                 expression_params: None,
                 streaming: true,
+                cache_mode: None,
             })?;
 
             let res = call_js_with_stream_as_callback(

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

@@ -11,7 +11,6 @@ import {
 } from '@cubejs-backend/query-orchestrator';
 
 import { DatabaseType, RequestContext } from './types';
-import { CacheMode } from '@cubejs-backend/shared';
 
 export interface OrchestratorApiOptions extends QueryOrchestratorOptions {
   contextToDbType: (dataSource: string) => Promise<DatabaseType>;

rust/cubesql/cubesql/src/compile/engine/df/scan.rs

@@ -43,6 +43,7 @@ use datafusion::{
 };
 use futures::Stream;
 use log::warn;
+use serde::Serialize;
 use serde_json::Value;
 use std::str::FromStr;
 use std::{
@@ -79,7 +80,7 @@ impl MemberField {
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Serialize)]
 pub enum CacheMode {
     StaleIfSlow,
     StaleWhileRevalidate,