Revert D5455584: [Folly] Move the SpookyHash libraries into folly/hash

Summary:
This reverts commit 616b04579eb6c822023b04840b075f3ac9fbb720

bypass-lint

Differential Revision: D5455584

fbshipit-source-id: afc712fe40121232f52a5bad781350581cec6ce8

folly/Hash.h

@@ -26,8 +26,8 @@
 
 #include <folly/ApplyTuple.h>
 #include <folly/Bits.h>
-#include <folly/hash/SpookyHashV1.h>
-#include <folly/hash/SpookyHashV2.h>
+#include <folly/SpookyHashV1.h>
+#include <folly/SpookyHashV2.h>
 
 /*
  * Various hashing functions.

folly/Makefile.am

@@ -207,8 +207,6 @@ nobase_follyinclude_HEADERS = \
 	futures/detail/FSM.h \
 	futures/detail/Types.h \
 	futures/test/TestExecutor.h \
-	hash/SpookyHashV1.h \
-	hash/SpookyHashV2.h \
 	gen/Base.h \
 	gen/Base-inl.h \
 	gen/Combine.h \
@@ -378,6 +376,8 @@ nobase_follyinclude_HEADERS = \
 	sorted_vector_types.h \
 	SparseByteSet.h \
 	SpinLock.h \
+	SpookyHashV1.h \
+	SpookyHashV2.h \
 	ssl/OpenSSLCertUtils.h \
 	ssl/OpenSSLHash.h \
 	ssl/OpenSSLPtrTypes.h \
@@ -477,8 +477,6 @@ libfolly_la_SOURCES = \
 	detail/Futex.cpp \
 	detail/StaticSingletonManager.cpp \
 	detail/ThreadLocalDetail.cpp \
-	hash/SpookyHashV1.cpp \
-	hash/SpookyHashV2.cpp \
 	GroupVarint.cpp \
 	GroupVarintTables.cpp \
 	IPAddress.cpp \
@@ -550,6 +548,8 @@ libfolly_la_SOURCES = \
 	Optional.cpp \
 	Singleton.cpp \
 	SocketAddress.cpp \
+	SpookyHashV1.cpp \
+	SpookyHashV2.cpp \
 	ssl/OpenSSLCertUtils.cpp \
 	ssl/OpenSSLHash.cpp \
 	ssl/detail/SSLSessionImpl.cpp \

folly/Range.h

@@ -21,7 +21,7 @@
 
 #include <folly/FBString.h>
 #include <folly/Portability.h>
-#include <folly/hash/SpookyHashV2.h>
+#include <folly/SpookyHashV2.h>
 #include <folly/portability/BitsFunctexcept.h>
 #include <folly/portability/Constexpr.h>
 #include <folly/portability/String.h>

folly/hash/SpookyHashV1.cpp → folly/SpookyHashV1.cpp

@@ -24,7 +24,7 @@
 //   July 12 2012: was passing out variables in final to in/out in short
 //   July 30 2012: I reintroduced the buffer overflow
 
-#include <folly/hash/SpookyHashV1.h>
+#include <folly/SpookyHashV1.h>
 
 #include <folly/CppAttributes.h>
 

folly/hash/SpookyHashV2.cpp → folly/SpookyHashV2.cpp

@@ -26,7 +26,7 @@
 //   August 5 2012: SpookyV2: d = should be d += in short hash, and remove
 //                  extra mix from long hash
 
-#include <folly/hash/SpookyHashV2.h>
+#include <folly/SpookyHashV2.h>
 
 #include <folly/CppAttributes.h>
 #include <folly/Portability.h>

folly/experimental/exception_tracer/ExceptionCounterLib.cpp

@@ -21,9 +21,9 @@
 
 #include <folly/RWSpinLock.h>
 #include <folly/Range.h>
+#include <folly/SpookyHashV2.h>
 #include <folly/Synchronized.h>
 #include <folly/ThreadLocal.h>
-#include <folly/hash/SpookyHashV2.h>
 
 #include <folly/experimental/exception_tracer/ExceptionTracerLib.h>
 #include <folly/experimental/exception_tracer/StackTrace.h>

folly/io/IOBuf.cpp

@@ -30,7 +30,7 @@
 #include <folly/Malloc.h>
 #include <folly/Memory.h>
 #include <folly/ScopeGuard.h>
-#include <folly/hash/SpookyHashV2.h>
+#include <folly/SpookyHashV2.h>
 #include <folly/io/Cursor.h>
 
 using std::unique_ptr;

folly/io/RecordIO-inl.h

@@ -20,7 +20,7 @@
 
 #include <boost/iterator/iterator_facade.hpp>
 
-#include <folly/hash/SpookyHashV2.h>
+#include <folly/SpookyHashV2.h>
 
 namespace folly {
 

folly/test/Makefile.am

@@ -217,11 +217,11 @@ portability_test_SOURCES = PortabilityTest.cpp
 portability_test_LDADD = libfollytestmain.la
 TESTS += portability_test
 
-spooky_hash_v1_test_SOURCES = ../hash/test/SpookyHashV1Test.cpp
+spooky_hash_v1_test_SOURCES = SpookyHashV1Test.cpp
 spooky_hash_v1_test_LDADD = libfollytestmain.la  $(top_builddir)/libfollybenchmark.la
 TESTS += spooky_hash_v1_test
 
-spooky_hash_v2_test_SOURCES = ../hash/test/SpookyHashV2Test.cpp
+spooky_hash_v2_test_SOURCES = SpookyHashV2Test.cpp
 spooky_hash_v2_test_LDADD = libfollytestmain.la  $(top_builddir)/libfollybenchmark.la
 TESTS += spooky_hash_v2_test
 

folly/hash/test/SpookyHashV1Test.cpp → folly/test/SpookyHashV1Test.cpp

@@ -20,7 +20,7 @@
 #define __STDC_FORMAT_MACROS 1
 #endif
 
-#include <folly/hash/SpookyHashV1.h>
+#include <folly/SpookyHashV1.h>
 
 #include <cinttypes>
 #include <cstddef>

folly/hash/test/SpookyHashV2Test.cpp → folly/test/SpookyHashV2Test.cpp

@@ -20,7 +20,7 @@
 #define __STDC_FORMAT_MACROS 1
 #endif
 
-#include <folly/hash/SpookyHashV2.h>
+#include <folly/SpookyHashV2.h>
 
 #include <cinttypes>
 #include <cstddef>