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)
96 lines
2.6 KiB
C++
96 lines
2.6 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.
|
|
|
|
#include "db/table_cache.h"
|
|
|
|
#include "db/filename.h"
|
|
#include "leveldb/env.h"
|
|
#include "leveldb/table.h"
|
|
#include "util/coding.h"
|
|
|
|
namespace leveldb {
|
|
|
|
struct TableAndFile {
|
|
RandomAccessFile* file;
|
|
Table* table;
|
|
};
|
|
|
|
static void DeleteEntry(const Slice& key, void* value) {
|
|
TableAndFile* tf = reinterpret_cast<TableAndFile*>(value);
|
|
delete tf->table;
|
|
delete tf->file;
|
|
delete tf;
|
|
}
|
|
|
|
static void UnrefEntry(void* arg1, void* arg2) {
|
|
Cache* cache = reinterpret_cast<Cache*>(arg1);
|
|
Cache::Handle* h = reinterpret_cast<Cache::Handle*>(arg2);
|
|
cache->Release(h);
|
|
}
|
|
|
|
TableCache::TableCache(const std::string& dbname,
|
|
const Options* options,
|
|
int entries)
|
|
: env_(options->env),
|
|
dbname_(dbname),
|
|
options_(options),
|
|
cache_(NewLRUCache(entries)) {
|
|
}
|
|
|
|
TableCache::~TableCache() {
|
|
delete cache_;
|
|
}
|
|
|
|
Iterator* TableCache::NewIterator(const ReadOptions& options,
|
|
uint64_t file_number,
|
|
uint64_t file_size,
|
|
Table** tableptr) {
|
|
if (tableptr != NULL) {
|
|
*tableptr = NULL;
|
|
}
|
|
|
|
char buf[sizeof(file_number)];
|
|
EncodeFixed64(buf, file_number);
|
|
Slice key(buf, sizeof(buf));
|
|
Cache::Handle* handle = cache_->Lookup(key);
|
|
if (handle == NULL) {
|
|
std::string fname = TableFileName(dbname_, file_number);
|
|
RandomAccessFile* file = NULL;
|
|
Table* table = NULL;
|
|
Status s = env_->NewRandomAccessFile(fname, &file);
|
|
if (s.ok()) {
|
|
s = Table::Open(*options_, file, file_size, &table);
|
|
}
|
|
|
|
if (!s.ok()) {
|
|
assert(table == NULL);
|
|
delete file;
|
|
// We do not cache error results so that if the error is transient,
|
|
// or somebody repairs the file, we recover automatically.
|
|
return NewErrorIterator(s);
|
|
}
|
|
|
|
TableAndFile* tf = new TableAndFile;
|
|
tf->file = file;
|
|
tf->table = table;
|
|
handle = cache_->Insert(key, tf, 1, &DeleteEntry);
|
|
}
|
|
|
|
Table* table = reinterpret_cast<TableAndFile*>(cache_->Value(handle))->table;
|
|
Iterator* result = table->NewIterator(options);
|
|
result->RegisterCleanup(&UnrefEntry, cache_, handle);
|
|
if (tableptr != NULL) {
|
|
*tableptr = table;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
void TableCache::Evict(uint64_t file_number) {
|
|
char buf[sizeof(file_number)];
|
|
EncodeFixed64(buf, file_number);
|
|
cache_->Erase(Slice(buf, sizeof(buf)));
|
|
}
|
|
|
|
} // namespace leveldb
|