engine: remove 2 from types and fns (#172)

Author: carllerche

crates/toasty-core/src/stmt/filter.rs

@@ -116,6 +116,12 @@ impl Statement {
         }
     }
 
+    pub fn filter_expr_unwrap(&self) -> &Expr {
+        self.filter()
+            .and_then(|f| f.expr.as_ref())
+            .expect("expected Statement with expression filter")
+    }
+
     pub fn filter_expr_mut(&mut self) -> Option<&mut Expr> {
         self.filter_mut().and_then(|filter| filter.expr.as_mut())
     }

crates/toasty/src/engine.rs

@@ -4,7 +4,7 @@ use plan::Plan;
 mod eval;
 mod exec;
 mod index;
-mod kv2;
+mod kv;
 mod planner;
 mod simplify;
 use simplify::Simplify;

crates/toasty/src/engine/exec.rs

@@ -1,5 +1,5 @@
 mod delete_by_key;
-mod exec_statement2;
+mod exec_statement;
 mod filter;
 mod find_pk_by_index;
 mod get_by_key;
@@ -57,15 +57,15 @@ impl Exec<'_> {
     async fn exec_step(&mut self, action: &Action) -> Result<()> {
         match action {
             Action::DeleteByKey(action) => self.action_delete_by_key(action).await,
-            Action::ExecStatement2(action) => self.action_exec_statement2(action).await,
+            Action::ExecStatement(action) => self.action_exec_statement(action).await,
             Action::Filter(action) => self.action_filter(action).await,
-            Action::FindPkByIndex2(action) => self.action_find_pk_by_index2(action).await,
-            Action::GetByKey2(action) => self.action_get_by_key2(action).await,
+            Action::FindPkByIndex(action) => self.action_find_pk_by_index(action).await,
+            Action::GetByKey(action) => self.action_get_by_key(action).await,
             Action::NestedMerge(action) => self.action_nested_merge(action).await,
-            Action::QueryPk2(action) => self.action_query_pk2(action).await,
-            Action::ReadModifyWrite2(action) => self.action_read_modify_write2(action).await,
+            Action::QueryPk(action) => self.action_query_pk(action).await,
+            Action::ReadModifyWrite(action) => self.action_read_modify_write(action).await,
             Action::Project(action) => self.action_project(action).await,
-            Action::SetVar2(action) => self.action_set_var2(action),
+            Action::SetVar(action) => self.action_set_var(action),
             Action::UpdateByKey(action) => self.action_update_by_key(action).await,
         }
     }

crates/toasty/src/engine/exec/exec_statement2.rs renamed to crates/toasty/src/engine/exec/exec_statement.rs

@@ -5,9 +5,9 @@ use toasty_core::{
 };
 
 impl Exec<'_> {
-    pub(super) async fn action_exec_statement2(
+    pub(super) async fn action_exec_statement(
         &mut self,
-        action: &plan::ExecStatement2,
+        action: &plan::ExecStatement,
     ) -> Result<()> {
         let mut stmt = action.stmt.clone();
 

crates/toasty/src/engine/exec/find_pk_by_index.rs

@@ -7,9 +7,9 @@ use super::{plan, Exec, Result};
 use crate::engine::simplify;
 
 impl Exec<'_> {
-    pub(super) async fn action_find_pk_by_index2(
+    pub(super) async fn action_find_pk_by_index(
         &mut self,
-        action: &plan::FindPkByIndex2,
+        action: &plan::FindPkByIndex,
     ) -> Result<()> {
         let mut filter = action.filter.clone();
 

crates/toasty/src/engine/exec/get_by_key.rs

@@ -3,7 +3,7 @@ use crate::driver::Rows;
 use toasty_core::{driver::operation, stmt::ValueStream};
 
 impl Exec<'_> {
-    pub(super) async fn action_get_by_key2(&mut self, action: &plan::GetByKey2) -> Result<()> {
+    pub(super) async fn action_get_by_key(&mut self, action: &plan::GetByKey) -> Result<()> {
         let keys = self
             .vars
             .load(action.input)

crates/toasty/src/engine/exec/query_pk.rs

@@ -5,7 +5,7 @@ use crate::{
 use toasty_core::driver::operation;
 
 impl Exec<'_> {
-    pub(super) async fn action_query_pk2(&mut self, action: &plan::QueryPk2) -> Result<()> {
+    pub(super) async fn action_query_pk(&mut self, action: &plan::QueryPk) -> Result<()> {
         let mut pk_filter = action.pk_filter.clone();
 
         if let Some(input) = &action.input {

crates/toasty/src/engine/exec/rmw.rs

@@ -11,9 +11,9 @@ use toasty_core::{
 };
 
 impl Exec<'_> {
-    pub(super) async fn action_read_modify_write2(
+    pub(super) async fn action_read_modify_write(
         &mut self,
-        action: &plan::ReadModifyWrite2,
+        action: &plan::ReadModifyWrite,
     ) -> Result<()> {
         assert!(action.input.is_empty(), "TODO");
 

crates/toasty/src/engine/exec/set_var.rs

@@ -5,7 +5,7 @@ use crate::{
 use toasty_core::driver::Rows;
 
 impl Exec<'_> {
-    pub(super) fn action_set_var2(&mut self, action: &plan::SetVar2) -> Result<()> {
+    pub(super) fn action_set_var(&mut self, action: &plan::SetVar) -> Result<()> {
         // Store the projected stream to the output variable
         self.vars.store(
             action.output.var,

crates/toasty/src/engine/index.rs

@@ -13,30 +13,17 @@ use toasty_core::{
  */
 
 impl Engine {
-    pub(crate) fn plan_index_path2<'a>(&'a self, stmt: &stmt::Statement) -> IndexPlan<'a> {
+    pub(crate) fn plan_index_path<'a>(&'a self, stmt: &stmt::Statement) -> IndexPlan<'a> {
         let cx = self.expr_cx();
         let cx = cx.scope(stmt);
-        // Get a handle to the expression target so it can be passed into plan_index_path
+        // Get a handle to the expression target so it can be passed into the planner
         let target = cx.target();
         let stmt::ExprTarget::Table(table) = target else {
             todo!("target={target:#?}")
         };
 
         // Get the statement filter
-        let Some(filter) = stmt.filter() else {
-            todo!("stmt={stmt:#?}")
-        };
-
-        self.plan_index_path(cx, table, filter)
-    }
-
-    pub(crate) fn plan_index_path<'a, 'stmt>(
-        &'a self,
-        cx: stmt::ExprContext<'stmt>,
-        table: &'stmt Table,
-        filter: &'stmt stmt::Filter,
-    ) -> IndexPlan<'a> {
-        let filter = filter.expr.as_ref().expect("TODO");
+        let filter = stmt.filter_expr_unwrap();
 
         let mut index_planner = IndexPlanner {
             cx,