feat(core/df-repr): better upper bound pruning to reduce plan space

datafusion-optd-cli/tests/cli_integration.rs

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use std::process::Command;
+use std::process::{Command, Stdio};
 
 use assert_cmd::prelude::CommandCargoExt;
 
@@ -55,11 +55,8 @@ fn init() {
 fn cli_test_tpch() {
     let mut cmd = Command::cargo_bin("datafusion-optd-cli").unwrap();
     cmd.current_dir(".."); // all paths in `test.sql` assume we're in the base dir of the repo
-    cmd.args([
-        "--enable-df-logical",
-        "--file",
-        "datafusion-optd-cli/tpch-sf0_01/test.sql",
-    ]);
+    cmd.args(["--file", "datafusion-optd-cli/tpch-sf0_01/test.sql"]);
+    cmd.stdout(Stdio::piped()).stderr(Stdio::piped());
     let status = cmd.status().unwrap();
     assert!(
         status.success(),

optd-core/Cargo.toml

@@ -19,6 +19,8 @@ serde = { version = "1.0", features = ["derive", "rc"] }
 arrow-schema = "53.3.0"
 chrono = "0.4"
 erased-serde = "0.4"
+pollster = "0.4"
+stacker = "0.1"
 
 [dev-dependencies]
 pretty_assertions = "1.4.1"

optd-core/src/cascades.rs

@@ -7,8 +7,8 @@
 
 mod memo;
 mod optimizer;
-mod tasks;
+pub mod rule_match;
+mod tasks2;
 
 pub use memo::{Memo, NaiveMemo};
 pub use optimizer::{CascadesOptimizer, ExprId, GroupId, OptimizerProperties, RelNodeContext};
-use tasks::Task;

optd-core/src/cascades/memo.rs

@@ -158,6 +158,11 @@ pub trait Memo<T: NodeType>: 'static + Send + Sync {
     ) -> Result<ArcPlanNode<T>> {
         get_best_group_binding_inner(self, group_id, &mut post_process)
     }
+
+    /// Get winner of a group and a subgroup.
+    fn get_group_winner(&self, group_id: GroupId) -> &Winner {
+        &self.get_group(group_id).info.winner
+    }
 }
 
 fn get_best_group_binding_inner<M: Memo<T> + ?Sized, T: NodeType>(
@@ -302,6 +307,7 @@ impl<T: NodeType> Memo<T> for NaiveMemo<T> {
                 self.expr_id_to_expr_node[expr_id]
             );
         }
+        let group_id = self.reduce_group(group_id);
         let grp = self.groups.get_mut(&group_id);
         grp.unwrap().info = group_info;
     }
@@ -352,7 +358,8 @@ impl<T: NodeType> NaiveMemo<T> {
     }
 
     fn verify_integrity(&self) {
-        if cfg!(debug_assertions) {
+        const ENABLE_INTEGRITY_CHECK: bool = false;
+        if ENABLE_INTEGRITY_CHECK {
             let num_of_exprs = self.expr_id_to_expr_node.len();
             assert_eq!(num_of_exprs, self.expr_node_to_expr_id.len());
             assert_eq!(num_of_exprs, self.expr_id_to_group_id.len());