36a5f8ed7f
- Replace raw slice comparison with a call to user comparator. Added test for custom comparators. - Fix end of namespace comments. - Fixed bug in picking inputs for a level-0 compaction. When finding overlapping files, the covered range may expand as files are added to the input set. We now correctly expand the range when this happens instead of continuing to use the old range. For example, suppose L0 contains files with the following ranges: F1: a .. d F2: c .. g F3: f .. j and the initial compaction target is F3. We used to search for range f..j which yielded {F2,F3}. However we now expand the range as soon as another file is added. In this case, when F2 is added, we expand the range to c..j and restart the search. That picks up file F1 as well. This change fixes a bug related to deleted keys showing up incorrectly after a compaction as described in Issue 44. (Sync with upstream @25072954)
44 lines
1012 B
C++
44 lines
1012 B
C++
// 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.
|
|
|
|
#ifndef STORAGE_LEVELDB_TABLE_BLOCK_H_
|
|
#define STORAGE_LEVELDB_TABLE_BLOCK_H_
|
|
|
|
#include <stddef.h>
|
|
#include <stdint.h>
|
|
#include "leveldb/iterator.h"
|
|
|
|
namespace leveldb {
|
|
|
|
class Comparator;
|
|
|
|
class Block {
|
|
public:
|
|
// Initialize the block with the specified contents.
|
|
// Takes ownership of data[] and will delete[] it when done.
|
|
Block(const char* data, size_t size);
|
|
|
|
~Block();
|
|
|
|
size_t size() const { return size_; }
|
|
Iterator* NewIterator(const Comparator* comparator);
|
|
|
|
private:
|
|
uint32_t NumRestarts() const;
|
|
|
|
const char* data_;
|
|
size_t size_;
|
|
uint32_t restart_offset_; // Offset in data_ of restart array
|
|
|
|
// No copying allowed
|
|
Block(const Block&);
|
|
void operator=(const Block&);
|
|
|
|
class Iter;
|
|
};
|
|
|
|
} // namespace leveldb
|
|
|
|
#endif // STORAGE_LEVELDB_TABLE_BLOCK_H_
|