From 979ee3bca6946a992f06aa0ae80250fc3b8938bd Mon Sep 17 00:00:00 2001 From: Marko Budiselic Date: Fri, 16 Feb 2024 18:51:29 +0000 Subject: [PATCH] Add the toolchain-v4 zstd patch script --- environment/toolchain/v4/_tmp_build_zstd.sh | 67 +++++++++++++++++++++ tests/unit/query_dump.cpp | 4 +- 2 files changed, 69 insertions(+), 2 deletions(-) create mode 100755 environment/toolchain/v4/_tmp_build_zstd.sh diff --git a/environment/toolchain/v4/_tmp_build_zstd.sh b/environment/toolchain/v4/_tmp_build_zstd.sh new file mode 100755 index 000000000..5fcc903cb --- /dev/null +++ b/environment/toolchain/v4/_tmp_build_zstd.sh @@ -0,0 +1,67 @@ +#!/bin/bash -e + +# helpers +pushd () { command pushd "$@" > /dev/null; } +popd () { command popd "$@" > /dev/null; } +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +CPUS=$( grep -c processor < /proc/cpuinfo ) +cd "$DIR" +source "$DIR/../../util.sh" +DISTRO="$(operating_system)" + +function log_tool_name () { + echo "" + echo "" + echo "#### $1 ####" + echo "" + echo "" +} + +TOOLCHAIN_VERSION=4 +NAME=toolchain-v$TOOLCHAIN_VERSION +PREFIX=/opt/$NAME + +rm -rf "$PREFIX/include/zstd.h" + +# create archives directory +mkdir -p archives && pushd archives +ZSTD_VERSION=1.5.5 +if [ ! -f zstd-$ZSTD_VERSION.tar.gz ]; then + wget https://github.com/facebook/zstd/releases/download/v$ZSTD_VERSION/zstd-$ZSTD_VERSION.tar.gz -O zstd-$ZSTD_VERSION.tar.gz +fi +popd + +# create build directory and activate toolchain +mkdir -p build +pushd build +source $PREFIX/activate +export CC=$PREFIX/bin/clang +export CXX=$PREFIX/bin/clang++ +export CFLAGS="$CFLAGS -fPIC" +export PATH=$PREFIX/bin:$PATH +export LD_LIBRARY_PATH=$PREFIX/lib64 +COMMON_CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=$PREFIX + -DCMAKE_PREFIX_PATH=$PREFIX + -DCMAKE_BUILD_TYPE=Release + -DCMAKE_C_COMPILER=$CC + -DCMAKE_CXX_COMPILER=$CXX + -DBUILD_SHARED_LIBS=OFF + -DCMAKE_CXX_STANDARD=20 + -DBUILD_TESTING=OFF + -DCMAKE_REQUIRED_INCLUDES=$PREFIX/include + -DCMAKE_POSITION_INDEPENDENT_CODE=ON" + +log_tool_name "zstd $ZSTD_VERSION" +if [ ! -f $PREFIX/include/zstd.h ]; then + if [ -d zstd-$ZSTD_VERSION ]; then + rm -rf zstd-$ZSTD_VERSION + fi + tar -xzf ../archives/zstd-$ZSTD_VERSION.tar.gz + pushd zstd-$ZSTD_VERSION + # build is used by facebook builder + mkdir _build + pushd _build + cmake ../build/cmake $COMMON_CMAKE_FLAGS -DZSTD_BUILD_SHARED=OFF + make -j$CPUS install + popd && popd +fi diff --git a/tests/unit/query_dump.cpp b/tests/unit/query_dump.cpp index 5d5a4a874..ae1e99505 100644 --- a/tests/unit/query_dump.cpp +++ b/tests/unit/query_dump.cpp @@ -198,8 +198,8 @@ DatabaseState GetState(memgraph::storage::Storage *db) { for (const auto &item : info.label_property) { label_property_indices.insert({dba->LabelToName(item.first), dba->PropertyToName(item.second)}); } - for (const auto &item : info.text) { - text_indices.insert({item.first, dba->PropertyToName(item.second)}); + for (const auto &item : info.text_indices) { + text_indices.insert({item.first, dba->LabelToName(item.second)}); } }