move Iterator, Enumerate, EvictingCacheMap, Foreach, Merge, and

Summary: this is all non-hphp includes that are going in container/

Reviewed By: mzlee, yfeldblum

Differential Revision: D6121745

fbshipit-source-id: b024bde8835fc7f332686793d75eb8e71591c912

CMakeLists.txt

@@ -311,6 +311,13 @@ if (BUILD_TESTS)
       TEST threaded_executor_test SOURCES ThreadedExecutorTest.cpp
       TEST unbounded_blocking_queue_test SOURCES UnboundedBlockingQueueTest.cpp
 
+    DIRECTORY container/test/
+      TEST enumerate_test SOURCES EnumerateTest.cpp
+      TEST evicting_cache_map_test SOURCES EvictingCacheMapTest.cpp
+      TEST foreach_test SOURCES ForeachTest.cpp
+      TEST merge_test SOURCES MergeTest.cpp
+      TEST sparse_byte_set_test SOURCES SparseByteSetTest.cpp
+
     DIRECTORY experimental/test/
       TEST autotimer_test SOURCES AutoTimerTest.cpp
       TEST bits_test_2 SOURCES BitsTest.cpp
@@ -520,8 +527,6 @@ if (BUILD_TESTS)
       TEST dynamic_converter_test SOURCES DynamicConverterTest.cpp
       TEST dynamic_other_test SOURCES DynamicOtherTest.cpp
       TEST endian_test SOURCES EndianTest.cpp
-      TEST enumerate_test SOURCES EnumerateTest.cpp
-      TEST evicting_cache_map_test SOURCES EvictingCacheMapTest.cpp
       TEST exception_test SOURCES ExceptionTest.cpp
       TEST exception_wrapper_test SOURCES ExceptionWrapperTest.cpp
       TEST expected_test SOURCES ExpectedTest.cpp
@@ -531,7 +536,6 @@ if (BUILD_TESTS)
       TEST file_util_test HANGING
         SOURCES FileUtilTest.cpp
       TEST fingerprint_test SOURCES FingerprintTest.cpp
-      TEST foreach_test SOURCES ForeachTest.cpp
       TEST format_other_test SOURCES FormatOtherTest.cpp
       TEST format_test SOURCES FormatTest.cpp
       TEST function_scheduler_test SOURCES FunctionSchedulerTest.cpp
@@ -563,7 +567,6 @@ if (BUILD_TESTS)
       TEST memcpy_test SOURCES MemcpyTest.cpp
       TEST memory_idler_test SOURCES MemoryIdlerTest.cpp
       TEST memory_test SOURCES MemoryTest.cpp
-      TEST merge SOURCES MergeTest.cpp
       TEST move_wrapper_test SOURCES MoveWrapperTest.cpp
       TEST mpmc_pipeline_test SOURCES MPMCPipelineTest.cpp
       TEST mpmc_queue_test SLOW
@@ -594,7 +597,6 @@ if (BUILD_TESTS)
       TEST singletonvault_c_test SOURCES SingletonVaultCTest.cpp
       TEST small_vector_test SOURCES small_vector_test.cpp
       TEST sorted_vector_types_test SOURCES sorted_vector_test.cpp
-      TEST sparse_byte_set_test SOURCES SparseByteSetTest.cpp
       TEST string_test SOURCES StringTest.cpp
       TEST synchronized_test SOURCES SynchronizedTest.cpp
       TEST thread_cached_int_test SOURCES ThreadCachedIntTest.cpp

folly/AtomicHashMap.h

@@ -91,10 +91,10 @@
 #include <stdexcept>
 
 #include <folly/AtomicHashArray.h>
-#include <folly/Foreach.h>
 #include <folly/Hash.h>
 #include <folly/Likely.h>
 #include <folly/ThreadCachedInt.h>
