Move folly/Hash.h to folly/hash/

Summary: [Folly] Move `folly/Hash.h` to `folly/hash/`.

Reviewed By: jsedgwick

Differential Revision: D6050464

fbshipit-source-id: 64eb65aac8e3e7cd0126e65ca3998bfe167e2d73

folly/AtomicHashArray.h

@@ -37,9 +37,9 @@
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/noncopyable.hpp>
 
-#include <folly/Hash.h>
 #include <folly/ThreadCachedInt.h>
 #include <folly/Utility.h>
+#include <folly/hash/Hash.h>
 
 namespace folly {
 

folly/AtomicHashMap.h

@@ -92,9 +92,9 @@
 
 #include <folly/AtomicHashArray.h>
 #include <folly/Foreach.h>
-#include <folly/Hash.h>
 #include <folly/Likely.h>
 #include <folly/ThreadCachedInt.h>
+#include <folly/hash/Hash.h>
 
 namespace folly {
 

folly/FBString.h

@@ -54,9 +54,9 @@
 #include <string>
 #include <utility>
 
-#include <folly/Hash.h>
 #include <folly/Malloc.h>
 #include <folly/Traits.h>
+#include <folly/hash/Hash.h>
 #include <folly/portability/BitsFunctexcept.h>
 
 // When used in folly, assertions are not disabled.

folly/FixedString.h

@@ -409,7 +409,7 @@ struct ReverseIterator {
 } // namespace fixedstring
 } // namespace detail
 
-// Defined in folly/Hash.h
+// Defined in folly/hash/Hash.h
 std::uint32_t hsieh_hash32_buf(const void* buf, std::size_t len);
 
 /** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** *

folly/IPAddressV4.h

@@ -23,9 +23,9 @@
 #include <iosfwd>
 
 #include <folly/FBString.h>
-#include <folly/Hash.h>
 #include <folly/Range.h>
 #include <folly/detail/IPAddress.h>
+#include <folly/hash/Hash.h>
 
 namespace folly {
 

folly/IPAddressV6.h

@@ -25,10 +25,10 @@
 #include <stdexcept>
 
 #include <folly/FBString.h>
-#include <folly/Hash.h>
 #include <folly/Optional.h>
 #include <folly/Range.h>
 #include <folly/detail/IPAddress.h>
+#include <folly/hash/Hash.h>
 
 namespace folly {
 

folly/Makefile.am

@@ -229,6 +229,7 @@ nobase_follyinclude_HEADERS = \
 	futures/test/TestExecutor.h \
 	hash/Checksum.h \
 	hash/detail/ChecksumDetail.h \
+	hash/Hash.h \
 	hash/SpookyHashV1.h \
 	hash/SpookyHashV2.h \
 	gen/Base.h \
@@ -246,7 +247,6 @@ nobase_follyinclude_HEADERS = \
 	gen/String.h \
 	gen/String-inl.h \
 	GroupVarint.h \
-	Hash.h \
 	IPAddress.h \
 	IPAddressV4.h \
 	IPAddressV6.h \

folly/Singleton.h

@@ -125,12 +125,12 @@
 #include <folly/Demangle.h>
 #include <folly/Exception.h>
 #include <folly/Executor.h>
-#include <folly/Hash.h>
 #include <folly/Memory.h>
 #include <folly/RWSpinLock.h>
 #include <folly/Synchronized.h>
 #include <folly/detail/StaticSingletonManager.h>
 #include <folly/experimental/ReadMostlySharedPtr.h>
+#include <folly/hash/Hash.h>
 
 #include <algorithm>
 #include <atomic>

folly/SocketAddress.cpp

@@ -32,7 +32,7 @@
 #include <folly/CppAttributes.h>
 #include <folly/Exception.h>
 #include <folly/Format.h>
-#include <folly/Hash.h>
+#include <folly/hash/Hash.h>
 
 namespace {
 

folly/Uri-inl.h

@@ -22,7 +22,7 @@
 #include <tuple>
 
 #include <folly/Conv.h>
-#include <folly/Hash.h>
+#include <folly/hash/Hash.h>
 
 namespace folly {
 

folly/concurrency/CacheLocality.h

@@ -28,12 +28,12 @@
 #include <unordered_map>
 #include <vector>
 
-#include <folly/Hash.h>
 #include <folly/Indestructible.h>
 #include <folly/Likely.h>
 #include <folly/Memory.h>
 #include <folly/Portability.h>
 #include <folly/ThreadId.h>
+#include <folly/hash/Hash.h>
 #include <folly/portability/BitsFunctexcept.h>
 #include <folly/portability/Memory.h>
 

folly/concurrency/test/ConcurrentHashMapTest.cpp

@@ -17,8 +17,8 @@
 #include <memory>
 #include <thread>
 
-#include <folly/Hash.h>
 #include <folly/concurrency/ConcurrentHashMap.h>
+#include <folly/hash/Hash.h>
 #include <folly/portability/GTest.h>
 #include <folly/test/DeterministicSchedule.h>
 

folly/detail/Futex.cpp

@@ -16,8 +16,8 @@
 
 #include <folly/detail/Futex.h>
 #include <boost/intrusive/list.hpp>
-#include <folly/Hash.h>
 #include <folly/ScopeGuard.h>
+#include <folly/hash/Hash.h>
 #include <folly/portability/SysSyscall.h>
 #include <stdint.h>
 #include <string.h>

folly/detail/MemoryIdler.h

@@ -20,10 +20,10 @@
 #include <chrono>
 
 #include <folly/AtomicStruct.h>
-#include <folly/Hash.h>
 #include <folly/ThreadId.h>
 #include <folly/Traits.h>
 #include <folly/detail/Futex.h>
+#include <folly/hash/Hash.h>
 
 namespace folly {
 

folly/dynamic.cpp

@@ -18,7 +18,7 @@
 
 #include <folly/Assume.h>
 #include <folly/Format.h>
-#include <folly/Hash.h>
+#include <folly/hash/Hash.h>
 #include <folly/portability/BitsFunctexcept.h>
 
 namespace folly {

folly/experimental/FunctionScheduler.h

@@ -18,13 +18,13 @@
 
 #include <folly/Function.h>
 #include <folly/Range.h>
-#include <folly/Hash.h>
+#include <folly/hash/Hash.h>
 #include <chrono>
 #include <condition_variable>
 #include <mutex>
 #include <thread>
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 namespace folly {
 

folly/experimental/StringKeyedUnorderedMap.h

@@ -24,9 +24,9 @@
 #include <unordered_map>
 #include <utility>
 
-#include <folly/Hash.h>
 #include <folly/Range.h>
 #include <folly/experimental/StringKeyedCommon.h>
+#include <folly/hash/Hash.h>
 
 namespace folly {
 

folly/experimental/StringKeyedUnorderedSet.h

@@ -24,9 +24,9 @@
 #include <unordered_set>
 #include <utility>
 
-#include <folly/Hash.h>
 #include <folly/Range.h>
 #include <folly/experimental/StringKeyedCommon.h>
+#include <folly/hash/Hash.h>
 
 namespace folly {
 

folly/experimental/symbolizer/ElfCache.h

@@ -29,9 +29,9 @@
 #include <boost/operators.hpp>
 #include <glog/logging.h>
 
-#include <folly/Hash.h>
 #include <folly/Range.h>
 #include <folly/experimental/symbolizer/Elf.h>
+#include <folly/hash/Hash.h>
 
 namespace folly {
 namespace symbolizer {

folly/experimental/test/StringKeyedTest.cpp

@@ -25,8 +25,8 @@
 
 #include <glog/logging.h>
 
-#include <folly/Hash.h>
 #include <folly/Range.h>
+#include <folly/hash/Hash.h>
 #include <folly/portability/GFlags.h>
 #include <folly/portability/GTest.h>
 

folly/hash/test/ChecksumTest.cpp

@@ -19,7 +19,7 @@
 #include <boost/crc.hpp>
 
 #include <folly/Benchmark.h>
-#include <folly/Hash.h>
+#include <folly/hash/Hash.h>
 #include <folly/hash/detail/ChecksumDetail.h>
 #include <folly/portability/GFlags.h>
 #include <folly/portability/GTest.h>

folly/test/HashBenchmark.cpp → folly/hash/test/HashBenchmark.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/Hash.h>
+#include <folly/hash/Hash.h>
 
 #include <stdint.h>
 #include <deque>

folly/test/HashTest.cpp → folly/hash/test/HashTest.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/Hash.h>
+#include <folly/hash/Hash.h>
 #include <folly/MapUtil.h>
 #include <folly/portability/GTest.h>
 #include <stdint.h>

folly/io/test/CompressionTest.cpp

@@ -27,10 +27,10 @@
 #include <glog/logging.h>
 
 #include <folly/Benchmark.h>
-#include <folly/Hash.h>
 #include <folly/Memory.h>
 #include <folly/Random.h>
 #include <folly/Varint.h>
+#include <folly/hash/Hash.h>
 #include <folly/io/IOBufQueue.h>
 #include <folly/portability/GTest.h>
 

folly/test/AtomicHashArrayTest.cpp

@@ -20,8 +20,8 @@
 
 #include <folly/AtomicHashArray.h>
 #include <folly/Conv.h>
-#include <folly/Hash.h>
 #include <folly/Memory.h>
+#include <folly/hash/Hash.h>
 #include <folly/portability/GTest.h>
 #include <folly/portability/SysMman.h>
 

folly/test/ConcurrentSkipListBenchmark.cpp

@@ -23,8 +23,8 @@
 
 #include <folly/Benchmark.h>
 #include <folly/ConcurrentSkipList.h>
-#include <folly/Hash.h>
 #include <folly/RWSpinLock.h>
+#include <folly/hash/Hash.h>
 #include <folly/portability/GFlags.h>
 #include <glog/logging.h>
 

folly/test/Makefile.am

@@ -89,7 +89,7 @@ foreach_benchmark_SOURCES = ForeachBenchmark.cpp
 foreach_benchmark_LDADD = libfollytestmain.la $(top_builddir)/libfollybenchmark.la
 check_PROGRAMS += foreach_benchmark
 
-hash_test_SOURCES = HashTest.cpp
+hash_test_SOURCES = ../hash/test/HashTest.cpp
 hash_test_LDADD = libfollytestmain.la
 
 invoke_test_SOURCES = ../functional/test/InvokeTest.cpp

folly/test/ThreadCachedIntTest.cpp

@@ -23,8 +23,8 @@
 #include <glog/logging.h>
 
 #include <folly/Benchmark.h>
-#include <folly/Hash.h>
 #include <folly/ThreadId.h>
+#include <folly/hash/Hash.h>
 #include <folly/portability/GFlags.h>
 #include <folly/portability/GTest.h>