Merge pull request #43 from atom-ide-community/performance

Author: aminya

.clang-tidy

@@ -1,4 +1,4 @@
 ---
-Checks: "*, -clang-diagnostics-*-compat, -cppcoreguidelines-init-variables, -modernize-return-braced-init-list, -misc-unused-parameters, -misc-non-private-member-variables-in-classes, -llvmlibc-*, -llvm-header-guard, -llvm-include-order, -modernize-use-trailing-return-type, -readability-const-return-type, -readability-avoid-const-params-in-decls, -readability-convert-member-functions-to-static, -fuchsia-default-arguments-declarations, -fuchsia-default-arguments-calls, -*-uppercase-literal-suffix, -fuchsia-overloaded-operator, -google-build-using-namespace, -google-global-names-in-headers"
+Checks: "*, -clang-diagnostics-*-compat, -cppcoreguidelines-init-variables, -modernize-return-braced-init-list, -misc-unused-parameters, -misc-non-private-member-variables-in-classes, -llvmlibc-*, -llvm-header-guard, -llvm-include-order, -modernize-use-trailing-return-type, -readability-avoid-const-params-in-decls, -readability-convert-member-functions-to-static, -fuchsia-default-arguments-declarations, -fuchsia-default-arguments-calls, -*-uppercase-literal-suffix, -fuchsia-overloaded-operator, -google-build-using-namespace, -google-global-names-in-headers, -google-readability-todo"
 HeaderFilterRegex: ".*"
 FormatStyle: none

src/common.h

@@ -1,5 +1,5 @@
-#ifndef fuzzaldrin_common_h__
-#define fuzzaldrin_common_h__
+#ifndef Fuzzaldrin_common_h_
+#define Fuzzaldrin_common_h_
 
 #include <vector>
 #include <set>
