Skip to content

Commit 9e1cd76

Browse files
authored
fix(meta): work around sea-orm bug for PG (#20110)
1 parent 84e6fea commit 9e1cd76

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Diff for: src/meta/src/hummock/manager/gc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ impl HummockManager {
477477
}
478478
hummock_gc_history::Entity::insert_many(batch)
479479
.on_conflict(
480-
OnConflict::new()
480+
OnConflict::column(hummock_gc_history::Column::ObjectId)
481481
.update_column(hummock_gc_history::Column::ObjectId)
482482
.to_owned(),
483483
)

Diff for: src/meta/src/hummock/manager/time_travel.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ impl HummockManager {
413413
}
414414
hummock_sstable_info::Entity::insert_many(batch)
415415
.on_conflict(
416-
OnConflict::new()
416+
OnConflict::column(hummock_sstable_info::Column::SstId)
417417
.update_column(hummock_sstable_info::Column::SstId)
418418
.to_owned(),
419419
)
@@ -467,7 +467,7 @@ impl HummockManager {
467467
};
468468
hummock_time_travel_version::Entity::insert(m)
469469
.on_conflict(
470-
OnConflict::new()
470+
OnConflict::column(hummock_time_travel_version::Column::VersionId)
471471
.update_column(hummock_time_travel_version::Column::VersionId)
472472
.to_owned(),
473473
)
@@ -499,7 +499,7 @@ impl HummockManager {
499499
};
500500
hummock_time_travel_delta::Entity::insert(m)
501501
.on_conflict(
502-
OnConflict::new()
502+
OnConflict::column(hummock_time_travel_delta::Column::VersionId)
503503
.update_column(hummock_time_travel_delta::Column::VersionId)
504504
.to_owned(),
505505
)

0 commit comments

Comments
 (0)