Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FLASH-674: check region version in executeTS #322

Merged
merged 13 commits into from
Nov 18, 2019
Merged

FLASH-674: check region version in executeTS #322

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e9dc0b0
Flash-594 coprocessor support filter on non-uint8 column
windtalker Oct 23, 2019
9f0dc68
address comments
windtalker Oct 25, 2019
6d8ff08
merge pingcap tics/master to master
windtalker Oct 25, 2019
1c8a429
fix merge error
windtalker Oct 25, 2019
a0e7614
address comments
windtalker Oct 25, 2019
59de965
Merge branch 'master' into master
windtalker Oct 28, 2019
a0f3c47
Merge branch 'master' of https://github.com/pingcap/tics
windtalker Oct 29, 2019
e05f61e
address comments
windtalker Oct 29, 2019
2668ba8
Merge branch 'master' of https://github.com/windtalker/tics
windtalker Oct 29, 2019
a0384ab
Merge branch 'master' of https://github.com/pingcap/tics
windtalker Oct 29, 2019
a2a685c
Merge branch 'master' of https://github.com/pingcap/tics
windtalker Oct 31, 2019
7eb6cd5
check region verion in executeTS
windtalker Nov 14, 2019
9d345ab
Merge branch 'master' of https://github.com/windtalker/tics
windtalker Nov 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions dbms/src/Flash/Coprocessor/InterpreterDAG.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,11 +262,12 @@ void InterpreterDAG::executeTS(const tipb::TableScan & ts, Pipeline & pipeline)
info.version = dag.getRegionVersion();
info.conf_version = dag.getRegionConfVersion();
auto current_region = context.getTMTContext().getKVStore()->getRegion(info.region_id);
if (!current_region)
if (!current_region || current_region->version() != dag.getRegionVersion() || current_region->confVer() != dag.getRegionConfVersion())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should add one more check:

if (current_region->isPendingRemove())
     // throw RegionException(..., RegionException::RegionReadStatus::PENDING_REMOVE);

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, region status should also be checked here

{
std::vector<RegionID> region_ids;
region_ids.push_back(info.region_id);
throw RegionException(std::move(region_ids), RegionException::RegionReadStatus::NOT_FOUND);
throw RegionException(std::move(region_ids),
current_region ? RegionException::RegionReadStatus::NOT_FOUND : RegionException::RegionReadStatus::VERSION_ERROR);
}
if (!checkKeyRanges(dag.getKeyRanges(), table_id, storage->pkIsUInt64(), current_region->getRange()))
throw Exception("Cop request only support full range scan for given region", ErrorCodes::COP_BAD_DAG_REQUEST);
Expand Down