chore(tesseract): Various improvements

Author: waralexrom

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

@@ -14,6 +14,8 @@ pub struct CubeDefinitionStatic {
     pub name: String,
     #[serde(rename = "sqlAlias")]
     pub sql_alias: Option<String>,
+    #[serde(rename = "isView")]
+    pub is_view: Option<bool>,
 }
 
 #[nativebridge::native_bridge(CubeDefinitionStatic)]

rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/multi_stage_query_planner.rs

@@ -171,6 +171,7 @@ impl MultiStageQueryPlanner {
         state: Rc<MultiStageAppliedState>,
         descriptions: &mut Vec<Rc<MultiStageQueryDescription>>,
     ) -> Result<Rc<MultiStageQueryDescription>, CubeError> {
+        let member = member.resolve_reference_chain();
         let member_name = member.full_name();
         if let Some(exists) = descriptions
             .iter()
@@ -187,7 +188,7 @@ impl MultiStageQueryPlanner {
             return Ok(rolling_window_query);
         }
 
-        let childs = member_childs(&member)?;
+        let childs = member_childs(&member, true)?;
         let has_multi_stage_members = has_multi_stage_members(&member, false)?;
         let description = if childs.is_empty() || !has_multi_stage_members {
             if has_multi_stage_members {

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

@@ -1,5 +1,6 @@
 use crate::planner::sql_evaluator::{MemberSymbol, TraversalVisitor};
 use cubenativeutils::CubeError;
+use itertools::Itertools;
 use std::rc::Rc;
 
 pub struct MemberChildsCollector {
@@ -56,8 +57,19 @@ impl TraversalVisitor for MemberChildsCollector {
     }
 }
 
-pub fn member_childs(node: &Rc<MemberSymbol>) -> Result<Vec<Rc<MemberSymbol>>, CubeError> {
+pub fn member_childs(
+    node: &Rc<MemberSymbol>,
+    resolve_references: bool,
+) -> Result<Vec<Rc<MemberSymbol>>, CubeError> {
     let mut visitor = MemberChildsCollector::new();
     visitor.apply(node, &MemberChildsCollectorState::new(true))?;
-    Ok(visitor.extract_result())
+    let res = visitor.extract_result();
+    let res = if resolve_references {
+        res.iter()
+            .map(|child| child.clone().resolve_reference_chain())
+            .collect_vec()
+    } else {
+        res
+    };
+    Ok(res)
 }

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

@@ -492,18 +492,22 @@ impl SymbolFactory for MeasureSymbolFactory {
                 && !definition.static_data().multi_stage.unwrap_or(false);
         let owned_by_cube = definition.static_data().owned_by_cube.unwrap_or(true);
         let is_multi_stage = definition.static_data().multi_stage.unwrap_or(false);
-
-        let is_reference = !owned_by_cube
-            && is_sql_is_direct_ref
-            && is_calculated
-            && !is_multi_stage
-            && measure_filters.is_empty()
-            && measure_drill_filters.is_empty()
-            && time_shifts.is_empty()
-            && measure_order_by.is_empty()
-            && reduce_by.is_none()
-            && add_group_by.is_none()
-            && group_by.is_none();
+        let cube = cube_evaluator.cube_from_path(cube_name.clone())?;
+
+        let is_view = cube.static_data().is_view.unwrap_or(false);
+
+        let is_reference = is_view
+            || (!owned_by_cube
+                && is_sql_is_direct_ref
+                && is_calculated
+                && !is_multi_stage
+                && measure_filters.is_empty()
+                && measure_drill_filters.is_empty()
+                && time_shifts.is_empty()
+                && measure_order_by.is_empty()
+                && reduce_by.is_none()
+                && add_group_by.is_none()
+                && group_by.is_none());
 
         Ok(MemberSymbol::new_measure(MeasureSymbol::new(
             cube_name,

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

@@ -136,6 +136,22 @@ impl MemberSymbol {
         }
     }
 
+    pub fn reference_member(&self) -> Option<Rc<MemberSymbol>> {
+        let deps = self.get_dependencies();
+        if deps.is_empty() || !self.is_reference() {
+            return None;
+        }
+        deps.first().cloned()
+    }
+
+    pub fn resolve_reference_chain(self: Rc<Self>) -> Rc<MemberSymbol> {
+        let mut current = self;
+        while let Some(reference) = current.reference_member() {
+            current = reference;
+        }
+        current
+    }
+
     pub fn owned_by_cube(&self) -> bool {
         match self {
             Self::Dimension(d) => d.owned_by_cube(),

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_templates/plan.rs

@@ -13,7 +13,7 @@ pub struct PlanSqlTemplates {
     base_tools: Rc<dyn BaseTools>,
 }
 pub const UNDERSCORE_UPPER_BOUND: Boundary = Boundary {
-    name: "LowerUpper",
+    name: "UnderscoreUpper",
     condition: |s, _| {
         s.get(0) == Some(&"_")
             && s.get(1)
@@ -25,6 +25,21 @@ pub const UNDERSCORE_UPPER_BOUND: Boundary = Boundary {
     len: 0,
 };
 
+fn grapheme_is_uppercase(c: &&str) -> bool {
+    c.to_uppercase() != c.to_lowercase() && *c == c.to_uppercase()
+}
+
+pub const UPPER_UPPER_BOUND: Boundary = Boundary {
+    name: "UpperUpper",
+    condition: |s, _| {
+        s.get(0).map(grapheme_is_uppercase) == Some(true)
+            && s.get(1).map(grapheme_is_uppercase) == Some(true)
+    },
+    arg: None,
+    start: 1,
+    len: 0,
+};
+
 impl PlanSqlTemplates {
     pub fn new(render: Rc<dyn SqlTemplatesRender>, base_tools: Rc<dyn BaseTools>) -> Self {
         Self { render, base_tools }
@@ -34,6 +49,7 @@ impl PlanSqlTemplates {
         let res = name
             .with_boundaries(&[
                 UNDERSCORE_UPPER_BOUND,
+                UPPER_UPPER_BOUND,
                 Boundary::LOWER_UPPER,
                 Boundary::DIGIT_UPPER,
                 Boundary::ACRONYM,