diff options
| author | prime <prime@yandex-team.com> | 2022-08-30 10:49:22 +0300 |
|---|---|---|
| committer | prime <prime@yandex-team.com> | 2022-08-30 10:49:22 +0300 |
| commit | 2844ceec0b5580e1f1d27a0542a278e9df7ea5a3 (patch) | |
| tree | 124b0688167813f6e9610eaf4143c0ab85f77374 | |
| parent | 329b8e356a6d854f393ebb4704a15a1b762cb656 (diff) | |
| download | ydb-2844ceec0b5580e1f1d27a0542a278e9df7ea5a3.tar.gz | |
Remove lz4 build with custom memory configuration
lz4 позволяет определить параметр memory на этапе компиляции. Этот параметр задаёт трейдофф между скоростью и степенью сжатия.
Сейчас этот параметр используется только в blockcodecs. Поиск по аркадии не находит упоминания этих кодеков. Возможно, что они вообще не используются.
https://a.yandex-team.ru/search?search=lz4-fast%5Cd%5Cd-fast,,,arcadia,,500&repo=arcadia
https://a.yandex-team.ru/search?search=lz4-fast%5Cd%5Cd-safe,,,arcadia,,500&repo=arcadia
Так как параметр на этапе компиляции требует хаков на уровне сборки и усложняет апдейт lz4, предлагаю удалить эти хаки, и оставить только default уровень сжатия (параметр 14).
20 files changed, 4 insertions, 148 deletions
diff --git a/CMakeLists.darwin.txt b/CMakeLists.darwin.txt index 167c3e5d8f..cc237e6dce 100644 --- a/CMakeLists.darwin.txt +++ b/CMakeLists.darwin.txt @@ -132,7 +132,6 @@ add_subdirectory(contrib/libs/fastlz) add_subdirectory(library/cpp/blockcodecs/codecs/legacy_zstd06) add_subdirectory(contrib/libs/zstd06) add_subdirectory(library/cpp/blockcodecs/codecs/lz4) -add_subdirectory(contrib/libs/lz4/generated) add_subdirectory(library/cpp/blockcodecs/codecs/lzma) add_subdirectory(contrib/libs/lzmasdk) add_subdirectory(library/cpp/blockcodecs/codecs/snappy) diff --git a/CMakeLists.linux.txt b/CMakeLists.linux.txt index 2bd2841b2d..961c6d7408 100644 --- a/CMakeLists.linux.txt +++ b/CMakeLists.linux.txt @@ -135,7 +135,6 @@ add_subdirectory(contrib/libs/fastlz) add_subdirectory(library/cpp/blockcodecs/codecs/legacy_zstd06) add_subdirectory(contrib/libs/zstd06) add_subdirectory(library/cpp/blockcodecs/codecs/lz4) -add_subdirectory(contrib/libs/lz4/generated) add_subdirectory(library/cpp/blockcodecs/codecs/lzma) add_subdirectory(contrib/libs/lzmasdk) add_subdirectory(library/cpp/blockcodecs/codecs/snappy) diff --git a/contrib/libs/lz4/generated/CMakeLists.txt b/contrib/libs/lz4/generated/CMakeLists.txt deleted file mode 100644 index ce10effbf8..0000000000 --- a/contrib/libs/lz4/generated/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ - -# This file was gererated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - - -add_library(libs-lz4-generated) -target_link_libraries(libs-lz4-generated PUBLIC - contrib-libs-cxxsupp -) -target_sources(libs-lz4-generated PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/lz4/generated/lz4_10.cpp - ${CMAKE_SOURCE_DIR}/contrib/libs/lz4/generated/lz4_11.cpp - ${CMAKE_SOURCE_DIR}/contrib/libs/lz4/generated/lz4_12.cpp - ${CMAKE_SOURCE_DIR}/contrib/libs/lz4/generated/lz4_13.cpp - ${CMAKE_SOURCE_DIR}/contrib/libs/lz4/generated/lz4_14.cpp - ${CMAKE_SOURCE_DIR}/contrib/libs/lz4/generated/lz4_15.cpp - ${CMAKE_SOURCE_DIR}/contrib/libs/lz4/generated/lz4_16.cpp - ${CMAKE_SOURCE_DIR}/contrib/libs/lz4/generated/lz4_17.cpp - ${CMAKE_SOURCE_DIR}/contrib/libs/lz4/generated/lz4_18.cpp - ${CMAKE_SOURCE_DIR}/contrib/libs/lz4/generated/lz4_19.cpp - ${CMAKE_SOURCE_DIR}/contrib/libs/lz4/generated/lz4_20.cpp - ${CMAKE_SOURCE_DIR}/contrib/libs/lz4/generated/lz4methods.cpp -) diff --git a/contrib/libs/lz4/generated/iface.h b/contrib/libs/lz4/generated/iface.h deleted file mode 100644 index e299d44014..0000000000 --- a/contrib/libs/lz4/generated/iface.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#if defined(__cplusplus) -extern "C" { -#endif - -struct TLZ4Methods { - int (*LZ4CompressLimited)(const char* source, char* dest, int isize, int maxOut); -}; - -struct TLZ4Methods* LZ4Methods(int memory); - -#if defined(__cplusplus) -} -#endif diff --git a/contrib/libs/lz4/generated/lz4_10.cpp b/contrib/libs/lz4/generated/lz4_10.cpp deleted file mode 100644 index 77a4528789..0000000000 --- a/contrib/libs/lz4/generated/lz4_10.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#define LZ4_MEMORY_USAGE 10 -#define LZ4_NAMESPACE lz4_10 -#include "lz4_ns.h" diff --git a/contrib/libs/lz4/generated/lz4_11.cpp b/contrib/libs/lz4/generated/lz4_11.cpp deleted file mode 100644 index 456c2222ed..0000000000 --- a/contrib/libs/lz4/generated/lz4_11.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#define LZ4_MEMORY_USAGE 11 -#define LZ4_NAMESPACE lz4_11 -#include "lz4_ns.h" diff --git a/contrib/libs/lz4/generated/lz4_12.cpp b/contrib/libs/lz4/generated/lz4_12.cpp deleted file mode 100644 index ccf99bceba..0000000000 --- a/contrib/libs/lz4/generated/lz4_12.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#define LZ4_MEMORY_USAGE 12 -#define LZ4_NAMESPACE lz4_12 -#include "lz4_ns.h" diff --git a/contrib/libs/lz4/generated/lz4_13.cpp b/contrib/libs/lz4/generated/lz4_13.cpp deleted file mode 100644 index 41c56deecf..0000000000 --- a/contrib/libs/lz4/generated/lz4_13.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#define LZ4_MEMORY_USAGE 13 -#define LZ4_NAMESPACE lz4_13 -#include "lz4_ns.h" diff --git a/contrib/libs/lz4/generated/lz4_14.cpp b/contrib/libs/lz4/generated/lz4_14.cpp deleted file mode 100644 index 16b3f15161..0000000000 --- a/contrib/libs/lz4/generated/lz4_14.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#define LZ4_MEMORY_USAGE 14 -#define LZ4_NAMESPACE lz4_14 -#include "lz4_ns.h" diff --git a/contrib/libs/lz4/generated/lz4_15.cpp b/contrib/libs/lz4/generated/lz4_15.cpp deleted file mode 100644 index e9ef921845..0000000000 --- a/contrib/libs/lz4/generated/lz4_15.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#define LZ4_MEMORY_USAGE 15 -#define LZ4_NAMESPACE lz4_15 -#include "lz4_ns.h" diff --git a/contrib/libs/lz4/generated/lz4_16.cpp b/contrib/libs/lz4/generated/lz4_16.cpp deleted file mode 100644 index 9384215c72..0000000000 --- a/contrib/libs/lz4/generated/lz4_16.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#define LZ4_MEMORY_USAGE 16 -#define LZ4_NAMESPACE lz4_16 -#include "lz4_ns.h" diff --git a/contrib/libs/lz4/generated/lz4_17.cpp b/contrib/libs/lz4/generated/lz4_17.cpp deleted file mode 100644 index 5e0e2d54d0..0000000000 --- a/contrib/libs/lz4/generated/lz4_17.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#define LZ4_MEMORY_USAGE 17 -#define LZ4_NAMESPACE lz4_17 -#include "lz4_ns.h" diff --git a/contrib/libs/lz4/generated/lz4_18.cpp b/contrib/libs/lz4/generated/lz4_18.cpp deleted file mode 100644 index 4440b9ba61..0000000000 --- a/contrib/libs/lz4/generated/lz4_18.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#define LZ4_MEMORY_USAGE 18 -#define LZ4_NAMESPACE lz4_18 -#include "lz4_ns.h" diff --git a/contrib/libs/lz4/generated/lz4_19.cpp b/contrib/libs/lz4/generated/lz4_19.cpp deleted file mode 100644 index 59118b5cd5..0000000000 --- a/contrib/libs/lz4/generated/lz4_19.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#define LZ4_MEMORY_USAGE 19 -#define LZ4_NAMESPACE lz4_19 -#include "lz4_ns.h" diff --git a/contrib/libs/lz4/generated/lz4_20.cpp b/contrib/libs/lz4/generated/lz4_20.cpp deleted file mode 100644 index 1e41fb33bc..0000000000 --- a/contrib/libs/lz4/generated/lz4_20.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#define LZ4_MEMORY_USAGE 20 -#define LZ4_NAMESPACE lz4_20 -#include "lz4_ns.h" diff --git a/contrib/libs/lz4/generated/lz4_ns.h b/contrib/libs/lz4/generated/lz4_ns.h deleted file mode 100644 index 2dfbbf8ccc..0000000000 --- a/contrib/libs/lz4/generated/lz4_ns.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "iface.h" - -#include <stddef.h> -#include <stdint.h> -#include <stdlib.h> -#include <string.h> - -namespace LZ4_NAMESPACE { - -#define ONLY_COMPRESS -#include "../lz4.c" - -struct TLZ4Methods ytbl = { - LZ4_compress_default, -}; - -} diff --git a/contrib/libs/lz4/generated/lz4methods.cpp b/contrib/libs/lz4/generated/lz4methods.cpp deleted file mode 100644 index 0f94d167a3..0000000000 --- a/contrib/libs/lz4/generated/lz4methods.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#include "iface.h" - -namespace lz4_10 { extern struct TLZ4Methods ytbl; } -namespace lz4_11 { extern struct TLZ4Methods ytbl; } -namespace lz4_12 { extern struct TLZ4Methods ytbl; } -namespace lz4_13 { extern struct TLZ4Methods ytbl; } -namespace lz4_14 { extern struct TLZ4Methods ytbl; } -namespace lz4_15 { extern struct TLZ4Methods ytbl; } -namespace lz4_16 { extern struct TLZ4Methods ytbl; } -namespace lz4_17 { extern struct TLZ4Methods ytbl; } -namespace lz4_18 { extern struct TLZ4Methods ytbl; } -namespace lz4_19 { extern struct TLZ4Methods ytbl; } -namespace lz4_20 { extern struct TLZ4Methods ytbl; } - -extern "C" { - -struct TLZ4Methods* LZ4Methods(int memory) { - switch (memory) { - case 10: return &lz4_10::ytbl; - case 11: return &lz4_11::ytbl; - case 12: return &lz4_12::ytbl; - case 13: return &lz4_13::ytbl; - case 14: return &lz4_14::ytbl; - case 15: return &lz4_15::ytbl; - case 16: return &lz4_16::ytbl; - case 17: return &lz4_17::ytbl; - case 18: return &lz4_18::ytbl; - case 19: return &lz4_19::ytbl; - case 20: return &lz4_20::ytbl; - } - - return 0; -} - -} diff --git a/contrib/restricted/boost/test/include/boost/test/tools/old/impl.hpp b/contrib/restricted/boost/test/include/boost/test/tools/old/impl.hpp index ae583a1880..8f8363e141 100644 --- a/contrib/restricted/boost/test/include/boost/test/tools/old/impl.hpp +++ b/contrib/restricted/boost/test/include/boost/test/tools/old/impl.hpp @@ -209,10 +209,7 @@ struct equal_coll_impl { std::size_t pos = 0; for( ; left_begin != left_end && right_begin != right_end; ++left_begin, ++right_begin, ++pos ) { -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" if( *left_begin != *right_begin ) { -#pragma GCC diagnostic pop pr = false; pr.message() << "\nMismatch at position " << pos << ": " << ::boost::test_tools::tt_detail::print_helper(*left_begin) diff --git a/library/cpp/blockcodecs/codecs/lz4/CMakeLists.txt b/library/cpp/blockcodecs/codecs/lz4/CMakeLists.txt index 299fcbd9b2..3f0a426090 100644 --- a/library/cpp/blockcodecs/codecs/lz4/CMakeLists.txt +++ b/library/cpp/blockcodecs/codecs/lz4/CMakeLists.txt @@ -12,7 +12,6 @@ target_link_libraries(blockcodecs-codecs-lz4 INTERFACE contrib-libs-cxxsupp yutil contrib-libs-lz4 - libs-lz4-generated cpp-blockcodecs-core ) @@ -21,7 +20,6 @@ target_link_libraries(blockcodecs-codecs-lz4.global PUBLIC contrib-libs-cxxsupp yutil contrib-libs-lz4 - libs-lz4-generated cpp-blockcodecs-core ) target_sources(blockcodecs-codecs-lz4.global PRIVATE diff --git a/library/cpp/blockcodecs/codecs/lz4/lz4.cpp b/library/cpp/blockcodecs/codecs/lz4/lz4.cpp index fbf0fe110f..94fcf4dd96 100644 --- a/library/cpp/blockcodecs/codecs/lz4/lz4.cpp +++ b/library/cpp/blockcodecs/codecs/lz4/lz4.cpp @@ -4,7 +4,6 @@ #include <contrib/libs/lz4/lz4.h> #include <contrib/libs/lz4/lz4hc.h> -#include <contrib/libs/lz4/generated/iface.h> using namespace NBlockCodecs; @@ -18,12 +17,11 @@ namespace { struct TLz4FastCompress { inline TLz4FastCompress(int memory) : Memory(memory) - , Methods(LZ4Methods(Memory)) { } inline size_t DoCompress(const TData& in, void* buf) const { - return Methods->LZ4CompressLimited(in.data(), (char*)buf, in.size(), LZ4_compressBound(in.size())); + return LZ4_compress_default(in.data(), (char*)buf, in.size(), LZ4_compressBound(in.size())); } inline TString CPrefix() { @@ -31,7 +29,6 @@ namespace { } const int Memory; - const TLZ4Methods* Methods; }; struct TLz4BestCompress { @@ -93,20 +90,15 @@ namespace { struct TLz4Registrar { TLz4Registrar() { - for (int i = 0; i < 30; ++i) { + for (int i = 10; i <= 20; ++i) { typedef TLz4Codec<TLz4FastCompress, TLz4FastDecompress> T1; typedef TLz4Codec<TLz4FastCompress, TLz4SafeDecompress> T2; THolder<T1> t1(new T1(i)); THolder<T2> t2(new T2(i)); - if (t1->Methods) { - RegisterCodec(std::move(t1)); - } - - if (t2->Methods) { - RegisterCodec(std::move(t2)); - } + RegisterCodec(std::move(t1)); + RegisterCodec(std::move(t2)); } RegisterCodec(MakeHolder<TLz4Codec<TLz4BestCompress, TLz4FastDecompress>>()); |