openkylin
/
ukui-search
mirror of https://gitee.com/openkylin/ukui-search.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Revert "增加索引目录时采用增量更新检验操作，避免重复索引" 

This reverts commit 031ce8bbd8.
This commit is contained in:
iaom 2023-04-24 18:33:30 +08:00
parent 5ae7233b21
commit d6565c87d6
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libsearch/index/batch-indexer.cpp
View File

@ -126,7 +126,10 @@ void BatchIndexer::basicIndex()
} }
filesNeedIndex = m_cache; filesNeedIndex = m_cache;
qDebug() <<filesNeedIndex.size() << "files need index."; qDebug() <<filesNeedIndex.size() << "files need index.";
} else if (m_mode == WorkMode::Update || m_mode == WorkMode::Add) { } else if(m_mode == WorkMode::Add) {
filesNeedIndex = m_cache;
qDebug() <<filesNeedIndex.size() << "files need index.";
} else if (m_mode == WorkMode::Update) {
QFileInfo info; QFileInfo info;
QMap<std::string, std::string> indexTimes = basicDb.getIndexTimes(); QMap<std::string, std::string> indexTimes = basicDb.getIndexTimes();
qDebug() << indexTimes.size() << "documents recorded"; qDebug() << indexTimes.size() << "documents recorded";
@ -136,15 +139,14 @@ void BatchIndexer::basicIndex()
filesNeedIndex.append(path); filesNeedIndex.append(path);
} }
} }
if(m_mode == WorkMode::Update && !indexTimes.isEmpty()) { if(!indexTimes.isEmpty()) {
qDebug() << indexTimes.size() << "documents need remove."; qDebug() << indexTimes.size() << "documents need remove.";
for(std::string uniqueTerm : indexTimes.keys()) { for(std::string uniqueTerm : indexTimes.keys()) {
basicDb.removeDocument(uniqueTerm); basicDb.removeDocument(uniqueTerm);
} }
basicDb.commit(); basicDb.commit();
} }
qDebug() << filesNeedIndex.size() << "files need update.";
qDebug() << filesNeedIndex.size() << "files need index.";
} }
uint allSize = filesNeedIndex.size(); uint allSize = filesNeedIndex.size();
Q_EMIT progress(IndexType::Basic, allSize, 0); Q_EMIT progress(IndexType::Basic, allSize, 0);
@ -205,6 +207,8 @@ void BatchIndexer::contentIndex()
if(!contentDb.open()) { if(!contentDb.open()) {
return; return;
} }
}
if(m_mode == WorkMode::Rebuild || m_mode == WorkMode::Add) {
for(QString path : m_cache) { for(QString path : m_cache) {
info.setFile(path); info.setFile(path);
if(true == suffixMap[info.suffix()] && info.isFile()) { if(true == suffixMap[info.suffix()] && info.isFile()) {
@ -213,7 +217,7 @@ void BatchIndexer::contentIndex()
} }
} }
} }
} else if(m_mode == WorkMode::Update || m_mode == WorkMode::Add) { } else if(m_mode == WorkMode::Update) {
QMap<std::string, std::string> indexTimes = contentDb.getIndexTimes(); QMap<std::string, std::string> indexTimes = contentDb.getIndexTimes();
qDebug() << indexTimes.size() << "documents recorded"; qDebug() << indexTimes.size() << "documents recorded";
for(QString path : m_cache) { for(QString path : m_cache) {
@ -230,7 +234,7 @@ void BatchIndexer::contentIndex()
} }
} }
} }
if(m_mode == WorkMode::Update && !indexTimes.isEmpty()) { if(!indexTimes.isEmpty()) {
qDebug() << indexTimes.size() << "documents need remove"; qDebug() << indexTimes.size() << "documents need remove";
for(std::string uniqueTerm : indexTimes.keys()) { for(std::string uniqueTerm : indexTimes.keys()) {
contentDb.removeDocument(uniqueTerm); contentDb.removeDocument(uniqueTerm);
@ -239,7 +243,6 @@ void BatchIndexer::contentIndex()
} }
} }
uint allSize = filesNeedIndex.size(); uint allSize = filesNeedIndex.size();
qDebug() << allSize << "files need content index."; qDebug() << allSize << "files need content index.";
Q_EMIT progress(IndexType::Contents, allSize, 0); Q_EMIT progress(IndexType::Contents, allSize, 0);