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)
58 lines
1.7 KiB
C++
58 lines
1.7 KiB
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_BUILDER_H_
|
|
#define STORAGE_LEVELDB_TABLE_BLOCK_BUILDER_H_
|
|
|
|
#include <vector>
|
|
|
|
#include <stdint.h>
|
|
#include "leveldb/slice.h"
|
|
|
|
namespace leveldb {
|
|
|
|
struct Options;
|
|
|
|
class BlockBuilder {
|
|
public:
|
|
explicit BlockBuilder(const Options* options);
|
|
|
|
// Reset the contents as if the BlockBuilder was just constructed.
|
|
void Reset();
|
|
|
|
// REQUIRES: Finish() has not been callled since the last call to Reset().
|
|
// REQUIRES: key is larger than any previously added key
|
|
void Add(const Slice& key, const Slice& value);
|
|
|
|
// Finish building the block and return a slice that refers to the
|
|
// block contents. The returned slice will remain valid for the
|
|
// lifetime of this builder or until Reset() is called.
|
|
Slice Finish();
|
|
|
|
// Returns an estimate of the current (uncompressed) size of the block
|
|
// we are building.
|
|
size_t CurrentSizeEstimate() const;
|
|
|
|
// Return true iff no entries have been added since the last Reset()
|
|
bool empty() const {
|
|
return buffer_.empty();
|
|
}
|
|
|
|
private:
|
|
const Options* options_;
|
|
std::string buffer_; // Destination buffer
|
|
std::vector<uint32_t> restarts_; // Restart points
|
|
int counter_; // Number of entries emitted since restart
|
|
bool finished_; // Has Finish() been called?
|
|
std::string last_key_;
|
|
|
|
// No copying allowed
|
|
BlockBuilder(const BlockBuilder&);
|
|
void operator=(const BlockBuilder&);
|
|
};
|
|
|
|
} // namespace leveldb
|
|
|
|
#endif // STORAGE_LEVELDB_TABLE_BLOCK_BUILDER_H_
|