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

Fix trie search. !Note! Need to review some @todo.

Browse source
This commit is contained in:
vng 2011-08-16 17:41:49 +03:00 • committed by Alex Zolotarev
parent 2d95d842c6
commit 8160688cb8
9 changed files with 73 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
indexer/feature.hpp
View file

@ -206,10 +206,11 @@ public:
size_t m_size;
GetNamesFn() : m_size(0) {}
void operator() (char lang, string const & name)
bool operator() (char lang, string const & name)
{
m_names[m_size++] = name;
m_langs[m_size] = lang;
return true;
}
};

24
indexer/index.hpp
View file

@ -15,7 +15,6 @@
#include "../geometry/rect2d.hpp"
#include "../coding/file_container.hpp"
#include "../coding/trie_reader.hpp"
#include "../base/base.hpp"
#include "../base/macros.hpp"
@ -141,9 +140,9 @@ public:
}
}
search::TrieIterator * GetWorldSearchIndex() const
search::SearchInfo * GetWorldSearchInfo() const
{
return m_pWorldSearchIndex.get();
return m_pWorldSearchInfo.get();
}
void Add(string const & file)
@ -159,10 +158,14 @@ public:
UpdateIndexes();
if (m_indexes.back()->IsWorldData())
/// @todo Keep this until World.mwm has search index.
static bool isWorld = true;
//if (m_indexes.back()->IsWorldData())
if (isWorld)
{
ASSERT(!m_pWorldSearchIndex.get(), ());
m_pWorldSearchIndex.reset(m_indexes.back()->GetSearchIndex());
ASSERT ( !m_pWorldSearchInfo.get(), () );
m_pWorldSearchInfo.reset(m_indexes.back()->GetSearchInfo());
isWorld = false;
}
}
@ -293,12 +296,9 @@ private:
return m_scaleRange.first <= 1;
}
search::TrieIterator * GetSearchIndex() const
search::SearchInfo * GetSearchInfo() const
{
return trie::reader::ReadTrie(
FilesContainerR(GetPlatform().GetReader(m_file)).GetReader(SEARCH_INDEX_FILE_TAG),
search::trie::ValueReader(),
search::trie::EdgeValueReader());
return new search::SearchInfo(FilesContainerR(GetPlatform().GetReader(m_file)));
}
void CloseIfUnlocked()
@ -393,7 +393,7 @@ private:
mutable vector<IndexProxy *> m_indexes;
mutable threads::Mutex m_mutex;
scoped_ptr<search::TrieIterator> m_pWorldSearchIndex;
scoped_ptr<search::SearchInfo> m_pWorldSearchInfo;
};
template <class FeatureVectorT, class BaseT> class OffsetToFeatureAdapter : public BaseT

5
search/engine.cpp
View file

