Fix join key doesn't respect root

Author: paveltiunov

rust/cubesqlplanner/cubesqlplanner/src/planner/base_measure.rs

@@ -7,6 +7,7 @@ use crate::cube_bridge::measure_definition::{
 use cubenativeutils::CubeError;
 use lazy_static::lazy_static;
 use regex::Regex;
+use std::fmt::{Debug, Formatter};
 use std::rc::Rc;
 
 #[derive(Clone, Debug)]
@@ -71,6 +72,15 @@ pub struct BaseMeasure {
     name: String,
 }
 
+impl Debug for BaseMeasure {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("BaseMeasure")
+            .field("measure", &self.measure)
+            .field("time_shifts", &self.time_shifts)
+            .finish()
+    }
+}
+
 impl BaseMember for BaseMeasure {
     fn to_sql(&self, context: Rc<VisitorContext>) -> Result<String, CubeError> {
         evaluate_with_context(&self.member_evaluator, self.query_tools.clone(), context)

rust/cubesqlplanner/cubesqlplanner/src/planner/query_properties.rs

@@ -32,7 +32,7 @@ impl OrderByItem {
     }
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Debug)]
 pub struct FullKeyAggregateMeasures {
     pub multiplied_measures: Vec<Rc<BaseMeasure>>,
     pub regular_measures: Vec<Rc<BaseMeasure>>,

rust/cubesqlplanner/cubesqlplanner/src/planner/query_tools.rs

@@ -24,8 +24,11 @@ pub struct QueryToolsCachedData {
     join_key_to_join: HashMap<Rc<JoinKey>, Rc<dyn JoinDefinition>>,
 }
 
-#[derive(Hash, PartialEq, Eq)]
-pub struct JoinKey(Vec<JoinItemStatic>);
+#[derive(Debug, Hash, PartialEq, Eq)]
+pub struct JoinKey {
+    root: String,
+    joins: Vec<JoinItemStatic>,
+}
 
 impl QueryToolsCachedData {
     pub fn new() -> Self {
@@ -96,13 +99,15 @@ impl QueryToolsCachedData {
                     .flat_map(|h| h.as_ref().iter().cloned())
                     .collect(),
             )?;
-            let join_key = Rc::new(JoinKey(
-                join.joins()?
+            let join_key = Rc::new(JoinKey {
+                root: join.static_data().root.to_string(),
+                joins: join
+                    .joins()?
                     .items()
                     .iter()
                     .map(|i| i.static_data().clone())
                     .collect(),
-            ));
+            });
             self.join_hints_to_join_key.insert(hints, join_key.clone());
             self.join_key_to_join.insert(join_key.clone(), join.clone());
             Ok((join_key, join))