+#include <folly/container/Foreach.h>
 
 namespace folly {
 

folly/Benchmark.cpp

@@ -30,9 +30,9 @@
 
 #include <boost/regex.hpp>
 
-#include <folly/Foreach.h>
 #include <folly/MapUtil.h>
 #include <folly/String.h>
+#include <folly/container/Foreach.h>
 #include <folly/json.h>
 
 using namespace std;

folly/Makefile.am

@@ -58,6 +58,12 @@ nobase_follyinclude_HEADERS = \
 	concurrency/ConcurrentHashMap.h \
 	concurrency/CoreCachedSharedPtr.h \
 	concurrency/detail/ConcurrentHashMap-detail.h \
+	container/Iterator.h \
+	container/Enumerate.h \
+	container/EvictingCacheMap.h \
+	container/Foreach.h \
+	container/Foreach-inl.h \
+	container/SparseByteSet.h \
 	ConstexprMath.h \
 	detail/AtomicHashUtils.h \
 	detail/AtomicUnorderedMapUtils.h \
@@ -111,8 +117,6 @@ nobase_follyinclude_HEADERS = \
 	DynamicConverter.h \
 	dynamic.h \
 	dynamic-inl.h \
-	Enumerate.h \
-	EvictingCacheMap.h \
 	Exception.h \
 	ExceptionString.h \
 	ExceptionWrapper.h \
@@ -199,8 +203,6 @@ nobase_follyinclude_HEADERS = \
 	Fingerprint.h \
 	FixedString.h \
 	folly-config.h \
-	Foreach.h \
-	Foreach-inl.h \
 	FormatArg.h \
 	FormatTraits.h \
 	Format.h \
@@ -309,7 +311,6 @@ nobase_follyinclude_HEADERS = \
 	io/async/test/TimeUtil.h \
 	io/async/test/UndelayedDestruction.h \
 	io/async/test/Util.h \
-	Iterator.h \
 	json.h \
 	Launder.h \
 	Lazy.h \
@@ -396,7 +397,6 @@ nobase_follyinclude_HEADERS = \
 	small_vector.h \
 	SocketAddress.h \
 	sorted_vector_types.h \
-	SparseByteSet.h \
 	SpinLock.h \
 	ssl/Init.h \
 	ssl/OpenSSLCertUtils.h \

folly/concurrency/CoreCachedSharedPtr.h

@@ -19,9 +19,9 @@
 #include <array>
 #include <memory>
 
-#include <folly/Enumerate.h>
 #include <folly/concurrency/AtomicSharedPtr.h>
 #include <folly/concurrency/CacheLocality.h>
+#include <folly/container/Enumerate.h>
 #include <folly/experimental/hazptr/hazptr.h>
 
 namespace folly {

folly/Foreach.h → folly/container/Foreach.h

@@ -320,4 +320,4 @@ downTo(T& iter, const U& begin) {
 #define FOR_EACH_RANGE_R(i, begin, end) \
   for (auto i = (false ? (begin) : (end)); ::folly::detail::downTo(i, (begin));)
 
-#include <folly/Foreach-inl.h>
+#include <folly/container/Foreach-inl.h>

folly/test/EnumerateTest.cpp → folly/container/test/EnumerateTest.cpp

@@ -18,8 +18,8 @@
 #include <string>
 #include <vector>
 
-#include <folly/Enumerate.h>
 #include <folly/Range.h>
+#include <folly/container/Enumerate.h>
 #include <folly/portability/GTest.h>
 
 TEST(Enumerate, Basic) {

folly/test/EvictingCacheMapTest.cpp → folly/container/test/EvictingCacheMapTest.cpp

@@ -16,7 +16,7 @@
 
 #include <set>
 
-#include <folly/EvictingCacheMap.h>
+#include <folly/container/EvictingCacheMap.h>
 #include <folly/portability/GTest.h>
 
 using namespace folly;

folly/test/ForeachBenchmark.cpp → folly/container/test/ForeachBenchmark.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/Foreach.h>
+#include <folly/container/Foreach.h>
 
 #include <folly/Benchmark.h>
 #include <folly/portability/GTest.h>

folly/test/ForeachTest.cpp → folly/container/test/ForeachTest.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/Foreach.h>
+#include <folly/container/Foreach.h>
 
 #include <array>
 #include <initializer_list>

folly/test/IteratorTest.cpp → folly/container/test/IteratorTest.cpp

@@ -26,7 +26,7 @@
 #include <utility>
 #include <vector>
 
-#include <folly/Iterator.h>
+#include <folly/container/Iterator.h>
 #include <folly/portability/GTest.h>
 
 namespace {

folly/algorithm/test/MergeTest.cpp → folly/container/test/MergeTest.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/algorithm/Merge.h>
+#include <folly/container/Merge.h>
 
 #include <map>
 #include <vector>

folly/test/SparseByteSetBench.cpp → folly/container/test/SparseByteSetBenchmark.cpp

@@ -20,7 +20,7 @@
 
 #include <folly/Benchmark.h>
 #include <folly/Format.h>
-#include <folly/SparseByteSet.h>
+#include <folly/container/SparseByteSet.h>
 #include <folly/portability/GFlags.h>
 #include <bitset>
 #include <random>

folly/test/SparseByteSetTest.cpp → folly/container/test/SparseByteSetTest.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/SparseByteSet.h>
+#include <folly/container/SparseByteSet.h>
 
 #include <cstdint>
 #include <limits>

folly/detail/RangeCommon.cpp

@@ -18,7 +18,7 @@
 
 #include <bitset>
 
-#include <folly/SparseByteSet.h>
+#include <folly/container/SparseByteSet.h>
 
 namespace folly {
 

folly/detail/ThreadLocalDetail.h

@@ -27,12 +27,12 @@
 #include <glog/logging.h>
 
 #include <folly/Exception.h>
-#include <folly/Foreach.h>
 #include <folly/Function.h>
 #include <folly/MicroSpinLock.h>
 #include <folly/Portability.h>
 #include <folly/ScopeGuard.h>
 #include <folly/SharedMutex.h>
+#include <folly/container/Foreach.h>
 #include <folly/memory/Malloc.h>
 #include <folly/portability/PThread.h>
 

folly/docs/Benchmark.md

@@ -17,7 +17,7 @@ Using `folly/Benchmark.h` is very simple. Here's an example:
 
 ``` Cpp
     #include <folly/Benchmark.h>
-    #include <folly/Foreach.h>
+    #include <folly/container/Foreach.h>
     #include <vector>
     using namespace std;
     using namespace folly;
@@ -71,7 +71,7 @@ implicitly `unsigned`. Consider a slightly reworked example:
 
 ``` Cpp
     #include <folly/Benchmark.h>
-    #include <folly/Foreach.h>
+    #include <folly/container/Foreach.h>
     #include <vector>
     using namespace std;
     using namespace folly;
@@ -127,7 +127,7 @@ compares with it:
 
 ``` Cpp
     #include <folly/Benchmark.h>
-    #include <folly/Foreach.h>
+    #include <folly/container/Foreach.h>
     #include <vector>
     using namespace std;
     using namespace folly;

folly/gen/test/StringBenchmark.cpp

@@ -19,8 +19,8 @@
 #include <glog/logging.h>
 
 #include <folly/Benchmark.h>
-#include <folly/Foreach.h>
 #include <folly/String.h>
+#include <folly/container/Foreach.h>
 #include <folly/gen/Base.h>
 #include <folly/gen/String.h>
 

folly/stats/test/HistogramBenchmark.cpp

@@ -16,7 +16,7 @@
 #include <folly/stats/Histogram.h>
 
 #include <folly/Benchmark.h>
-#include <folly/Foreach.h>
+#include <folly/container/Foreach.h>
 #include <folly/portability/GFlags.h>
 
 using folly::Histogram;

folly/stats/test/TimeSeriesTest.cpp

@@ -24,7 +24,7 @@
 
 #include <glog/logging.h>
 
-#include <folly/Foreach.h>
+#include <folly/container/Foreach.h>
 #include <folly/portability/GTest.h>
 
 using std::chrono::seconds;

folly/test/BenchmarkTest.cpp

@@ -15,8 +15,8 @@
  */
 
 #include <folly/Benchmark.h>
-#include <folly/Foreach.h>
 #include <folly/String.h>
+#include <folly/container/Foreach.h>
 #include <algorithm>
 #include <iostream>
 #include <numeric>

folly/test/ConcurrentSkipListTest.cpp

@@ -27,9 +27,9 @@
 
 #include <glog/logging.h>
 
-#include <folly/Foreach.h>
 #include <folly/Memory.h>
 #include <folly/String.h>
+#include <folly/container/Foreach.h>
 #include <folly/memory/Arena.h>
 #include <folly/portability/GFlags.h>
 #include <folly/portability/GTest.h>

folly/test/ConvBenchmark.cpp

@@ -20,7 +20,7 @@
 
 #include <folly/Benchmark.h>
 #include <folly/CppAttributes.h>
-#include <folly/Foreach.h>
+#include <folly/container/Foreach.h>
 
 #include <array>
 #include <limits>

folly/test/ConvTest.cpp

@@ -21,7 +21,7 @@
 #include <boost/lexical_cast.hpp>
 
 #include <folly/Conv.h>
-#include <folly/Foreach.h>
+#include <folly/container/Foreach.h>
 #include <folly/portability/GTest.h>
 
 #include <algorithm>

folly/test/FBStringBenchmark.cpp

@@ -27,8 +27,8 @@
 #include <boost/random.hpp>
 
 #include <folly/Benchmark.h>
-#include <folly/Foreach.h>
 #include <folly/Random.h>
+#include <folly/container/Foreach.h>
 #include <folly/portability/GFlags.h>
 
 using namespace std;

folly/test/FBStringTest.cpp

@@ -29,9 +29,9 @@
 #include <boost/random.hpp>
 
 #include <folly/Conv.h>
-#include <folly/Foreach.h>
 #include <folly/Portability.h>
 #include <folly/Random.h>
+#include <folly/container/Foreach.h>
 #include <folly/portability/GTest.h>
 
 using namespace std;

folly/test/FBVectorBenchmark.cpp

@@ -25,9 +25,9 @@
 #include <folly/Benchmark.h>
 #include <folly/FBString.h>
 #include <folly/FBVector.h>
-#include <folly/Foreach.h>
 #include <folly/Random.h>
 #include <folly/Traits.h>
+#include <folly/container/Foreach.h>
 #include <folly/portability/GFlags.h>
 #include <folly/portability/GTest.h>
 

folly/test/FBVectorTest.cpp

@@ -26,9 +26,9 @@
 #include <boost/random.hpp>
 
 #include <folly/FBString.h>
-#include <folly/Foreach.h>
 #include <folly/Random.h>
 #include <folly/Traits.h>
+#include <folly/container/Foreach.h>
 #include <folly/portability/GTest.h>
 
 using namespace std;

folly/test/Makefile.am

@@ -82,10 +82,10 @@ sorted_vector_types_test_SOURCES = sorted_vector_test.cpp
 sorted_vector_types_test_LDADD = libfollytestmain.la
 
 
-foreach_test_SOURCES = ForeachTest.cpp
+foreach_test_SOURCES = ../container/test/ForeachTest.cpp
 foreach_test_LDADD = libfollytestmain.la
 
-foreach_benchmark_SOURCES = ForeachBenchmark.cpp
+foreach_benchmark_SOURCES = ../container/test/ForeachBenchmark.cpp
 foreach_benchmark_LDADD = libfollytestmain.la $(top_builddir)/libfollybenchmark.la
 check_PROGRAMS += foreach_benchmark
 

folly/test/RandomBenchmark.cpp

@@ -22,7 +22,7 @@
 #include <glog/logging.h>
 
 #include <folly/Benchmark.h>
-#include <folly/Foreach.h>
+#include <folly/container/Foreach.h>
 
 #if FOLLY_HAVE_EXTRANDOM_SFMT19937
 #include <ext/random>

folly/test/RangeFindBenchmark.cpp

@@ -22,7 +22,7 @@
 #include <string>
 
 #include <folly/Benchmark.h>
-#include <folly/Foreach.h>
+#include <folly/container/Foreach.h>
 
 using namespace folly;
 using namespace std;

folly/test/SynchronizedTestLib-inl.h

@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include <folly/Foreach.h>
 #include <folly/Random.h>
 #include <folly/Synchronized.h>
+#include <folly/container/Foreach.h>
 #include <folly/portability/GTest.h>
 #include <glog/logging.h>
 #include <algorithm>