perf: #155 & explain tpcc make sure all statement use index

KipData · Dec 4, 2024 · 60526e1 · 60526e1
1 parent 874529a
commit 60526e1
Show file tree

Hide file tree

Showing 26 changed files with 891 additions and 332 deletions.
diff --git a/README.md b/README.md
@@ -63,13 +63,13 @@ run `cargo run -p tpcc --release` to run tpcc
 - Tips: TPCC currently only supports single thread
 ```shell
 <90th Percentile RT (MaxRT)>
-   New-Order : 0.005  (0.007)
-     Payment : 0.084  (0.141)
-Order-Status : 0.492  (0.575)
-    Delivery : 6.109  (6.473)
- Stock-Level : 0.001  (0.001)
+   New-Order : 0.003  (0.006)
+     Payment : 0.001  (0.003)
+Order-Status : 0.062  (0.188)
+    Delivery : 0.022  (0.052)
+ Stock-Level : 0.004  (0.006)
 <TpmC>
-98 Tpmc
+6669 Tpmc
 ```
 #### PG Wire Service
 run `cargo run --features="net"` to start server

diff --git a/src/catalog/table.rs b/src/catalog/table.rs
@@ -143,11 +143,28 @@ impl TableCatalog {
                 }
             })
             .clone();
+
+        let mut val_tys = Vec::with_capacity(column_ids.len());
+        for column_id in column_ids.iter() {
+            let val_ty = self
+                .get_column_by_id(column_id)
+                .ok_or_else(|| DatabaseError::ColumnNotFound(column_id.to_string()))?
+                .datatype()
+                .clone();
+            val_tys.push(val_ty)
+        }
+        let value_ty = if val_tys.len() == 1 {
+            val_tys.pop().unwrap()
+        } else {
+            LogicalType::Tuple(val_tys)
+        };
+
         let index = IndexMeta {
             id: index_id,
             column_ids,
             table_name: self.name.clone(),
             pk_ty,
+            value_ty,
             name,
             ty,
         };

diff --git a/src/execution/ddl/add_column.rs b/src/execution/ddl/add_column.rs
@@ -11,7 +11,6 @@ use crate::{
 use std::ops::Coroutine;
 use std::ops::CoroutineState;
 use std::pin::Pin;
-use std::slice;
 
 pub struct AddColumn {
     op: AddColumnOperator,
@@ -80,8 +79,7 @@ impl<'a, T: Transaction + 'a> WriteExecutor<'a, T> for AddColumn {
                         .cloned(),
                 ) {
                     for (tuple_id, value) in unique_values {
-                        let index =
-                            Index::new(unique_meta.id, slice::from_ref(&value), IndexType::Unique);
+                        let index = Index::new(unique_meta.id, &value, IndexType::Unique);
                         throw!(transaction.add_index(table_name, index, &tuple_id));
                     }
                 }

diff --git a/src/execution/ddl/create_index.rs b/src/execution/ddl/create_index.rs
@@ -9,6 +9,7 @@ use crate::throw;
 use crate::types::index::Index;
 use crate::types::tuple::Tuple;
 use crate::types::tuple_builder::TupleBuilder;
+use crate::types::value::DataValue;
 use crate::types::ColumnId;
 use std::ops::Coroutine;
 use std::ops::CoroutineState;
@@ -86,7 +87,10 @@ impl<'a, T: Transaction + 'a> WriteExecutor<'a, T> for CreateIndex {
                 }
                 drop(coroutine);
                 for (tuple_id, values) in index_values {
-                    let index = Index::new(index_id, &values, ty);
+                    let Some(value) = DataValue::values_to_tuple(values) else {
+                        continue;
+                    };
+                    let index = Index::new(index_id, &value, ty);
                     throw!(transaction.add_index(table_name.as_str(), index, &tuple_id));
                 }
                 yield Ok(TupleBuilder::build_result("1".to_string()));

diff --git a/src/execution/dml/analyze.rs b/src/execution/dml/analyze.rs
@@ -90,7 +90,9 @@ impl<'a, T: Transaction + 'a> WriteExecutor<'a, T> for Analyze {
                         if values.len() == 1 {
                             throw!(builder.append(&values[0]));
                         } else {
-                            throw!(builder.append(&Arc::new(DataValue::Tuple(Some(values)))));
+                            throw!(
+                                builder.append(&Arc::new(DataValue::Tuple(Some((values, false)))))
+                            );
                         }
                     }
                 }

