From 992de5d4c9d41813ab05183e7c646be249593340 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Mon, 1 Apr 2019 14:49:57 +0000 Subject: XXHChecksumAggregator -> XXH64ChecksumAggregator and update copyright. --- .../documentmetastore/documentmetastore_test.cpp | 4 +-- .../proton/bucketdb/checksumaggregator.cpp | 4 ++- .../proton/bucketdb/checksumaggregator.h | 2 +- .../proton/bucketdb/checksumaggregators.cpp | 34 +++++++++++----------- .../proton/bucketdb/checksumaggregators.h | 16 +++++----- 5 files changed, 31 insertions(+), 29 deletions(-) (limited to 'searchcore') diff --git a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp index d7d6159af61..7e16094bbf1 100644 --- a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp +++ b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp @@ -24,7 +24,7 @@ LOG_SETUP("documentmetastore_test"); using namespace document; using proton::bucketdb::BucketState; using proton::bucketdb::LegacyChecksumAggregator; -using proton::bucketdb::XXHChecksumAggregator; +using proton::bucketdb::XXH64ChecksumAggregator; using proton::bucketdb::IBucketCreateListener; using search::AttributeFileSaveTarget; using search::AttributeGuard; @@ -845,7 +845,7 @@ TEST("requireThatBasicBucketInfoWorks") BucketState::setChecksumType(BucketState::ChecksumType::LEGACY); requireThatBasicBucketInfoWorks(); BucketState::setChecksumType(BucketState::ChecksumType::XXHASH64); - requireThatBasicBucketInfoWorks(); + requireThatBasicBucketInfoWorks(); } TEST("requireThatWeCanRetrieveListOfLidsFromBucketId") diff --git a/searchcore/src/vespa/searchcore/proton/bucketdb/checksumaggregator.cpp b/searchcore/src/vespa/searchcore/proton/bucketdb/checksumaggregator.cpp index 738a9a81655..20088fee9c0 100644 --- a/searchcore/src/vespa/searchcore/proton/bucketdb/checksumaggregator.cpp +++ b/searchcore/src/vespa/searchcore/proton/bucketdb/checksumaggregator.cpp @@ -1,3 +1,5 @@ +// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + #include "checksumaggregators.h" namespace proton::bucketdb { @@ -8,7 +10,7 @@ ChecksumAggregator::create(ChecksumType type, BucketChecksum seed) { case ChecksumType::LEGACY: return std::make_unique(seed); case ChecksumType::XXHASH64: - return std::make_unique(seed); + return std::make_unique(seed); } return std::unique_ptr(); } diff --git a/searchcore/src/vespa/searchcore/proton/bucketdb/checksumaggregator.h b/searchcore/src/vespa/searchcore/proton/bucketdb/checksumaggregator.h index fc0b7987756..421cca5c6b5 100644 --- a/searchcore/src/vespa/searchcore/proton/bucketdb/checksumaggregator.h +++ b/searchcore/src/vespa/searchcore/proton/bucketdb/checksumaggregator.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/searchcore/src/vespa/searchcore/proton/bucketdb/checksumaggregators.cpp b/searchcore/src/vespa/searchcore/proton/bucketdb/checksumaggregators.cpp index c4b57078fcb..f56d29bb82d 100644 --- a/searchcore/src/vespa/searchcore/proton/bucketdb/checksumaggregators.cpp +++ b/searchcore/src/vespa/searchcore/proton/bucketdb/checksumaggregators.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "checksumaggregators.h" #include @@ -72,39 +72,39 @@ LegacyChecksumAggregator::empty() const { return _checksum == 0; } -XXHChecksumAggregator * -XXHChecksumAggregator::clone() const { - return new XXHChecksumAggregator(*this); +XXH64ChecksumAggregator * +XXH64ChecksumAggregator::clone() const { + return new XXH64ChecksumAggregator(*this); } -XXHChecksumAggregator & -XXHChecksumAggregator::addDoc(const GlobalId &gid, const Timestamp ×tamp) { +XXH64ChecksumAggregator & +XXH64ChecksumAggregator::addDoc(const GlobalId &gid, const Timestamp ×tamp) { _checksum ^= compute(gid, timestamp); return *this; } -XXHChecksumAggregator & -XXHChecksumAggregator::removeDoc(const GlobalId &gid, const Timestamp ×tamp) { +XXH64ChecksumAggregator & +XXH64ChecksumAggregator::removeDoc(const GlobalId &gid, const Timestamp ×tamp) { _checksum ^= compute(gid, timestamp); return *this; } -XXHChecksumAggregator & -XXHChecksumAggregator::addChecksum(const ChecksumAggregator & rhs) { - _checksum ^= dynamic_cast(rhs)._checksum; +XXH64ChecksumAggregator & +XXH64ChecksumAggregator::addChecksum(const ChecksumAggregator & rhs) { + _checksum ^= dynamic_cast(rhs)._checksum; return *this; } -XXHChecksumAggregator & -XXHChecksumAggregator::removeChecksum(const ChecksumAggregator & rhs) { - _checksum ^= dynamic_cast(rhs)._checksum; +XXH64ChecksumAggregator & +XXH64ChecksumAggregator::removeChecksum(const ChecksumAggregator & rhs) { + _checksum ^= dynamic_cast(rhs)._checksum; return *this; } BucketChecksum -XXHChecksumAggregator::getChecksum() const { +XXH64ChecksumAggregator::getChecksum() const { return BucketChecksum((_checksum >> 32) ^ (_checksum & 0xffffffffL)); } bool -XXHChecksumAggregator::empty() const { return _checksum == 0; } +XXH64ChecksumAggregator::empty() const { return _checksum == 0; } uint64_t -XXHChecksumAggregator::compute(const GlobalId &gid, const Timestamp ×tamp) { +XXH64ChecksumAggregator::compute(const GlobalId &gid, const Timestamp ×tamp) { char buffer[20]; memcpy(&buffer[0], gid.get(), 12); reinterpret_cast(&buffer[12])[0] = timestamp.getValue(); diff --git a/searchcore/src/vespa/searchcore/proton/bucketdb/checksumaggregators.h b/searchcore/src/vespa/searchcore/proton/bucketdb/checksumaggregators.h index 19f1de59827..6d6f1b7f842 100644 --- a/searchcore/src/vespa/searchcore/proton/bucketdb/checksumaggregators.h +++ b/searchcore/src/vespa/searchcore/proton/bucketdb/checksumaggregators.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "checksumaggregator.h" @@ -24,14 +24,14 @@ private: /** * Implementations of the bucket checksums based on XXHASH64. **/ -class XXHChecksumAggregator : public ChecksumAggregator { +class XXH64ChecksumAggregator : public ChecksumAggregator { public: - XXHChecksumAggregator(BucketChecksum seed) : _checksum(seed) { } - XXHChecksumAggregator * clone() const override; - XXHChecksumAggregator & addDoc(const GlobalId &gid, const Timestamp ×tamp) override; - XXHChecksumAggregator & removeDoc(const GlobalId &gid, const Timestamp ×tamp) override; - XXHChecksumAggregator & addChecksum(const ChecksumAggregator & rhs) override; - XXHChecksumAggregator & removeChecksum(const ChecksumAggregator & rhs) override; + XXH64ChecksumAggregator(BucketChecksum seed) : _checksum(seed) { } + XXH64ChecksumAggregator * clone() const override; + XXH64ChecksumAggregator & addDoc(const GlobalId &gid, const Timestamp ×tamp) override; + XXH64ChecksumAggregator & removeDoc(const GlobalId &gid, const Timestamp ×tamp) override; + XXH64ChecksumAggregator & addChecksum(const ChecksumAggregator & rhs) override; + XXH64ChecksumAggregator & removeChecksum(const ChecksumAggregator & rhs) override; BucketChecksum getChecksum() const override; bool empty() const override; private: -- cgit v1.2.3