Refine tuple result iteration

Author: KKould

Cargo.lock

@@ -2,7 +2,7 @@
 
 [package]
 name          = "kite_sql"
-version       = "0.3.2"
+version       = "0.3.3"
 edition       = "2021"
 build         = "build.rs"
 authors       = ["Kould <kould2333@gmail.com>", "Xwg <loloxwg@gmail.com>"]
@@ -53,7 +53,7 @@ required-features = ["pprof"]
 bumpalo               = { version = "3", default-features = false, features = ["collections"] }
 ordered-float         = { version = "4" }
 paste                 = { version = "1" }
-kite_sql_serde_macros = { version = "0.2.2", path = "kite_sql_serde_macros" }
+kite_sql_serde_macros = { version = "0.2.3", path = "kite_sql_serde_macros" }
 
 # Optional dependencies for features
 comfy-table           = { version = "7", default-features = false, optional = true }

Cargo.toml

@@ -202,10 +202,10 @@ Recent 720-second local comparison on the machine above:
 
 | Backend | TpmC | New-Order p90 | Payment p90 | Order-Status p90 | Delivery p90 | Stock-Level p90 |
 | --- | ---: | ---: | ---: | ---: | ---: | ---: |
-| KiteSQL LMDB | 73638 | 0.001s | 0.001s | 0.001s | 0.002s | 0.001s |
-| KiteSQL RocksDB | 39051 | 0.001s | 0.001s | 0.002s | 0.009s | 0.001s |
-| SQLite balanced | 56788 | 0.001s | 0.001s | 0.001s | 0.001s | 0.001s |
-| SQLite practical | 44049 | 0.001s | 0.001s | 0.001s | 0.001s | 0.001s |
+| KiteSQL LMDB | 64871 | 0.001s | 0.001s | 0.001s | 0.002s | 0.001s |
+| KiteSQL RocksDB | 37922 | 0.001s | 0.001s | 0.002s | 0.010s | 0.001s |
+| SQLite balanced | 53938 | 0.001s | 0.001s | 0.001s | 0.001s | 0.001s |
+| SQLite practical | 41493 | 0.001s | 0.001s | 0.001s | 0.001s | 0.001s |
 
 The detailed raw outputs are recorded in [tpcc/README.md](tpcc/README.md).
 #### 👉[check more](tpcc/README.md)

README.md

