25a0d0ca30
Summary: Although RocksDB falls over in various other ways with KVs around 4GB or more, this change fixes how XXH32 and XXH64 were being called by the block checksum code to support >= 4GB in case that should ever happen, or the code copied for other uses. This change is not a schema compatibility issue because the checksum verification code would checksum the first (block_size + 1) mod 2^32 bytes while the checksum construction code would checksum the first block_size mod 2^32 plus the compression type byte, meaning the XXH32/64 checksums for >=4GB block would not match about 255/256 times. While touching this code, I refactored to consolidate redundant implementations, improving diagnostics and performance tracking in some cases. Also used less confusing language in those diagnostics. Makes https://github.com/facebook/rocksdb/issues/6875 obsolete. Pull Request resolved: https://github.com/facebook/rocksdb/pull/6978 Test Plan: I was able to write a test for this using an SST file writer and VerifyChecksum in a reader. The test fails before the fix, though I'm leaving the test disabled because I don't think it's worth the expense of running regularly. Reviewed By: gg814 Differential Revision: D22143260 Pulled By: pdillinger fbshipit-source-id: 982993d16134e8c50bea2269047f901c1783726e
38 lines
1.5 KiB
C++
38 lines
1.5 KiB
C++
// Copyright (c) 2011-present, Facebook, Inc. All rights reserved.
|
|
// This source code is licensed under both the GPLv2 (found in the
|
|
// COPYING file in the root directory) and Apache 2.0 License
|
|
// (found in the LICENSE.Apache file in the root directory).
|
|
//
|
|
// Copyright (c) 2011 The LevelDB Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file. See the AUTHORS file for names of contributors.
|
|
#pragma once
|
|
|
|
#include "rocksdb/table.h"
|
|
|
|
namespace ROCKSDB_NAMESPACE {
|
|
// Release the cached entry and decrement its ref count.
|
|
extern void ForceReleaseCachedEntry(void* arg, void* h);
|
|
|
|
inline MemoryAllocator* GetMemoryAllocator(
|
|
const BlockBasedTableOptions& table_options) {
|
|
return table_options.block_cache.get()
|
|
? table_options.block_cache->memory_allocator()
|
|
: nullptr;
|
|
}
|
|
|
|
inline MemoryAllocator* GetMemoryAllocatorForCompressedBlock(
|
|
const BlockBasedTableOptions& table_options) {
|
|
return table_options.block_cache_compressed.get()
|
|
? table_options.block_cache_compressed->memory_allocator()
|
|
: nullptr;
|
|
}
|
|
|
|
// Assumes block has a trailer as in format.h. file_name and offset provided
|
|
// for generating a diagnostic message in returned status.
|
|
extern Status VerifyBlockChecksum(ChecksumType type, const char* data,
|
|
size_t block_size,
|
|
const std::string& file_name,
|
|
uint64_t offset);
|
|
} // namespace ROCKSDB_NAMESPACE
|