Fix select concurrent bugs

Cargo.toml

@@ -3,7 +3,7 @@ members = ["codegen", "examples", "performance_measurement", "performance_measur
 
 [package]
 name = "worktable"
-version = "0.6.12"
+version = "0.6.13"
 edition = "2024"
 authors = ["Handy-caT"]
 license = "MIT"
@@ -16,7 +16,7 @@ perf_measurements = ["dep:performance_measurement", "dep:performance_measurement
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-worktable_codegen = { path = "codegen", version = "0.6.12" }
+worktable_codegen = { path = "codegen", version = "0.6.13" }
 
 eyre = "0.6.12"
 derive_more = { version = "1.0.0", features = ["from", "error", "display", "into"] }

codegen/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "worktable_codegen"
-version = "0.6.12"
+version = "0.6.13"
 edition = "2024"
 license = "MIT"
 description = "WorkTable codegeneration crate"

codegen/src/worktable/generator/queries/delete.rs

@@ -45,12 +45,6 @@ impl Generator {
                     #full_row_lock
                 };
 
-                let link = self.0
-                    .pk_map
-                    .get(&pk)
-                    .map(|v| v.get().value)
-                    .ok_or(WorkTableError::NotFound)?;
-
                 #delete_logic
 
                 lock.unlock();  // Releases locks

codegen/src/worktable/generator/queries/update.rs

@@ -246,7 +246,7 @@ impl Generator {
                         #full_row_lock
                     };
 
-                    let row_old = self.0.data.select(link)?;
+                    let row_old = self.select(pk.clone()).expect("should not be deleted by other thread");
                     let mut row_new = row_old.clone();
                     let pk = row_old.get_primary_key().clone();
                     #(#row_updates)*

codegen/src/worktable/generator/table/index_fns.rs

@@ -84,6 +84,7 @@ impl Generator {
             .ok_or(syn::Error::new(i.span(), "Row not found"))?;
         let fn_name = Ident::new(format!("select_by_{i}").as_str(), Span::mixed_site());
         let field_ident = &idx.name;
+        let row_field_ident = &idx.field;
         let by = if is_float(type_.to_string().as_str()) {
             quote! {
                 &OrderedFloat(by)
@@ -103,7 +104,8 @@ impl Generator {
                 let rows = self.0.indexes.#field_ident
                     .get(#by)
                     .into_iter()
-                    .filter_map(|(_, link)| self.0.data.select(*link).ok());
+                    .filter_map(|(_, link)| self.0.data.select(*link).ok())
+                    .filter(move |r| &r.#row_field_ident == &by);
 
                 SelectQueryBuilder::new(rows)
             }

codegen/src/worktable/parser/attribute.rs

@@ -43,14 +43,13 @@ impl Parser {
 
 #[cfg(test)]
 mod tests {
-    use proc_macro2::TokenStream;
     use quote::quote;
 
     use crate::worktable::Parser;
 
     #[test]
     fn test_empty() {
-        let tokens = TokenStream::from(quote! {});
+        let tokens = quote! {};
         let mut parser = Parser::new(tokens);
         let empty = parser.parse_persist();
         assert!(empty.is_ok());
@@ -59,15 +58,15 @@ mod tests {
 
     #[test]
     fn test_literal_field() {
-        let tokens = TokenStream::from(quote! {"nme": TestName,});
+        let tokens = quote! {"nme": TestName,};
         let mut parser = Parser::new(tokens);
         let name = parser.parse_persist();
         assert!(name.is_err());
     }
 
     #[test]
     fn test_persistence() {
-        let tokens = TokenStream::from(quote! {persist: true,});
+        let tokens = quote! {persist: true,};
         let mut parser = Parser::new(tokens);
         let name = parser.parse_persist();
         assert!(name.is_ok());
@@ -76,7 +75,7 @@ mod tests {
 
     #[test]
     fn test_wrong_field() {
-        let tokens = TokenStream::from(quote! {nme: TestName,});
+        let tokens = quote! {nme: TestName,};
         let mut parser = Parser::new(tokens);
         let name = parser.parse_persist();
         assert!(name.is_ok());
@@ -85,7 +84,7 @@ mod tests {
 
     #[test]
     fn test_no_comma() {
-        let tokens = TokenStream::from(quote! {name: TestName});
+        let tokens = quote! {name: TestName};
         let mut parser = Parser::new(tokens);
         let name = parser.parse_persist();
         assert!(name.is_ok());

codegen/src/worktable/parser/columns.rs

@@ -130,17 +130,16 @@ impl Parser {
 mod tests {
     use std::collections::HashMap;
 
-    use proc_macro2::TokenStream;
     use quote::quote;
 
     use crate::worktable::Parser;
 
     #[test]
     fn test_columns_parse() {
-        let tokens = TokenStream::from(quote! {columns: {
+        let tokens = quote! {columns: {
             id: i64 primary_key,
             test: u64,
-        }});
+        }};
         let mut parser = Parser::new(tokens);
         let columns = parser.parse_columns();
 
@@ -160,10 +159,10 @@ mod tests {
 
     #[test]
     fn test_columns_parse_no_last_comma() {
-        let tokens = TokenStream::from(quote! {columns: {
+        let tokens = quote! {columns: {
             id: i64 primary_key,
             test: u64
-        }});
+        }};
         let mut parser = Parser::new(tokens);
         let columns = parser.parse_columns();
 
@@ -183,10 +182,10 @@ mod tests {
 
     #[test]
     fn test_columns_parse_optional() {
-        let tokens = TokenStream::from(quote! {columns: {
+        let tokens = quote! {columns: {
             id: i64 primary_key,
             test: u64 optional,
-        }});
+        }};
         let mut parser = Parser::new(tokens);
         let columns = parser.parse_columns();
 
@@ -208,11 +207,11 @@ mod tests {
 
     #[test]
     fn test_columns_parse_three() {
-        let tokens = TokenStream::from(quote! {columns: {
+        let tokens = quote! {columns: {
             id: i64 primary_key,
             test: u64,
             a: u64
-        }});
+        }};
         let mut parser = Parser::new(tokens);
         let columns = parser.parse_columns();
 
@@ -232,10 +231,10 @@ mod tests {
 
     #[test]
     fn test_columns_parse_no_primary_key() {
-        let tokens = TokenStream::from(quote! {columns: {
+        let tokens = quote! {columns: {
             id: i64,
             test: u64
-        }});
+        }};
         let mut parser = Parser::new(tokens);
         let columns = parser.parse_columns();
 
@@ -247,7 +246,7 @@ mod tests {
 
         #[test]
         fn test_row_parse() {
-            let row_tokens = TokenStream::from(quote! {id: i64 primary_key,});
+            let row_tokens = quote! {id: i64 primary_key,};
 
             let mut parser = Parser::new(row_tokens);
             let row = parser.parse_row();
@@ -262,7 +261,7 @@ mod tests {
 
         #[test]
         fn test_row_parse_no_comma() {
-            let row_tokens = TokenStream::from(quote! {id: i64 primary_key TreeIndex});
+            let row_tokens = quote! {id: i64 primary_key TreeIndex};
 
             let mut parser = Parser::new(row_tokens);
             let row = parser.parse_row();
@@ -277,7 +276,7 @@ mod tests {
 
         #[test]
         fn test_row_parse_no_primary_key() {
-            let row_tokens = TokenStream::from(quote! {id: i64,});
+            let row_tokens = quote! {id: i64,};
 
             let mut parser = Parser::new(row_tokens);
             let row = parser.parse_row();
@@ -292,7 +291,7 @@ mod tests {
 
         #[test]
         fn test_row_parse_no_primary_key_no_comma() {
-            let row_tokens = TokenStream::from(quote! {id: i64});
+            let row_tokens = quote! {id: i64};
 
             let mut parser = Parser::new(row_tokens);
             let row = parser.parse_row();
@@ -307,7 +306,7 @@ mod tests {
 
         #[test]
         fn test_row_parse_optional() {
-            let row_tokens = TokenStream::from(quote! {id: i64 optional});
+            let row_tokens = quote! {id: i64 optional};
 
             let mut parser = Parser::new(row_tokens);
             let row = parser.parse_row();

codegen/src/worktable/parser/name.rs

@@ -44,14 +44,13 @@ impl Parser {
 
 #[cfg(test)]
 mod tests {
-    use proc_macro2::TokenStream;
     use quote::quote;
 
     use crate::worktable::Parser;
 
     #[test]
     fn test_name_parse() {
-        let tokens = TokenStream::from(quote! {name: TestName,});
+        let tokens = quote! {name: TestName,};
 
         let mut parser = Parser::new(tokens);
         let name = parser.parse_name();
@@ -64,7 +63,7 @@ mod tests {
 
     #[test]
     fn test_empty() {
-        let tokens = TokenStream::from(quote! {});
+        let tokens = quote! {};
 
         let mut parser = Parser::new(tokens);
         let name = parser.parse_name();
@@ -74,7 +73,7 @@ mod tests {
 
     #[test]
     fn test_literal_field() {
-        let tokens = TokenStream::from(quote! {"nme": TestName,});
+        let tokens = quote! {"nme": TestName,};
 
         let mut parser = Parser::new(tokens);
         let name = parser.parse_name();
@@ -84,7 +83,7 @@ mod tests {
 
     #[test]
     fn test_wrong_field() {
-        let tokens = TokenStream::from(quote! {nme: TestName,});
+        let tokens = quote! {nme: TestName,};
 
         let mut parser = Parser::new(tokens);
         let name = parser.parse_name();