@@ -49,33 +49,40 @@ mod app {
             .run("insert into t1 values(0, 0), (1, 1)")?
             .done()?;
 
-        assert!(database.run("select * from t1")?.next().is_none());
+        let mut hidden_iter = database.run("select * from t1")?;
+        assert!(hidden_iter.next_tuple(|_, _| ())?.is_none());
+        hidden_iter.done()?;
 
         transaction.commit()?;
 
         let mut iter = database.run("select * from t1")?;
-        assert_eq!(
-            iter.next().unwrap()?,
-            Tuple::new(None, vec![DataValue::Int32(0), DataValue::Int32(0)])
-        );
-        assert_eq!(
-            iter.next().unwrap()?,
-            Tuple::new(None, vec![DataValue::Int32(1), DataValue::Int32(1)])
-        );
-        assert!(iter.next().is_none());
+        iter.next_tuple(|_, tuple| {
+            assert_eq!(
+                tuple,
+                &Tuple::new(None, vec![DataValue::Int32(0), DataValue::Int32(0)])
+            );
+        })?
+        .unwrap();
+        iter.next_tuple(|_, tuple| {
+            assert_eq!(
+                tuple,
+                &Tuple::new(None, vec![DataValue::Int32(1), DataValue::Int32(1)])
+            );
+        })?
+        .unwrap();
+        assert!(iter.next_tuple(|_, _| ())?.is_none());
         iter.done()?;
 
         let mut tx2 = database.new_transaction()?;
         tx2.run("update t1 set c2 = 99 where c1 = 0")?.done()?;
+        let mut c2_iter = database.run("select c2 from t1 where c1 = 0")?;
         assert_eq!(
-            database
-                .run("select c2 from t1 where c1 = 0")?
-                .next()
-                .unwrap()?
-                .values[0]
-                .i32(),
+            c2_iter
+                .next_tuple(|_, tuple| tuple.values[0].i32())?
+                .unwrap(),
             Some(0)
         );
+        c2_iter.done()?;
         drop(tx2);
 
         database.ddl("drop table t1")?;

examples/transaction.rs

@@ -1,6 +1,6 @@
 [package]
 name        = "kite_sql_serde_macros"
-version     = "0.2.2"
+version     = "0.2.3"
 edition     = "2021"
 description = "Derive macros for KiteSQL"
 documentation = "https://docs.rs/kite_sql_serde_macros/latest/kite_sql_serde_macros/"

kite_sql_serde_macros/Cargo.toml

@@ -244,7 +244,7 @@ pub(crate) fn handle(ast: DeriveInput) -> Result<TokenStream, Error> {
         });
         field_initializers.push(quote! {
             #field_name: ::kite_sql::orm::take_value_at::<#field_ty>(
-                &mut tuple,
+                tuple,
                 #field_index_ident,
                 #column_name_lit,
             )?
@@ -410,7 +410,7 @@ pub(crate) fn handle(ast: DeriveInput) -> Result<TokenStream, Error> {
         {
             fn from_query_row(
                 schema: &::kite_sql::types::tuple::SchemaView<'_, '_>,
-                mut tuple: ::kite_sql::types::tuple::Tuple,
+                tuple: &mut ::kite_sql::types::tuple::Tuple,
             ) -> ::std::result::Result<Self, ::kite_sql::errors::DatabaseError> {
                 let mut __kite_orm_found_fields = 0usize;
                 #(#field_index_declarations)*

kite_sql_serde_macros/src/orm.rs

@@ -88,7 +88,7 @@ pub(crate) fn handle(ast: DeriveInput) -> Result<TokenStream, Error> {
         });
         field_initializers.push(quote! {
             #field_name: ::kite_sql::orm::take_value_at::<#field_ty>(
-                &mut tuple,
+                tuple,
                 #field_index_ident,
                 #field_name_lit,
             )?
@@ -121,7 +121,7 @@ pub(crate) fn handle(ast: DeriveInput) -> Result<TokenStream, Error> {
         {
             fn from_query_row(
                 schema: &::kite_sql::types::tuple::SchemaView<'_, '_>,
-                mut tuple: ::kite_sql::types::tuple::Tuple,
+                tuple: &mut ::kite_sql::types::tuple::Tuple,
             ) -> ::std::result::Result<Self, ::kite_sql::errors::DatabaseError> {
                 let mut __kite_orm_found_fields = 0usize;
                 #(#field_index_declarations)*

kite_sql_serde_macros/src/projection.rs

@@ -15,7 +15,7 @@
 #[cfg(not(target_arch = "wasm32"))]
 mod native {
     use comfy_table::{Cell, Table};
-    use kite_sql::db::{BorrowResultIter, DBTransaction, DataBaseBuilder, Database};
+    use kite_sql::db::{DBTransaction, DataBaseBuilder, Database, ResultIter};
     use kite_sql::errors::DatabaseError;
     use kite_sql::storage::rocksdb::RocksStorage;
     use rustyline::config::Configurer;
@@ -172,7 +172,7 @@ Transaction commands:
 
     fn print_table<I>(mut iter: I) -> Result<(), DatabaseError>
     where
-        I: BorrowResultIter,
+        I: ResultIter,
     {
         let (table, schema_len, row_count) = create_table(&mut iter)?;
         iter.done()?;
@@ -192,7 +192,7 @@ Transaction commands:
 
     fn create_table<I>(iter: &mut I) -> Result<(Table, usize, usize), DatabaseError>
     where
-        I: BorrowResultIter,
+        I: ResultIter,
     {
         let mut table = Table::new();
         let (header, schema_len) = iter.schema(|schema| {
@@ -209,13 +209,14 @@ Transaction commands:
         }
 
         let mut row_count = 0usize;
-        while let Some(tuple) = iter.next_borrowed_tuple()? {
-            row_count += 1;
-            let row = tuple
+        while let Some(row) = iter.next_tuple(|_, tuple| {
+            tuple
                 .values
                 .iter()
                 .map(|value| Cell::new(format!("{value}")))
-                .collect::<Vec<_>>();
+                .collect::<Vec<_>>()
+        })? {
+            row_count += 1;
             table.add_row(row);
         }