Skip to content

Add range selects logic #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Handy-caT merged 3 commits into from
May 5, 2026
Merged

Add range selects logic #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b18423
add range selects logic
Handy-caT May 5, 2026
cf18b72
rework floats to not expose ordered float
Handy-caT May 5, 2026
c2920a6
fix pk ergonomics
Handy-caT May 5, 2026
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
32 changes: 32 additions & 0 deletions codegen/src/generators/in_memory/table/impls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ impl InMemoryGenerator {
let persisted_impl = self.gen_table_new_fn();
let name_fn = self.gen_table_name_fn();
let select_fn = self.gen_table_select_fn();
let select_range_fn = self.gen_table_select_range_fn();
let insert_fn = self.gen_table_insert_fn();
let reinsert_fn = self.gen_table_reinsert_fn();
let upsert_fn = self.gen_table_upsert_fn();
Expand All @@ -28,6 +29,7 @@ impl InMemoryGenerator {
impl #ident {
#name_fn
#select_fn
#select_range_fn
#insert_fn
#reinsert_fn
#upsert_fn
Expand Down Expand Up @@ -74,6 +76,36 @@ impl InMemoryGenerator {
}
}

fn gen_table_select_range_fn(&self) -> TokenStream {
let name_generator = WorktableNameGenerator::from_table_name(self.name.to_string());
let row_type = name_generator.get_row_type_ident();
let primary_key_type = name_generator.get_primary_key_type_ident();
let column_range_type = name_generator.get_column_range_type_ident();
let row_fields_ident = name_generator.get_row_fields_enum_ident();

quote! {
pub fn select_by_pk_range<R, Pk>(&self, range: R) -> SelectQueryBuilder<#row_type,
impl DoubleEndedIterator<Item = #row_type> + '_,
#column_range_type,
#row_fields_ident>
where
#primary_key_type: From<Pk>,
R: std::ops::RangeBounds<Pk>,
Pk: Clone,
{
let converted_range = (
range.start_bound().map(|v| #primary_key_type::from(v.clone())),
range.end_bound().map(|v| #primary_key_type::from(v.clone())),
);
let rows = self.0.primary_index.pk_map
.range(converted_range)
.filter_map(|(_, link)| self.0.data.select_non_ghosted(link.0).ok());

SelectQueryBuilder::new(rows)
}
}
}

fn gen_table_insert_fn(&self) -> TokenStream {
let name_generator = WorktableNameGenerator::from_table_name(self.name.to_string());
let row_type = name_generator.get_row_type_ident();
Expand Down
67 changes: 63 additions & 4 deletions codegen/src/generators/in_memory/table/index_fns.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ impl InMemoryGenerator {
.indexes
.iter()
.map(|(i, idx)| {
if idx.is_unique {
Self::gen_unique_index_fn(i, idx, &self.columns.columns_map, row_ident.clone())
let point_fn = if idx.is_unique {
Self::gen_unique_index_fn(i, idx, &self.columns.columns_map, row_ident.clone())?
} else {
Self::gen_non_unique_index_fn(
i,
Expand All @@ -30,8 +30,19 @@ impl InMemoryGenerator {
row_ident.clone(),
&column_range_type,
&row_fields_ident,
)
}
)?
};

let range_fn = Self::gen_range_index_fn(
i,
idx,
&self.columns.columns_map,
row_ident.clone(),
&column_range_type,
&row_fields_ident,
)?;

Ok(quote! { #point_fn #range_fn })
})
.collect::<Result<Vec<_>, syn::Error>>()?;

Expand Down Expand Up @@ -111,4 +122,52 @@ impl InMemoryGenerator {
}
})
}

fn gen_range_index_fn(
i: &Ident,
idx: &Index,
columns_map: &HashMap<Ident, TokenStream>,
row_ident: Ident,
column_range_type: &Ident,
row_fields_ident: &Ident,
) -> syn::Result<TokenStream> {
let type_ = columns_map
.get(i)
.ok_or(syn::Error::new(i.span(), "Row not found"))?;
let fn_name = Ident::new(format!("select_by_{i}_range").as_str(), Span::mixed_site());
let field_ident = &idx.name;

let (range_bounds, range_arg) = if is_float(type_.to_string().as_str()) {
(
quote! { std::ops::RangeBounds<#type_> },
quote! {
(
range.start_bound().map(|v| OrderedFloat(*v)),
range.end_bound().map(|v| OrderedFloat(*v)),
)
},
)
} else {
(
quote! { std::ops::RangeBounds<#type_> },
quote! { range },
)
};

Ok(quote! {
pub fn #fn_name<R>(&self, range: R) -> SelectQueryBuilder<#row_ident,
impl DoubleEndedIterator<Item = #row_ident> + '_,
#column_range_type,
#row_fields_ident>
where
R: #range_bounds
{
let rows = self.0.indexes.#field_ident
.range(#range_arg)
.filter_map(|(_, link)| self.0.data.select_non_ghosted(link.0).ok());

SelectQueryBuilder::new(rows)
}
})
}
}
32 changes: 32 additions & 0 deletions codegen/src/generators/persist/table/impls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ impl PersistGenerator {
let name_fn = self.gen_table_name_fn();
let version_fn = self.gen_table_version_fn();
let select_fn = self.gen_table_select_fn();
let select_range_fn = self.gen_table_select_range_fn();
let insert_fn = self.gen_table_insert_fn();
let reinsert_fn = self.gen_table_reinsert_fn();
let upsert_fn = self.gen_table_upsert_fn();
Expand All @@ -30,6 +31,7 @@ impl PersistGenerator {
#name_fn
#version_fn
#select_fn
#select_range_fn
#insert_fn
#reinsert_fn
#upsert_fn
Expand Down Expand Up @@ -158,6 +160,36 @@ impl PersistGenerator {
}
}

fn gen_table_select_range_fn(&self) -> TokenStream {
let name_generator = WorktableNameGenerator::from_table_name(self.name.to_string());
let row_type = name_generator.get_row_type_ident();
let primary_key_type = name_generator.get_primary_key_type_ident();
let column_range_type = name_generator.get_column_range_type_ident();
let row_fields_ident = name_generator.get_row_fields_enum_ident();

quote! {
pub fn select_by_pk_range<R, Pk>(&self, range: R) -> SelectQueryBuilder<#row_type,
impl DoubleEndedIterator<Item = #row_type> + '_,
#column_range_type,
#row_fields_ident>
where
#primary_key_type: From<Pk>,
R: std::ops::RangeBounds<Pk>,
Pk: Clone,
{
let converted_range = (
range.start_bound().map(|v| #primary_key_type::from(v.clone())),
range.end_bound().map(|v| #primary_key_type::from(v.clone())),
);
let rows = self.0.primary_index.pk_map
.range(converted_range)
.filter_map(|(_, link)| self.0.data.select_non_ghosted(link.0).ok());

SelectQueryBuilder::new(rows)
}
}
}

fn gen_table_insert_fn(&self) -> TokenStream {
let name_generator = WorktableNameGenerator::from_table_name(self.name.to_string());
let row_type = name_generator.get_row_type_ident();
Expand Down
67 changes: 63 additions & 4 deletions codegen/src/generators/persist/table/index_fns.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ impl PersistGenerator {
.indexes
.iter()
.map(|(i, idx)| {
if idx.is_unique {
Self::gen_unique_index_fn(i, idx, &self.columns.columns_map, row_ident.clone())
let point_fn = if idx.is_unique {
Self::gen_unique_index_fn(i, idx, &self.columns.columns_map, row_ident.clone())?
} else {
Self::gen_non_unique_index_fn(
i,
Expand All @@ -30,8 +30,19 @@ impl PersistGenerator {
row_ident.clone(),
&column_range_type,
&row_fields_ident,
)
}
)?
};

let range_fn = Self::gen_range_index_fn(
i,
idx,
&self.columns.columns_map,
row_ident.clone(),
&column_range_type,
&row_fields_ident,
)?;

Ok(quote! { #point_fn #range_fn })
})
.collect::<Result<Vec<_>, syn::Error>>()?;

Expand Down Expand Up @@ -111,4 +122,52 @@ impl PersistGenerator {
}
})
}

fn gen_range_index_fn(
i: &Ident,
idx: &Index,
columns_map: &HashMap<Ident, TokenStream>,
row_ident: Ident,
column_range_type: &Ident,
row_fields_ident: &Ident,
) -> syn::Result<TokenStream> {
let type_ = columns_map
.get(i)
.ok_or(syn::Error::new(i.span(), "Row not found"))?;
let fn_name = Ident::new(format!("select_by_{i}_range").as_str(), Span::mixed_site());
let field_ident = &idx.name;

let (range_bounds, range_arg) = if is_float(type_.to_string().as_str()) {
(
quote! { std::ops::RangeBounds<#type_> },
quote! {
(
range.start_bound().map(|v| OrderedFloat(*v)),
range.end_bound().map(|v| OrderedFloat(*v)),
)
},
)
} else {
(
quote! { std::ops::RangeBounds<#type_> },
quote! { range },
)
};

Ok(quote! {
pub fn #fn_name<R>(&self, range: R) -> SelectQueryBuilder<#row_ident,
impl DoubleEndedIterator<Item = #row_ident> + '_,
#column_range_type,
#row_fields_ident>
where
R: #range_bounds
{
let rows = self.0.indexes.#field_ident
.range(#range_arg)
.filter_map(|(_, link)| self.0.data.select_non_ghosted(link.0).ok());

SelectQueryBuilder::new(rows)
}
})
}
}
32 changes: 32 additions & 0 deletions codegen/src/generators/read_only/table/impls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ impl ReadOnlyGenerator {
let name_fn = self.gen_table_name_fn();
let version_fn = self.gen_table_version_fn();
let select_fn = self.gen_table_select_fn();
let select_range_fn = self.gen_table_select_range_fn();
let insert_fn = self.gen_table_insert_fn();
let reinsert_fn = self.gen_table_reinsert_fn();
let upsert_fn = self.gen_table_upsert_fn();
Expand All @@ -29,6 +30,7 @@ impl ReadOnlyGenerator {
#name_fn
#version_fn
#select_fn
#select_range_fn
#insert_fn
#reinsert_fn
#upsert_fn
Expand Down Expand Up @@ -154,6 +156,36 @@ impl ReadOnlyGenerator {
}
}

fn gen_table_select_range_fn(&self) -> TokenStream {
let name_generator = WorktableNameGenerator::from_table_name(self.name.to_string());
let row_type = name_generator.get_row_type_ident();
let primary_key_type = name_generator.get_primary_key_type_ident();
let column_range_type = name_generator.get_column_range_type_ident();
let row_fields_ident = name_generator.get_row_fields_enum_ident();

quote! {
pub fn select_by_pk_range<R, Pk>(&self, range: R) -> SelectQueryBuilder<#row_type,
impl DoubleEndedIterator<Item = #row_type> + '_,
#column_range_type,
#row_fields_ident>
where
#primary_key_type: From<Pk>,
R: std::ops::RangeBounds<Pk>,
Pk: Clone,
{
let converted_range = (
range.start_bound().map(|v| #primary_key_type::from(v.clone())),
range.end_bound().map(|v| #primary_key_type::from(v.clone())),
);
let rows = self.0.primary_index.pk_map
.range(converted_range)
.filter_map(|(_, link)| self.0.data.select_non_ghosted(link.0).ok());

SelectQueryBuilder::new(rows)
}
}
}

fn gen_table_insert_fn(&self) -> TokenStream {
quote! {}
}
Expand Down
Loading
Loading