fix(backend-native): Use the lowest granularity for data-transform td with granularity fallback

Author: KSDaemon

rust/cubeorchestrator/src/query_result_transform.rs

@@ -197,8 +197,14 @@ pub fn get_members(
                     .any(|dim| *dim == MemberOrMemberExpression::Member(calc_member.clone()))
             })
         {
-            members_map.insert(calc_member.clone(), column.clone());
-            members_arr.push(calc_member);
+            // For cases when the same dimension with few different granularities is present
+            // we should not duplicate the dimension without granularity
+            if members_map
+                .insert(calc_member.clone(), column.clone())
+                .is_none()
+            {
+                members_arr.push(calc_member);
+            }
         }
     }
 
@@ -290,6 +296,21 @@ pub fn get_vanilla_row(
 ) -> Result<HashMap<String, DBResponsePrimitive>> {
     let mut row = HashMap::new();
 
+    // FIXME: For now custom granularities are not supported, only common ones.
+    // There is no granularity type/class implementation in rust yet.
+    let granularity_levels: HashMap<&str, u8> = HashMap::from([
+        ("second", 1),
+        ("minute", 2),
+        ("hour", 3),
+        ("day", 4),
+        ("week", 5),
+        ("month", 6),
+        ("quarter", 7),
+        ("year", 8),
+    ]);
+    let default_level_for_unknown = 10;
+    let mut minimal_granularities: HashMap<String, (u8, DBResponsePrimitive)> = HashMap::new();
+
     for (alias, &index) in columns_pos {
         if let Some(value) = db_row.get(index) {
             let member_name = match alias_to_member_name_map.get(alias) {
@@ -324,23 +345,46 @@ pub fn get_vanilla_row(
             row.insert(member_name.clone(), transformed_value.clone());
 
             // Handle deprecated time dimensions without granularity
+            // Try to collect minimal granularity value for time dimensions without granularity
+            // as there might be more than one granularity column for the same dimension
             let path: Vec<&str> = member_name.split(MEMBER_SEPARATOR).collect();
-            let member_name_without_granularity =
-                format!("{}{}{}", path[0], MEMBER_SEPARATOR, path[1]);
-            if path.len() == 3
-                && query.dimensions.as_ref().map_or(true, |dims| {
+            if path.len() == 3 {
+                let granularity = path[2];
+                let member_name_without_granularity =
+                    format!("{}{}{}", path[0], MEMBER_SEPARATOR, path[1]);
+
+                // Check that a member without granularity is absent in the query
+                if query.dimensions.as_ref().map_or(true, |dims| {
                     !dims.iter().any(|dim| {
                         *dim == MemberOrMemberExpression::Member(
                             member_name_without_granularity.clone(),
                         )
                     })
-                })
-            {
-                row.insert(member_name_without_granularity, transformed_value);
+                }) {
+                    let level = granularity_levels
+                        .get(granularity)
+                        .cloned()
+                        .unwrap_or(default_level_for_unknown);
+
+                    match minimal_granularities.get(&member_name_without_granularity) {
+                        Some((existing_level, _)) if *existing_level < level => {}
+                        _ => {
+                            minimal_granularities.insert(
+                                member_name_without_granularity,
+                                (level, transformed_value),
+                            );
+                        }
+                    }
+                }
             }
         }
     }
 
+    // Handle deprecated time dimensions without granularity
+    for (member, (_, value)) in minimal_granularities {
+        row.insert(member, value);
+    }
+
     match query_type {
         QueryType::CompareDateRangeQuery => {
             let date_range_value = get_date_range_value(query.time_dimensions.as_ref())?;
@@ -1271,6 +1315,133 @@ mod tests {
         ]
       ]
     }
+  },
+  "blending_query_multiple_granularities": {
+    "request": {
+      "aliasToMemberNameMap": {
+        "e_commerce_records_us2021__avg_discount": "ECommerceRecordsUs2021.avg_discount",
+        "e_commerce_records_us2021__order_date_month": "ECommerceRecordsUs2021.orderDate.month",
+        "e_commerce_records_us2021__order_date_week": "ECommerceRecordsUs2021.orderDate.week"
+      },
+      "annotation": {
+        "ECommerceRecordsUs2021.avg_discount": {
+          "title": "E Commerce Records Us2021 Avg Discount",
+          "shortTitle": "Avg Discount",
+          "type": "number",
+          "drillMembers": [],
+          "drillMembersGrouped": {
+            "measures": [],
+            "dimensions": []
+          }
+        },
+        "ECommerceRecordsUs2021.orderDate.month": {
+          "title": "E Commerce Records Us2021 Order Date",
+          "shortTitle": "Order Date",
+          "type": "time"
+        },
+        "ECommerceRecordsUs2021.orderDate.week": {
+          "title": "E Commerce Records Us2021 Order Date",
+          "shortTitle": "Order Date",
+          "type": "time"
+        },
+        "ECommerceRecordsUs2021.orderDate": {
+          "title": "E Commerce Records Us2021 Order Date",
+          "shortTitle": "Order Date",
+          "type": "time"
+        }
+      },
+      "query": {
+        "measures": [
+          "ECommerceRecordsUs2021.avg_discount"
+        ],
+        "timeDimensions": [
+          {
+            "dimension": "ECommerceRecordsUs2021.orderDate",
+            "granularity": "month",
+            "dateRange": [
+              "2020-01-01T00:00:00.000",
+              "2020-12-30T23:59:59.999"
+            ]
+          },
+          {
+            "dimension": "ECommerceRecordsUs2021.orderDate",
+            "granularity": "week",
+            "dateRange": [
+              "2020-01-01T00:00:00.000",
+              "2020-12-30T23:59:59.999"
+            ]
+          }
+        ],
+        "filters": [
+          {
+            "operator": "equals",
+            "values": [
+              "First Class"
+            ],
+            "member": "ECommerceRecordsUs2021.shipMode"
+          }
+        ],
+        "limit": 2,
+        "rowLimit": 2,
+        "timezone": "UTC",
+        "order": [],
+        "dimensions": []
+      },
+      "queryType": "blendingQuery"
+    },
+    "queryResult": [
+      {
+        "e_commerce_records_us2021__order_date_month": "2020-01-01T00:00:00.000",
+        "e_commerce_records_us2021__order_date_week": "2019-12-30T00:00:00.000",
+        "e_commerce_records_us2021__avg_discount": "0.28571428571428571429"
+      },
+      {
+        "e_commerce_records_us2021__order_date_month": "2020-02-01T00:00:00.000",
+        "e_commerce_records_us2021__order_date_week": "2020-01-27T00:00:00.000",
+        "e_commerce_records_us2021__avg_discount": "0.21777777777777777778"
+      }
+    ],
+    "finalResultDefault": [
+      {
+        "ECommerceRecordsUs2021.orderDate.month": "2020-01-01T00:00:00.000",
+        "ECommerceRecordsUs2021.orderDate.week": "2019-12-30T00:00:00.000",
+        "ECommerceRecordsUs2021.orderDate": "2019-12-30T00:00:00.000",
+        "ECommerceRecordsUs2021.avg_discount": "0.28571428571428571429",
+        "time.month": "2020-01-01T00:00:00.000"
+      },
+      {
+        "ECommerceRecordsUs2021.orderDate.month": "2020-02-01T00:00:00.000",
+        "ECommerceRecordsUs2021.orderDate.week": "2020-01-27T00:00:00.000",
+        "ECommerceRecordsUs2021.orderDate": "2020-01-27T00:00:00.000",
+        "ECommerceRecordsUs2021.avg_discount": "0.21777777777777777778",
+        "time.month": "2020-02-01T00:00:00.000"
+      }
+    ],
+    "finalResultCompact": {
+      "members": [
+        "ECommerceRecordsUs2021.orderDate.month",
+        "ECommerceRecordsUs2021.orderDate.week",
+        "ECommerceRecordsUs2021.orderDate",
+        "ECommerceRecordsUs2021.avg_discount",
+        "time.month"
+      ],
+      "dataset": [
+        [
+          "2020-01-01T00:00:00.000",
+          "2019-12-30T00:00:00.000",
+          "2019-12-30T00:00:00.000",
+          "0.28571428571428571429",
+          "2020-01-01T00:00:00.000"
+        ],
+        [
+          "2020-02-01T00:00:00.000",
+          "2020-01-27T00:00:00.000",
+          "2020-01-27T00:00:00.000",
+          "0.21777777777777777778",
+          "2020-02-01T00:00:00.000"
+        ]
+      ]
+    }
   }
 }
     "#;
@@ -1919,6 +2090,32 @@ mod tests {
         Ok(())
     }
 
+    #[test]
+    fn test_blending_query_multiple_granularities_default() -> Result<()> {
+        let mut test_data = TEST_SUITE_DATA
+            .get(&"blending_query_multiple_granularities".to_string())
+            .unwrap()
+            .clone();
+        test_data.request.res_type = Some(ResultType::Default);
+        let raw_data = QueryResult::from_js_raw_data(test_data.query_result.clone())?;
+        let transformed = TransformedData::transform(&test_data.request, &raw_data)?;
+        compare_transformed_data(&transformed, &test_data.final_result_default.unwrap())?;
+        Ok(())
+    }
+
+    #[test]
+    fn test_blending_query_multiple_granularities_compact() -> Result<()> {
+        let mut test_data = TEST_SUITE_DATA
+            .get(&"blending_query_multiple_granularities".to_string())
+            .unwrap()
+            .clone();
+        test_data.request.res_type = Some(ResultType::Compact);
+        let raw_data = QueryResult::from_js_raw_data(test_data.query_result.clone())?;
+        let transformed = TransformedData::transform(&test_data.request, &raw_data)?;
+        compare_transformed_data(&transformed, &test_data.final_result_compact.unwrap())?;
+        Ok(())
+    }
+
     #[test]
     fn test_get_members_no_alias_to_member_name_map() -> Result<()> {
         let mut test_data = TEST_SUITE_DATA