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

[indexer] Move support classes to MwmSet

Browse source
This commit is contained in:
Sergey Yershov 2018-06-14 19:26:54 +03:00 • committed by mpimenov
parent 8d14bbb537
commit d3a9093765
4 changed files with 77 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
indexer/index.cpp
View file

@ -1,45 +1,10 @@
#include "indexer/index.hpp"
#include "platform/local_country_file_utils.hpp"
#include "indexer/rank_table.hpp"
#include "coding/file_name_utils.hpp"
#include "coding/internal/file_data.hpp"
#include "base/logging.hpp"
using platform::CountryFile;
using platform::LocalCountryFile;
//////////////////////////////////////////////////////////////////////////////////
// MwmValue implementation
//////////////////////////////////////////////////////////////////////////////////
using namespace std;
MwmValue::MwmValue(LocalCountryFile const & localFile)
: m_cont(platform::GetCountryReader(localFile, MapOptions::Map)), m_file(localFile)
{
m_factory.Load(m_cont);
}
void MwmValue::SetTable(MwmInfoEx & info)
{
auto const version = GetHeader().GetFormat();
if (version < version::Format::v5)
return;
m_table = info.m_table.lock();
if (!m_table)
{
if (version == version::Format::v5)
m_table = feature::FeaturesOffsetsTable::CreateIfNotExistsAndLoad(m_file, m_cont);
else
m_table = feature::FeaturesOffsetsTable::Load(m_cont);
info.m_table = m_table;
}
}
//////////////////////////////////////////////////////////////////////////////////
// Index implementation
//////////////////////////////////////////////////////////////////////////////////

41
indexer/index.hpp
View file

@ -27,47 +27,6 @@
#include <utility>
#include <vector>
class MwmInfoEx : public MwmInfo
{
private:
friend class Index;
friend class MwmValue;
// weak_ptr is needed here to access offsets table in already
// instantiated MwmValue-s for the MWM, including MwmValues in the
// MwmSet's cache. We can't use shared_ptr because of offsets table
// must be removed as soon as the last corresponding MwmValue is
// destroyed. Also, note that this value must be used and modified
// only in MwmValue::SetTable() method, which, in turn, is called
// only in the MwmSet critical section, protected by a lock. So,
// there's an implicit synchronization on this field.
std::weak_ptr<feature::FeaturesOffsetsTable> m_table;
};
class MwmValue : public MwmSet::MwmValueBase
{
public:
FilesContainerR const m_cont;
IndexFactory m_factory;
platform::LocalCountryFile const m_file;
std::shared_ptr<feature::FeaturesOffsetsTable> m_table;
explicit MwmValue(platform::LocalCountryFile const & localFile);
void SetTable(MwmInfoEx & info);
inline feature::DataHeader const & GetHeader() const { return m_factory.GetHeader(); }
inline feature::RegionData const & GetRegionData() const { return m_factory.GetRegionData(); }
inline version::MwmVersion const & GetMwmVersion() const { return m_factory.GetMwmVersion(); }
inline std::string const & GetCountryFileName() const
{
return m_file.GetCountryFile().GetName();
}
inline bool HasSearchIndex() { return m_cont.IsExist(SEARCH_INDEX_FILE_TAG); }
inline bool HasGeometryIndex() { return m_cont.IsExist(INDEX_FILE_TAG); }
};
class Index : public MwmSet
{
protected:

31
indexer/mwm_set.cpp
View file

@ -3,6 +3,8 @@
#include "coding/reader.hpp"
#include "platform/local_country_file_utils.hpp"
#include "base/assert.hpp"
#include "base/exception.hpp"
#include "base/logging.hpp"
@ -406,6 +408,35 @@ void MwmSet::ClearCache(MwmId const & id)
ClearCacheImpl(RemoveIfKeepValid(m_cache.begin(), m_cache.end(), sameId), m_cache.end());
}
//////////////////////////////////////////////////////////////////////////////////
// MwmValue implementation
//////////////////////////////////////////////////////////////////////////////////
using namespace std;
MwmValue::MwmValue(LocalCountryFile const & localFile)
: m_cont(platform::GetCountryReader(localFile, MapOptions::Map)), m_file(localFile)
{
m_factory.Load(m_cont);
}
void MwmValue::SetTable(MwmInfoEx & info)
{
auto const version = GetHeader().GetFormat();
if (version < version::Format::v5)
return;
m_table = info.m_table.lock();
if (!m_table)
{
if (version == version::Format::v5)
m_table = feature::FeaturesOffsetsTable::CreateIfNotExistsAndLoad(m_file, m_cont);
else
m_table = feature::FeaturesOffsetsTable::Load(m_cont);
info.m_table = m_table;
}
}
string DebugPrint(MwmSet::RegResult result)
{
switch (result)

47
indexer/mwm_set.hpp
View file

@ -9,6 +9,9 @@
#include "base/macros.hpp"
#include "indexer/feature_meta.hpp"
#include "indexer/data_factory.hpp"
#include "indexer/features_offsets_table.hpp"
#include "std/atomic.hpp"
#include "std/deque.hpp"
@ -88,6 +91,23 @@ protected:
uint32_t m_numRefs; ///< Number of active handles.
};
class MwmInfoEx : public MwmInfo
{
private:
friend class Index;
friend class MwmValue;
// weak_ptr is needed here to access offsets table in already
// instantiated MwmValue-s for the MWM, including MwmValues in the
// MwmSet's cache. We can't use shared_ptr because of offsets table
// must be removed as soon as the last corresponding MwmValue is
// destroyed. Also, note that this value must be used and modified
// only in MwmValue::SetTable() method, which, in turn, is called
// only in the MwmSet critical section, protected by a lock. So,
// there's an implicit synchronization on this field.
std::weak_ptr<feature::FeaturesOffsetsTable> m_table;
};
class MwmSet
{
public:
@ -368,7 +388,32 @@ protected:
private:
base::ObserverListSafe<Observer> m_observers;
};
}; // class MwmSet
class MwmValue : public MwmSet::MwmValueBase
{
public:
FilesContainerR const m_cont;
IndexFactory m_factory;
platform::LocalCountryFile const m_file;
std::shared_ptr<feature::FeaturesOffsetsTable> m_table;
explicit MwmValue(platform::LocalCountryFile const & localFile);
void SetTable(MwmInfoEx & info);
inline feature::DataHeader const & GetHeader() const { return m_factory.GetHeader(); }
inline feature::RegionData const & GetRegionData() const { return m_factory.GetRegionData(); }
inline version::MwmVersion const & GetMwmVersion() const { return m_factory.GetMwmVersion(); }
inline std::string const & GetCountryFileName() const
{
return m_file.GetCountryFile().GetName();
}
inline bool HasSearchIndex() { return m_cont.IsExist(SEARCH_INDEX_FILE_TAG); }
inline bool HasGeometryIndex() { return m_cont.IsExist(INDEX_FILE_TAG); }
}; // class MwmValue
string DebugPrint(MwmSet::RegResult result);
string DebugPrint(MwmSet::Event::Type type);