fix(tesseract): Filter by multi-stage measure (cube-js#10579)

Author: waralexrom

packages/cubejs-schema-compiler/test/integration/postgres/multi-stage.test.ts

@@ -232,6 +232,25 @@ views:
       },
     ],
     { joinGraph, cubeEvaluator, compiler }));
+    it('multi stage measure filter', async () => dbRunner.runQueryTest({
+      dimensions: ['orders.status'],
+      timeDimensions: [
+        {
+          dimension: 'orders.date',
+          granularity: 'year'
+        }
+      ],
+      filters: [
+        { member: 'orders.cagr_1_y', operator: 'gt', values: ['1.5'] }
+      ],
+      timezone: 'UTC'
+    }, [
+      {
+        orders__date_year: '2023-01-01T00:00:00.000Z',
+        orders__status: 'completed',
+      },
+    ],
+    { joinGraph, cubeEvaluator, compiler }));
   } else {
     // This test is working only in tesseract
     test.skip('multi stage over sub query', () => { expect(1).toBe(1); });

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

@@ -49,7 +49,7 @@ impl MultiStageQueryPlanner {
     > {
         let multi_stage_members = self
             .query_properties
-            .all_members(false)
+            .all_used_symbols()?
             .into_iter()
             .filter_map(|memb| -> Option<Result<_, CubeError>> {
                 match has_multi_stage_members(&memb, false) {

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

@@ -659,20 +659,28 @@ impl QueryProperties {
         if exclude_time_dimensions {
             dimensions.chain(measures).collect_vec()
         } else {
-            let time_dimensions = self.time_dimensions.iter().map(|d| {
-                /* if let Ok(td) = d.as_time_dimension() {
-                    td.base_symbol().clone()
-                } else { */
-                d.clone()
-                //}
-            });
+            let time_dimensions = self.time_dimensions.iter().map(|d| d.clone());
             dimensions
                 .chain(time_dimensions)
                 .chain(measures)
                 .collect_vec()
         }
     }
 
+    pub fn all_used_symbols(&self) -> Result<Vec<Rc<MemberSymbol>>, CubeError> {
+        let mut members = vec![];
+        members.extend(self.time_dimensions.iter().cloned());
+        members.extend(self.dimensions.iter().cloned());
+        self.fill_all_filter_symbols(&mut members);
+        members.extend(self.all_used_measures()?);
+
+        let res = members
+            .into_iter()
+            .unique_by(|m| m.full_name())
+            .collect_vec();
+        Ok(res)
+    }
+
     pub fn get_member_symbols(
         &self,
         include_time_dimensions: bool,
@@ -708,22 +716,6 @@ impl QueryProperties {
         }
     }
 
-    /* pub fn group_by(&self) -> Vec<Expr> {
-        if self.ungrouped {
-            vec![]
-        } else {
-            self.dimensions
-                .iter()
-                .map(|f| Expr::Member(MemberExpression::new(f.clone())))
-                .chain(
-                    self.time_dimensions
-                        .iter()
-                        .map(|f| Expr::Member(MemberExpression::new(f.clone()))),
-                )
-                .collect()
-        }
-    } */
-
     pub fn default_order(
         dimensions: &Vec<Rc<MemberSymbol>>,
         time_dimensions: &Vec<Rc<MemberSymbol>>,

rust/cubesqlplanner/cubesqlplanner/src/tests/integration/multi_stage/filters.rs

@@ -173,3 +173,28 @@ async fn test_filter_on_multi_stage_measure() {
         insta::assert_snapshot!(result);
     }
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_filter_on_only_multi_stage_measure() {
+    let ctx = create_context();
+
+    let query = indoc! {r#"
+        dimensions:
+          - orders.status
+          - orders.category
+        filters:
+          - member: orders.amount_reduce_category
+            operator: gt
+            values:
+              - "200"
+        order:
+          - id: orders.status
+          - id: orders.category
+    "#};
+
+    ctx.build_sql(query).unwrap();
+
+    if let Some(result) = ctx.try_execute_pg(query, SEED).await {
+        insta::assert_snapshot!(result);
+    }
+}

rust/cubesqlplanner/cubesqlplanner/src/tests/integration/multi_stage/snapshots/cubesqlplanner__tests__integration__multi_stage__filters__filter_on_only_multi_stage_measure.snap

@@ -0,0 +1,12 @@
+---
+source: cubesqlplanner/src/tests/integration/multi_stage/filters.rs
+expression: result
+---
+orders__status | orders__category
+---------------+-----------------
+completed      | books           
+completed      | clothing        
+completed      | electronics     
+pending        | books           
+pending        | clothing        
+pending        | electronics