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

Review fixes.

Browse source
This commit is contained in:
Yuri Gorshenin 2016-02-16 16:53:26 +03:00 • committed by Sergey Yershov
parent 3431ad9bf3
commit 49b7fc3226
4 changed files with 66 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
indexer/indexer_tests/index_test.cpp
View file

@ -16,6 +16,7 @@
#include "base/scope_guard.hpp"
#include "base/stl_add.hpp"
#include "std/algorithm.hpp"
#include "std/bind.hpp"
#include "std/string.hpp"
@ -48,30 +49,14 @@ public:
}
// Checks expectations and clears them.
bool Check()
bool CheckExpectations()
{
bool ok = true;
size_t i = 0;
for (; i < m_actual.size() && m_expected.size(); ++i)
if (m_actual != m_expected)
{
if (m_actual[i] != m_expected[i])
{
LOG(LINFO, ("Check failed: expected:", m_expected[i], "actual:", m_actual[i]));
ok = false;
}
}
for (; i < m_actual.size(); ++i)
{
LOG(LINFO, ("Unexpected event:", m_actual[i]));
LOG(LINFO, ("Check failed. Expected:", m_expected, "actual:", m_actual));
ok = false;
}
for (; i < m_expected.size(); ++i)
{
LOG(LINFO, ("Unmet expectation:", m_expected[i]));
ok = false;
}
m_actual.clear();
m_expected.clear();
return ok;
@ -95,10 +80,10 @@ public:
}
protected:
template <typename... Args>
void AddEvent(vector<MwmSet::Event> & events, Args... args)
template <typename... TArgs>
void AddEvent(vector<MwmSet::Event> & events, TArgs... args)
{
events.emplace_back(forward<Args>(args)...);
events.emplace_back(forward<TArgs>(args)...);
}
Index m_index;
@ -138,7 +123,7 @@ UNIT_CLASS_TEST(IndexTest, StatusNotifications)
TEST(id1.IsAlive(), ());
ExpectRegistered(file1);
TEST(Check(), ());
TEST(CheckExpectations(), ());
}
// Checks that map can't registered twice.
@ -149,7 +134,7 @@ UNIT_CLASS_TEST(IndexTest, StatusNotifications)
TEST(result.first.IsAlive(), ());
TEST_EQUAL(id1, result.first, ());
TEST(Check(), ());
TEST(CheckExpectations(), ());
}
// Checks that observers are notified when map is updated.
@ -163,10 +148,10 @@ UNIT_CLASS_TEST(IndexTest, StatusNotifications)
TEST_NOT_EQUAL(id1, id2, ());
ExpectUpdated(file2, file1);
TEST(Check(), ());
TEST(CheckExpectations(), ());
}
// Tries to deregister a map in presence of an active lock. Map
// Tries to deregister a map in presence of an active handle. Map
// should be marked "to be removed" but can't be deregistered. After
// leaving the inner block the map should be deregistered.
{
@ -175,10 +160,10 @@ UNIT_CLASS_TEST(IndexTest, StatusNotifications)
TEST(handle.IsAlive(), ());
TEST(!m_index.DeregisterMap(country), ());
TEST(Check(), ());
TEST(CheckExpectations(), ());
}
ExpectDeregistered(file2);
TEST(Check(), ());
TEST(CheckExpectations(), ());
}
}

89
indexer/mwm_set.cpp
View file

