chore(cubesql): QueryEngine - support custom metadata for QueryPlan

Author: ovr

rust/cubesql/cubesql/src/compile/plan.rs

@@ -47,12 +47,7 @@ pub enum QueryPlan {
     // Query will be executed via Data Fusion
     DataFusionSelect(LogicalPlan, DFSessionContext),
     // Query will be executed via DataFusion and saved to session
-    CreateTempTable(
-        LogicalPlan,
-        DFSessionContext,
-        String,
-        Arc<TempTableManager>,
-    ),
+    CreateTempTable(LogicalPlan, DFSessionContext, String, Arc<TempTableManager>),
 }
 
 impl fmt::Debug for QueryPlan {
@@ -85,8 +80,9 @@ impl fmt::Debug for QueryPlan {
 impl QueryPlan {
     pub fn as_logical_plan(&self) -> LogicalPlan {
         match self {
-            QueryPlan::DataFusionSelect(plan, _)
-            | QueryPlan::CreateTempTable(plan, _, _, _) => plan.clone(),
+            QueryPlan::DataFusionSelect(plan, _) | QueryPlan::CreateTempTable(plan, _, _, _) => {
+                plan.clone()
+            }
             QueryPlan::MetaOk(_, _) | QueryPlan::MetaTabular(_, _) => {
                 panic!("This query doesnt have a plan, because it already has values for response")
             }
@@ -110,8 +106,7 @@ impl QueryPlan {
 
     pub fn print(&self, pretty: bool) -> Result<String, CubeError> {
         match self {
-            QueryPlan::DataFusionSelect(plan, _)
-            | QueryPlan::CreateTempTable(plan, _, _, _) => {
+            QueryPlan::DataFusionSelect(plan, _) | QueryPlan::CreateTempTable(plan, _, _, _) => {
                 if pretty {
                     Ok(plan.display_indent().to_string())
                 } else {

rust/cubesql/cubesql/src/compile/query_engine.rs

@@ -253,13 +253,7 @@ pub trait QueryEngine {
             qtrace.set_best_plan_and_cube_scans(&rewrite_plan);
         }
 
-        Ok((
-            QueryPlan::DataFusionSelect(
-                rewrite_plan,
-                ctx,
-            ),
-            metadata
-        ))
+        Ok((QueryPlan::DataFusionSelect(rewrite_plan, ctx), metadata))
     }
 
     fn evaluate_wrapped_sql(
@@ -480,7 +474,8 @@ impl QueryEngine for SqlQueryEngine {
         stmt: &Self::AstStatementType,
     ) -> Result<(LogicalPlan, Self::PlanMetadataType), DataFusionError> {
         let df_query_planner = SqlToRel::new_with_options(cube_ctx, true);
-        let plan = df_query_planner.statement_to_plan(DFStatement::Statement(Box::new(stmt.clone())))?;
+        let plan =
+            df_query_planner.statement_to_plan(DFStatement::Statement(Box::new(stmt.clone())))?;
 
         Ok((plan, ()))
     }