@ -15,7 +15,7 @@ namespace search
Engine::Engine(IndexType const * pIndex,
CategoriesHolder & categories)
: m_pIndex(pIndex), m_pTrieIterator(pIndex->GetWorldSearchIndex()),
: m_pIndex(pIndex), m_pSearchInfo(pIndex->GetWorldSearchInfo()),
m_pCategories(new CategoriesHolder()),
m_pRunner(new threads::ConcurrentRunner), m_pLastQuery(NULL),
m_queriesActive(0)
@ -36,7 +36,8 @@ void Engine::Search(string const & queryText,
LOG(LDEBUG, (queryText, rect));
impl::Query * pQuery =
new impl::Query(queryText, rect, m_pIndex, this, m_pCategories.get(), m_pTrieIterator);
new impl::Query(queryText, rect, m_pIndex, this, m_pCategories.get(),
m_pSearchInfo->GetTrie(), m_pSearchInfo->GetFeatures());
{
threads::MutexGuard mutexGuard(m_mutex);

2
search/engine.hpp
View file

@ -45,7 +45,7 @@ public:
private:
IndexType const * m_pIndex;
TrieIterator * m_pTrieIterator;
SearchInfo * m_pSearchInfo;
scoped_ptr<CategoriesHolder> m_pCategories;
scoped_ptr<threads::IRunner> m_pRunner;
threads::Mutex m_mutex;

6
search/query.cpp
View file

@ -121,12 +121,14 @@ struct FeatureProcessor
} // unnamed namespace
Query::Query(string const & query, m2::RectD const & viewport, IndexType const * pIndex,
Engine * pEngine, CategoriesHolder * pCategories, TrieIterator * pTrieRoot)
Engine * pEngine, CategoriesHolder * pCategories,
TrieIterator * pTrieRoot, FeaturesVector * pFeatures)
: m_queryText(query), m_queryUniText(NormalizeAndSimplifyString(query)),
m_viewport(viewport),
m_pCategories(pCategories),
m_pTrieRoot(pTrieRoot),
m_pIndex(pIndex ? new IndexType(*pIndex) : NULL),
m_pFeatures(pFeatures),
m_resultsRemaining(10),
m_pEngine(pEngine), m_bTerminate(false)
{
@ -234,7 +236,7 @@ void Query::Search(function<void (Result const &)> const & f)
if (m_pTrieRoot)
{
search::MatchAgainstTrie(*this, *m_pTrieRoot);
search::MatchAgainstTrie(*this, *m_pTrieRoot, *m_pFeatures);
}
if (m_bTerminate)

4
search/query.hpp
View file

@ -27,7 +27,8 @@ public:
typedef Engine::IndexType IndexType;
Query(string const & query, m2::RectD const & viewport, IndexType const * pIndex,
Engine * pEngine, CategoriesHolder * pCategories, TrieIterator * pTrieRoot = NULL);
Engine * pEngine, CategoriesHolder * pCategories,
TrieIterator * pTrieRoot, FeaturesVector * pFeatures);
~Query();
// Search with parameters, passed in constructor.
@ -59,6 +60,7 @@ private:
m2::RectD m_viewport;
CategoriesHolder * m_pCategories;
TrieIterator * m_pTrieRoot;
FeaturesVector * m_pFeatures;
vector<strings::UniString> m_keywords;
unordered_map<uint32_t, uint32_t> m_keywordsToSkipForType;

16
search/search_tests/query_test.cpp
View file

@ -13,16 +13,16 @@ UNIT_TEST(QueryParseKeywords_Smoke)
vector<UniString> expected;
expected.push_back(MakeUniString("minsk"));
expected.push_back(MakeUniString("belarus"));
TEST_EQUAL(expected, Query("minsk belarus ", m2::RectD(), 0, 0, 0).GetKeywords(), ());
TEST_EQUAL(MakeUniString(""), Query("minsk belarus ", m2::RectD(), 0, 0, 0).GetPrefix(), ());
TEST_EQUAL(expected, Query("minsk belarus ma", m2::RectD(), 0, 0, 0).GetKeywords(), ());
TEST_EQUAL(MakeUniString("ma"), Query("minsk belarus ma", m2::RectD(), 0, 0, 0).GetPrefix(), ());
TEST_EQUAL(expected, Query("minsk belarus ", m2::RectD(), 0, 0, 0, 0, 0).GetKeywords(), ());
TEST_EQUAL(MakeUniString(""), Query("minsk belarus ", m2::RectD(), 0, 0, 0, 0, 0).GetPrefix(), ());
TEST_EQUAL(expected, Query("minsk belarus ma", m2::RectD(), 0, 0, 0, 0, 0).GetKeywords(), ());
TEST_EQUAL(MakeUniString("ma"), Query("minsk belarus ma", m2::RectD(), 0, 0, 0, 0, 0).GetPrefix(), ());
}
UNIT_TEST(QueryParseKeywords_Empty)
{
TEST_EQUAL(vector<UniString>(), Query("", m2::RectD(), 0, 0, 0).GetKeywords(), ());
TEST_EQUAL(MakeUniString(""), Query("", m2::RectD(), 0, 0, 0).GetPrefix(), ());
TEST_EQUAL(vector<UniString>(), Query("Z", m2::RectD(), 0, 0, 0).GetKeywords(), ());
TEST_EQUAL(MakeUniString("z"), Query("Z", m2::RectD(), 0, 0, 0).GetPrefix(), ());
TEST_EQUAL(vector<UniString>(), Query("", m2::RectD(), 0, 0, 0, 0, 0).GetKeywords(), ());
TEST_EQUAL(MakeUniString(""), Query("", m2::RectD(), 0, 0, 0, 0, 0).GetPrefix(), ());
TEST_EQUAL(vector<UniString>(), Query("Z", m2::RectD(), 0, 0, 0, 0, 0).GetKeywords(), ());
TEST_EQUAL(MakeUniString("z"), Query("Z", m2::RectD(), 0, 0, 0, 0, 0).GetPrefix(), ());
}

