Skip to content

Commit 6711572

Browse files
yuhaijun999ketor
authored andcommitted
[feat][store] Add restore feature second edition.
1 parent 84c478f commit 6711572

File tree

3 files changed

+250
-69
lines changed

3 files changed

+250
-69
lines changed

src/br/restore_region_meta.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,10 @@ butil::Status RestoreRegionMeta::CreateRegionToCoordinator() {
8080
// ignore store_ids
8181
// ignore split_from_region_id
8282
request.set_region_type(region_->region_type());
83-
// if (region_->definition().has_index_parameter()) {
84-
// request.mutable_index_parameter()->CopyFrom(region_->definition().index_parameter());
85-
// }
83+
if (region_->definition().has_index_parameter() &&
84+
region_->definition().index_parameter().index_type() != dingodb::pb::common::IndexType ::INDEX_TYPE_NONE) {
85+
request.mutable_index_parameter()->CopyFrom(region_->definition().index_parameter());
86+
}
8687

8788
DINGO_LOG_IF(INFO, FLAGS_br_log_switch_restore_detail_detail) << request.DebugString();
8889

src/coordinator/coordinator_control_coor.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -789,18 +789,19 @@ void CoordinatorControl::GenRegionFull(const pb::coordinator_internal::RegionInt
789789
void CoordinatorControl::GenRegionSlim(const pb::coordinator_internal::RegionInternal& region_internal,
790790
pb::common::Region& region) {
791791
region.set_id(region_internal.id());
792+
region.mutable_definition()->set_id(region_internal.id());
792793
region.mutable_definition()->set_name(region_internal.definition().name());
793794
region.mutable_definition()->mutable_epoch()->set_conf_version(region_internal.definition().epoch().conf_version());
794795
region.mutable_definition()->mutable_epoch()->set_version(region_internal.definition().epoch().version());
795796
region.mutable_definition()->mutable_range()->set_start_key(region_internal.definition().range().start_key());
796-
region.mutable_definition()->mutable_range()->set_start_key(region_internal.definition().range().start_key());
797797
region.mutable_definition()->mutable_range()->set_end_key(region_internal.definition().range().end_key());
798798
if (region_internal.definition().has_index_parameter()) {
799799
*region.mutable_definition()->mutable_index_parameter() = region_internal.definition().index_parameter();
800800
}
801801
region.mutable_definition()->set_tenant_id(region_internal.definition().tenant_id());
802802
region.mutable_definition()->set_table_id(region_internal.definition().table_id());
803803
region.mutable_definition()->set_index_id(region_internal.definition().index_id());
804+
region.mutable_definition()->set_part_id(region_internal.definition().part_id());
804805
region.set_state(region_internal.state());
805806
region.set_create_timestamp(region_internal.create_timestamp());
806807
region.set_region_type(region_internal.region_type());

0 commit comments

Comments
 (0)