Skip to content

Commit 7decc37

Browse files
xy720xy720
committed
format
1 parent bb36f83 commit 7decc37

File tree

7 files changed

+33
-23
lines changed

7 files changed

+33
-23
lines changed

‎be/src/cloud/cloud_snapshot_mgr.cpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,10 @@ Status CloudSnapshotMgr::convert_rowsets(
158158
RETURN_IF_ERROR(_create_rowset_meta(new_rowset_meta_pb, rowset_meta_pb, tablet_id,
159159
target_tablet, storage_resource, tablet_schema,
160160
file_mapping, rowset_id_mapping));
161-
if (new_rowset_meta_pb->has_tablet_schema() && new_rowset_meta_pb->tablet_schema().index_size() > 0) {
162-
RETURN_IF_ERROR(_rename_index_ids(*new_rowset_meta_pb->mutable_tablet_schema(), target_tablet_schema));
161+
if (new_rowset_meta_pb->has_tablet_schema() &&
162+
new_rowset_meta_pb->tablet_schema().index_size() > 0) {
163+
RETURN_IF_ERROR(_rename_index_ids(*new_rowset_meta_pb->mutable_tablet_schema(),
164+
target_tablet_schema));
163165
}
164166
Version rowset_version = {rowset_meta_pb.start_version(), rowset_meta_pb.end_version()};
165167
rs_version_map[rowset_version] = new_rowset_meta_pb;
@@ -282,7 +284,8 @@ Status CloudSnapshotMgr::_create_rowset_meta(
282284
return Status::OK();
283285
}
284286

285-
Status CloudSnapshotMgr::_rename_index_ids(TabletSchemaPB& schema_pb, const TabletSchemaSPtr& tablet_schema) const {
287+
Status CloudSnapshotMgr::_rename_index_ids(TabletSchemaPB& schema_pb,
288+
const TabletSchemaSPtr& tablet_schema) const {
286289
if (tablet_schema == nullptr) {
287290
return Status::OK();
288291
}

‎be/src/cloud/cloud_snapshot_mgr.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ class CloudSnapshotMgr {
9090
std::unordered_map<std::string, std::string>& file_mapping,
9191
std::unordered_map<RowsetId, RowsetId>& rowset_id_mapping);
9292

93-
Status _rename_index_ids(TabletSchemaPB& schema_pb, const TabletSchemaSPtr& tablet_schema) const;
93+
Status _rename_index_ids(TabletSchemaPB& schema_pb,
94+
const TabletSchemaSPtr& tablet_schema) const;
9495

9596
private:
9697
CloudStorageEngine& _engine;

‎be/src/olap/snapshot_manager.cpp‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,8 @@ Result<std::vector<PendingRowsetGuard>> SnapshotManager::convert_rowset_ids(
249249
}
250250

251251
if (rowset_meta->has_tablet_schema() && rowset_meta->tablet_schema().index_size() > 0) {
252-
RETURN_IF_ERROR_RESULT(_rename_index_ids(*rowset_meta->mutable_tablet_schema(), target_tablet_schema));
252+
RETURN_IF_ERROR_RESULT(
253+
_rename_index_ids(*rowset_meta->mutable_tablet_schema(), target_tablet_schema));
253254
}
254255

255256
Version rowset_version = {visible_rowset.start_version(), visible_rowset.end_version()};
@@ -289,13 +290,15 @@ Result<std::vector<PendingRowsetGuard>> SnapshotManager::convert_rowset_ids(
289290
rowset_meta->set_partition_id(partition_id);
290291
}
291292

292-
if (rowset_meta->has_tablet_schema() && rowset_meta->tablet_schema().index_size() > 0) {
293-
RETURN_IF_ERROR_RESULT(_rename_index_ids(*rowset_meta->mutable_tablet_schema(), target_tablet_schema));
293+
if (rowset_meta->has_tablet_schema() && rowset_meta->tablet_schema().index_size() > 0) {
294+
RETURN_IF_ERROR_RESULT(
295+
_rename_index_ids(*rowset_meta->mutable_tablet_schema(), target_tablet_schema));
294296
}
295297
}
296298

297299
if (new_tablet_meta_pb.schema().index_size() > 0) {
298-
RETURN_IF_ERROR_RESULT(_rename_index_ids(*new_tablet_meta_pb.mutable_schema(), target_tablet_schema));
300+
RETURN_IF_ERROR_RESULT(
301+
_rename_index_ids(*new_tablet_meta_pb.mutable_schema(), target_tablet_schema));
299302
}
300303

301304
if (!rowset_id_mapping.empty() && cloned_tablet_meta_pb.has_delete_bitmap()) {
@@ -365,7 +368,8 @@ Status SnapshotManager::_rename_rowset_id(const RowsetMetaPB& rs_meta_pb,
365368
return Status::OK();
366369
}
367370

368-
Status SnapshotManager::_rename_index_ids(TabletSchemaPB& schema_pb, const TabletSchemaSPtr& tablet_schema) const {
371+
Status SnapshotManager::_rename_index_ids(TabletSchemaPB& schema_pb,
372+
const TabletSchemaSPtr& tablet_schema) const {
369373
if (tablet_schema == nullptr) {
370374
return Status::OK();
371375
}

‎be/src/olap/snapshot_manager.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ class SnapshotManager {
133133
TabletSchemaSPtr tablet_schema, const RowsetId& next_id,
134134
RowsetMetaPB* new_rs_meta_pb);
135135

136-
Status _rename_index_ids(TabletSchemaPB& schema_pb, const TabletSchemaSPtr& tablet_schema) const;
136+
Status _rename_index_ids(TabletSchemaPB& schema_pb,
137+
const TabletSchemaSPtr& tablet_schema) const;
137138

138139
StorageEngine& _engine;
139140
std::atomic<uint64_t> _snapshot_base_id {0};

‎be/src/olap/tablet_schema.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,8 @@ class TabletSchema : public MetadataAdder<TabletSchema> {
535535

536536
bool has_ngram_bf_index(int32_t col_unique_id) const;
537537
const TabletIndex* get_ngram_bf_index(int32_t col_unique_id) const;
538-
const TabletIndex* get_index(int32_t col_unique_id, IndexType index_type, const std::string& suffix_path) const;
538+
const TabletIndex* get_index(int32_t col_unique_id, IndexType index_type,
539+
const std::string& suffix_path) const;
539540
void update_indexes_from_thrift(const std::vector<doris::TOlapTableIndex>& indexes);
540541
// If schema version is not set, it should be -1
541542
int32_t schema_version() const { return _schema_version; }

‎be/test/cloud/cloud_snapshot_mgr_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ TEST_F(CloudSnapshotMgrTest, TestConvertRowsets) {
9292
index2->set_index_name("test_index2");
9393
index2->set_index_type(IndexType::INVERTED);
9494
index2->add_col_unique_id(2);
95-
95+
9696
RowsetMetaPB* rowset_meta = input_meta_pb.add_rs_metas();
9797
RowsetId rowset_id;
9898
rowset_id.init(10000);
@@ -124,7 +124,7 @@ TEST_F(CloudSnapshotMgrTest, TestConvertRowsets) {
124124
input_schema->mutable_index(1)->set_index_id(2002);
125125
rowset_meta->mutable_tablet_schema()->mutable_index(0)->set_index_id(2001);
126126
rowset_meta->mutable_tablet_schema()->mutable_index(1)->set_index_id(2002);
127-
127+
128128
CloudTabletSPtr target_tablet = std::make_shared<CloudTablet>(*_engine, tablet_meta);
129129
StorageResource storage_resource {_fs};
130130
std::unordered_map<std::string, std::string> file_mapping;

‎be/test/olap/tablet_schema_test.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -805,56 +805,56 @@ TEST_F(TabletSchemaTest, test_tablet_schema_need_record_variant_extended_schema)
805805

806806
TEST_F(TabletSchemaTest, test_tablet_schema_get_index) {
807807
TabletSchema schema;
808-
808+
809809
TabletColumn col1;
810810
col1.set_unique_id(14001);
811811
col1.set_name("test_col1");
812812
col1.set_type(FieldType::OLAP_FIELD_TYPE_STRING);
813813
schema.append_column(col1);
814-
814+
815815
TabletColumn col2;
816816
col2.set_unique_id(14002);
817817
col2.set_name("test_col2");
818818
col2.set_type(FieldType::OLAP_FIELD_TYPE_VARCHAR);
819819
schema.append_column(col2);
820-
820+
821821
TabletIndex inverted_index;
822822
TabletIndexPB inverted_index_pb;
823823
inverted_index_pb.set_index_id(5001);
824824
inverted_index_pb.set_index_name("inverted_idx");
825825
inverted_index_pb.set_index_type(IndexType::INVERTED);
826826
inverted_index_pb.add_col_unique_id(14001);
827827
inverted_index.init_from_pb(inverted_index_pb);
828-
828+
829829
TabletIndex bitmap_index;
830830
TabletIndexPB bitmap_index_pb;
831831
bitmap_index_pb.set_index_id(5002);
832832
bitmap_index_pb.set_index_name("bitmap_idx");
833833
bitmap_index_pb.set_index_type(IndexType::BITMAP);
834834
bitmap_index_pb.add_col_unique_id(14001);
835835
bitmap_index.init_from_pb(bitmap_index_pb);
836-
836+
837837
TabletIndex ann_index;
838838
TabletIndexPB ann_index_pb;
839839
ann_index_pb.set_index_id(5003);
840840
ann_index_pb.set_index_name("ann_idx");
841841
ann_index_pb.set_index_type(IndexType::ANN);
842842
ann_index_pb.add_col_unique_id(14002);
843843
ann_index.init_from_pb(ann_index_pb);
844-
844+
845845
TabletIndex ngram_bf_index;
846846
TabletIndexPB ngram_bf_index_pb;
847847
ngram_bf_index_pb.set_index_id(5004);
848848
ngram_bf_index_pb.set_index_name("ngram_bf_idx");
849849
ngram_bf_index_pb.set_index_type(IndexType::NGRAM_BF);
850850
ngram_bf_index_pb.add_col_unique_id(14002);
851851
ngram_bf_index.init_from_pb(ngram_bf_index_pb);
852-
852+
853853
schema.append_index(std::move(inverted_index));
854854
schema.append_index(std::move(bitmap_index));
855855
schema.append_index(std::move(ann_index));
856856
schema.append_index(std::move(ngram_bf_index));
857-
857+
858858
const TabletIndex* found_inverted = schema.get_index(14001, IndexType::INVERTED, "");
859859
EXPECT_NE(nullptr, found_inverted);
860860
EXPECT_EQ("inverted_idx", found_inverted->index_name());
@@ -878,13 +878,13 @@ TEST_F(TabletSchemaTest, test_tablet_schema_get_index) {
878878
EXPECT_EQ("inverted_idx", empty_suffix->index_name());
879879
const TabletIndex* with_suffix = schema.get_index(14001, IndexType::INVERTED, "test_suffix");
880880
EXPECT_EQ(nullptr, with_suffix);
881-
881+
882882
EXPECT_TRUE(found_inverted->is_inverted_index());
883883
EXPECT_EQ(IndexType::INVERTED, found_inverted->index_type());
884884
EXPECT_EQ(IndexType::BITMAP, found_bitmap->index_type());
885885
EXPECT_EQ(IndexType::ANN, found_ann->index_type());
886886
EXPECT_EQ(IndexType::NGRAM_BF, found_ngram_bf->index_type());
887-
887+
888888
const auto& inverted_col_ids = found_inverted->col_unique_ids();
889889
EXPECT_EQ(1, inverted_col_ids.size());
890890
EXPECT_EQ(14001, inverted_col_ids[0]);

0 commit comments

Comments
 (0)