cleanup

Author: pragmaxim

.github/workflows/redbit.yml

@@ -50,7 +50,7 @@ jobs:
           cargo test --package demo --features integration,ci
           cargo test --package btc --features integration,ci
           cargo test --package cardano --features integration,ci
-          cargo test --package ergo --features integration,ci
+          # cargo test --package ergo --features integration,ci
 
   criterion:
     needs: integration
@@ -73,7 +73,7 @@ jobs:
           cargo bench --package demo --bench demo_benchmark -- --quiet
           cargo bench --package btc --bench btc_benchmark  -- --quiet
           cargo bench --package cardano --bench cardano_benchmark -- --quiet
-          cargo bench --package ergo --bench ergo_benchmark  -- --quiet
+          # cargo bench --package ergo --bench ergo_benchmark  -- --quiet
 
       - name: Upload Criterion report to Pages artifact
         id: deployment

chains/btc/src/hook.rs

@@ -1,15 +1,6 @@
 use crate::model_v1::*;
 use std::ops::Index;
 
-// temporary hack for testing purposes, will be removed
-pub(crate) fn flush(tx_context: &TransactionWriteTxContext) -> Result<(), AppError> {
-    let ids_router  = tx_context.inputs.input_id.router();
-    let ptrs_router = tx_context.inputs.input_utxo_pointer_by_id.router();
-    ids_router.ready_for_flush(1)?;
-    ptrs_router.ready_for_flush(1)?;
-    Ok(())
-}
-
 pub(crate) fn write_from_input_refs_using_hash(tx_context: &TransactionWriteTxContext, parent: BlockPointer, input_refs: Vec<InputRef>, is_last: bool) -> Result<(), AppError> {
     let ids_router  = tx_context.inputs.input_id.router();
     let ptrs_router = tx_context.inputs.input_utxo_pointer_by_id.router();

chains/cardano/src/hook.rs

@@ -1,15 +1,6 @@
 use crate::model_v1::*;
 use std::ops::Index;
 
-// temporary hack for testing purposes, will be removed
-pub(crate) fn flush(tx_context: &TransactionWriteTxContext) -> Result<(), AppError> {
-    let ids_router  = tx_context.inputs.input_id.router();
-    let ptrs_router = tx_context.inputs.input_utxo_pointer_by_id.router();
-    ids_router.ready_for_flush(1)?;
-    ptrs_router.ready_for_flush(1)?;
-    Ok(())
-}
-
 pub(crate) fn write_from_input_refs_using_hash(tx_context: &TransactionWriteTxContext, parent: BlockPointer, input_refs: Vec<InputRef>, is_last: bool) -> Result<(), AppError> {
     let ids_router  = tx_context.inputs.input_id.router();
     let ptrs_router = tx_context.inputs.input_utxo_pointer_by_id.router();

chains/demo/src/hook.rs

@@ -1,15 +1,6 @@
 use crate::model_v1::*;
 use std::ops::Index;
 
-// temporary hack for testing purposes, will be removed
-pub(crate) fn flush(tx_context: &TransactionWriteTxContext) -> Result<(), AppError> {
-    let ids_router  = tx_context.inputs.input_id.router();
-    let ptrs_router = tx_context.inputs.input_utxo_pointer_by_id.router();
-    ids_router.ready_for_flush(1)?;
-    ptrs_router.ready_for_flush(1)?;
-    Ok(())
-}
-
 pub(crate) fn write_from_input_refs_using_hash(tx_context: &TransactionWriteTxContext, parent: BlockPointer, input_refs: Vec<InputRef>, is_last: bool) -> Result<(), AppError> {
     let ids_router  = tx_context.inputs.input_id.router();
     let ptrs_router = tx_context.inputs.input_utxo_pointer_by_id.router();

chains/demo/tests/entity_test.rs

@@ -97,7 +97,7 @@ mod entity_tests {
         let transaction = blocks.first().unwrap().transactions.first().unwrap();
 
         let found_by_hash = Transaction::stream_by_hash(transaction_tx, transaction.hash.clone(), None).unwrap().try_collect::<Vec<Transaction>>().await.unwrap();
-        assert_eq!(found_by_hash.len(), 3);
+        assert_eq!(found_by_hash.len(), 1);
         assert!(found_by_hash.iter().any(|tx| tx.id == transaction.id));
         assert!(found_by_hash.iter().any(|tx| tx.id == transaction.id));
     }
@@ -110,7 +110,7 @@ mod entity_tests {
         let utxo = blocks.first().unwrap().transactions.first().unwrap().utxos.first().unwrap();
 
         let found_by_address = Utxo::stream_by_address(utxo_tx, utxo.address.clone(), None).unwrap().try_collect::<Vec<Utxo>>().await.unwrap();
-        assert_eq!(found_by_address.len(), 9);
+        assert_eq!(found_by_address.len(), 1);
         assert!(found_by_address.iter().any(|tx| tx.id == utxo.id));
         assert!(found_by_address.iter().any(|tx| tx.id == utxo.id));
     }
@@ -150,7 +150,7 @@ mod entity_tests {
         let transaction = blocks.first().unwrap().transactions.first().unwrap();
 
         let found_by_hash = Transaction::get_by_hash(&transaction_tx, &transaction.hash).expect("Failed to query by hash");
-        assert_eq!(found_by_hash.len(), 3);
+        assert_eq!(found_by_hash.len(), 1);
         assert!(found_by_hash.iter().any(|tx| tx.id == transaction.id));
         assert!(found_by_hash.iter().any(|tx| tx.id == transaction.id));
     }
@@ -163,12 +163,11 @@ mod entity_tests {
         let utxo = blocks.first().unwrap().transactions.first().unwrap().utxos.first().unwrap();
 
         let found_by_address = Utxo::get_by_address(&utxo_tx, &utxo.address).expect("Failed to query by address");
-        assert_eq!(found_by_address.len(), 9);
+        assert_eq!(found_by_address.len(), 1);
         assert!(found_by_address.iter().any(|tx| tx.id == utxo.id));
         assert!(found_by_address.iter().any(|tx| tx.id == utxo.id));
     }
 
-
     #[tokio::test]
     async fn it_should_get_entities_by_range_on_pk() {
         let (blocks, _storage_owner, storage) = init_temp_storage("db_test", 0).await;

chains/ergo/src/hook.rs

@@ -1,14 +1,5 @@
 use crate::model_v1::*;
 
-// temporary hack for testing purposes
-pub(crate) fn flush(tx_context: &TransactionWriteTxContext) -> Result<(), AppError> {
-    let ids_router  = tx_context.inputs.input_id.router();
-    let ptrs_router = tx_context.inputs.input_utxo_pointer_by_id.router();
-    ids_router.ready_for_flush(1)?;
-    ptrs_router.ready_for_flush(1)?;
-    Ok(())
-}
-
 pub(crate) fn write_from_input_refs_using_utxos(tx_context: &TransactionWriteTxContext, parent: BlockPointer, input_refs: Vec<BoxId>, is_last: bool) -> Result<(), AppError> {
     let ids_router  = tx_context.inputs.input_id.router();
     let ptrs_router = tx_context.inputs.input_utxo_pointer_by_id.router();

macros/src/column/column_impls.rs

@@ -1,18 +1,19 @@
-use proc_macro2::{Literal, Ident, TokenStream};
+use crate::column::column_codec::*;
+use crate::macro_utils;
+use crate::macro_utils::InnerKind;
+use proc_macro2::{Ident, Literal, TokenStream};
 use quote::quote;
-use syn::{parse_str, Attribute, Path, Type};
 use syn::punctuated::Punctuated;
 use syn::token::Comma;
-use crate::column::column_codec::*;
-use crate::macro_utils::InnerKind;
+use syn::{parse_str, Attribute, FieldsNamed, Path, Type};
 
 pub fn generate_column_impls(
     struct_ident: &Ident,
     new_type: &Type,
     inner_type: &Type,
     binary_encoding_opt: Option<String>,
 ) -> (TokenStream, Option<Attribute>, Punctuated<Path, Comma>) {
-    let kind = crate::macro_utils::classify_inner_type(inner_type);
+    let kind = macro_utils::classify_inner_type(inner_type);
 
     let binary_encoding = binary_encoding_opt.unwrap_or_else(|| "hex".to_string());
     let mut schema_example = quote! { vec![Some(json!(#struct_ident::default().url_encode()))] };
@@ -21,7 +22,7 @@ pub fn generate_column_impls(
     let mut schema_type = quote! { SchemaType::Type(Type::String) };
     let mut default_code = quote! { Self(Default::default()) };
     let mut url_encoded_code = quote! { format!("{}", self.0) };
-    let mut iterable_code = quote! { compile_error!("IterableColumn::next is not supported for this type.") };
+    let mut iterable_code = quote! { compile_error!("Sampleable::next is not supported for this type.") };
     let mut custom_db_codec = quote! {};
     let mut cache_key_codec = quote! {};
 
@@ -180,7 +181,7 @@ pub fn generate_column_impls(
             }
         }
 
-        impl IterableColumn for #struct_ident {
+        impl Sampleable for #struct_ident {
             fn next_value(&self) -> Self {
                 #iterable_code
             }
@@ -210,3 +211,61 @@ pub fn generate_column_impls(
 
     (impls, struct_attr, extra_derive_impls)
 }
+
+fn make_zero_or_default_field_expr(field_ty: &Type) -> TokenStream {
+    if macro_utils::classify_integer_type(field_ty).is_some() {
+        quote! { 0 as #field_ty }
+    } else {
+        quote! { Default::default() }
+    }
+}
+
+fn gen_field_inits_zero(fields: &FieldsNamed) -> Vec<TokenStream> {
+    fields.named.iter().map(|f| {
+        let name = f.ident.as_ref().expect("named field");
+        let ty   = &f.ty;
+        let expr = make_zero_or_default_field_expr(ty);
+        quote! { #name: #expr, }
+    }).collect()
+}
+
+fn make_next_field_expr(field_ident: &syn::Ident, field_ty: &Type) -> TokenStream {
+    if macro_utils::classify_integer_type(field_ty).is_some() {
+        quote! { self.#field_ident.wrapping_add(1) }
+    } else {
+        quote! { self.#field_ident.clone() }
+    }
+}
+
+fn gen_next_field_inits(fields: &FieldsNamed) -> Vec<TokenStream> {
+    fields.named.iter().map(|f| {
+        let name = f.ident.as_ref().expect("named field");
+        let ty   = &f.ty;
+        let expr = make_next_field_expr(name, ty);
+        quote! { #name: #expr, }
+    }).collect()
+}
+
+pub fn gen_default_impl(struct_ident: &Ident, struct_type: &Type, fields: &FieldsNamed) -> TokenStream {
+    let default_inits = gen_field_inits_zero(fields);
+
+    quote! {
+        impl ::core::default::Default for #struct_type {
+            fn default() -> Self {
+                #struct_ident { #(#default_inits)* }
+            }
+        }
+    }
+}
+
+pub fn gen_sampleable_impl(struct_ident: &Ident, struct_type: &Type, fields: &FieldsNamed) -> TokenStream {
+    let next_inits = gen_next_field_inits(fields);
+
+    quote! {
+        impl Sampleable for #struct_type {
+            fn next_value(&self) -> Self {
+                #struct_ident { #(#next_inits)* }
+            }
+        }
+    }
+}

macros/src/column/init.rs

@@ -6,7 +6,7 @@ pub fn default_init_expr(column_type: &Type) -> TokenStream {
     quote! {
         {
             let value = <#column_type as Default>::default();
-            <#column_type as IterableColumn>::nth_value(&value, sample_index)
+            <#column_type as Sampleable>::nth_value(&value, sample_index)
         }
     }
 }

macros/src/column/mod.rs

@@ -12,11 +12,12 @@ mod get_keys_by;
 pub mod column_impls;
 pub mod column_codec;
 pub mod info;
+pub mod transient;
 
 use crate::entity;
 use crate::entity::context;
 use crate::entity::context::TxContextItem;
-use crate::entity::query::{RangeQuery, FilterQueryItem};
+use crate::entity::query::{FilterQueryItem, RangeQuery};
 use crate::field_parser::{ColumnProps, EntityDef, FieldDef, IndexingType, OneToManyParentDef, Used};
 use crate::rest::*;
 use crate::table::{DictTableDefs, IndexTableDefs, PlainTableDef, TableDef};

macros/src/column/stream_by.rs

@@ -13,7 +13,7 @@ pub fn by_dict_def(
     dict_table_var: &Ident,
 ) -> FunctionDef {
     let fn_name = format_ident!("stream_by_{}", column_name);
-    let EntityDef { key_def, entity_name, entity_type, query_type, info_type:_, read_ctx_type, write_ctx_type: _} = &entity_def;
+    let EntityDef { key_def, entity_name, entity_type, query_type, read_ctx_type, ..} = &entity_def;
     let pk_type = key_def.field_def().tpe;
     let fn_stream = quote! {
         pub fn #fn_name(tx_context: #read_ctx_type, val: #column_type, query: Option<#query_type>) -> Result<Pin<Box<dyn futures::Stream<Item = Result<#entity_type, AppError>> + Send>>, AppError> {
@@ -142,7 +142,7 @@ pub fn by_dict_def(
 
 pub fn by_index_def(entity_def: &EntityDef, column_name: &Ident, column_type: &Type, index_table: &Ident) -> FunctionDef {
     let fn_name = format_ident!("stream_by_{}", column_name);
-    let EntityDef { key_def, entity_name, entity_type, query_type, info_type:_, read_ctx_type, write_ctx_type: _} = &entity_def;
+    let EntityDef { key_def, entity_name, entity_type, query_type, read_ctx_type, ..} = &entity_def;
     let pk_type = key_def.field_def().tpe;
     let fn_stream = quote! {
         pub fn #fn_name(tx_context: #read_ctx_type, val: #column_type, query: Option<#query_type>) -> Result<Pin<Box<dyn futures::Stream<Item = Result<#entity_type, AppError>> + Send>>, AppError> {