chore(cubesql): Rename SplitRules to OldSplitRules to prepare for mig…

…ration
cube-js · Feb 4, 2024 · 7a0a0c0 · 7a0a0c0
1 parent 407c3fd
commit 7a0a0c0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/rust/cubesql/cubesql/src/compile/rewrite/rewriter.rs b/rust/cubesql/cubesql/src/compile/rewrite/rewriter.rs
@@ -8,7 +8,8 @@ use crate::{
             cost::BestCubePlan,
             rules::{
                 case::CaseRules, common::CommonRules, dates::DateRules, filters::FilterRules,
-                members::MemberRules, order::OrderRules, split::SplitRules, wrapper::WrapperRules,
+                members::MemberRules, old_split::OldSplitRules, order::OrderRules,
+                wrapper::WrapperRules,
             },
             LiteralExprValue, LogicalPlanLanguage, QueryParamIndex,
         },
@@ -513,7 +514,7 @@ impl Rewriter {
             Box::new(DateRules::new()),
             Box::new(OrderRules::new()),
             Box::new(CommonRules::new()),
-            Box::new(SplitRules::new(meta_context.clone(), config_obj.clone())),
+            Box::new(OldSplitRules::new(meta_context.clone(), config_obj.clone())),
             Box::new(CaseRules::new()),
         ];
         let mut rewrites = Vec::new();

diff --git a/rust/cubesql/cubesql/src/compile/rewrite/rules/mod.rs b/rust/cubesql/cubesql/src/compile/rewrite/rules/mod.rs
@@ -6,8 +6,8 @@ pub mod common;
 pub mod dates;
 pub mod filters;
 pub mod members;
+pub mod old_split;
 pub mod order;
-pub mod split;
 pub mod utils;
 pub mod wrapper;
 

diff --git a/...ubesql/src/compile/rewrite/rules/split.rs → ...ql/src/compile/rewrite/rules/old_split.rs b/...ubesql/src/compile/rewrite/rules/split.rs → ...ql/src/compile/rewrite/rules/old_split.rs
@@ -32,12 +32,12 @@ use datafusion::{
 use egg::{EGraph, Id, Rewrite, Subst, Var};
 use std::{fmt::Display, ops::Index, sync::Arc};
 
-pub struct SplitRules {
+pub struct OldSplitRules {
     meta_context: Arc<MetaContext>,
     config_obj: Arc<dyn ConfigObj>,
 }
 
-impl RewriteRules for SplitRules {
+impl RewriteRules for OldSplitRules {
     fn rewrite_rules(&self) -> Vec<Rewrite<LogicalPlanLanguage, LogicalPlanAnalysis>> {
         let mut rules = vec![
             transforming_rewrite(
@@ -4631,7 +4631,7 @@ impl RewriteRules for SplitRules {
     }
 }
 
-impl SplitRules {
+impl OldSplitRules {
     pub fn new(meta_context: Arc<MetaContext>, config_obj: Arc<dyn ConfigObj>) -> Self {
         Self {
             meta_context,

diff --git a/rust/cubesql/cubesql/src/compile/test/rewrite_engine.rs b/rust/cubesql/cubesql/src/compile/test/rewrite_engine.rs
@@ -16,8 +16,8 @@ use crate::{
             converter::{CubeRunner, LogicalPlanToLanguageConverter},
             rewriter::RewriteRules,
             rules::{
-                dates::DateRules, filters::FilterRules, members::MemberRules, order::OrderRules,
-                split::SplitRules,
+                dates::DateRules, filters::FilterRules, members::MemberRules,
+                old_split::OldSplitRules, order::OrderRules,
             },
             LogicalPlanLanguage,
         },
@@ -70,7 +70,7 @@ pub fn rewrite_rules(
         Box::new(FilterRules::new(cube_context.meta.clone(), true)),
         Box::new(DateRules::new()),
         Box::new(OrderRules::new()),
-        Box::new(SplitRules::new(
+        Box::new(OldSplitRules::new(
             cube_context.meta.clone(),
             cube_context.sessions.server.config_obj.clone(),
         )),