@@ -20,8 +20,8 @@ constexpr size_t kMaxThreads = 16;
 // Safe string class that logs error when index is accessed outside the string.
 class SafeString : public std::string {
   public:
-    SafeString() = default;
-    SafeString(const std::string &s) : std::string(s) {}
+    explicit SafeString() = default;
+    explicit SafeString(const std::string &s) : std::string(s) {}
     const char &operator[](size_t i) const {
         if (i >= size()) {
             printf("ERROR string index access index=%zu str=%s\n", i, c_str());
@@ -53,7 +53,7 @@ struct PreparedQuery {
     Element ext;
     std::set<char> charCodes{};
 
-    PreparedQuery(const Element &q, const char pathSeparator);
+    explicit PreparedQuery(const Element &q, const char pathSeparator);
 };
 
 struct Options {
@@ -68,16 +68,16 @@ struct Options {
 #endif
     const PreparedQuery preparedQuery;
 
-    Options(const Element &_query, size_t _maxResults, bool _usePathScoring, bool _useExtensionBonus) : max_results(_maxResults), usePathScoring(_usePathScoring), useExtensionBonus(_useExtensionBonus), preparedQuery(_query, pathSeparator) {}
-    Options(const Element &_query, char _pathSeparator) : pathSeparator(_pathSeparator), preparedQuery(_query, _pathSeparator) {}
+    explicit Options(const Element &_query, size_t _maxResults, bool _usePathScoring, bool _useExtensionBonus) : max_results(_maxResults), usePathScoring(_usePathScoring), useExtensionBonus(_useExtensionBonus), preparedQuery(_query, pathSeparator) {}
+    explicit Options(const Element &_query, char _pathSeparator) : pathSeparator(_pathSeparator), preparedQuery(_query, _pathSeparator) {}
 };
 
 struct AcronymResult {
     Score score;
     float pos;
     int count;
 
-    AcronymResult(Score s, float p, int c) noexcept : score(s), pos(p), count(c) {}
+    explicit AcronymResult(Score s, float p, int c) noexcept : score(s), pos(p), count(c) {}
 };
 
 extern Element ToLower(const Element &s);
@@ -98,9 +98,9 @@ extern Score path_scorer_score(const CandidateString &string, const Element &que
 extern int countDir(const CandidateString &path, const size_t end, const char pathSeparator) noexcept;
 extern CandidateString getExtension(const CandidateString &str);
 
-extern const std::vector<CandidateIndex> filter(const vector<std::vector<CandidateString>> &candidates, const Element &query, const Options &options);
+extern std::vector<CandidateIndex> filter(const vector<std::vector<CandidateString>> &candidates, const Element &query, const Options &options);
 
 extern std::vector<size_t> matcher_match(const CandidateString &string, const Element &query, const Options &options);
 extern void get_wrap(const CandidateString &string, const Element &query, const Options &options, std::string *out);
 
-#endif// fuzzaldrin_common_h__
+#endif// Fuzzaldrin_common_h_

src/filter.cc

@@ -4,7 +4,6 @@
 #include <thread>
 #include <limits>
 
-namespace {
 
 struct CandidateScore {
     // TODO non const
@@ -50,7 +49,7 @@ void thread_worker_filter(const std::vector<CandidateString> &candidates,
     filter_internal(candidates, start_index, query, options, max_results, results);
 }
 
-const std::vector<CandidateIndex> sort_priority_queue(CandidateScorePriorityQueue &&candidates) {
+std::vector<CandidateIndex> sort_priority_queue(CandidateScorePriorityQueue &&candidates) {
     vector<CandidateScore> sorted;
     std::vector<CandidateIndex> ret;
     sorted.reserve(candidates.size());
@@ -61,14 +60,12 @@ const std::vector<CandidateIndex> sort_priority_queue(CandidateScorePriorityQueu
     }
     std::sort(sorted.begin(), sorted.end());
     for (const auto &item : sorted) {
-        ret.push_back(item.index);
+        ret.emplace_back(item.index);
     }
     return ret;
 }
 
-}// namespace
-
-const std::vector<CandidateIndex> filter(const vector<std::vector<CandidateString>> &candidates, const Element &query, const Options &options) {
+std::vector<CandidateIndex> filter(const vector<std::vector<CandidateString>> &candidates, const Element &query, const Options &options) {
     CandidateScorePriorityQueue top_k;
     auto max_results = options.max_results;
     if (max_results == 0u) {

src/fuzzaldrin.cc

@@ -44,7 +44,7 @@ Napi::Value Fuzzaldrin::setArrayFiltererCandidates(const Napi::CallbackInfo &inf
         }
         for (auto j = cur_start; j < cur_start + chunk_size; j++) {
             const Napi::Value val = candidates[j];
-            candidates_[i].push_back(val.ToString().Utf8Value());
+            candidates_[i].emplace_back(val.ToString().Utf8Value());
         }
         cur_start += chunk_size;
     }
@@ -80,7 +80,7 @@ Napi::Value Fuzzaldrin::setTreeFiltererCandidates(const Napi::CallbackInfo &info
             chunk_size++;
         }
         for (auto j = cur_start; j < cur_start + chunk_size; j++) {
-            candidates_[i].push_back(candidates[j].data);// different // TODO copy
+            candidates_[i].emplace_back(candidates[j].data);// different // TODO copy
         }
         cur_start += chunk_size;
     }

src/matcher.cc

@@ -117,7 +117,7 @@ std::vector<size_t> computeMatch(const CandidateString &subject, const Candidate
             pos--;
             break;
         case Direction::DIAGONAL:
-            matches.push_back(i + offset);
+            matches.emplace_back(i + offset);
             j--;
             i--;
             pos -= n + 1;
@@ -192,14 +192,14 @@ std::vector<size_t> mergeMatches(const std::vector<size_t> &a, const std::vector
 
         while (bj <= ai && ++j < n) {
             if (bj < ai) {
-                out.push_back(bj);
+                out.emplace_back(bj);
             }
             bj = b[j];
         }
-        out.push_back(ai);
+        out.emplace_back(ai);
     }
     while (j < n) {
-        out.push_back(b[j++]);
+        out.emplace_back(b[j++]);
     }
     return out;
 }

src/path_scorer.cc

@@ -1,16 +1,11 @@
 #include "common.h"
 
-namespace {
-
 // Directory depth at which the full path influence is halved.
 constexpr size_t tau_depth = 20;
 
 // Full path is also penalized for length of basename. This adjust a scale factor for that penalty.
 constexpr Score file_coeff = 2.5;
 
-};// namespace
-
-
 extern Score scorePath(const CandidateString &subject, const CandidateString &subject_lw, Score fullPathScore, const Options &options);
 
 extern Score getExtensionScore(const CandidateString &candidate, const CandidateString &ext, const int startPos, const int endPos, const int maxDepth);

src/scorer.cc

@@ -7,8 +7,6 @@
 //  score: Find string similarity using a Smith Waterman algorithm
 //         Modified to account for programing scenarios (CamelCase folder/file.ext object.property)
 
-namespace {
-
 // Base point for a single character match
 // This balance making patterns VS position and size penalty.
 constexpr int wm = 150;
@@ -28,16 +26,14 @@ constexpr Score tau_size = 150;
 // This has a direct influence on worst case scenario benchmark.
 constexpr float miss_coeff = 0.75;// Max number missed consecutive hit = ceil(miss_coeff*query.length) + 5
 
-}// namespace
-
 extern bool isWordEnd(const size_t pos, const CandidateString &subject, const CandidateString &subject_lw, const size_t len);
 extern bool isSeparator(const char c) noexcept;
 extern Score scoreExact(const size_t n, const size_t m, const size_t quality, const Score pos);
 
 extern Score scorePattern(const size_t count, const size_t len, const size_t sameCase, const bool start, const bool end) noexcept;
 extern Score scoreExactMatch(const CandidateString &subject, const CandidateString &subject_lw, const Element &query, const Element &query_lw, size_t pos, const size_t n, const size_t m);
 
-extern bool isAcronymFullWord(const CandidateString &subject, const CandidateString &subject_lw, const Element &query, const unsigned nbAcronymInQuery);
+extern bool isAcronymFullWord(const CandidateString &subject, const CandidateString &subject_lw, const Element &query, const unsigned nbAcronymInQuery) noexcept;
 
 
 //
@@ -535,7 +531,7 @@ AcronymResult scoreAcronyms(const CandidateString &subject, const CandidateStrin
 //
 // This method check for (b) assuming (a) has been checked before entering.
 
-bool isAcronymFullWord(const CandidateString &subject, const CandidateString &subject_lw, const Element &query, const unsigned nbAcronymInQuery) {
+bool isAcronymFullWord(const CandidateString &subject, const CandidateString &subject_lw, const Element &query, const unsigned nbAcronymInQuery) noexcept {
     const auto m = subject.size();
     const auto n = query.size();
     auto count = 0u;

src/tree.h

@@ -1,5 +1,5 @@
-#ifndef fuzzaldrin_tree_h__
-#define fuzzaldrin_tree_h__
+#ifndef Fuzzaldrin_tree_h_
+#define Fuzzaldrin_tree_h_
 
 #include <optional>
 #include "common.h"
@@ -31,7 +31,7 @@ struct CandidateObject {
     const size_t level = 0;
     const size_t index = 0;
 
-    CandidateObject(CandidateString &&data_, const size_t level_, const size_t index_) noexcept
+    explicit CandidateObject(CandidateString &&data_, const size_t level_, const size_t index_) noexcept
       : data{ move(data_) }, level{ level_ }, index{ index_ } {}
 };
 
@@ -44,7 +44,9 @@ struct Tree {
 
     /** Recursive function that fills the entriesArray from the given jsTreeArray */
     void makeEntriesArray(const Napi::Array &jsTreeArray, const size_t level) {
-        for (auto iEntry = 0u, len = jsTreeArray.Length(); iEntry < len; iEntry++) {
+        const auto entriesArrayLength = jsTreeArray.Length();
+        entriesArray.reserve(entriesArrayLength);// reserve enough space
+        for (auto iEntry = 0u; iEntry < entriesArrayLength; iEntry++) {
             auto jsTree = jsTreeArray[iEntry].As<Napi::Object>();
             makeEntriesArray(jsTree, level, iEntry);
         }
@@ -71,15 +73,15 @@ struct Tree {
     }
 
     // default constructor is needed for generation of all the move/copy methods
-    Tree() = default;
+    explicit Tree() = default;
 
     /** create a Tree object and make an entries array */
     // NOTE: this is made to only accept Napi::Array because we cannot export templates to JavaScript
-    Tree(const Napi::Array &jsTreeArrayOrObject_, const string &dataKey_, const string &childrenKey_)
+    explicit Tree(const Napi::Array &jsTreeArrayOrObject_, const string &dataKey_, const string &childrenKey_)
       : dataKey{ dataKey_ },
         childrenKey{ childrenKey_ } {
         makeEntriesArray(jsTreeArrayOrObject_, 0);
     }
 };
 
-#endif// tree_h__
+#endif// Fuzzaldrin_tree_h_