feat(cubesql): Remove cube_to_data_source in MetaContext::new

Author: mcheshkov

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

@@ -142,7 +142,7 @@ impl TransportService for NodeBridgeTransport {
 
         let channel = self.channel.clone();
 
-        let (cube_to_data_source, member_to_data_source, data_source_to_sql_generator) =
+        let (member_to_data_source, data_source_to_sql_generator) =
             call_raw_js_with_channel_as_callback(
                 self.channel.clone(),
                 self.sql_generators.clone(),
@@ -152,17 +152,6 @@ impl TransportService for NodeBridgeTransport {
                     let obj = v
                         .downcast::<JsObject, _>(cx)
                         .map_err(|e| CubeError::user(e.to_string()))?;
-                    let cube_to_data_source_obj = obj
-                        .get::<JsObject, _, _>(cx, "cubeNameToDataSource")
-                        .map_cube_err("Can't cast cubeNameToDataSource to object")?;
-
-                    let cube_to_data_source =
-                        key_to_values(cx, cube_to_data_source_obj, |cx, v| {
-                            let res = v.downcast::<JsString, _>(cx).map_cube_err(
-                                "Can't cast value to string in cube_to_data_source",
-                            )?;
-                            Ok(res.value(cx))
-                        })?;
 
                     let member_to_data_source_obj = obj
                         .get::<JsObject, _, _>(cx, "memberToDataSource")
@@ -194,11 +183,7 @@ impl TransportService for NodeBridgeTransport {
                             Ok(res)
                         })?;
 
-                    Ok((
-                        cube_to_data_source,
-                        member_to_data_source,
-                        data_source_to_sql_generator,
-                    ))
+                    Ok((member_to_data_source, data_source_to_sql_generator))
                 }),
             )
             .await?;
@@ -223,7 +208,6 @@ impl TransportService for NodeBridgeTransport {
         })?;
         Ok(Arc::new(MetaContext::new(
             response.cubes.unwrap_or_default(),
-            cube_to_data_source,
             member_to_data_source,
             data_source_to_sql_generator,
             compiler_id,

rust/cubesql/cubesql/src/compile/test/mod.rs

@@ -656,10 +656,6 @@ fn get_test_tenant_ctx_with_meta_and_templates(
     meta: Vec<CubeMeta>,
     custom_templates: Vec<(String, String)>,
 ) -> Arc<MetaContext> {
-    let cube_to_data_source = meta
-        .iter()
-        .map(|c| (c.name.clone(), "default".to_string()))
-        .collect();
     let member_to_data_source = meta
         .iter()
         .flat_map(|cube| {
@@ -673,7 +669,6 @@ fn get_test_tenant_ctx_with_meta_and_templates(
         .collect();
     Arc::new(MetaContext::new(
         meta,
-        cube_to_data_source,
         member_to_data_source,
         vec![("default".to_string(), sql_generator(custom_templates))]
             .into_iter()

rust/cubesql/cubesql/src/transport/ctx.rs

@@ -76,7 +76,6 @@ impl<'meta> DataSource<'meta> {
 impl MetaContext {
     pub fn new(
         cubes: Vec<CubeMeta>,
-        cube_to_data_source: HashMap<String, String>,
         member_to_data_source: HashMap<String, String>,
         data_source_to_sql_generator: HashMap<String, Arc<dyn SqlGenerator + Send + Sync>>,
         compiler_id: Uuid,
@@ -293,13 +292,8 @@ mod tests {
         ];
 
         // TODO
-        let test_context = MetaContext::new(
-            test_cubes,
-            HashMap::new(),
-            HashMap::new(),
-            HashMap::new(),
-            Uuid::new_v4(),
-        );
+        let test_context =
+            MetaContext::new(test_cubes, HashMap::new(), HashMap::new(), Uuid::new_v4());
 
         match test_context.find_cube_table_with_oid(18000) {
             Some(table) => assert_eq!(18000, table.oid),

rust/cubesql/cubesql/src/transport/service.rs

@@ -250,7 +250,6 @@ impl TransportService for HttpTransport {
             response.cubes.unwrap_or_else(Vec::new),
             HashMap::new(),
             HashMap::new(),
-            HashMap::new(),
             Uuid::new_v4(),
         ));