fix: fix issues

spaceandtimelabs · Nov 14, 2024 · 0d76046 · 0d76046
1 parent bc63f52
commit 0d76046
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 14 deletions.
diff --git a/crates/proof-of-sql/src/sql/proof_plans/filter_exec.rs b/crates/proof-of-sql/src/sql/proof_plans/filter_exec.rs
@@ -3,7 +3,7 @@ use crate::{
     base::{
         database::{
             filter_util::filter_columns, Column, ColumnField, ColumnRef, DataAccessor, OwnedTable,
-            TableRef,
+            Table, TableRef,
         },
         map::{IndexMap, IndexSet},
         proof::ProofError,

diff --git a/crates/proof-of-sql/src/sql/proof_plans/filter_exec_test_dishonest_prover.rs b/crates/proof-of-sql/src/sql/proof_plans/filter_exec_test_dishonest_prover.rs
@@ -3,7 +3,7 @@ use crate::{
     base::{
         database::{
             filter_util::*, owned_table_utility::*, Column, DataAccessor, OwnedTableTestAccessor,
-            TestAccessor,
+            Table, TestAccessor,
         },
         proof::ProofError,
         scalar::Scalar,

diff --git a/crates/proof-of-sql/src/sql/proof_plans/group_by_exec.rs b/crates/proof-of-sql/src/sql/proof_plans/group_by_exec.rs
@@ -5,7 +5,7 @@ use crate::{
             group_by_util::{
                 aggregate_columns, compare_indexes_by_owned_columns, AggregatedColumns,
             },
-            Column, ColumnField, ColumnRef, ColumnType, DataAccessor, OwnedTable, TableRef,
+            Column, ColumnField, ColumnRef, ColumnType, DataAccessor, OwnedTable, Table, TableRef,
         },
         map::{IndexMap, IndexSet},
         proof::ProofError,

diff --git a/crates/proof-of-sql/src/sql/proof_plans/projection_exec.rs b/crates/proof-of-sql/src/sql/proof_plans/projection_exec.rs
@@ -91,25 +91,14 @@ impl ProverEvaluate for ProjectionExec {
         accessor: &'a dyn DataAccessor<S>,
     ) -> Table<'a, S> {
         let column_refs = self.get_column_references();
-<<<<<<< HEAD
         let used_table = accessor.get_table(self.table.table_ref, &column_refs);
-        let columns: Vec<_> = self
-            .aliased_results
-            .iter()
-            .map(|aliased_expr| aliased_expr.expr.result_evaluate(alloc, &used_table))
-            .collect();
-        columns
-=======
-        let used_table =
-            Table::<'a, S>::from_columns(&column_refs, self.table.table_ref, accessor, alloc);
         Table::<'a, S>::try_from_iter(self.aliased_results.iter().map(|aliased_expr| {
             (
                 aliased_expr.alias,
                 aliased_expr.expr.result_evaluate(alloc, &used_table),
             )
         }))
         .expect("Failed to create table from iterator")
->>>>>>> 531ba7cc (refactor!: let `ProofPlan::result_evaluate` and `final_round_evaluate` return `Table`)
     }
 
     fn first_round_evaluate(&self, _builder: &mut FirstRoundBuilder) {}