Use CubeRewrite type alias

Author: mcheshkov

rust/cubesql/cubesql/src/compile/rewrite/mod.rs

@@ -9,7 +9,7 @@ use self::analysis::{LogicalPlanData, MemberNameToExpr};
 use crate::{
     compile::rewrite::{
         analysis::{LogicalPlanAnalysis, OriginalExpr},
-        rewriter::CubeEGraph,
+        rewriter::{CubeEGraph, CubeRewrite},
     },
     CubeError,
 };
@@ -37,7 +37,6 @@ use std::{
     str::FromStr,
     sync::Arc,
 };
-
 // trace_macros!(true);
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Hash)]
@@ -658,11 +657,7 @@ fn expr_column_name(expr: &Expr, cube: &Option<String>) -> String {
     }
 }
 
-pub fn rewrite(
-    name: &str,
-    searcher: String,
-    applier: String,
-) -> Rewrite<LogicalPlanLanguage, LogicalPlanAnalysis> {
+pub fn rewrite(name: &str, searcher: String, applier: String) -> CubeRewrite {
     Rewrite::new(
         name.to_string(),
         searcher.parse::<Pattern<LogicalPlanLanguage>>().unwrap(),
@@ -676,7 +671,7 @@ pub fn transforming_rewrite<T>(
     searcher: String,
     applier: String,
     transform_fn: T,
-) -> Rewrite<LogicalPlanLanguage, LogicalPlanAnalysis>
+) -> CubeRewrite
 where
     T: Fn(&mut CubeEGraph, &mut Subst) -> bool + Sync + Send + 'static,
 {
@@ -695,7 +690,7 @@ pub fn transforming_rewrite_with_root<T>(
     searcher: String,
     applier: String,
     transform_fn: T,
-) -> Rewrite<LogicalPlanLanguage, LogicalPlanAnalysis>
+) -> CubeRewrite
 where
     T: Fn(&mut CubeEGraph, Id, &mut Subst) -> bool + Sync + Send + 'static,
 {
@@ -713,7 +708,7 @@ pub fn transforming_chain_rewrite<T>(
     chain: Vec<(&str, String)>,
     applier: String,
     transform_fn: T,
-) -> Rewrite<LogicalPlanLanguage, LogicalPlanAnalysis>
+) -> CubeRewrite
 where
     T: Fn(&mut CubeEGraph, &mut Subst) -> bool + Sync + Send + 'static,
 {
@@ -739,7 +734,7 @@ pub fn transforming_chain_rewrite_with_root<T>(
     chain: Vec<(&str, String)>,
     applier: String,
     transform_fn: T,
-) -> Rewrite<LogicalPlanLanguage, LogicalPlanAnalysis>
+) -> CubeRewrite
 where
     T: Fn(&mut CubeEGraph, Id, &mut Subst) -> bool + Sync + Send + 'static,
 {
@@ -1159,7 +1154,7 @@ pub fn list_rewrite(
     list_type: ListType,
     searcher: ListPattern,
     applier: ListPattern,
-) -> Rewrite<LogicalPlanLanguage, LogicalPlanAnalysis> {
+) -> CubeRewrite {
     let searcher = ListNodeSearcher::new(
         list_type.clone(),
         &searcher.list_var,
@@ -1181,7 +1176,7 @@ pub fn list_rewrite_with_lists(
     searcher: ListPattern,
     applier_pattern: &str,
     lists: impl IntoIterator<Item = ListApplierListPattern>,
-) -> Rewrite<LogicalPlanLanguage, LogicalPlanAnalysis> {
+) -> CubeRewrite {
     let searcher = ListNodeSearcher::new(
         list_type.clone(),
         &searcher.list_var,
@@ -1198,7 +1193,7 @@ pub fn list_rewrite_with_vars(
     searcher: ListPattern,
     applier: ListPattern,
     top_level_elem_vars: &[&str],
-) -> Rewrite<LogicalPlanLanguage, LogicalPlanAnalysis> {
+) -> CubeRewrite {
     let searcher = ListNodeSearcher::new(
         list_type.clone(),
         &searcher.list_var,
@@ -1222,7 +1217,7 @@ pub fn list_rewrite_with_lists_and_vars(
     applier_pattern: &str,
     lists: impl IntoIterator<Item = ListApplierListPattern>,
     top_level_elem_vars: &[&str],
-) -> Rewrite<LogicalPlanLanguage, LogicalPlanAnalysis> {
+) -> CubeRewrite {
     let searcher = ListNodeSearcher::new(
         list_type.clone(),
         &searcher.list_var,

rust/cubesql/cubesql/src/compile/rewrite/rewriter.rs

@@ -392,7 +392,7 @@ impl Rewriter {
     fn run_rewrites(
         cube_context: &Arc<CubeContext>,
         egraph: CubeEGraph,
-        rules: Arc<Vec<Rewrite<LogicalPlanLanguage, LogicalPlanAnalysis>>>,
+        rules: Arc<Vec<CubeRewrite>>,
         stage: &str,
     ) -> Result<(CubeRunner, Vec<QtraceEgraphIteration>), CubeError> {
         let runner = Self::rewrite_runner(cube_context.clone(), egraph);
@@ -523,7 +523,7 @@ impl Rewriter {
         meta_context: Arc<MetaContext>,
         config_obj: Arc<dyn ConfigObj>,
         eval_stable_functions: bool,
-    ) -> Vec<Rewrite<LogicalPlanLanguage, LogicalPlanAnalysis>> {
+    ) -> Vec<CubeRewrite> {
         let sql_push_down = Self::sql_push_down_enabled();
         let rules: Vec<Box<dyn RewriteRules>> = vec![
             Box::new(MemberRules::new(
@@ -575,7 +575,7 @@ impl Rewriter {
 }
 
 pub trait RewriteRules {
-    fn rewrite_rules(&self) -> Vec<Rewrite<LogicalPlanLanguage, LogicalPlanAnalysis>>;
+    fn rewrite_rules(&self) -> Vec<CubeRewrite>;
 }
 
 struct IncrementalScheduler {

rust/cubesql/cubesql/src/compile/test/rewrite_engine.rs

@@ -4,17 +4,14 @@ use datafusion::{
     logical_plan::LogicalPlan,
     sql::{parser::Statement, planner::SqlToRel},
 };
-use egg::Rewrite;
 
 use super::get_test_session;
 use crate::{
     compile::{
         parser::parse_sql_to_statement,
         rewrite::{
-            analysis::LogicalPlanAnalysis,
             converter::{CubeRunner, LogicalPlanToLanguageConverter},
-            rewriter::Rewriter,
-            LogicalPlanLanguage,
+            rewriter::{CubeRewrite, Rewriter},
         },
         rewrite_statement, CompilationError, CubeContext, DatabaseProtocol, QueryEngine,
         SqlQueryEngine,
@@ -55,9 +52,7 @@ pub fn rewrite_runner(plan: LogicalPlan, context: Arc<CubeContext>) -> CubeRunne
     converter.take_runner()
 }
 
-pub fn rewrite_rules(
-    cube_context: Arc<CubeContext>,
-) -> Vec<Rewrite<LogicalPlanLanguage, LogicalPlanAnalysis>> {
+pub fn rewrite_rules(cube_context: Arc<CubeContext>) -> Vec<CubeRewrite> {
     Rewriter::rewrite_rules(
         cube_context.meta.clone(),
         cube_context.sessions.server.config_obj.clone(),

rust/cubesql/cubesql/src/sql/compiler_cache.rs

@@ -2,11 +2,7 @@ use crate::{
     compile::{
         engine::CubeContext,
         qtrace::Qtrace,
-        rewrite::{
-            analysis::LogicalPlanAnalysis,
-            rewriter::{CubeEGraph, Rewriter},
-            LogicalPlanLanguage,
-        },
+        rewrite::rewriter::{CubeEGraph, CubeRewrite, Rewriter},
         DatabaseProtocol,
     },
     config::ConfigObj,
@@ -17,7 +13,6 @@ use crate::{
 };
 use async_trait::async_trait;
 use datafusion::scalar::ScalarValue;
-use egg::Rewrite;
 use lru::LruCache;
 use std::{collections::HashMap, fmt::Debug, num::NonZeroUsize, sync::Arc};
 use uuid::Uuid;
@@ -29,7 +24,7 @@ pub trait CompilerCache: Send + Sync + Debug {
         ctx: AuthContextRef,
         protocol: DatabaseProtocol,
         eval_stable_functions: bool,
-    ) -> Result<Arc<Vec<Rewrite<LogicalPlanLanguage, LogicalPlanAnalysis>>>, CubeError>;
+    ) -> Result<Arc<Vec<CubeRewrite>>, CubeError>;
 
     async fn meta(
         &self,
@@ -64,8 +59,7 @@ pub struct CompilerCacheImpl {
 
 pub struct CompilerCacheEntry {
     meta_context: Arc<MetaContext>,
-    rewrite_rules:
-        RWLockAsync<HashMap<bool, Arc<Vec<Rewrite<LogicalPlanLanguage, LogicalPlanAnalysis>>>>>,
+    rewrite_rules: RWLockAsync<HashMap<bool, Arc<Vec<CubeRewrite>>>>,
     parameterized_cache: MutexAsync<LruCache<[u8; 32], CubeEGraph>>,
     queries_cache: MutexAsync<LruCache<[u8; 32], CubeEGraph>>,
 }
@@ -79,7 +73,7 @@ impl CompilerCache for CompilerCacheImpl {
         ctx: AuthContextRef,
         protocol: DatabaseProtocol,
         eval_stable_functions: bool,
-    ) -> Result<Arc<Vec<Rewrite<LogicalPlanLanguage, LogicalPlanAnalysis>>>, CubeError> {
+    ) -> Result<Arc<Vec<CubeRewrite>>, CubeError> {
         let cache_entry = self.get_cache_entry(ctx.clone(), protocol).await?;
 
         let rewrite_rules = {