diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-02-03 21:32:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-03 21:32:27 +0100 |
commit | aebcb6e3c49c75e84bfa3624b7e7999cfff874dd (patch) | |
tree | 3a80e3f64bc03b590c17c7ebd86669bc6e227486 /searchlib | |
parent | 0e63320ed4803d38b44f380f3182abcf6d19381d (diff) |
Revert "Revert "Use OS provided xxhash.""
Diffstat (limited to 'searchlib')
4 files changed, 4 insertions, 4 deletions
diff --git a/searchlib/src/vespa/searchlib/aggregation/aggregation.cpp b/searchlib/src/vespa/searchlib/aggregation/aggregation.cpp index 2c081328fd1..d40cdd5f13e 100644 --- a/searchlib/src/vespa/searchlib/aggregation/aggregation.cpp +++ b/searchlib/src/vespa/searchlib/aggregation/aggregation.cpp @@ -5,7 +5,7 @@ #include <vespa/searchlib/expression/resultvector.h> #include <vespa/document/fieldvalue/document.h> #include <vespa/vespalib/objects/visit.hpp> -#include <vespa/vespalib/xxhash/xxhash.h> +#include <xxhash.h> using namespace search::expression; diff --git a/searchlib/src/vespa/searchlib/docstore/chunkformats.cpp b/searchlib/src/vespa/searchlib/docstore/chunkformats.cpp index 32f02359162..8c32872bcec 100644 --- a/searchlib/src/vespa/searchlib/docstore/chunkformats.cpp +++ b/searchlib/src/vespa/searchlib/docstore/chunkformats.cpp @@ -2,8 +2,8 @@ #include "chunkformats.h" #include <vespa/vespalib/util/crc.h> -#include <vespa/vespalib/xxhash/xxhash.h> #include <vespa/vespalib/util/stringfmt.h> +#include <xxhash.h> namespace search { diff --git a/searchlib/src/vespa/searchlib/docstore/value.cpp b/searchlib/src/vespa/searchlib/docstore/value.cpp index 8750413e3bc..68bb060683d 100644 --- a/searchlib/src/vespa/searchlib/docstore/value.cpp +++ b/searchlib/src/vespa/searchlib/docstore/value.cpp @@ -3,7 +3,7 @@ #include "value.h" #include <vespa/vespalib/data/databuffer.h> #include <vespa/vespalib/util/compressor.h> -#include <vespa/vespalib/xxhash/xxhash.h> +#include <xxhash.h> using vespalib::compression::compress; using vespalib::compression::decompress; diff --git a/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp b/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp index 47ab81f9b2e..126028c27e9 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp +++ b/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp @@ -2,11 +2,11 @@ #include "domainpart.h" #include <vespa/vespalib/util/crc.h> -#include <vespa/vespalib/xxhash/xxhash.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/data/fileheader.h> #include <vespa/searchlib/common/fileheadercontext.h> #include <vespa/fastlib/io/bufferedfile.h> +#include <xxhash.h> #include <vespa/log/log.h> LOG_SETUP(".transactionlog.domainpart"); |