@ -86,51 +86,53 @@ MwmSet::MwmId MwmSet::GetMwmIdByCountryFileImpl(CountryFile const & countryFile)
pair<MwmSet::MwmId, MwmSet::RegResult> MwmSet::Register(LocalCountryFile const & localFile)
{
pair<MwmSet::MwmId, MwmSet::RegResult> result;
WithEventLog([&](EventList & events)
{
CountryFile const & countryFile = localFile.GetCountryFile();
MwmId const id = GetMwmIdByCountryFileImpl(countryFile);
if (!id.IsAlive())
{
result = RegisterImpl(localFile, events);
return;
}
auto registerFile = [&](EventList & events)
{
CountryFile const & countryFile = localFile.GetCountryFile();
MwmId const id = GetMwmIdByCountryFileImpl(countryFile);
if (!id.IsAlive())
{
result = RegisterImpl(localFile, events);
return;
}
shared_ptr<MwmInfo> info = id.GetInfo();
shared_ptr<MwmInfo> info = id.GetInfo();
// Deregister old mwm for the country.
if (info->GetVersion() < localFile.GetVersion())
{
EventList subEvents;
DeregisterImpl(id, subEvents);
result = RegisterImpl(localFile, subEvents);
// Deregister old mwm for the country.
if (info->GetVersion() < localFile.GetVersion())
{
EventList subEvents;
DeregisterImpl(id, subEvents);
result = RegisterImpl(localFile, subEvents);
// In the case of success all sub-events are
// replaced with a single UPDATE event. Otherwise,
// sub-events are reported as is.
if (result.second == MwmSet::RegResult::Success)
events.Add(Event(Event::TYPE_UPDATED, localFile, info->GetLocalFile()));
else
events.Append(subEvents);
return;
}
// In the case of success all sub-events are
// replaced with a single UPDATE event. Otherwise,
// sub-events are reported as is.
if (result.second == MwmSet::RegResult::Success)
events.Add(Event(Event::TYPE_UPDATED, localFile, info->GetLocalFile()));
else
events.Append(subEvents);
return;
}
string const name = countryFile.GetNameWithoutExt();
// Update the status of the mwm with the same version.
if (info->GetVersion() == localFile.GetVersion())
{
LOG(LINFO, ("Updating already registered mwm:", name));
SetStatus(*info, MwmInfo::STATUS_REGISTERED, events);
info->m_file = localFile;
result = make_pair(id, RegResult::VersionAlreadyExists);
return;
}
string const name = countryFile.GetNameWithoutExt();
// Update the status of the mwm with the same version.
if (info->GetVersion() == localFile.GetVersion())
{
LOG(LINFO, ("Updating already registered mwm:", name));
SetStatus(*info, MwmInfo::STATUS_REGISTERED, events);
info->m_file = localFile;
result = make_pair(id, RegResult::VersionAlreadyExists);
return;
}
LOG(LWARNING, ("Trying to add too old (", localFile.GetVersion(), ") mwm (",
name, "), current version:", info->GetVersion()));
result = make_pair(MwmId(), RegResult::VersionTooOld);
return;
});
LOG(LWARNING, ("Trying to add too old (", localFile.GetVersion(), ") mwm (", name,
"), current version:", info->GetVersion()));
result = make_pair(MwmId(), RegResult::VersionTooOld);
return;
};
WithEventLog(registerFile);
return result;
}
@ -292,7 +294,7 @@ unique_ptr<MwmSet::MwmValueBase> MwmSet::LockValueImpl(MwmId const & id, EventLi
}
}
void MwmSet::UnlockValue(MwmId const & id, unique_ptr<MwmValueBase> && p)
void MwmSet::UnlockValue(MwmId const & id, unique_ptr<MwmValueBase> p)
{
WithEventLog([&](EventList & events)
{
@ -300,9 +302,10 @@ void MwmSet::UnlockValue(MwmId const & id, unique_ptr<MwmValueBase> && p)
});
}
void MwmSet::UnlockValueImpl(MwmId const & id, unique_ptr<MwmValueBase> && p, EventList & events)
void MwmSet::UnlockValueImpl(MwmId const & id, unique_ptr<MwmValueBase> p, EventList & events)
{
ASSERT(id.IsAlive() && p, (id));
ASSERT(id.IsAlive(), (id));
ASSERT(p.get() != nullptr, ());
if (!id.IsAlive() || !p)
return;

10
indexer/mwm_set.hpp
View file

@ -234,10 +234,12 @@ public:
// used.
virtual void OnMapRegistered(platform::LocalCountryFile const & localFile) {}
// Called when a map is updated to a newer version.
// Called when a map is updated to a newer version. Feel free to
// treat it as combined OnMapRegistered(newFile) +
// OnMapRegistered(oldFile).
virtual void OnMapUpdated(platform::LocalCountryFile const & newFile, platform::LocalCountryFile const & oldFile) {}
// Called when a map is deregistered and can not be used.
// Called when a map is deregistered and can no longer be used.
virtual void OnMapDeregistered(platform::LocalCountryFile const & localFile) {}
};
@ -338,8 +340,8 @@ private:
unique_ptr<MwmValueBase> LockValue(MwmId const & id);
unique_ptr<MwmValueBase> LockValueImpl(MwmId const & id, EventList & events);
void UnlockValue(MwmId const & id, unique_ptr<MwmValueBase> && p);
void UnlockValueImpl(MwmId const & id, unique_ptr<MwmValueBase> && p, EventList & events);
void UnlockValue(MwmId const & id, unique_ptr<MwmValueBase> p);
void UnlockValueImpl(MwmId const & id, unique_ptr<MwmValueBase> p, EventList & events);
/// Do the cleaning for [beg, end) without acquiring the mutex.
/// @precondition This function is always called under mutex m_lock.

2
map/feature_vec_model.cpp
View file

@ -84,7 +84,7 @@ void FeaturesFetcher::ClearCaches()
}
void FeaturesFetcher::OnMapUpdated(platform::LocalCountryFile const & newFile,
platform::LocalCountryFile const & oldFile)
platform::LocalCountryFile const & oldFile)
{
if (m_onMapDeregistered)
m_onMapDeregistered(oldFile);