28
search/search_trie.hpp
View file

@ -1,9 +1,13 @@
#pragma once
#include "../indexer/features_vector.hpp"
#include "../coding/reader.hpp"
#include "../coding/trie.hpp"
#include "../coding/trie_reader.hpp"
#include "../base/base.hpp"
namespace search
{
namespace trie
@ -36,8 +40,26 @@ struct EdgeValueReader
} // namespace search::trie
typedef ::trie::Iterator<
search::trie::ValueReader::ValueType,
search::trie::EdgeValueReader::ValueType> TrieIterator;
typedef ::trie::Iterator<
search::trie::ValueReader::ValueType,
search::trie::EdgeValueReader::ValueType> TrieIterator;
class SearchInfo
{
scoped_ptr<TrieIterator> m_iterator;
FeaturesVector m_features;
public:
SearchInfo(FilesContainerR const & cont)
: m_features(cont),
m_iterator(::trie::reader::ReadTrie(
cont.GetReader(SEARCH_INDEX_FILE_TAG),
trie::ValueReader(),
trie::EdgeValueReader()))
{
}
TrieIterator * GetTrie() { return m_iterator.get(); }
FeaturesVector * GetFeatures() { return &m_features; }
};
} // namespace search

19
search/search_trie_matching.cpp
View file

@ -1,5 +1,9 @@
#include "search_trie_matching.hpp"
#include "query.hpp"
#include "string_match.hpp"
#include "../indexer/feature_visibility.hpp"
#include "../std/algorithm.hpp"
#include "../std/functional.hpp"
#include "../std/queue.hpp"
@ -7,6 +11,7 @@
#include "../std/utility.hpp"
#include "../std/vector.hpp"
void search::MatchAgainstTrie(search::impl::Query & query, search::TrieIterator & trieRoot,
FeaturesVector const & featuresVector)
{
@ -62,7 +67,7 @@ void search::MatchAgainstTrie(search::impl::Query & query, search::TrieIterator
// TODO: Deal with different names of the same feature.
// TODO: Best name for features.
FeatureType feature;
featuresVector.Get(featureQueue.top().second, features);
featuresVector.Get(featureQueue.top().second, feature);
FeatureType::GetNamesFn names;
feature.ForEachNameRef(names);
string displayName;
@ -75,9 +80,15 @@ void search::MatchAgainstTrie(search::impl::Query & query, search::TrieIterator
break;
}
}
ASSERT(!displayName.empty(), ());
query.AddResult(impl::IntermediateResult(query.GetViewport(), feature, displayName, 0,
feature::DrawableScaleRangeForText(feature).first));
/// @todo Need Yuri's review.
//ASSERT(!displayName.empty(), ());
if (!displayName.empty())
{
query.AddResult(impl::IntermediateResult(query.GetViewport(), feature, displayName, 0,
feature::DrawableScaleRangeForText(feature).first));
}
featureQueue.pop();
}
}