refactor!: remove old FilterExec and FilterResultExpr and rename …

…`DenseFilterExec` to `FilterExec` (#137)
spaceandtimelabs · Sep 10, 2024 · 50a093b · 50a093b
1 parent 9c25104
commit 50a093b
Show file tree

Hide file tree

Showing 21 changed files with 568 additions and 1,347 deletions.
diff --git a/crates/proof-of-sql/src/sql/parse/filter_exec_builder.rs b/crates/proof-of-sql/src/sql/parse/filter_exec_builder.rs
@@ -6,7 +6,7 @@ use crate::{
     },
     sql::{
         proof_exprs::{AliasedDynProofExpr, DynProofExpr, TableExpr},
-        proof_plans::DenseFilterExec,
+        proof_plans::FilterExec,
     },
 };
 use indexmap::IndexMap;
@@ -71,8 +71,8 @@ impl<C: Commitment> FilterExecBuilder<C> {
         self
     }
 
-    pub fn build(self) -> DenseFilterExec<C> {
-        DenseFilterExec::new(
+    pub fn build(self) -> FilterExec<C> {
+        FilterExec::new(
             self.filter_result_expr_list,
             self.table_expr.expect("Table expr is required"),
             self.where_expr

diff --git a/crates/proof-of-sql/src/sql/parse/query_expr.rs b/crates/proof-of-sql/src/sql/parse/query_expr.rs
@@ -121,12 +121,12 @@ impl<C: Commitment> QueryExpr<C> {
                     );
                 }
                 Ok(Self {
-                    proof_expr: DynProofPlan::DenseFilter(filter),
+                    proof_expr: DynProofPlan::Filter(filter),
                     postprocessing,
                 })
             }
         } else {
-            // No group by, so we need to do a dense filter.
+            // No group by, so we need to do a filter.
             let column_mapping = context.get_column_mapping();
             let enriched_exprs = result_aliased_exprs
                 .iter()
@@ -152,7 +152,7 @@ impl<C: Commitment> QueryExpr<C> {
                 );
             }
             Ok(Self {
-                proof_expr: DynProofPlan::DenseFilter(filter),
+                proof_expr: DynProofPlan::Filter(filter),
                 postprocessing,
             })
         }