Skip to content

Commit

Permalink
fix(meta): work around sea-orm bug (#20099)
Browse files Browse the repository at this point in the history
  • Loading branch information
zwang28 authored Jan 10, 2025
1 parent 4c8eb2a commit 84e6fea
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/meta/src/hummock/manager/gc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -477,8 +477,8 @@ impl HummockManager {
}
hummock_gc_history::Entity::insert_many(batch)
.on_conflict(
OnConflict::column(hummock_gc_history::Column::ObjectId)
.do_nothing()
OnConflict::new()
.update_column(hummock_gc_history::Column::ObjectId)
.to_owned(),
)
.do_nothing()
Expand Down
12 changes: 6 additions & 6 deletions src/meta/src/hummock/manager/time_travel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,8 @@ impl HummockManager {
}
hummock_sstable_info::Entity::insert_many(batch)
.on_conflict(
OnConflict::column(hummock_sstable_info::Column::SstId)
.do_nothing()
OnConflict::new()
.update_column(hummock_sstable_info::Column::SstId)
.to_owned(),
)
.do_nothing()
Expand Down Expand Up @@ -467,8 +467,8 @@ impl HummockManager {
};
hummock_time_travel_version::Entity::insert(m)
.on_conflict(
OnConflict::column(hummock_time_travel_version::Column::VersionId)
.do_nothing()
OnConflict::new()
.update_column(hummock_time_travel_version::Column::VersionId)
.to_owned(),
)
.do_nothing()
Expand Down Expand Up @@ -499,8 +499,8 @@ impl HummockManager {
};
hummock_time_travel_delta::Entity::insert(m)
.on_conflict(
OnConflict::column(hummock_time_travel_delta::Column::VersionId)
.do_nothing()
OnConflict::new()
.update_column(hummock_time_travel_delta::Column::VersionId)
.to_owned(),
)
.do_nothing()
Expand Down

0 comments on commit 84e6fea

Please sign in to comment.