mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-08-04 11:00:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

thread group index to storage initializers

Browse source
This commit is contained in:
Niko Matsakis 2020-06-30 10:26:55 +00:00
parent 9bd9f8b202
commit 206c086bac
7 changed files with 47 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/salsa-macros/src/database_storage.rs
View file

@ -53,7 +53,7 @@ pub(crate) fn database(args: TokenStream, input: TokenStream) -> TokenStream {
.zip(&query_group_names_snake)
.zip(&query_group_storage_names)
.zip(&query_group_key_names)
.zip(0_usize..)
.zip(0_u16..)
{
let group_path = &query_group.group_path;
let group_name = query_group.name();

18
components/salsa-macros/src/query_group.rs
View file

@ -192,7 +192,7 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
let mut query_descriptor_variants = proc_macro2::TokenStream::new();
let mut group_data_elements = vec![];
let mut storage_fields = proc_macro2::TokenStream::new();
let mut storage_defaults = proc_macro2::TokenStream::new();
let mut queries_with_storage = vec![];
for query in &queries {
let key_names: &Vec<_> = &(0..query.keys.len())
.map(|i| Ident::new(&format!("key{}", i), Span::call_site()))
@ -220,6 +220,8 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
continue;
}
queries_with_storage.push(fn_name);
query_fn_definitions.extend(quote! {
fn #fn_name(&self, #(#key_names: #keys),*) -> #value {
<Self as salsa::plumbing::GetQueryTable<#qt>>::get_query_table(self).get((#(#key_names),*))
@ -295,7 +297,6 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
storage_fields.extend(quote! {
pub #fn_name: std::sync::Arc<<#qt as salsa::Query<DB__>>::Storage>,
});
storage_defaults.extend(quote! { #fn_name: Default::default(), });
}
// Emit the trait itself.
@ -349,7 +350,7 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
});
// Emit the query types.
for query in &queries {
for (query, query_index) in queries.iter().zip(0_u16..) {
let fn_name = &query.fn_name;
let qt = &query.query_type;
@ -388,6 +389,8 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
type GroupStorage = #group_storage<#db>;
type GroupKey = #group_key;
const QUERY_INDEX: u16 = #query_index;
fn query_storage(
group_storage: &Self::GroupStorage,
) -> &std::sync::Arc<Self::Storage> {
@ -466,8 +469,6 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
}
// Emit query group storage struct
// It would derive Default, but then all database structs would have to implement Default
// as the derived version includes an unused `+ Default` constraint.
output.extend(quote! {
#trait_vis struct #group_storage<DB__>
where
@ -484,9 +485,12 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
DB__: salsa::plumbing::HasQueryGroup<#group_struct>,
DB__: salsa::Database,
{
#trait_vis fn new(group_index: usize) -> Self {
#trait_vis fn new(group_index: u16) -> Self {
#group_storage {
#storage_defaults
#(
#queries_with_storage:
std::sync::Arc::new(salsa::plumbing::QueryStorageOps::new(group_index)),
)*
}
}
}