Reverting D2503151 to unbreak buck build

Summary: This breaks buck build. Reverting till the fix is in to unblock build pipeline.

Reviewed By: jmswen

Differential Revision: D2550685

fb-gh-sync-id: 7623e6c7fcaad70d7d207ec10a59f7381c72cebc

diff --git a/folly/configure.ac b/folly/configure.ac
index 9ab499aa230441c943aebc5f9c24b2c6c7ff3caa..bcfe9c9402e1df4c95fb98a01388f9cf91e7b967 100644 (file)
--- a/folly/configure.ac
+++ b/folly/configure.ac
@@ -446,7 +446,6 @@ AC_CHECK_HEADER([lz4.h], AC_CHECK_LIB([lz4], [LZ4_decompress_safe]))
 AC_CHECK_HEADER([snappy.h], AC_CHECK_LIB([snappy], [main]))
 AC_CHECK_HEADER([zlib.h], AC_CHECK_LIB([z], [main]))
 AC_CHECK_HEADER([lzma.h], AC_CHECK_LIB([lzma], [main]))
-AC_CHECK_HEADER([zstd.h], AC_CHECK_LIB([zstd], [main]))
 
 # Include directory that contains "folly" so #include <folly/Foo.h> works
 AM_CPPFLAGS='-I$(top_srcdir)/..'

diff --git a/folly/io/Compression.cpp b/folly/io/Compression.cpp
index 53d36c5fd878c7597373dd6c9762470235300e0e..97c62f0705a84b49cf1673fa1719181c65e8fe09 100644 (file)
--- a/folly/io/Compression.cpp
+++ b/folly/io/Compression.cpp
@@ -36,10 +36,6 @@
 #include <lzma.h>
 #endif
 
-#if FOLLY_HAVE_LIBZSTD
-#include <zstd.h>
-#endif
-
 #include <folly/Conv.h>
 #include <folly/Memory.h>
 #include <folly/Portability.h>
@@ -923,83 +919,6 @@ std::unique_ptr<IOBuf> LZMA2Codec::doUncompress(const IOBuf* data,
 
 #endif  // FOLLY_HAVE_LIBLZMA
 
-#ifdef FOLLY_HAVE_LIBZSTD
-
-/**
- * ZSTD_BETA compression
- */
-class ZSTDCodec final : public Codec {
- public:
-  static std::unique_ptr<Codec> create(int level, CodecType);
-  explicit ZSTDCodec(int level, CodecType type);
-
- private:
-  bool doNeedsUncompressedLength() const override;
-  std::unique_ptr<IOBuf> doCompress(const IOBuf* data) override;
-  std::unique_ptr<IOBuf> doUncompress(
-      const IOBuf* data,
-      uint64_t uncompressedLength) override;
-};
-
-std::unique_ptr<Codec> ZSTDCodec::create(int level, CodecType type) {
-  return make_unique<ZSTDCodec>(level, type);
-}
-
-ZSTDCodec::ZSTDCodec(int level, CodecType type) : Codec(type) {
-  DCHECK(type == CodecType::ZSTD_BETA);
-}
-
-bool ZSTDCodec::doNeedsUncompressedLength() const {
-  return true;
-}
-
-std::unique_ptr<IOBuf> ZSTDCodec::doCompress(const IOBuf* data) {
-  size_t rc;
-  size_t maxCompressedLength = ZSTD_compressBound(data->length());
-  auto out = IOBuf::createCombined(maxCompressedLength);
-
-  CHECK_EQ(out->length(), 0);
-
-  rc = ZSTD_compress(
-      out->writableTail(), out->capacity(), data->data(), data->length());
-
-  if (ZSTD_isError(rc)) {
-    throw std::runtime_error(to<std::string>(
-          "ZSTD compression returned an error: ",
-          ZSTD_getErrorName(rc)));
-  }
-
-  out->append(rc);
-  CHECK_EQ(out->length(), rc);
-
-  return out;
-}
-
-std::unique_ptr<IOBuf> ZSTDCodec::doUncompress(const IOBuf* data,
-                                               uint64_t uncompressedLength) {
-  size_t rc;
-  auto out = IOBuf::createCombined(uncompressedLength);
-
-  CHECK_GE(out->capacity(), uncompressedLength);
-  CHECK_EQ(out->length(), 0);
-
-  rc = ZSTD_decompress(
-      out->writableTail(), out->capacity(), data->data(), data->length());
-
-  if (ZSTD_isError(rc)) {
-    throw std::runtime_error(to<std::string>(
-          "ZSTD decompression returned an error: ",
-          ZSTD_getErrorName(rc)));
-  }
-
-  out->append(rc);
-  CHECK_EQ(out->length(), rc);
-
-  return out;
-}
-
-#endif  // FOLLY_HAVE_LIBZSTD
-
 }  // namespace
 
 std::unique_ptr<Codec> getCodec(CodecType type, int level) {
@@ -1041,12 +960,6 @@ std::unique_ptr<Codec> getCodec(CodecType type, int level) {
     nullptr,
     nullptr,
 #endif
-
-#if FOLLY_HAVE_LIBZSTD
-    ZSTDCodec::create,
-#else
-    nullptr,
-#endif
   };
 
   size_t idx = static_cast<size_t>(type);

diff --git a/folly/io/Compression.h b/folly/io/Compression.h
index 5bcb5177270474a9db0fa5db99ddd12c4201268f..7bbbb1c88517921562e7e6d4bc22248f347634f7 100644 (file)
--- a/folly/io/Compression.h
+++ b/folly/io/Compression.h
@@ -73,14 +73,7 @@ enum class CodecType {
   LZMA2 = 6,
   LZMA2_VARINT_SIZE = 7,
 
-  /**
-   * Use ZSTD_BETA compression.
-   * This format is not yet final; please do not rely on it for anything other
-   * than testing purposes yet.
-   */
-  ZSTD_BETA = 8,
-
-  NUM_CODEC_TYPES = 9,
+  NUM_CODEC_TYPES = 8,
 };
 
 class Codec {

diff --git a/folly/io/test/CompressionTest.cpp b/folly/io/test/CompressionTest.cpp
index 1a177f2554a6291c7b84a6df643a8eb15f7b9b83..314eba5ec745112e6e20ea82e263c35d709ea9c7 100644 (file)
--- a/folly/io/test/CompressionTest.cpp
+++ b/folly/io/test/CompressionTest.cpp
@@ -128,7 +128,6 @@ TEST(CompressionTestNeedsUncompressedLength, Simple) {
   EXPECT_TRUE(getCodec(CodecType::LZMA2)->needsUncompressedLength());
   EXPECT_FALSE(getCodec(CodecType::LZMA2_VARINT_SIZE)
     ->needsUncompressedLength());
-  EXPECT_TRUE(getCodec(CodecType::ZSTD_BETA)->needsUncompressedLength());
 }
 
 class CompressionTest
@@ -181,8 +180,7 @@ INSTANTIATE_TEST_CASE_P(
                                      CodecType::ZLIB,
                                      CodecType::LZ4_VARINT_SIZE,
                                      CodecType::LZMA2,
-                                     CodecType::LZMA2_VARINT_SIZE,
-                                     CodecType::ZSTD_BETA)));
+                                     CodecType::LZMA2_VARINT_SIZE)));
 
 class CompressionVarintTest
     : public testing::TestWithParam<std::tr1::tuple<int, CodecType>> {