Plan create index v2

bustubx/src/planner/logical_plan_v2/create_index.rs

@@ -1,9 +1,9 @@
-use crate::catalog::SchemaRef;
+use crate::common::table_ref::TableReference;
+use crate::planner::logical_plan_v2::OrderByExpr;
 
 #[derive(derive_new::new, Debug, Clone)]
 pub struct CreateIndex {
     pub index_name: String,
-    pub table_name: String,
-    pub table_schema: SchemaRef,
-    pub key_attrs: Vec<u32>,
+    pub table: TableReference,
+    pub columns: Vec<OrderByExpr>,
 }

bustubx/src/planner/logical_planner/logical_planner.rs

@@ -1,5 +1,5 @@
-use crate::BustubxResult;
-use sqlparser::ast::{JoinConstraint, JoinOperator, Statement, TableFactor, TableWithJoins};
+use crate::{BustubxError, BustubxResult};
+use sqlparser::ast::{Ident, JoinConstraint, JoinOperator, Statement, TableFactor, TableWithJoins};
 use std::sync::Arc;
 
 use crate::catalog::{Catalog, DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};
@@ -198,7 +198,7 @@ impl<'a> LogicalPlanner<'a> {
         }
     }
 
-    pub fn plan_order_by(
+    pub fn plan_order_by_v2(
         &self,
         order_by: &sqlparser::ast::OrderByExpr,
     ) -> BustubxResult<OrderByExpr> {
@@ -209,4 +209,26 @@ impl<'a> LogicalPlanner<'a> {
             nulls_first: order_by.nulls_first.unwrap_or(false),
         })
     }
+
+    pub fn plan_table_name(
+        &self,
+        table_name: &sqlparser::ast::ObjectName,
+    ) -> BustubxResult<TableReference> {
+        match table_name.0.as_slice() {
+            [table] => Ok(TableReference::bare(table.value.clone())),
+            [schema, table] => Ok(TableReference::partial(
+                schema.value.clone(),
+                table.value.clone(),
+            )),
+            [catalog, schema, table] => Ok(TableReference::full(
+                catalog.value.clone(),
+                schema.value.clone(),
+                table.value.clone(),
+            )),
+            _ => Err(BustubxError::Plan(format!(
+                "Fail to plan table name: {}",
+                table_name
+            ))),
+        }
+    }
 }

bustubx/src/planner/logical_planner/plan_create_index.rs

@@ -1,6 +1,10 @@
+use crate::common::table_ref::TableReference;
 use crate::expression::{ColumnExpr, Expr};
 use crate::planner::logical_plan::LogicalPlan;
+use crate::planner::logical_plan_v2::{CreateIndex, LogicalPlanV2};
 use crate::planner::operator::LogicalOperator;
+use crate::{BustubxError, BustubxResult};
+use itertools::Itertools;
 use sqlparser::ast::{ObjectName, OrderByExpr};
 
 use super::LogicalPlanner;
@@ -37,4 +41,29 @@ impl<'a> LogicalPlanner<'a> {
             children: Vec::new(),
         }
     }
+
+    pub fn plan_create_index_v2(
+        &self,
+        index_name: &ObjectName,
+        table_name: &ObjectName,
+        columns: &Vec<OrderByExpr>,
+    ) -> BustubxResult<LogicalPlanV2> {
+        let index_name = index_name
+            .0
+            .get(0)
+            .map_or(Err(BustubxError::Plan("".to_string())), |ident| {
+                Ok(ident.value.clone())
+            })?;
+        let table = self.plan_table_name(table_name)?;
+        let mut columns_expr = vec![];
+        for col in columns.iter() {
+            let col_expr = self.plan_order_by_v2(&col)?;
+            columns_expr.push(col_expr);
+        }
+        Ok(LogicalPlanV2::CreateIndex(CreateIndex {
+            index_name,
+            table,
+            columns: columns_expr,
+        }))
+    }
 }