join map in tesseract

Author: KSDaemon

rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/cube_definition.rs

@@ -18,6 +18,8 @@ pub struct CubeDefinitionStatic {
     pub is_view: Option<bool>,
     #[serde(rename = "calendar")]
     pub is_calendar: Option<bool>,
+    #[serde(rename = "joinMap")]
+    pub join_map: Option<Vec<Vec<String>>>,
 }
 
 impl CubeDefinitionStatic {

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/join_hints_collector.rs

@@ -27,7 +27,7 @@ impl TraversalVisitor for JoinHintsCollector {
         _: &Self::State,
     ) -> Result<Option<Self::State>, CubeError> {
         if node.is_multi_stage() {
-            //We don't add multi stage members childs to join hints
+            //We don't add multi-stage members childs to join hints
             return Ok(None);
         }
 
@@ -83,8 +83,39 @@ impl TraversalVisitor for JoinHintsCollector {
 pub fn collect_join_hints(node: &Rc<MemberSymbol>) -> Result<Vec<JoinHintItem>, CubeError> {
     let mut visitor = JoinHintsCollector::new();
     visitor.apply(node, &())?;
-    let res = visitor.extract_result();
-    Ok(res)
+    let mut collected_hints = visitor.extract_result();
+
+    let join_map = match node.as_ref() {
+        MemberSymbol::Dimension(d) => {
+            println!("cube_name: {}, name: {}", d.cube_name(), d.name());
+
+            d.join_map()
+        },
+        MemberSymbol::TimeDimension(d) => d.join_map(),
+        MemberSymbol::Measure(m) => m.join_map(),
+        _ => &None,
+    };
+
+    if let Some(join_map) = join_map {
+        for hint in collected_hints.iter_mut() {
+            match hint {
+                // If hints array has single element, check if it can be enriched with join hints
+                JoinHintItem::Single(hints) => {
+                    for path in join_map.iter() {
+                        if let Some(hint_index) = path.iter().position(|p| p == hints) {
+                            *hint = JoinHintItem::Vector(path[0..=hint_index].to_vec());
+                            break;
+                        }
+                    }
+                }
+                // If hints is an array with multiple elements, it means it already
+                // includes full join hint path
+                JoinHintItem::Vector(_) => {}
+            }
+        }
+    }
+
+    Ok(collected_hints)
 }
 
 pub fn collect_join_hints_for_measures(

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/cube_symbol.rs

@@ -74,6 +74,7 @@ pub struct CubeTableSymbol {
     member_sql: Option<Rc<SqlCall>>,
     alias: String,
     is_table_sql: bool,
+    join_map: Option<Vec<Vec<String>>>,
 }
 
 impl CubeTableSymbol {
@@ -82,12 +83,14 @@ impl CubeTableSymbol {
         member_sql: Option<Rc<SqlCall>>,
         alias: String,
         is_table_sql: bool,
+        join_map: Option<Vec<Vec<String>>>,
     ) -> Rc<Self> {
         Rc::new(Self {
             cube_name,
             member_sql,
             alias,
             is_table_sql,
+            join_map,
         })
     }
 
@@ -133,6 +136,10 @@ impl CubeTableSymbol {
     pub fn alias(&self) -> String {
         self.alias.clone()
     }
+
+    pub fn join_map(&self) -> &Option<Vec<Vec<String>>> {
+        &self.join_map
+    }
 }
 
 pub struct CubeTableSymbolFactory {
@@ -203,6 +210,7 @@ impl SymbolFactory for CubeTableSymbolFactory {
             sql,
             alias,
             is_table_sql,
+            definition.static_data().join_map.clone(),
         )))
     }
 }

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/dimension_symbol.rs

@@ -258,6 +258,10 @@ impl DimensionSymbol {
         &self.definition
     }
 
+    pub fn join_map(&self) -> &Option<Vec<Vec<String>>> {
+        self.cube.join_map()
+    }
+
     pub fn name(&self) -> &String {
         &self.name
     }

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/measure_symbol.rs

@@ -488,6 +488,11 @@ impl MeasureSymbol {
     pub fn cube_name(&self) -> &String {
         &self.cube.cube_name()
     }
+
+    pub fn join_map(&self) -> &Option<Vec<Vec<String>>> {
+        self.cube.join_map()
+    }
+
     pub fn name(&self) -> &String {
         &self.name
     }

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/time_dimension_symbol.rs

@@ -175,6 +175,13 @@ impl TimeDimensionSymbol {
         self.base_symbol.cube_name()
     }
 
+    pub fn join_map(&self) -> &Option<Vec<Vec<String>>> {
+        match self.base_symbol.as_ref() {
+            MemberSymbol::Dimension(d) => d.join_map(),
+            _ => &None,
+        }
+    }
+
     pub fn is_multi_stage(&self) -> bool {
         self.base_symbol.is_multi_stage()
     }