From ebff31e4f6a2762a03cc98e9381f89534d685089 Mon Sep 17 00:00:00 2001 From: Yedidya Feldblum Date: Sun, 23 Jul 2017 22:24:46 -0700 Subject: [PATCH] Move the SpookyHash libraries into folly/hash Summary: [Folly] Move the SpookyHash libraries into `folly/hash`. And propagate the changes to `#include` lines, etc. Reviewed By: Orvid Differential Revision: D5477735 fbshipit-source-id: 94fe95ece05b52bde1466ab5f9fb8b53a4c59bed --- folly/Hash.h | 4 ++-- folly/Makefile.am | 8 ++++---- folly/Range.h | 2 +- .../experimental/exception_tracer/ExceptionCounterLib.cpp | 2 +- folly/{ => hash}/SpookyHashV1.cpp | 2 +- folly/{ => hash}/SpookyHashV1.h | 0 folly/{ => hash}/SpookyHashV2.cpp | 2 +- folly/{ => hash}/SpookyHashV2.h | 0 folly/{ => hash}/test/SpookyHashV1Test.cpp | 2 +- folly/{ => hash}/test/SpookyHashV2Test.cpp | 2 +- folly/io/IOBuf.cpp | 2 +- folly/io/RecordIO-inl.h | 2 +- folly/test/Makefile.am | 4 ++-- 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 90492180..e8b75df3 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 e2940ab5..34f6e9ca 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -207,6 +207,8 @@ 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 \ @@ -376,8 +378,6 @@ 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,6 +477,8 @@ libfolly_la_SOURCES = \ detail/Futex.cpp \ detail/StaticSingletonManager.cpp \ detail/ThreadLocalDetail.cpp \ + hash/SpookyHashV1.cpp \ + hash/SpookyHashV2.cpp \ GroupVarint.cpp \ GroupVarintTables.cpp \ IPAddress.cpp \ @@ -548,8 +550,6 @@ 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 f80e635d..efe34908 100644 --- a/folly/Range.h +++ b/folly/Range.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/folly/experimental/exception_tracer/ExceptionCounterLib.cpp b/folly/experimental/exception_tracer/ExceptionCounterLib.cpp index 05e307de..c1a59cfb 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/SpookyHashV1.cpp b/folly/hash/SpookyHashV1.cpp similarity index 99% rename from folly/SpookyHashV1.cpp rename to folly/hash/SpookyHashV1.cpp index 401da9f8..f291b472 100644 --- a/folly/SpookyHashV1.cpp +++ b/folly/hash/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/SpookyHashV1.h b/folly/hash/SpookyHashV1.h similarity index 100% rename from folly/SpookyHashV1.h rename to folly/hash/SpookyHashV1.h diff --git a/folly/SpookyHashV2.cpp b/folly/hash/SpookyHashV2.cpp similarity index 99% rename from folly/SpookyHashV2.cpp rename to folly/hash/SpookyHashV2.cpp index 0f623625..3a43b9f6 100644 --- a/folly/SpookyHashV2.cpp +++ b/folly/hash/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/SpookyHashV2.h b/folly/hash/SpookyHashV2.h similarity index 100% rename from folly/SpookyHashV2.h rename to folly/hash/SpookyHashV2.h diff --git a/folly/test/SpookyHashV1Test.cpp b/folly/hash/test/SpookyHashV1Test.cpp similarity index 99% rename from folly/test/SpookyHashV1Test.cpp rename to folly/hash/test/SpookyHashV1Test.cpp index e5b4eb12..054c37ca 100644 --- a/folly/test/SpookyHashV1Test.cpp +++ b/folly/hash/test/SpookyHashV1Test.cpp @@ -20,7 +20,7 @@ #define __STDC_FORMAT_MACROS 1 #endif -#include +#include #include #include diff --git a/folly/test/SpookyHashV2Test.cpp b/folly/hash/test/SpookyHashV2Test.cpp similarity index 99% rename from folly/test/SpookyHashV2Test.cpp rename to folly/hash/test/SpookyHashV2Test.cpp index 227b4fb7..406c1007 100644 --- a/folly/test/SpookyHashV2Test.cpp +++ b/folly/hash/test/SpookyHashV2Test.cpp @@ -20,7 +20,7 @@ #define __STDC_FORMAT_MACROS 1 #endif -#include +#include #include #include diff --git a/folly/io/IOBuf.cpp b/folly/io/IOBuf.cpp index 3ca39aa2..91f7d8de 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 203fae9f..09f90c57 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 2af336e1..b10f9d23 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 = SpookyHashV1Test.cpp +spooky_hash_v1_test_SOURCES = ../hash/test/SpookyHashV1Test.cpp spooky_hash_v1_test_LDADD = libfollytestmain.la $(top_builddir)/libfollybenchmark.la TESTS += spooky_hash_v1_test -spooky_hash_v2_test_SOURCES = SpookyHashV2Test.cpp +spooky_hash_v2_test_SOURCES = ../hash/test/SpookyHashV2Test.cpp spooky_hash_v2_test_LDADD = libfollytestmain.la $(top_builddir)/libfollybenchmark.la TESTS += spooky_hash_v2_test -- 2.34.1