Skip to content

Fix diff logic for full row update #48

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 1 commit into from
Feb 19, 2025
Merged

Fix diff logic for full row update #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
101 changes: 61 additions & 40 deletions codegen/src/worktable/generator/queries/update.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,32 @@ impl Generator {
fn gen_full_row_update(&mut self) -> TokenStream {
let name_generator = WorktableNameGenerator::from_table_name(self.name.to_string());
let row_ident = name_generator.get_row_type_ident();
let avt_type_ident = name_generator.get_available_type_ident();

let row_updates = self
.columns
.columns_map
.keys()
.map(|i| {
quote! {
std::mem::swap(&mut archived.inner.#i, &mut row.#i);
std::mem::swap(&mut archived.inner.#i, &mut archived_row.#i);
}
})
.collect::<Vec<_>>();

let idents: Vec<_> = self
.columns
.indexes
.values()
.map(|idx| idx.field.clone())
.collect();
let diff_container = quote! {
let row_old = self.select(pk.clone()).unwrap();
let row_new = row.clone();
let mut diffs: std::collections::HashMap<&str, Difference<#avt_type_ident>> = std::collections::HashMap::new();
};
let diff_process = self.gen_process_diffs_on_index(idents.as_slice(), idents.as_slice());

quote! {
pub async fn update(&self, row: #row_ident) -> core::result::Result<(), WorkTableError> {
let pk = row.get_primary_key();
Expand All @@ -54,13 +68,16 @@ impl Generator {
self.0.lock_map.insert(op_id.into(), lock.clone());

let mut bytes = rkyv::to_bytes::<rkyv::rancor::Error>(&row).map_err(|_| WorkTableError::SerializeError)?;
let mut row = unsafe { rkyv::access_unchecked_mut::<<#row_ident as rkyv::Archive>::Archived>(&mut bytes[..]).unseal_unchecked() };
let mut archived_row = unsafe { rkyv::access_unchecked_mut::<<#row_ident as rkyv::Archive>::Archived>(&mut bytes[..]).unseal_unchecked() };
let link = self.0
.pk_map
.get(&pk)
.map(|v| v.get().value)
.ok_or(WorkTableError::NotFound)?;

#diff_container
#diff_process

let id = self.0.data.with_ref(link, |archived| {
archived.is_locked()
}).map_err(WorkTableError::PagesError)?;
Expand Down Expand Up @@ -139,6 +156,37 @@ impl Generator {
}
}

fn gen_process_diffs_on_index(&self, idents: &[Ident], idx_idents: &[Ident]) -> TokenStream {
let name_generator = WorktableNameGenerator::from_table_name(self.name.to_string());
let avt_type_ident = name_generator.get_available_type_ident();

let diff = idents
.iter()
.filter(|i| idx_idents.contains(i))
.map(|i| {
let diff_key = Literal::string(i.to_string().as_str());
quote! {
let old = &row_old.#i;
let new = &row_new.#i;

if old != new {
let diff = Difference::<#avt_type_ident> {
old: old.clone().into(),
new: new.clone().into(),
};

diffs.insert(#diff_key, diff);
}
}
})
.collect::<Vec<_>>();

quote! {
#(#diff)*
self.0.indexes.process_difference(link, diffs)?;
}
}

fn gen_pk_update(
&self,
snake_case_name: String,
Expand Down Expand Up @@ -171,53 +219,28 @@ impl Generator {
Span::mixed_site(),
);

let name_generator = WorktableNameGenerator::from_table_name(self.name.to_string());
let avt_type_ident = name_generator.get_available_type_ident();

let row_updates = idents
.iter()
.map(|i| {
quote! {
std::mem::swap(&mut archived.inner.#i, &mut row.#i);
std::mem::swap(&mut archived.inner.#i, &mut archived_row.#i);
}
})
.collect::<Vec<_>>();

let diff = idx_idents.map(|columns| {
idents
.iter()
.filter(|i| columns.contains(i))
.map(|i| {
let diff_key = Literal::string(i.to_string().as_str());
quote! {
let old: #avt_type_ident = row_old.clone().#i.into();
let new: #avt_type_ident = row_new.#i.into();

let diff = Difference {
old: old.clone(),
new: new.clone(),
};

diffs.insert(#diff_key, diff);
}
})
.collect::<Vec<_>>()
});

let diff_container_ident = if let Some(ref diff) = diff {
quote! {
let diff_process = if let Some(idx_idents) = idx_idents {
let name_generator = WorktableNameGenerator::from_table_name(self.name.to_string());
let avt_type_ident = name_generator.get_available_type_ident();
let diff_container = quote! {
let row_old = self.select(by.clone()).unwrap();
let row_new = row.clone();
let mut diffs: std::collections::HashMap<&str, Difference<#avt_type_ident>> = std::collections::HashMap::new();
#(#diff)*
}
} else {
quote! {}
};
};

let process_diff_ident = if diff.is_some() {
let process = self.gen_process_diffs_on_index(idents, idx_idents.as_slice());
quote! {
self.0.indexes.process_difference(link, diffs)?;
#diff_container
#process
}
} else {
quote! {}
Expand All @@ -230,17 +253,15 @@ impl Generator {

self.0.lock_map.insert(op_id.into(), lock.clone());

#diff_container_ident

let mut bytes = rkyv::to_bytes::<rkyv::rancor::Error>(&row).map_err(|_| WorkTableError::SerializeError)?;
let mut row = unsafe { rkyv::access_unchecked_mut::<<#query_ident as rkyv::Archive>::Archived>(&mut bytes[..]).unseal_unchecked() };
let mut archived_row = unsafe { rkyv::access_unchecked_mut::<<#query_ident as rkyv::Archive>::Archived>(&mut bytes[..]).unseal_unchecked() };
let link = self.0
.pk_map
.get(&by)
.map(|v| v.get().value)
.ok_or(WorkTableError::NotFound)?;

#process_diff_ident
#diff_process

let id = self.0.data.with_ref(link, |archived| {
archived.#check_ident()
Expand Down
Loading