chore: make the linter Dockerfile compatible for local arm linting

GenSpectrum · Jun 7, 2024 · 94a5571 · 94a5571
1 parent 1b764af
commit 94a5571
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -458,7 +458,7 @@ std::vector<Tuple> TupleFactory::allocateMany(size_t count) {
    const size_t allocation_size = tuple_size * count;
    std::vector<std::byte>& 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;
 }