From 453d5ff6fdcb0a1e2c68efd90dcf40d053a5bceb Mon Sep 17 00:00:00 2001 From: James Sedgwick Date: Sat, 21 Oct 2017 10:25:08 -0700 Subject: [PATCH] move io/Compression and io/compression/* to compression/ Summary: as above (Note: this ignores all push blocking failures!) Reviewed By: yfeldblum Differential Revision: D6099826 fbshipit-source-id: 20152487135aa8eaf6d2e99369801b6dde4992aa --- CMakeLists.txt | 4 +++- folly/Makefile.am | 10 +++++----- folly/{io => compression}/Compression.cpp | 6 +++--- folly/{io => compression}/Compression.h | 0 folly/{io => }/compression/Utils.h | 0 folly/{io => }/compression/Zlib.cpp | 6 +++--- folly/{io => }/compression/Zlib.h | 2 +- folly/{io => compression}/test/CompressionTest.cpp | 4 ++-- 8 files changed, 17 insertions(+), 15 deletions(-) rename folly/{io => compression}/Compression.cpp (99%) rename folly/{io => compression}/Compression.h (100%) rename folly/{io => }/compression/Utils.h (100%) rename folly/{io => }/compression/Zlib.cpp (99%) rename folly/{io => }/compression/Zlib.h (98%) rename folly/{io => compression}/test/CompressionTest.cpp (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index e41ba08d..3255fe47 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -294,6 +294,9 @@ if (BUILD_TESTS) apply_folly_compile_options_to_target(folly_test_support) folly_define_tests( + DIRECTORY compression/test/ + TEST compression_test SOURCES CompressionTest.cpp + DIRECTORY concurrency/test/ TEST cache_locality_test SOURCES CacheLocalityTest.cpp @@ -414,7 +417,6 @@ if (BUILD_TESTS) TEST spooky_hash_v2_test SOURCES SpookyHashV2Test.cpp DIRECTORY io/test/ - TEST compression_test SOURCES CompressionTest.cpp TEST iobuf_test SOURCES IOBufTest.cpp TEST iobuf_cursor_test SOURCES IOBufCursorTest.cpp TEST iobuf_queue_test SOURCES IOBufQueueTest.cpp diff --git a/folly/Makefile.am b/folly/Makefile.am index 3fc4644b..ef127982 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -53,6 +53,9 @@ nobase_follyinclude_HEADERS = \ CppAttributes.h \ CpuId.h \ CPortability.h \ + compression/Compression.h \ + compression/Utils.h \ + compression/Zlib.h \ concurrency/CacheLocality.h \ concurrency/ConcurrentHashMap.h \ concurrency/CoreCachedSharedPtr.h \ @@ -253,7 +256,6 @@ nobase_follyinclude_HEADERS = \ IndexedMemPool.h \ init/Init.h \ IntrusiveList.h \ - io/Compression.h \ io/Cursor.h \ io/Cursor-inl.h \ io/IOBuf.h \ @@ -311,8 +313,6 @@ nobase_follyinclude_HEADERS = \ io/async/test/TimeUtil.h \ io/async/test/UndelayedDestruction.h \ io/async/test/Util.h \ - io/compression/Utils.h \ - io/compression/Zlib.h \ Iterator.h \ json.h \ Launder.h \ @@ -488,6 +488,8 @@ libfollybase_la_SOURCES = \ libfolly_la_SOURCES = \ Assume.cpp \ ClockGettimeWrappers.cpp \ + compression/Compression.cpp \ + compression/Zlib.cpp \ concurrency/CacheLocality.cpp \ concurrency/GlobalThreadPoolList.cpp \ detail/Futex.cpp \ @@ -527,7 +529,6 @@ libfolly_la_SOURCES = \ IPAddressV6.cpp \ LifoSem.cpp \ init/Init.cpp \ - io/Compression.cpp \ io/Cursor.cpp \ io/IOBuf.cpp \ io/IOBufQueue.cpp \ @@ -558,7 +559,6 @@ libfolly_la_SOURCES = \ io/async/test/TimeUtil.cpp \ io/async/ssl/OpenSSLUtils.cpp \ io/async/ssl/SSLErrors.cpp \ - io/compression/Zlib.cpp \ json.cpp \ detail/MemoryIdler.cpp \ detail/SocketFastOpen.cpp \ diff --git a/folly/io/Compression.cpp b/folly/compression/Compression.cpp similarity index 99% rename from folly/io/Compression.cpp rename to folly/compression/Compression.cpp index 0d386525..05ea019c 100644 --- a/folly/io/Compression.cpp +++ b/folly/compression/Compression.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #if FOLLY_HAVE_LIBLZ4 #include @@ -32,7 +32,7 @@ #endif #if FOLLY_HAVE_LIBZ -#include +#include #endif #if FOLLY_HAVE_LIBLZMA @@ -54,8 +54,8 @@ #include #include #include +#include #include -#include #include #include diff --git a/folly/io/Compression.h b/folly/compression/Compression.h similarity index 100% rename from folly/io/Compression.h rename to folly/compression/Compression.h diff --git a/folly/io/compression/Utils.h b/folly/compression/Utils.h similarity index 100% rename from folly/io/compression/Utils.h rename to folly/compression/Utils.h diff --git a/folly/io/compression/Zlib.cpp b/folly/compression/Zlib.cpp similarity index 99% rename from folly/io/compression/Zlib.cpp rename to folly/compression/Zlib.cpp index 38cfa1ad..4df54d5d 100644 --- a/folly/io/compression/Zlib.cpp +++ b/folly/compression/Zlib.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #if FOLLY_HAVE_LIBZ @@ -22,9 +22,9 @@ #include #include #include -#include +#include +#include #include -#include using folly::io::compression::detail::dataStartsWithLE; using folly::io::compression::detail::prefixToStringLE; diff --git a/folly/io/compression/Zlib.h b/folly/compression/Zlib.h similarity index 98% rename from folly/io/compression/Zlib.h rename to folly/compression/Zlib.h index 74dfe032..fb04cccc 100644 --- a/folly/io/compression/Zlib.h +++ b/folly/compression/Zlib.h @@ -17,7 +17,7 @@ #pragma once #include -#include +#include #if FOLLY_HAVE_LIBZ diff --git a/folly/io/test/CompressionTest.cpp b/folly/compression/test/CompressionTest.cpp similarity index 99% rename from folly/io/test/CompressionTest.cpp rename to folly/compression/test/CompressionTest.cpp index 69a037d8..9c846048 100644 --- a/folly/io/test/CompressionTest.cpp +++ b/folly/compression/test/CompressionTest.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include @@ -39,7 +39,7 @@ #endif #if FOLLY_HAVE_LIBZ -#include +#include #endif namespace zlib = folly::io::zlib; -- 2.34.1