Commit 453d5ff6 authored by James Sedgwick's avatar James Sedgwick Committed by Facebook Github Bot

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
parent 44dcd737
...@@ -294,6 +294,9 @@ if (BUILD_TESTS) ...@@ -294,6 +294,9 @@ if (BUILD_TESTS)
apply_folly_compile_options_to_target(folly_test_support) apply_folly_compile_options_to_target(folly_test_support)
folly_define_tests( folly_define_tests(
DIRECTORY compression/test/
TEST compression_test SOURCES CompressionTest.cpp
DIRECTORY concurrency/test/ DIRECTORY concurrency/test/
TEST cache_locality_test SOURCES CacheLocalityTest.cpp TEST cache_locality_test SOURCES CacheLocalityTest.cpp
...@@ -414,7 +417,6 @@ if (BUILD_TESTS) ...@@ -414,7 +417,6 @@ if (BUILD_TESTS)
TEST spooky_hash_v2_test SOURCES SpookyHashV2Test.cpp TEST spooky_hash_v2_test SOURCES SpookyHashV2Test.cpp
DIRECTORY io/test/ DIRECTORY io/test/
TEST compression_test SOURCES CompressionTest.cpp
TEST iobuf_test SOURCES IOBufTest.cpp TEST iobuf_test SOURCES IOBufTest.cpp
TEST iobuf_cursor_test SOURCES IOBufCursorTest.cpp TEST iobuf_cursor_test SOURCES IOBufCursorTest.cpp
TEST iobuf_queue_test SOURCES IOBufQueueTest.cpp TEST iobuf_queue_test SOURCES IOBufQueueTest.cpp
......
...@@ -53,6 +53,9 @@ nobase_follyinclude_HEADERS = \ ...@@ -53,6 +53,9 @@ nobase_follyinclude_HEADERS = \
CppAttributes.h \ CppAttributes.h \
CpuId.h \ CpuId.h \
CPortability.h \ CPortability.h \
compression/Compression.h \
compression/Utils.h \
compression/Zlib.h \
concurrency/CacheLocality.h \ concurrency/CacheLocality.h \
concurrency/ConcurrentHashMap.h \ concurrency/ConcurrentHashMap.h \
concurrency/CoreCachedSharedPtr.h \ concurrency/CoreCachedSharedPtr.h \
...@@ -253,7 +256,6 @@ nobase_follyinclude_HEADERS = \ ...@@ -253,7 +256,6 @@ nobase_follyinclude_HEADERS = \
IndexedMemPool.h \ IndexedMemPool.h \
init/Init.h \ init/Init.h \
IntrusiveList.h \ IntrusiveList.h \
io/Compression.h \
io/Cursor.h \ io/Cursor.h \
io/Cursor-inl.h \ io/Cursor-inl.h \
io/IOBuf.h \ io/IOBuf.h \
...@@ -311,8 +313,6 @@ nobase_follyinclude_HEADERS = \ ...@@ -311,8 +313,6 @@ nobase_follyinclude_HEADERS = \
io/async/test/TimeUtil.h \ io/async/test/TimeUtil.h \
io/async/test/UndelayedDestruction.h \ io/async/test/UndelayedDestruction.h \
io/async/test/Util.h \ io/async/test/Util.h \
io/compression/Utils.h \
io/compression/Zlib.h \
Iterator.h \ Iterator.h \
json.h \ json.h \
Launder.h \ Launder.h \
...@@ -488,6 +488,8 @@ libfollybase_la_SOURCES = \ ...@@ -488,6 +488,8 @@ libfollybase_la_SOURCES = \
libfolly_la_SOURCES = \ libfolly_la_SOURCES = \
Assume.cpp \ Assume.cpp \
ClockGettimeWrappers.cpp \ ClockGettimeWrappers.cpp \
compression/Compression.cpp \
compression/Zlib.cpp \
concurrency/CacheLocality.cpp \ concurrency/CacheLocality.cpp \
concurrency/GlobalThreadPoolList.cpp \ concurrency/GlobalThreadPoolList.cpp \
detail/Futex.cpp \ detail/Futex.cpp \
...@@ -527,7 +529,6 @@ libfolly_la_SOURCES = \ ...@@ -527,7 +529,6 @@ libfolly_la_SOURCES = \
IPAddressV6.cpp \ IPAddressV6.cpp \
LifoSem.cpp \ LifoSem.cpp \
init/Init.cpp \ init/Init.cpp \
io/Compression.cpp \
io/Cursor.cpp \ io/Cursor.cpp \
io/IOBuf.cpp \ io/IOBuf.cpp \
io/IOBufQueue.cpp \ io/IOBufQueue.cpp \
...@@ -558,7 +559,6 @@ libfolly_la_SOURCES = \ ...@@ -558,7 +559,6 @@ libfolly_la_SOURCES = \
io/async/test/TimeUtil.cpp \ io/async/test/TimeUtil.cpp \
io/async/ssl/OpenSSLUtils.cpp \ io/async/ssl/OpenSSLUtils.cpp \
io/async/ssl/SSLErrors.cpp \ io/async/ssl/SSLErrors.cpp \
io/compression/Zlib.cpp \
json.cpp \ json.cpp \
detail/MemoryIdler.cpp \ detail/MemoryIdler.cpp \
detail/SocketFastOpen.cpp \ detail/SocketFastOpen.cpp \
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include <folly/io/Compression.h> #include <folly/compression/Compression.h>
#if FOLLY_HAVE_LIBLZ4 #if FOLLY_HAVE_LIBLZ4
#include <lz4.h> #include <lz4.h>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#endif #endif
#if FOLLY_HAVE_LIBZ #if FOLLY_HAVE_LIBZ
#include <folly/io/compression/Zlib.h> #include <folly/compression/Zlib.h>
#endif #endif
#if FOLLY_HAVE_LIBLZMA #if FOLLY_HAVE_LIBLZMA
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
#include <folly/Portability.h> #include <folly/Portability.h>
#include <folly/ScopeGuard.h> #include <folly/ScopeGuard.h>
#include <folly/Varint.h> #include <folly/Varint.h>
#include <folly/compression/Utils.h>
#include <folly/io/Cursor.h> #include <folly/io/Cursor.h>
#include <folly/io/compression/Utils.h>
#include <algorithm> #include <algorithm>
#include <unordered_set> #include <unordered_set>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include <folly/io/compression/Zlib.h> #include <folly/compression/Zlib.h>
#if FOLLY_HAVE_LIBZ #if FOLLY_HAVE_LIBZ
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
#include <folly/Optional.h> #include <folly/Optional.h>
#include <folly/Range.h> #include <folly/Range.h>
#include <folly/ScopeGuard.h> #include <folly/ScopeGuard.h>
#include <folly/io/Compression.h> #include <folly/compression/Compression.h>
#include <folly/compression/Utils.h>
#include <folly/io/Cursor.h> #include <folly/io/Cursor.h>
#include <folly/io/compression/Utils.h>
using folly::io::compression::detail::dataStartsWithLE; using folly::io::compression::detail::dataStartsWithLE;
using folly::io::compression::detail::prefixToStringLE; using folly::io::compression::detail::prefixToStringLE;
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#pragma once #pragma once
#include <folly/Portability.h> #include <folly/Portability.h>
#include <folly/io/Compression.h> #include <folly/compression/Compression.h>
#if FOLLY_HAVE_LIBZ #if FOLLY_HAVE_LIBZ
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include <folly/io/Compression.h> #include <folly/compression/Compression.h>
#include <algorithm> #include <algorithm>
#include <random> #include <random>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#endif #endif
#if FOLLY_HAVE_LIBZ #if FOLLY_HAVE_LIBZ
#include <folly/io/compression/Zlib.h> #include <folly/compression/Zlib.h>
#endif #endif
namespace zlib = folly::io::zlib; namespace zlib = folly::io::zlib;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment