fix: linter errors

GenSpectrum · Jun 17, 2024 · 872c50a · 872c50a
1 parent 6be2b3d
commit 872c50a
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 21 deletions.
diff --git a/src/silo/query_engine/operators/selection.cpp b/src/silo/query_engine/operators/selection.cpp
@@ -55,6 +55,7 @@ Selection::Selection(std::unique_ptr<Predicate> predicate, uint32_t row_count)
 
 Selection::~Selection() noexcept = default;
 
+namespace {
 std::string displayComparator(Comparator comparator) {
    switch (comparator) {
       case Comparator::EQUALS:
@@ -72,6 +73,7 @@ std::string displayComparator(Comparator comparator) {
    }
    throw std::runtime_error("found unhandled comparator");
 }
+}  // namespace
 
 std::string Selection::toString() const {
    std::vector<std::string> predicate_strings;

diff --git a/src/silo/storage/insertion_index.cpp b/src/silo/storage/insertion_index.cpp
@@ -17,19 +17,9 @@
 
 namespace silo::storage::insertion {
 
+namespace {
 constexpr std::string_view REGEX_ANY = ".*";
 
-template <typename SymbolType>
-size_t ThreeMerHash<SymbolType>::operator()(
-   const std::array<typename SymbolType::Symbol, 3>& three_mer
-) const {
-   size_t seed = 0;
-   for (const auto one_mer : three_mer) {
-      boost::hash_combine(seed, std::hash<typename SymbolType::Symbol>{}(one_mer));
-   }
-   return seed;
-}
-
 template <typename SymbolType>
 std::vector<std::array<typename SymbolType::Symbol, 3>> extractThreeMers(
    const std::string& search_pattern
@@ -54,6 +44,18 @@ std::vector<std::array<typename SymbolType::Symbol, 3>> extractThreeMers(
    }
    return {result.begin(), result.end()};
 }
+}  // namespace
+
+template <typename SymbolType>
+size_t ThreeMerHash<SymbolType>::operator()(
+   const std::array<typename SymbolType::Symbol, 3>& three_mer
+) const {
+   size_t seed = 0;
+   for (const auto one_mer : three_mer) {
+      boost::hash_combine(seed, std::hash<typename SymbolType::Symbol>{}(one_mer));
+   }
+   return seed;
+}
 
 template <typename SymbolType>
 std::unique_ptr<roaring::Roaring> InsertionPosition<SymbolType>::searchWithThreeMerIndex(

diff --git a/src/silo_api/info_handler.cpp b/src/silo_api/info_handler.cpp
@@ -14,7 +14,7 @@
 
 namespace silo {
 
-// NOLINTNEXTLINE(readability-identifier-naming)
+// NOLINTNEXTLINE(readability-identifier-naming,misc-use-internal-linkage)
 void to_json(nlohmann::json& json, const DatabaseInfo& databaseInfo) {
    json = nlohmann::json{
       {"sequenceCount", databaseInfo.sequence_count},
@@ -24,7 +24,7 @@ void to_json(nlohmann::json& json, const DatabaseInfo& databaseInfo) {
    };
 }
 
-// NOLINTNEXTLINE(readability-identifier-naming)
+// NOLINTNEXTLINE(readability-identifier-naming,misc-use-internal-linkage)
 void to_json(nlohmann::json& json, const BitmapContainerSizeStatistic& statistics) {
    json = nlohmann::json{
       {"numberOfArrayContainers", statistics.number_of_array_containers},
@@ -41,7 +41,7 @@ void to_json(nlohmann::json& json, const BitmapContainerSizeStatistic& statistic
    };
 }
 
-// NOLINTNEXTLINE(readability-identifier-naming)
+// NOLINTNEXTLINE(readability-identifier-naming,misc-use-internal-linkage)
 void to_json(nlohmann::json& json, const BitmapSizePerSymbol& bitmapSizePerSymbol) {
    std::map<std::string, uint64_t> size_in_bytes_for_nlohmann;
    for (const auto& [symbol, size] : bitmapSizePerSymbol.size_in_bytes) {
@@ -51,7 +51,7 @@ void to_json(nlohmann::json& json, const BitmapSizePerSymbol& bitmapSizePerSymbo
    json = size_in_bytes_for_nlohmann;
 }
 
-// NOLINTNEXTLINE(readability-identifier-naming)
+// NOLINTNEXTLINE(readability-identifier-naming,misc-use-internal-linkage)
 void to_json(nlohmann::json& json, const BitmapContainerSize& bitmapContainerSize) {
    json = nlohmann::json{
       {"sectionLength", bitmapContainerSize.section_length},
@@ -62,7 +62,7 @@ void to_json(nlohmann::json& json, const BitmapContainerSize& bitmapContainerSiz
    };
 }
 
-// NOLINTNEXTLINE(readability-identifier-naming)
+// NOLINTNEXTLINE(readability-identifier-naming,misc-use-internal-linkage)
 void to_json(nlohmann::json& json, const DetailedDatabaseInfo& databaseInfo) {
    json = nlohmann::json{
       {"bitmapSizePerSymbol", databaseInfo.sequences.at("main").bitmap_size_per_symbol},
@@ -73,8 +73,7 @@ void to_json(nlohmann::json& json, const DetailedDatabaseInfo& databaseInfo) {
 
 }  // namespace silo
 
-namespace silo_api {
-
+namespace {
 std::map<std::string, std::string> getQueryParameter(const Poco::Net::HTTPServerRequest& request) {
    std::map<std::string, std::string> map;
    const Poco::URI uri(request.getURI());
@@ -85,6 +84,9 @@ std::map<std::string, std::string> getQueryParameter(const Poco::Net::HTTPServer
    }
    return map;
 }
+}  // namespace
+
+namespace silo_api {
 
 InfoHandler::InfoHandler(DatabaseMutex& database)
     : database(database) {}

diff --git a/src/silo_api/rest_resource.cpp b/src/silo_api/rest_resource.cpp
@@ -9,19 +9,21 @@
 
 #include "silo_api/error_request_handler.h"
 
-namespace silo_api {
-
+namespace {
 void methodNotAllowed(
    Poco::Net::HTTPServerRequest& request,
    Poco::Net::HTTPServerResponse& response
 ) {
    response.setContentType("application/json");
    response.setStatus(Poco::Net::HTTPResponse::HTTP_METHOD_NOT_ALLOWED);
-   response.send() << nlohmann::json(ErrorResponse{
+   response.send() << nlohmann::json(silo_api::ErrorResponse{
       .error = "Method not allowed",
       .message = request.getMethod() + " is not allowed on resource " + request.getURI()
    });
 }
+}  // namespace
+
+namespace silo_api {
 
 void RestResource::handleRequest(
    Poco::Net::HTTPServerRequest& request,