hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 15:24:05 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

fulltext search can not cancel

Browse source
This commit is contained in:
Xiao YiFang 2022-06-19 14:56:18 +08:00
parent 4edd3b3987
commit 6ff042d56f
1 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
ftshelpers.cc
View file

@ -443,27 +443,19 @@ void FTSResultsRequest::checkArticles( QVector< uint32_t > const & offsets,
QStringList const & words,
QRegExp const & searchRegexp )
{
const int parallel_count = QThread::idealThreadCount()/2;
QSemaphore sem( parallel_count < 1 ? 1 : parallel_count );
QFutureSynchronizer< void > synchronizer;
// const int parallel_count = QThread::idealThreadCount()/2;
// QSemaphore sem( parallel_count < 1 ? 1 : parallel_count );
//
// QFutureSynchronizer< void > synchronizer;
const auto searchRegularExpression = createMatchRegex( searchRegexp );
for( auto & address : offsets )
{
if( Utils::AtomicInt::loadAcquire( isCancelled ) )
{
synchronizer.setCancelOnWait(true);
return;
}
sem.acquire();
QFuture< void > f = QtConcurrent::run(
[ =,&sem ]()
{
QSemaphoreReleaser releaser( sem );
checkSingleArticle( address, words, searchRegularExpression );
} );
synchronizer.addFuture( f );
checkSingleArticle( address, words, searchRegularExpression );
}
}
@ -723,7 +715,18 @@ void FTSResultsRequest::indexSearch( BtreeIndexing::BtreeIndex & ftsIndex,
}
};
// int n = indexWords.length();
QtConcurrent::blockingMap( indexWords, findLinks );
// QtConcurrent::blockingMap( indexWords, findLinks );
for(QString word:indexWords)
{
if( Utils::AtomicInt::loadAcquire( isCancelled ) )
{
return;
}
findLinks( word );
}
// blocked execution.
int i = 0;
for( auto & elem : addressLists )
@ -840,7 +843,20 @@ void FTSResultsRequest::combinedIndexSearch( BtreeIndexing::BtreeIndex & ftsInde
sets << tmp;
}
};
QtConcurrent::blockingMap( wordsList, fn_wordLink );
// QtConcurrent::blockingMap( wordsList, fn_wordLink );
{
for(const auto & word : wordsList )
{
if( Utils::AtomicInt::loadAcquire( isCancelled ) )
{
return;
}
fn_wordLink( word );
}
}
//blocked execution.
int i = 0;
for( auto & elem : sets )