This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch branch-1.2-lts in repository https://gitbox.apache.org/repos/asf/doris.git
commit c54dacf0efec40b2c9e8faa64e9f10f2180e314d Author: chenlinzhong <[email protected]> AuthorDate: Sat Apr 8 09:32:36 2023 +0800 [bug](GC)the issue of incorrect disk usage (#18397) --- be/src/olap/rowset/rowset_meta_manager.cpp | 7 +++++++ be/src/olap/rowset/rowset_meta_manager.h | 1 + be/src/olap/tablet.cpp | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/be/src/olap/rowset/rowset_meta_manager.cpp b/be/src/olap/rowset/rowset_meta_manager.cpp index 7a58fa9cb6..ac9ae5764e 100644 --- a/be/src/olap/rowset/rowset_meta_manager.cpp +++ b/be/src/olap/rowset/rowset_meta_manager.cpp @@ -42,6 +42,13 @@ bool RowsetMetaManager::check_rowset_meta(OlapMeta* meta, TabletUid tablet_uid, return meta->key_may_exist(META_COLUMN_FAMILY_INDEX, key, &value); } +Status RowsetMetaManager::exists(OlapMeta* meta, TabletUid tablet_uid, const RowsetId& rowset_id) { + std::string key = ROWSET_PREFIX + tablet_uid.to_string() + "_" + rowset_id.to_string(); + std::string value; + Status s = meta->get(META_COLUMN_FAMILY_INDEX, key, &value); + return s; +} + Status RowsetMetaManager::get_rowset_meta(OlapMeta* meta, TabletUid tablet_uid, const RowsetId& rowset_id, RowsetMetaSharedPtr rowset_meta) { diff --git a/be/src/olap/rowset/rowset_meta_manager.h b/be/src/olap/rowset/rowset_meta_manager.h index 8c8f3144e0..cca2304ce3 100644 --- a/be/src/olap/rowset/rowset_meta_manager.h +++ b/be/src/olap/rowset/rowset_meta_manager.h @@ -31,6 +31,7 @@ namespace doris { class RowsetMetaManager { public: static bool check_rowset_meta(OlapMeta* meta, TabletUid tablet_uid, const RowsetId& rowset_id); + static Status exists(OlapMeta* meta, TabletUid tablet_uid, const RowsetId& rowset_id); static Status get_rowset_meta(OlapMeta* meta, TabletUid tablet_uid, const RowsetId& rowset_id, RowsetMetaSharedPtr rowset_meta); diff --git a/be/src/olap/tablet.cpp b/be/src/olap/tablet.cpp index 084ee03f24..04e43f719a 100644 --- a/be/src/olap/tablet.cpp +++ b/be/src/olap/tablet.cpp @@ -1162,7 +1162,8 @@ bool Tablet::check_rowset_id(const RowsetId& rowset_id) { return true; } } - if (RowsetMetaManager::check_rowset_meta(_data_dir->get_meta(), tablet_uid(), rowset_id)) { + Status s = RowsetMetaManager::exists(_data_dir->get_meta(), tablet_uid(), rowset_id); + if (!s.is<META_KEY_NOT_FOUND>()) { return true; } return false; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