diff --git a/src/execution/dml/delete.rs b/src/execution/dml/delete.rs
@@ -88,9 +88,13 @@ impl<'a, T: Transaction + 'a> WriteExecutor<'a, T> for Delete {
                 ) in indexes
                 {
                     for (i, values) in value_rows.into_iter().enumerate() {
+                        let Some(value) = DataValue::values_to_tuple(values) else {
+                            continue;
+                        };
+
                         throw!(transaction.del_index(
                             &table_name,
-                            &Index::new(index_id, &values, index_ty),
+                            &Index::new(index_id, &value, index_ty),
                             Some(&tuple_ids[i]),
                         ));
                     }

diff --git a/src/execution/dml/insert.rs b/src/execution/dml/insert.rs
@@ -131,7 +131,7 @@ impl<'a, T: Transaction + 'a> WriteExecutor<'a, T> for Insert {
                             id: Some(if primary_keys.len() == 1 {
                                 tuple_id.pop().unwrap()
                             } else {
-                                DataValue::Tuple(Some(tuple_id))
+                                DataValue::Tuple(Some((tuple_id, false)))
                             }),
                             values,
                         });
@@ -142,7 +142,10 @@ impl<'a, T: Transaction + 'a> WriteExecutor<'a, T> for Insert {
 
                         for tuple in tuples.iter() {
                             let values = throw!(Projection::projection(tuple, &exprs, &schema));
-                            let index = Index::new(index_meta.id, &values, index_meta.ty);
+                            let Some(value) = DataValue::values_to_tuple(values) else {
+                                continue;
+                            };
+                            let index = Index::new(index_meta.id, &value, index_meta.ty);
 
                             throw!(transaction.add_index(
                                 &table_name,

diff --git a/src/execution/dml/update.rs b/src/execution/dml/update.rs
@@ -10,6 +10,7 @@ use crate::types::index::Index;
 use crate::types::tuple::types;
 use crate::types::tuple::Tuple;
 use crate::types::tuple_builder::{TupleBuilder, TupleIdBuilder};
+use crate::types::value::DataValue;
 use std::collections::HashMap;
 use std::ops::Coroutine;
 use std::ops::CoroutineState;
@@ -82,7 +83,10 @@ impl<'a, T: Transaction + 'a> WriteExecutor<'a, T> for Update {
                         for tuple in tuples.iter() {
                             let values =
                                 throw!(Projection::projection(tuple, &exprs, &input_schema));
-                            let index = Index::new(index_meta.id, &values, index_meta.ty);
+                            let Some(value) = DataValue::values_to_tuple(values) else {
+                                continue;
+                            };
+                            let index = Index::new(index_meta.id, &value, index_meta.ty);
                             throw!(transaction.del_index(
                                 &table_name,
                                 &index,
@@ -116,7 +120,10 @@ impl<'a, T: Transaction + 'a> WriteExecutor<'a, T> for Update {
                         for (index_meta, exprs) in index_metas.iter() {
                             let values =
                                 throw!(Projection::projection(&tuple, exprs, &input_schema));
-                            let index = Index::new(index_meta.id, &values, index_meta.ty);
+                            let Some(value) = DataValue::values_to_tuple(values) else {
+                                continue;
+                            };
+                            let index = Index::new(index_meta.id, &value, index_meta.ty);
                             throw!(transaction.add_index(
                                 &table_name,
                                 index,

diff --git a/src/expression/evaluator.rs b/src/expression/evaluator.rs
@@ -274,7 +274,9 @@ impl ScalarExpression {
                 for expr in exprs {
                     values.push(expr.eval(tuple, schema)?);
                 }
-                Ok(DataValue::Tuple((!values.is_empty()).then_some(values)))
+                Ok(DataValue::Tuple(
+                    (!values.is_empty()).then_some((values, false)),
+                ))
             }
             ScalarExpression::ScalaFunction(ScalarFunction { inner, args, .. }) => {
                 inner.eval(args, tuple, schema)?.cast(inner.return_type())