From f884306dbc2e8b32361a7afcc93f40ca7c86d3a7 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 4 May 2020 20:46:10 +0300
Subject: [PATCH] Update zstd to 1.4.4

---
 contrib/zstd                      |  2 +-
 contrib/zstd-cmake/CMakeLists.txt | 28 +++++++++++++++++++++++-----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/contrib/zstd b/contrib/zstd
index 255597502c3..10f0e6993f9 160000
--- a/contrib/zstd
+++ b/contrib/zstd
@@ -1 +1 @@
-Subproject commit 255597502c3a4ef150abc964e376d4202a8c2929
+Subproject commit 10f0e6993f9d2f682da6d04aa2385b7d53cbb4ee
diff --git a/contrib/zstd-cmake/CMakeLists.txt b/contrib/zstd-cmake/CMakeLists.txt
index 963657b3b7b..58a827761ea 100644
--- a/contrib/zstd-cmake/CMakeLists.txt
+++ b/contrib/zstd-cmake/CMakeLists.txt
@@ -49,7 +49,10 @@ FILE(READ ${LIBRARY_DIR}/zstd.h HEADER_CONTENT)
 GetLibraryVersion("${HEADER_CONTENT}" LIBVER_MAJOR LIBVER_MINOR LIBVER_RELEASE)
 MESSAGE(STATUS "ZSTD VERSION ${LIBVER_MAJOR}.${LIBVER_MINOR}.${LIBVER_RELEASE}")
 
+# cd contrib/zstd/lib
+# find . -name '*.c' | grep -vP 'deprecated|legacy' | sort | sed 's/^\./        ${LIBRARY_DIR}/'
 SET(Sources
+        ${LIBRARY_DIR}/common/debug.c
         ${LIBRARY_DIR}/common/entropy_common.c
         ${LIBRARY_DIR}/common/error_private.c
         ${LIBRARY_DIR}/common/fse_decompress.c
@@ -58,8 +61,11 @@ SET(Sources
         ${LIBRARY_DIR}/common/xxhash.c
         ${LIBRARY_DIR}/common/zstd_common.c
         ${LIBRARY_DIR}/compress/fse_compress.c
+        ${LIBRARY_DIR}/compress/hist.c
         ${LIBRARY_DIR}/compress/huf_compress.c
         ${LIBRARY_DIR}/compress/zstd_compress.c
+        ${LIBRARY_DIR}/compress/zstd_compress_literals.c
+        ${LIBRARY_DIR}/compress/zstd_compress_sequences.c
         ${LIBRARY_DIR}/compress/zstd_double_fast.c
         ${LIBRARY_DIR}/compress/zstd_fast.c
         ${LIBRARY_DIR}/compress/zstd_lazy.c
@@ -67,16 +73,21 @@ SET(Sources
         ${LIBRARY_DIR}/compress/zstdmt_compress.c
         ${LIBRARY_DIR}/compress/zstd_opt.c
         ${LIBRARY_DIR}/decompress/huf_decompress.c
+        ${LIBRARY_DIR}/decompress/zstd_ddict.c
+        ${LIBRARY_DIR}/decompress/zstd_decompress_block.c
         ${LIBRARY_DIR}/decompress/zstd_decompress.c
-        ${LIBRARY_DIR}/deprecated/zbuff_common.c
-        ${LIBRARY_DIR}/deprecated/zbuff_compress.c
-        ${LIBRARY_DIR}/deprecated/zbuff_decompress.c
         ${LIBRARY_DIR}/dictBuilder/cover.c
         ${LIBRARY_DIR}/dictBuilder/divsufsort.c
+        ${LIBRARY_DIR}/dictBuilder/fastcover.c
         ${LIBRARY_DIR}/dictBuilder/zdict.c)
 
+# cd contrib/zstd/lib
+# find . -name '*.h' | grep -vP 'deprecated|legacy' | sort | sed 's/^\./        ${LIBRARY_DIR}/'
 SET(Headers
         ${LIBRARY_DIR}/common/bitstream.h
+        ${LIBRARY_DIR}/common/compiler.h
+        ${LIBRARY_DIR}/common/cpu.h
+        ${LIBRARY_DIR}/common/debug.h
         ${LIBRARY_DIR}/common/error_private.h
         ${LIBRARY_DIR}/common/fse.h
         ${LIBRARY_DIR}/common/huf.h
@@ -86,14 +97,21 @@ SET(Headers
         ${LIBRARY_DIR}/common/xxhash.h
         ${LIBRARY_DIR}/common/zstd_errors.h
         ${LIBRARY_DIR}/common/zstd_internal.h
+        ${LIBRARY_DIR}/compress/hist.h
+        ${LIBRARY_DIR}/compress/zstd_compress_internal.h
+        ${LIBRARY_DIR}/compress/zstd_compress_literals.h
+        ${LIBRARY_DIR}/compress/zstd_compress_sequences.h
+        ${LIBRARY_DIR}/compress/zstd_cwksp.h
         ${LIBRARY_DIR}/compress/zstd_double_fast.h
         ${LIBRARY_DIR}/compress/zstd_fast.h
         ${LIBRARY_DIR}/compress/zstd_lazy.h
         ${LIBRARY_DIR}/compress/zstd_ldm.h
         ${LIBRARY_DIR}/compress/zstdmt_compress.h
         ${LIBRARY_DIR}/compress/zstd_opt.h
-        ${LIBRARY_DIR}/compress/zstd_ldm.h
-        ${LIBRARY_DIR}/deprecated/zbuff.h
+        ${LIBRARY_DIR}/decompress/zstd_ddict.h
+        ${LIBRARY_DIR}/decompress/zstd_decompress_block.h
+        ${LIBRARY_DIR}/decompress/zstd_decompress_internal.h
+        ${LIBRARY_DIR}/dictBuilder/cover.h
         ${LIBRARY_DIR}/dictBuilder/divsufsort.h
         ${LIBRARY_DIR}/dictBuilder/zdict.h
         ${LIBRARY_DIR}/zstd.h)