Browse Source

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).
prime 2 years ago
parent
commit
2844ceec0b

+ 0 - 1
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)

+ 0 - 1
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)

+ 0 - 27
contrib/libs/lz4/generated/CMakeLists.txt

@@ -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
-)

+ 0 - 15
contrib/libs/lz4/generated/iface.h

@@ -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

+ 0 - 3
contrib/libs/lz4/generated/lz4_10.cpp

@@ -1,3 +0,0 @@
-#define LZ4_MEMORY_USAGE 10
-#define LZ4_NAMESPACE lz4_10
-#include "lz4_ns.h"

+ 0 - 3
contrib/libs/lz4/generated/lz4_11.cpp

@@ -1,3 +0,0 @@
-#define LZ4_MEMORY_USAGE 11
-#define LZ4_NAMESPACE lz4_11
-#include "lz4_ns.h"

+ 0 - 3
contrib/libs/lz4/generated/lz4_12.cpp

@@ -1,3 +0,0 @@
-#define LZ4_MEMORY_USAGE 12
-#define LZ4_NAMESPACE lz4_12
-#include "lz4_ns.h"

+ 0 - 3
contrib/libs/lz4/generated/lz4_13.cpp

@@ -1,3 +0,0 @@
-#define LZ4_MEMORY_USAGE 13
-#define LZ4_NAMESPACE lz4_13
-#include "lz4_ns.h"

+ 0 - 3
contrib/libs/lz4/generated/lz4_14.cpp

@@ -1,3 +0,0 @@
-#define LZ4_MEMORY_USAGE 14
-#define LZ4_NAMESPACE lz4_14
-#include "lz4_ns.h"

+ 0 - 3
contrib/libs/lz4/generated/lz4_15.cpp

@@ -1,3 +0,0 @@
-#define LZ4_MEMORY_USAGE 15
-#define LZ4_NAMESPACE lz4_15
-#include "lz4_ns.h"

Some files were not shown because too many files changed in this diff