diff --git a/contrib/tiflash-proxy b/contrib/tiflash-proxy index 0089b469d0f..5a8ab3893ee 160000 --- a/contrib/tiflash-proxy +++ b/contrib/tiflash-proxy @@ -1 +1 @@ -Subproject commit 0089b469d0f2a0c4802026acb55fb8bb94e79080 +Subproject commit 5a8ab3893eebf88c0cf0727a958a4c63f0f29df8 diff --git a/dbms/src/Flash/Coprocessor/InterpreterDAGHelper.hpp b/dbms/src/Flash/Coprocessor/InterpreterDAGHelper.hpp index dc651fbd3aa..1c33aa850e9 100644 --- a/dbms/src/Flash/Coprocessor/InterpreterDAGHelper.hpp +++ b/dbms/src/Flash/Coprocessor/InterpreterDAGHelper.hpp @@ -18,8 +18,9 @@ RegionException::RegionReadStatus GetRegionReadStatus( if (!current_region) return RegionException::RegionReadStatus::NOT_FOUND; auto meta_snap = current_region->dumpRegionMetaSnapshot(); - if (meta_snap.ver != check_info.region_version || meta_snap.conf_ver != check_info.region_conf_version) + if (meta_snap.ver != check_info.region_version) return RegionException::RegionReadStatus::EPOCH_NOT_MATCH; + // No need to check conf_version if its peer state is normal if (current_region->peerState() != raft_serverpb::PeerState::Normal) return RegionException::RegionReadStatus::NOT_FOUND; diff --git a/dbms/src/Storages/Transaction/LearnerRead.cpp b/dbms/src/Storages/Transaction/LearnerRead.cpp index 9bb6dd41a7c..aeed308a37b 100644 --- a/dbms/src/Storages/Transaction/LearnerRead.cpp +++ b/dbms/src/Storages/Transaction/LearnerRead.cpp @@ -69,19 +69,6 @@ struct UnavailableRegions std::atomic status{RegionException::RegionReadStatus::NOT_FOUND}; }; -/// Check whether region is invalid or not. -RegionException::RegionReadStatus isValidRegion(const RegionQueryInfo & region_to_query, const RegionPtr & region_in_mem) -{ - if (region_in_mem->peerState() != raft_serverpb::PeerState::Normal) - return RegionException::RegionReadStatus::NOT_FOUND; - - const auto & meta_snap = region_in_mem->dumpRegionMetaSnapshot(); - if (meta_snap.ver != region_to_query.version || meta_snap.conf_ver != region_to_query.conf_version) - return RegionException::RegionReadStatus::EPOCH_NOT_MATCH; - - return RegionException::RegionReadStatus::OK; -} - LearnerReadSnapshot doLearnerRead(const TiDB::TableID table_id, // const MvccQueryInfo & mvcc_query_info, // size_t num_streams, TMTContext & tmt, Poco::Logger * log)