From 94a55712c2b9b27e8f83e8372c30369af76ccffc Mon Sep 17 00:00:00 2001 From: Alexander Taepper Date: Fri, 17 May 2024 11:58:45 +0200 Subject: [PATCH] chore: make the linter Dockerfile compatible for local arm linting --- Dockerfile_linter_dependencies | 6 +++++- src/silo/query_engine/actions/tuple.cpp | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile_linter_dependencies b/Dockerfile_linter_dependencies index 25c183a21..348c818d2 100644 --- a/Dockerfile_linter_dependencies +++ b/Dockerfile_linter_dependencies @@ -17,6 +17,10 @@ RUN apt update \ RUN pip install conan==2.0.17 COPY conanfile.py conanprofile.docker ./ -RUN mv conanprofile.docker conanprofile +RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ + mv conanprofile.docker_arm conanprofile; \ + else \ + mv conanprofile.docker conanprofile; \ + fi RUN conan install . --build=missing --profile ./conanprofile --profile:build ./conanprofile --output-folder=build -s build_type=Debug diff --git a/src/silo/query_engine/actions/tuple.cpp b/src/silo/query_engine/actions/tuple.cpp index 9af86c430..c26dfa8c1 100644 --- a/src/silo/query_engine/actions/tuple.cpp +++ b/src/silo/query_engine/actions/tuple.cpp @@ -458,7 +458,7 @@ std::vector TupleFactory::allocateMany(size_t count) { const size_t allocation_size = tuple_size * count; std::vector& data = all_tuple_data.emplace_back(allocation_size); for (unsigned i = 0; i < count; i++) { - tuples.emplace_back(&columns, data.data() + i * tuple_size, tuple_size); + tuples.emplace_back(&columns, data.data() + (i * tuple_size), tuple_size); } return tuples; }