From 5d8920df0889fc4d720ed7ac6e19dbcc231701e5 Mon Sep 17 00:00:00 2001 From: Mihaela Ogrezeanu Date: Sat, 22 Jul 2017 03:03:41 -0700 Subject: [PATCH] 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 | 4 ++-- folly/Makefile.am | 8 ++++---- folly/Range.h | 2 +- folly/{hash => }/SpookyHashV1.cpp | 2 +- folly/{hash => }/SpookyHashV1.h | 0 folly/{hash => }/SpookyHashV2.cpp | 2 +- folly/{hash => }/SpookyHashV2.h | 0 .../experimental/exception_tracer/ExceptionCounterLib.cpp | 2 +- folly/io/IOBuf.cpp | 2 +- folly/io/RecordIO-inl.h | 2 +- folly/test/Makefile.am | 4 ++-- folly/{hash => }/test/SpookyHashV1Test.cpp | 2 +- folly/{hash => }/test/SpookyHashV2Test.cpp | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) rename folly/{hash => }/SpookyHashV1.cpp (99%) rename folly/{hash => }/SpookyHashV1.h (100%) rename folly/{hash => }/SpookyHashV2.cpp (99%) rename folly/{hash => }/SpookyHashV2.h (100%) rename folly/{hash => }/test/SpookyHashV1Test.cpp (99%) rename folly/{hash => }/test/SpookyHashV2Test.cpp (99%) diff --git a/folly/Hash.h b/folly/Hash.h index c3593c3c..77ba5878 100644 --- a/folly/Hash.h +++ b/folly/Hash.h @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include /* * Various hashing functions. diff --git a/folly/Makefile.am b/folly/Makefile.am index bffc7d98..a1607f04 100644 --- a/folly/Makefile.am +++ b/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 \ diff --git a/folly/Range.h b/folly/Range.h index efe34908..f80e635d 100644 --- a/folly/Range.h +++ b/folly/Range.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/folly/hash/SpookyHashV1.cpp b/folly/SpookyHashV1.cpp similarity index 99% rename from folly/hash/SpookyHashV1.cpp rename to folly/SpookyHashV1.cpp index f291b472..401da9f8 100644 --- a/folly/hash/SpookyHashV1.cpp +++ b/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 +#include #include diff --git a/folly/hash/SpookyHashV1.h b/folly/SpookyHashV1.h similarity index 100% rename from folly/hash/SpookyHashV1.h rename to folly/SpookyHashV1.h diff --git a/folly/hash/SpookyHashV2.cpp b/folly/SpookyHashV2.cpp similarity index 99% rename from folly/hash/SpookyHashV2.cpp rename to folly/SpookyHashV2.cpp index 3a43b9f6..0f623625 100644 --- a/folly/hash/SpookyHashV2.cpp +++ b/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 +#include #include #include diff --git a/folly/hash/SpookyHashV2.h b/folly/SpookyHashV2.h similarity index 100% rename from folly/hash/SpookyHashV2.h rename to folly/SpookyHashV2.h diff --git a/folly/experimental/exception_tracer/ExceptionCounterLib.cpp b/folly/experimental/exception_tracer/ExceptionCounterLib.cpp index c1a59cfb..05e307de 100644 --- a/folly/experimental/exception_tracer/ExceptionCounterLib.cpp +++ b/folly/experimental/exception_tracer/ExceptionCounterLib.cpp @@ -21,9 +21,9 @@ #include #include +#include #include #include -#include #include #include diff --git a/folly/io/IOBuf.cpp b/folly/io/IOBuf.cpp index 91f7d8de..3ca39aa2 100644 --- a/folly/io/IOBuf.cpp +++ b/folly/io/IOBuf.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include using std::unique_ptr; diff --git a/folly/io/RecordIO-inl.h b/folly/io/RecordIO-inl.h index 09f90c57..203fae9f 100644 --- a/folly/io/RecordIO-inl.h +++ b/folly/io/RecordIO-inl.h @@ -20,7 +20,7 @@ #include -#include +#include namespace folly { diff --git a/folly/test/Makefile.am b/folly/test/Makefile.am index b10f9d23..2af336e1 100644 --- a/folly/test/Makefile.am +++ b/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 diff --git a/folly/hash/test/SpookyHashV1Test.cpp b/folly/test/SpookyHashV1Test.cpp similarity index 99% rename from folly/hash/test/SpookyHashV1Test.cpp rename to folly/test/SpookyHashV1Test.cpp index 054c37ca..e5b4eb12 100644 --- a/folly/hash/test/SpookyHashV1Test.cpp +++ b/folly/test/SpookyHashV1Test.cpp @@ -20,7 +20,7 @@ #define __STDC_FORMAT_MACROS 1 #endif -#include +#include #include #include diff --git a/folly/hash/test/SpookyHashV2Test.cpp b/folly/test/SpookyHashV2Test.cpp similarity index 99% rename from folly/hash/test/SpookyHashV2Test.cpp rename to folly/test/SpookyHashV2Test.cpp index 406c1007..227b4fb7 100644 --- a/folly/hash/test/SpookyHashV2Test.cpp +++ b/folly/test/SpookyHashV2Test.cpp @@ -20,7 +20,7 @@ #define __STDC_FORMAT_MACROS 1 #endif -#include +#include #include #include -- 2.34.1