RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[search] Less checks for IsCancelled.

Browse source
This commit is contained in:
vng 2016-01-07 14:29:54 +03:00 • committed by Sergey Yershov
parent 38db712a88
commit 2279383b72
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
search/retrieval.cpp
View file

@ -73,10 +73,11 @@ unique_ptr<coding::CompressedBitVector> RetrieveAddressFeaturesImpl(
// TODO (@y, @m): This code may be optimized in the case where
// bit vectors are sorted in the search index.
vector<uint64_t> features;
uint32_t counter = 0;
auto collector = [&](TValue const & value)
{
if (cancellable.IsCancelled())
MYTHROW(CancelException, ("Search cancelled"));
if ((++counter & 0xFF) == 0)
BailIfCancelled(cancellable);
features.push_back(value.m_featureId);
};
@ -93,10 +94,11 @@ unique_ptr<coding::CompressedBitVector> RetrieveGeometryFeaturesImpl(
// TODO (@y, @m): remove this code as soon as geometry index will
// have native support for bit vectors.
vector<uint64_t> features;
uint32_t counter = 0;
auto collector = [&](uint64_t featureId)
{
if (cancellable.IsCancelled())
MYTHROW(CancelException, ("Search cancelled"));
if ((++counter & 0xFF) == 0)
BailIfCancelled(cancellable);
features.push_back(featureId);
};