Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 50/remove snappy from contrib #109

Merged
merged 8 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/actions/prepare_vm/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@ runs:
sudo make
sudo make install
cd ..
wget https://github.com/google/snappy/archive/refs/tags/1.1.10.tar.gz
tar -xzvf 1.1.10.tar.gz
cd snappy-1.1.10
mkdir build && cd build
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DBUILD_SHARED_LIBS=ON \
-DSNAPPY_BUILD_TESTS=OFF -DSNAPPY_BUILD_BENCHMARKS=OFF ..
sudo cmake --build . --target install
cd ../..
(V=4.8.1; curl -L https://github.com/ccache/ccache/releases/download/v${V}/ccache-${V}-linux-x86_64.tar.xz | \
sudo tar -xJ -C /usr/local/bin/ --strip-components=1 --no-same-owner ccache-${V}-linux-x86_64/ccache)
sudo rm -rf llvm.sh libiconv-1.15
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ If you ok with this warning, then...
- xxhash
- zlib
- zstd
- snappy 1.1.10+

## Runtime requirements

Expand All @@ -49,7 +50,14 @@ tar -xvzf libiconv-1.15.tar.gz
cd libiconv-1.15
./configure --prefix=/usr/local
sudo make
sudo make install
sudo make install && cd ..

wget https://github.com/google/snappy/archive/refs/tags/1.1.10.tar.gz
tar -xzvf 1.1.10.tar.gz
cd snappy-1.1.10 && mkdir build && cd build
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DBUILD_SHARED_LIBS=ON \
-DSNAPPY_BUILD_TESTS=OFF -DSNAPPY_BUILD_BENCHMARKS=OFF ..
sudo cmake --build . --target install && cd ../..
```

## Create the work directory
Expand Down
1 change: 1 addition & 0 deletions cmake/external_libs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ find_package(RapidJSON REQUIRED)
find_package(ZLIB REQUIRED)
find_package(xxHash REQUIRED)
find_package(ZSTD REQUIRED)
find_package(Snappy 1.1.10 REQUIRED CONFIG)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

А почему 1.1.10? Так ли прям она нам нужна? Может поставить 1.1.8, и тогда пользователи смогут пользоваться apt, а не руками устанавливать либу?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Да, я погорячился. Последние патчи в snappy в основном перформанс и сборку улучшали, и нет особых причин держаться за 1.1.10. Исправил


# rapidjson
add_library(ydb-sdk-rapidjson INTERFACE)
Expand Down
2 changes: 1 addition & 1 deletion contrib/libs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ add_subdirectory(libc_compat)
add_subdirectory(lz4)
add_subdirectory(lzmasdk)
add_subdirectory(nayuki_md5)
add_subdirectory(snappy)
#add_subdirectory(snappy)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Кажется, правильней удалить строчку, чем комментировать

#add_subdirectory(zstd)
add_subdirectory(zstd06)
1 change: 0 additions & 1 deletion contrib/libs/snappy/AUTHORS

This file was deleted.

26 changes: 0 additions & 26 deletions contrib/libs/snappy/CMakeLists.darwin-arm64.txt

This file was deleted.

26 changes: 0 additions & 26 deletions contrib/libs/snappy/CMakeLists.darwin-x86_64.txt

This file was deleted.

26 changes: 0 additions & 26 deletions contrib/libs/snappy/CMakeLists.linux-aarch64.txt

This file was deleted.

26 changes: 0 additions & 26 deletions contrib/libs/snappy/CMakeLists.linux-x86_64.txt

This file was deleted.

19 changes: 0 additions & 19 deletions contrib/libs/snappy/CMakeLists.txt

This file was deleted.

26 changes: 0 additions & 26 deletions contrib/libs/snappy/CMakeLists.windows-x86_64.txt

This file was deleted.

31 changes: 0 additions & 31 deletions contrib/libs/snappy/CONTRIBUTING.md

This file was deleted.

54 changes: 0 additions & 54 deletions contrib/libs/snappy/COPYING

This file was deleted.

Loading
Loading