dolysis
/
rocksdb
mirror of https://github.com/facebook/rocksdb.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid to reply on ROCKSDB_FALLOCATE_PRESENT in include/posix/io_posix.h 

Summary: include/posix/io_posix.h should not depend on ROCKSDB_FALLOCATE_PRESENT. Remove it.

Test Plan: Build it with both of ROCKSDB_FALLOCATE_PRESENT defined and not defined.

Reviewers: rven, yhchiang, anthony, kradhakrishnan, IslamAbdelRahman, igor

Reviewed By: igor

Subscribers: leveldb, dhruba

Differential Revision: https://reviews.facebook.net/D49563
This commit is contained in:
sdong 2015-10-27 14:27:48 -07:00
parent d6219e4d9b
commit c37223c083
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/posix/io_posix.h
View File

@ -68,10 +68,8 @@ class PosixWritableFile : public WritableFile {
const std::string filename_;
int fd_;
uint64_t filesize_;
#ifdef ROCKSDB_FALLOCATE_PRESENT
bool allow_fallocate_;
bool fallocate_with_keep_size_;
#endif
public:
PosixWritableFile(const std::string& fname, int fd,
@ -89,11 +87,9 @@ class PosixWritableFile : public WritableFile {
virtual bool IsSyncThreadSafe() const override;
virtual uint64_t GetFileSize() override;
virtual Status InvalidateCache(size_t offset, size_t length) override;
#ifdef ROCKSDB_FALLOCATE_PRESENT
virtual Status Allocate(off_t offset, off_t len) override;
virtual Status RangeSync(off_t offset, off_t nbytes) override;
virtual size_t GetUniqueId(char* id, size_t max_size) const override;
#endif
};
class PosixMmapReadableFile : public RandomAccessFile {
@ -123,10 +119,8 @@ class PosixMmapFile : public WritableFile {
char* dst_; // Where to write next (in range [base_,limit_])
char* last_sync_; // Where have we synced up to
uint64_t file_offset_; // Offset of base_ in file
#ifdef ROCKSDB_FALLOCATE_PRESENT
bool allow_fallocate_; // If false, fallocate calls are bypassed
bool fallocate_with_keep_size_;
#endif
// Roundup x to a multiple of y
static size_t Roundup(size_t x, size_t y) { return ((x + y - 1) / y) * y; }
@ -156,9 +150,7 @@ class PosixMmapFile : public WritableFile {
virtual Status Fsync() override;
virtual uint64_t GetFileSize() override;
virtual Status InvalidateCache(size_t offset, size_t length) override;
#ifdef ROCKSDB_FALLOCATE_PRESENT
virtual Status Allocate(off_t offset, off_t len) override;
#endif
};
class PosixDirectory : public Directory {

2
util/env_test.cc
View File

@ -18,6 +18,7 @@
#include <list>
#ifdef OS_LINUX
#include <fcntl.h>
#include <linux/fs.h>
#include <stdlib.h>
#include <sys/stat.h>
@ -26,7 +27,6 @@
#ifdef ROCKSDB_FALLOCATE_PRESENT
#include <errno.h>
#include <fcntl.h>
#endif
#include "rocksdb/env.h"

21
util/io_posix.cc
View File

@ -477,8 +477,8 @@ Status PosixMmapFile::InvalidateCache(size_t offset, size_t length) {
#endif
}
#ifdef ROCKSDB_FALLOCATE_PRESENT
Status PosixMmapFile::Allocate(off_t offset, off_t len) {
#ifdef ROCKSDB_FALLOCATE_PRESENT
TEST_KILL_RANDOM("PosixMmapFile::Allocate:0", rocksdb_kill_odds);
int alloc_status = 0;
if (allow_fallocate_) {
@ -490,8 +490,10 @@ Status PosixMmapFile::Allocate(off_t offset, off_t len) {
} else {
return IOError(filename_, errno);
}
}
#else
return Status::NotSupported("PosixMmapFile::Allocate() not supported.");
#endif
}
/*
* PosixWritableFile
@ -605,8 +607,8 @@ Status PosixWritableFile::InvalidateCache(size_t offset, size_t length) {
#endif
}
#ifdef ROCKSDB_FALLOCATE_PRESENT
Status PosixWritableFile::Allocate(off_t offset, off_t len) {
#ifdef ROCKSDB_FALLOCATE_PRESENT
TEST_KILL_RANDOM("PosixWritableFile::Allocate:0", rocksdb_kill_odds);
IOSTATS_TIMER_GUARD(allocate_nanos);
int alloc_status = 0;
@ -619,20 +621,31 @@ Status PosixWritableFile::Allocate(off_t offset, off_t len) {
} else {
return IOError(filename_, errno);
}
#else
return Status::NotSupported("PosixWritableFile::Allocate() not supported.");
#endif
}
Status PosixWritableFile::RangeSync(off_t offset, off_t nbytes) {
#ifdef ROCKSDB_FALLOCATE_PRESENT
if (sync_file_range(fd_, offset, nbytes, SYNC_FILE_RANGE_WRITE) == 0) {
return Status::OK();
} else {
return IOError(filename_, errno);
}
#else
return Status::NotSupported("PosixWritableFile::RangeSync() not supported.");
#endif
}
size_t PosixWritableFile::GetUniqueId(char* id, size_t max_size) const {
#ifdef ROCKSDB_FALLOCATE_PRESENT
return GetUniqueIdFromFile(fd_, id, max_size);
}
#else
// What we should do with it?
return 0;
#endif
}
PosixDirectory::~PosixDirectory() { close(fd_); }