Skip to content

adapter: remove apply_item_update optimization #34241

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
merged 1 commit into from
Nov 24, 2025
Merged

adapter: remove apply_item_update optimization #34241

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
48 changes: 23 additions & 25 deletions src/adapter/src/catalog/apply.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,33 +1014,31 @@ impl CatalogState {
item: name.clone(),
};
let entry = match retractions.items.remove(&key) {
Some(mut retraction) => {
Some(retraction) => {
assert_eq!(retraction.id, item.id);
// We only reparse the SQL if it's changed. Otherwise, we use the existing
// item. This is a performance optimization and not needed for correctness.
// This makes it difficult to use the `UpdateFrom` trait, but the structure
// is still the same as the trait.
if retraction.create_sql() != create_sql {
let item = self
.deserialize_item(
global_id,
&create_sql,
&extra_versions,
local_expression_cache,
Some(retraction.item),
)
.unwrap_or_else(|e| {
panic!("{e:?}: invalid persisted SQL: {create_sql}")
});
retraction.item = item;
}
retraction.id = id;
retraction.oid = oid;
retraction.name = name;
retraction.owner_id = owner_id;
retraction.privileges = PrivilegeMap::from_mz_acl_items(privileges);

retraction
let item = self
.deserialize_item(
global_id,
&create_sql,
&extra_versions,
local_expression_cache,
Some(retraction.item),
)
.unwrap_or_else(|e| {
panic!("{e:?}: invalid persisted SQL: {create_sql}")
});

CatalogEntry {
item,
id,
oid,
name,
owner_id,
privileges: PrivilegeMap::from_mz_acl_items(privileges),
referenced_by: retraction.referenced_by,
used_by: retraction.used_by,
}
}
None => {
let catalog_item = self
Expand Down