mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 15:47:38 +02:00
Code Issues Releases Wiki Activity

* Keep m_luceneReader & -Searcher alive during indexing and don't block mutex while searching.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-10-03 05:25:36 +02:00
parent 510485fcf0
commit 025d152936
2 changed files with 12 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/TomahawkSettings.cpp
View File

@@ -1536,7 +1536,7 @@ TomahawkSettings::updateIndex()
} }
tDebug() << Q_FUNC_INFO << "Wiping index."; tDebug() << Q_FUNC_INFO << "Wiping index.";
Database::instance()->wipeIndex(); // Database::instance()->wipeIndex();
Tomahawk::DatabaseCommand* cmd = new Tomahawk::DatabaseCommand_UpdateSearchIndex(); Tomahawk::DatabaseCommand* cmd = new Tomahawk::DatabaseCommand_UpdateSearchIndex();
Database::instance()->enqueue( QSharedPointer<Tomahawk::DatabaseCommand>( cmd ) ); Database::instance()->enqueue( QSharedPointer<Tomahawk::DatabaseCommand>( cmd ) );
} }

50
src/libtomahawk/database/fuzzyindex/FuzzyIndex.cpp
View File

@@ -97,17 +97,6 @@ FuzzyIndex::beginIndexing()
try try
{ {
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Starting indexing:" << m_lucenePath; tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Starting indexing:" << m_lucenePath;
if ( m_luceneReader )
{
tDebug( LOGVERBOSE ) << "Deleting old lucene stuff.";
m_luceneSearcher->close();
m_luceneReader->close();
m_luceneSearcher.reset();
m_luceneReader.reset();
}
tDebug( LOGVERBOSE ) << "Creating new index writer.";
m_luceneWriter = newLucene<IndexWriter>( m_luceneDir, m_analyzer, true, IndexWriter::MaxFieldLengthLIMITED ); m_luceneWriter = newLucene<IndexWriter>( m_luceneDir, m_analyzer, true, IndexWriter::MaxFieldLengthLIMITED );
} }
catch( LuceneException& error ) catch( LuceneException& error )
@@ -126,6 +115,9 @@ FuzzyIndex::endIndexing()
m_luceneWriter->close(); m_luceneWriter->close();
m_luceneWriter.reset(); m_luceneWriter.reset();
m_luceneReader = IndexReader::open( m_luceneDir );
m_luceneSearcher = newLucene<IndexSearcher>( m_luceneReader );
m_mutex.unlock(); m_mutex.unlock();
emit indexReady(); emit indexReady();
} }
@@ -211,23 +203,13 @@ FuzzyIndex::loadLuceneIndex()
QMap< int, float > QMap< int, float >
FuzzyIndex::search( const Tomahawk::query_ptr& query ) FuzzyIndex::search( const Tomahawk::query_ptr& query )
{ {
QMutexLocker lock( &m_mutex ); // QMutexLocker lock( &m_mutex );
QMap< int, float > resultsmap; QMap< int, float > resultsmap;
if ( !m_luceneReader || !m_luceneSearcher )
return resultsmap;
try try
{ {
if ( !m_luceneReader )
{
if ( !IndexReader::indexExists( m_luceneDir ) )
{
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "index didn't exist.";
return resultsmap;
}
m_luceneReader = IndexReader::open( m_luceneDir );
m_luceneSearcher = newLucene<IndexSearcher>( m_luceneReader );
}
float minScore; float minScore;
Collection<String> fields; // = newCollection<String>(); Collection<String> fields; // = newCollection<String>();
MultiFieldQueryParserPtr parser = newLucene<MultiFieldQueryParser>( LuceneVersion::LUCENE_CURRENT, fields, m_analyzer ); MultiFieldQueryParserPtr parser = newLucene<MultiFieldQueryParser>( LuceneVersion::LUCENE_CURRENT, fields, m_analyzer );
@@ -296,23 +278,13 @@ FuzzyIndex::searchAlbum( const Tomahawk::query_ptr& query )
{ {
Q_ASSERT( query->isFullTextQuery() ); Q_ASSERT( query->isFullTextQuery() );
QMutexLocker lock( &m_mutex ); // QMutexLocker lock( &m_mutex );
QMap< int, float > resultsmap; QMap< int, float > resultsmap;
if ( !m_luceneReader || !m_luceneSearcher )
return resultsmap;
try try
{ {
if ( !m_luceneReader )
{
if ( !IndexReader::indexExists( m_luceneDir ) )
{
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "index didn't exist.";
return resultsmap;
}
m_luceneReader = IndexReader::open( m_luceneDir );
m_luceneSearcher = newLucene<IndexSearcher>( m_luceneReader );
}
QueryParserPtr parser = newLucene<QueryParser>( LuceneVersion::LUCENE_CURRENT, L"album", m_analyzer ); QueryParserPtr parser = newLucene<QueryParser>( LuceneVersion::LUCENE_CURRENT, L"album", m_analyzer );
QString q = Tomahawk::DatabaseImpl::sortname( query->fullTextQuery() ); QString q = Tomahawk::DatabaseImpl::sortname( query->fullTextQuery() );