This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch branch-0.15 in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
commit 26e3a37f442ead2e45c46be85ded460088fd90c4 Author: Mingyu Chen <[email protected]> AuthorDate: Mon Oct 18 10:12:55 2021 +0800 [UT] Fix ut bugs (#6862) Co-authored-by: morningman <[email protected]> --- be/src/olap/tablet_meta.cpp | 4 ++-- be/src/olap/tablet_meta.h | 2 +- be/test/olap/test_data/header_without_inc_rs.txt | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/be/src/olap/tablet_meta.cpp b/be/src/olap/tablet_meta.cpp index 564ced8..4ede471 100644 --- a/be/src/olap/tablet_meta.cpp +++ b/be/src/olap/tablet_meta.cpp @@ -53,7 +53,7 @@ TabletMeta::TabletMeta(int64_t table_id, int64_t partition_id, int64_t tablet_id uint32_t next_unique_id, const std::unordered_map<uint32_t, uint32_t>& col_ordinal_to_unique_id, TabletUid tablet_uid, TTabletType::type tabletType) - : _tablet_uid(0, 0), _preferred_rowset_type(BETA_ROWSET), _schema(new TabletSchema) { + : _tablet_uid(0, 0), _schema(new TabletSchema) { TabletMetaPB tablet_meta_pb; tablet_meta_pb.set_table_id(table_id); tablet_meta_pb.set_partition_id(partition_id); @@ -151,10 +151,10 @@ TabletMeta::TabletMeta(const TabletMeta& b) _tablet_type(b._tablet_type), _tablet_state(b._tablet_state), _schema(b._schema), - _in_restore_mode(b._in_restore_mode), _rs_metas(b._rs_metas), _stale_rs_metas(b._stale_rs_metas), _del_pred_array(b._del_pred_array), + _in_restore_mode(b._in_restore_mode), _preferred_rowset_type(b._preferred_rowset_type) { } diff --git a/be/src/olap/tablet_meta.h b/be/src/olap/tablet_meta.h index 8995e96..069507e 100644 --- a/be/src/olap/tablet_meta.h +++ b/be/src/olap/tablet_meta.h @@ -199,7 +199,7 @@ private: DelPredicateArray _del_pred_array; bool _in_restore_mode = false; - RowsetTypePB _preferred_rowset_type = ALPHA_ROWSET; + RowsetTypePB _preferred_rowset_type = BETA_ROWSET; RWMutex _meta_lock; }; diff --git a/be/test/olap/test_data/header_without_inc_rs.txt b/be/test/olap/test_data/header_without_inc_rs.txt index 96acbb3..edd7d03 100644 --- a/be/test/olap/test_data/header_without_inc_rs.txt +++ b/be/test/olap/test_data/header_without_inc_rs.txt @@ -140,5 +140,6 @@ "hi": 10, "lo": 10 }, + "preferred_rowset_type": "BETA_ROWSET", "tablet_type": "TABLET_TYPE_DISK" } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
