Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = ["codegen", "examples", "performance_measurement", "performance_measur

[package]
name = "worktable"
version = "0.6.4"
version = "0.6.5"
edition = "2024"
authors = ["Handy-caT"]
license = "MIT"
Expand All @@ -22,7 +22,7 @@ tokio = { version = "1", features = ["full"] }
tracing = "0.1"
rkyv = { version = "0.8.9", features = ["uuid-1"] }
lockfree = { version = "0.5.1" }
worktable_codegen = { path = "codegen", version = "0.6.0" }
worktable_codegen = { path = "codegen", version = "0.6.5" }
fastrand = "2.3.0"
futures = "0.3.30"
uuid = { version = "1.10.0", features = ["v4", "v7"] }
Expand Down
2 changes: 1 addition & 1 deletion codegen/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "worktable_codegen"
version = "0.6.0"
version = "0.6.5"
edition = "2024"
license = "MIT"
description = "WorkTable codegeneration crate"
Expand Down
10 changes: 10 additions & 0 deletions codegen/src/worktable/generator/row.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,18 @@ impl Generator {
rows[*pos] = quote! {pub #i: #type_,}
}

let custom_derives =
if let Some(custom_derives) = &self.config.as_ref().map(|c| &c.row_derives) {
quote! {
#[derive(#(#custom_derives),*)]
}
} else {
quote! {}
};

quote! {
#[derive(rkyv::Archive, Debug, rkyv::Deserialize, Clone, rkyv::Serialize, PartialEq, MemStat)]
#custom_derives
#[rkyv(derive(Debug))]
#[repr(C)]
pub struct #ident {
Expand Down
3 changes: 3 additions & 0 deletions codegen/src/worktable/model/config.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
use proc_macro2::Ident;

#[derive(Debug, Default)]
pub struct Config {
pub page_size: Option<u32>,
pub row_derives: Vec<Ident>,
}
90 changes: 64 additions & 26 deletions codegen/src/worktable/parser/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,35 +57,73 @@ impl Parser {
}

pub fn parse_config(&mut self, config: &mut Config) -> syn::Result<Option<()>> {
let Some(_) = self.input_iter.peek() else {
return Ok(None);
};
let ident = self.input_iter.next().unwrap();
let name = if let TokenTree::Ident(ident) = ident {
ident
} else {
return Err(syn::Error::new(ident.span(), "Expected identifier."));
};
while self.peek_next().is_some() {
let Some(_) = self.input_iter.peek() else {
return Ok(None);
};
let ident = self.input_iter.next().unwrap();
let name = if let TokenTree::Ident(ident) = ident {
ident
} else {
return Err(syn::Error::new(ident.span(), "Expected identifier."));
};

self.parse_colon()?;
self.parse_colon()?;

match name.to_string().as_str() {
"page_size" => {
let value = self.input_iter.next().ok_or(syn::Error::new(
self.input.span(),
"Expected page size value in declaration",
))?;
let value = if let TokenTree::Literal(value) = value {
value
} else {
return Err(syn::Error::new(value.span(), "Expected identifier."));
};

self.try_parse_comma()?;

let value = value.to_string();
let value = value.replace("_", "");

match name.to_string().as_str() {
"page_size" => {
let value = self.input_iter.next().ok_or(syn::Error::new(
self.input.span(),
"Expected page size value in declaration",
))?;
let value = if let TokenTree::Literal(value) = value {
value
} else {
return Err(syn::Error::new(value.span(), "Expected identifier."));
};
let value = value.to_string();
let value = value.replace("_", "");

config.page_size = Some(u32::from_str(value.as_str()).unwrap())
config.page_size = Some(u32::from_str(value.as_str()).unwrap())
}
"row_derives" => {
const CONFIG_VARIANTS: [&str; 2] = ["page_size", "row_derives"];

let mut derives = vec![];

while let Some(ident) = self.peek_next() {
if CONFIG_VARIANTS.contains(&ident.to_string().as_str()) {
if derives.is_empty() {
return Err(syn::Error::new(
ident.span(),
"Expected at least one derive in declaration.",
));
}
break;
}

let derive = self.input_iter.next().ok_or(syn::Error::new(
self.input.span(),
"Expected at least one derive in declaration",
))?;
let derive = if let TokenTree::Ident(derive) = derive {
derive
} else {
return Err(syn::Error::new(derive.span(), "Expected identifier."));
};

self.try_parse_comma()?;

derives.push(derive)
}

config.row_derives = derives;
}
_ => return Err(syn::Error::new(name.span(), "Unexpected identifier")),
}
_ => return Err(syn::Error::new(name.span(), "Unexpected identifier")),
}

Ok(Some(()))
Expand Down
11 changes: 11 additions & 0 deletions tests/worktable/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ worktable! (
name: Test,
columns: {
id: u64 primary_key autoincrement,
something: String,
another: u32,
},
config: {
row_derives: Default,
page_size: 32_000,
}
);
Expand All @@ -15,3 +18,11 @@ worktable! (
fn test_page_size() {
assert_eq!(TEST_PAGE_SIZE, 32_000)
}

#[test]
fn test_default_available() {
let d = TestRow::default();
assert_eq!(d.id, u64::default());
assert_eq!(d.something, String::default());
assert_eq!(d.another, u32::default())
}
Loading