feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

FileSearchResult: Use FilePath for fileName

Browse Source 
This saves about 2 seconds out of 5 seconds spent in
displayResult() for converting from QString into
FilePath in main thread (use case: gitgrep with
2 million hits).

Change-Id: I6334e8559986501c34c90a5c7c6b4acc9a6953e0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-09-05 19:06:37 +02:00
parent b842620810
commit a9eb732ce6
6 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/filesearch.cpp
View File

@@ -190,7 +190,7 @@ void FileSearch::operator()(QFutureInterface<FileSearchResultList> &futureInterf
} }
if (equal) { if (equal) {
const QString resultItemText = clippedText(chunk, MAX_LINE_SIZE); const QString resultItemText = clippedText(chunk, MAX_LINE_SIZE);
results << FileSearchResult(item.filePath, results << FileSearchResult(FilePath::fromString(item.filePath),
lineNr, lineNr,
resultItemText, resultItemText,
regionPtr - chunkPtr, regionPtr - chunkPtr,
@@ -268,7 +268,7 @@ void FileSearchRegExp::operator()(QFutureInterface<FileSearchResultList> &future
int pos = 0; int pos = 0;
while ((match = doGuardedMatch(line, pos)).hasMatch()) { while ((match = doGuardedMatch(line, pos)).hasMatch()) {
pos = match.capturedStart(); pos = match.capturedStart();
results << FileSearchResult(item.filePath, lineNr, resultItemText, results << FileSearchResult(FilePath::fromString(item.filePath), lineNr, resultItemText,
pos, match.capturedLength(), pos, match.capturedLength(),
match.capturedTexts()); match.capturedTexts());
if (match.capturedLength() == 0) if (match.capturedLength() == 0)

6
src/libs/utils/filesearch.h
View File

@@ -5,6 +5,8 @@
#include "utils_global.h" #include "utils_global.h"
#include "filepath.h"
#include <QDir> #include <QDir>
#include <QMap> #include <QMap>
#include <QSet> #include <QSet>
@@ -153,7 +155,7 @@ class QTCREATOR_UTILS_EXPORT FileSearchResult
{ {
public: public:
FileSearchResult() = default; FileSearchResult() = default;
FileSearchResult(const QString &fileName, int lineNumber, const QString &matchingLine, FileSearchResult(const FilePath &fileName, int lineNumber, const QString &matchingLine,
int matchStart, int matchLength, int matchStart, int matchLength,
const QStringList &regexpCapturedTexts) const QStringList &regexpCapturedTexts)
: fileName(fileName), : fileName(fileName),
@@ -172,7 +174,7 @@ public:
} }
bool operator!=(const FileSearchResult &o) const { return !(*this == o); } bool operator!=(const FileSearchResult &o) const { return !(*this == o); }
QString fileName; FilePath fileName;
int lineNumber; int lineNumber;
QString matchingLine; QString matchingLine;
int matchStart; int matchStart;

2
src/plugins/git/gitgrep.cpp
View File

@@ -85,7 +85,7 @@ public:
QString filePath = line.left(lineSeparator); QString filePath = line.left(lineSeparator);
if (!m_ref.isEmpty() && filePath.startsWith(m_ref)) if (!m_ref.isEmpty() && filePath.startsWith(m_ref))
filePath.remove(0, m_ref.length()); filePath.remove(0, m_ref.length());
single.fileName = m_directory.pathAppended(filePath).toString(); single.fileName = m_directory.pathAppended(filePath);
const int textSeparator = line.indexOf(QChar::Null, lineSeparator + 1); const int textSeparator = line.indexOf(QChar::Null, lineSeparator + 1);
single.lineNumber = line.mid(lineSeparator + 1, textSeparator - lineSeparator - 1).toInt(); single.lineNumber = line.mid(lineSeparator + 1, textSeparator - lineSeparator - 1).toInt();
QString text = line.mid(textSeparator + 1); QString text = line.mid(textSeparator + 1);

2
src/plugins/silversearcher/silversearcheroutputparser.cpp
View File

@@ -45,7 +45,7 @@ bool SilverSearcherOutputParser::parseFilePath()
int startIndex = ++index; int startIndex = ++index;
while (index < outputSize && output[index] != '\n') while (index < outputSize && output[index] != '\n')
++index; ++index;
item.fileName = QString(output.data() + startIndex, index - startIndex); item.fileName = Utils::FilePath::fromString(QString(output.data() + startIndex, index - startIndex));
++index; ++index;
return true; return true;
} }

2
src/plugins/texteditor/basefilefind.cpp
View File

@@ -227,7 +227,7 @@ static void displayResult(QFutureWatcher<FileSearchResultList> *watcher,
QList<SearchResultItem> items; QList<SearchResultItem> items;
for (const FileSearchResult &result : results) { for (const FileSearchResult &result : results) {
SearchResultItem item; SearchResultItem item;
item.setFilePath(Utils::FilePath::fromString(result.fileName)); item.setFilePath(result.fileName);
item.setMainRange(result.lineNumber, result.matchStart, result.matchLength); item.setMainRange(result.lineNumber, result.matchStart, result.matchLength);
item.setLineText(displayText(result.matchingLine)); item.setLineText(displayText(result.matchingLine));
item.setUseTextEditorFont(true); item.setUseTextEditorFont(true);

22
tests/auto/filesearch/tst_filesearch.cpp
View File

@@ -6,6 +6,8 @@
#include <QTextCodec> #include <QTextCodec>
#include <QtTest> #include <QtTest>
using namespace Utils;
class tst_FileSearch : public QObject class tst_FileSearch : public QObject
{ {
Q_OBJECT Q_OBJECT
@@ -50,34 +52,34 @@ namespace {
void tst_FileSearch::multipleResults() void tst_FileSearch::multipleResults()
{ {
Utils::FileSearchResultList expectedResults; Utils::FileSearchResultList expectedResults;
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 2, QLatin1String("search to find multiple find results"), 10, 4, QStringList()); expectedResults << FileSearchResult(FilePath::fromString(FILENAME), 2, QLatin1String("search to find multiple find results"), 10, 4, QStringList());
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 2, QLatin1String("search to find multiple find results"), 24, 4, QStringList()); expectedResults << FileSearchResult(FilePath::fromString(FILENAME), 2, QLatin1String("search to find multiple find results"), 24, 4, QStringList());
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 4, QLatin1String("here you find another result"), 9, 4, QStringList()); expectedResults << FileSearchResult(FilePath::fromString(FILENAME), 4, QLatin1String("here you find another result"), 9, 4, QStringList());
test_helper(expectedResults, QLatin1String("find"), QTextDocument::FindFlags()); test_helper(expectedResults, QLatin1String("find"), QTextDocument::FindFlags());
expectedResults.clear(); expectedResults.clear();
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 5, QLatin1String("aaaaaaaa this line has 2 results for four a in a row"), 0, 4, QStringList()); expectedResults << FileSearchResult(FilePath::fromString(FILENAME), 5, QLatin1String("aaaaaaaa this line has 2 results for four a in a row"), 0, 4, QStringList());
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 5, QLatin1String("aaaaaaaa this line has 2 results for four a in a row"), 4, 4, QStringList()); expectedResults << FileSearchResult(FilePath::fromString(FILENAME), 5, QLatin1String("aaaaaaaa this line has 2 results for four a in a row"), 4, 4, QStringList());
test_helper(expectedResults, QLatin1String("aaaa"), QTextDocument::FindFlags()); test_helper(expectedResults, QLatin1String("aaaa"), QTextDocument::FindFlags());
expectedResults.clear(); expectedResults.clear();
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 5, QLatin1String("aaaaaaaa this line has 2 results for four a in a row"), 0, 4, QStringList() << QLatin1String("aaaa")); expectedResults << FileSearchResult(FilePath::fromString(FILENAME), 5, QLatin1String("aaaaaaaa this line has 2 results for four a in a row"), 0, 4, QStringList() << QLatin1String("aaaa"));
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 5, QLatin1String("aaaaaaaa this line has 2 results for four a in a row"), 4, 4, QStringList() << QLatin1String("aaaa")); expectedResults << FileSearchResult(FilePath::fromString(FILENAME), 5, QLatin1String("aaaaaaaa this line has 2 results for four a in a row"), 4, 4, QStringList() << QLatin1String("aaaa"));
test_helper(expectedResults, QLatin1String("aaaa"), QTextDocument::FindFlags(), RegExp); test_helper(expectedResults, QLatin1String("aaaa"), QTextDocument::FindFlags(), RegExp);
} }
void tst_FileSearch::caseSensitive() void tst_FileSearch::caseSensitive()
{ {
Utils::FileSearchResultList expectedResults; Utils::FileSearchResultList expectedResults;
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 3, QLatin1String("search CaseSensitively for casesensitive"), 7, 13, QStringList()); expectedResults << FileSearchResult(FilePath::fromString(FILENAME), 3, QLatin1String("search CaseSensitively for casesensitive"), 7, 13, QStringList());
test_helper(expectedResults, QLatin1String("CaseSensitive"), QTextDocument::FindCaseSensitively); test_helper(expectedResults, QLatin1String("CaseSensitive"), QTextDocument::FindCaseSensitively);
} }
void tst_FileSearch::caseInSensitive() void tst_FileSearch::caseInSensitive()
{ {
Utils::FileSearchResultList expectedResults; Utils::FileSearchResultList expectedResults;
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 3, QLatin1String("search CaseSensitively for casesensitive"), 7, 13, QStringList()); expectedResults << FileSearchResult(FilePath::fromString(FILENAME), 3, QLatin1String("search CaseSensitively for casesensitive"), 7, 13, QStringList());
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 3, QLatin1String("search CaseSensitively for casesensitive"), 27, 13, QStringList()); expectedResults << FileSearchResult(FilePath::fromString(FILENAME), 3, QLatin1String("search CaseSensitively for casesensitive"), 27, 13, QStringList());
test_helper(expectedResults, QLatin1String("CaseSensitive"), QTextDocument::FindFlags()); test_helper(expectedResults, QLatin1String("CaseSensitive"), QTextDocument::FindFlags());
} }