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)
35 lines
1.2 KiB
C++
35 lines
1.2 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_TWO_LEVEL_ITERATOR_H_
|
|
#define STORAGE_LEVELDB_TABLE_TWO_LEVEL_ITERATOR_H_
|
|
|
|
#include "leveldb/iterator.h"
|
|
|
|
namespace leveldb {
|
|
|
|
struct ReadOptions;
|
|
|
|
// Return a new two level iterator. A two-level iterator contains an
|
|
// index iterator whose values point to a sequence of blocks where
|
|
// each block is itself a sequence of key,value pairs. The returned
|
|
// two-level iterator yields the concatenation of all key/value pairs
|
|
// in the sequence of blocks. Takes ownership of "index_iter" and
|
|
// will delete it when no longer needed.
|
|
//
|
|
// Uses a supplied function to convert an index_iter value into
|
|
// an iterator over the contents of the corresponding block.
|
|
extern Iterator* NewTwoLevelIterator(
|
|
Iterator* index_iter,
|
|
Iterator* (*block_function)(
|
|
void* arg,
|
|
const ReadOptions& options,
|
|
const Slice& index_value),
|
|
void* arg,
|
|
const ReadOptions& options);
|
|
|
|
} // namespace leveldb
|
|
|
|
#endif // STORAGE_LEVELDB_TABLE_TWO_LEVEL_ITERATOR_H_
|