From 3689721d994da3b346039a8c99aca144f460ad22 Mon Sep 17 00:00:00 2001 From: Minionyh Date: Tue, 17 Dec 2024 13:15:47 +0000 Subject: [PATCH] [CP] use default hashmap latch --- src/rootserver/mview/ob_collect_mv_merge_info_task.h | 2 -- src/rootserver/mview/ob_mview_maintenance_service.cpp | 3 ++- src/rootserver/mview/ob_mview_maintenance_service.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/rootserver/mview/ob_collect_mv_merge_info_task.h b/src/rootserver/mview/ob_collect_mv_merge_info_task.h index 55e3095cb..3b44eaba9 100644 --- a/src/rootserver/mview/ob_collect_mv_merge_info_task.h +++ b/src/rootserver/mview/ob_collect_mv_merge_info_task.h @@ -34,8 +34,6 @@ namespace rootserver int (obrpc::ObSrvRpcProxy::*)(const arg &, obrpc::ObSrvRpcProxy::AsyncCB *, const obrpc::ObRpcOpts &), obrpc::ObSrvRpcProxy> name RPC_MVIEW(obrpc::OB_COLLECT_MV_MERGE_INFO, obrpc::ObCollectMvMergeInfoArg, obrpc::ObCollectMvMergeInfoResult, ObCollectMvMergeInfoProxy); -typedef common::hash::ObHashSet NewMvBaseTabletSet; - class ObCollectMvMergeInfoTask : public ObMViewTimerTask { public: diff --git a/src/rootserver/mview/ob_mview_maintenance_service.cpp b/src/rootserver/mview/ob_mview_maintenance_service.cpp index 135fde3dd..636c33711 100644 --- a/src/rootserver/mview/ob_mview_maintenance_service.cpp +++ b/src/rootserver/mview/ob_mview_maintenance_service.cpp @@ -274,13 +274,14 @@ int ObMViewMaintenanceService::update_mview_refresh_info_cache( int ret = OB_SUCCESS; int update_cache_cnt = 0; const int invalid_refresh_scn = 0; + int64_t now_ts = ObTimeUtility::fast_current_time(); ARRAY_FOREACH_X(mview_ids, idx, cnt, OB_SUCC(ret)) { RefreshInfo new_refresh_info; if (mview_refresh_scns.at(idx) == invalid_refresh_scn) { // skip update invalid scn in cache } else if (mview_refresh_modes.at(idx) == (uint64_t)ObMVRefreshMode::MAJOR_COMPACTION) { new_refresh_info.refresh_scn_ = mview_refresh_scns.at(idx); - new_refresh_info.refresh_ts_ = ObTimeUtility::fast_current_time(); + new_refresh_info.refresh_ts_ = now_ts; new_refresh_info.expired_ts_ = new_refresh_info.refresh_ts_ + ObMViewMaintenanceService::CacheValidInterval; if (OB_FAIL(mview_refresh_info_map.set_refactored(mview_ids.at(idx), new_refresh_info, 1/*overwrite*/))) { diff --git a/src/rootserver/mview/ob_mview_maintenance_service.h b/src/rootserver/mview/ob_mview_maintenance_service.h index 3e189bd94..da25ca007 100644 --- a/src/rootserver/mview/ob_mview_maintenance_service.h +++ b/src/rootserver/mview/ob_mview_maintenance_service.h @@ -43,7 +43,7 @@ struct RefreshInfo }; typedef common::hash:: - ObHashMap + ObHashMap ObMviewRefreshInfoMap; class ObMViewMaintenanceService : public logservice::ObIReplaySubHandler, public logservice::ObICheckpointSubHandler,