NextGraph
/
rocksdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit c37223c083.
main
sdong 10 years ago
parent 28c8758a34
commit 2889df84cb
3 changed files with 13 additions and 18 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      include/posix/io_posix.h
  2. 2
      util/env_test.cc
  3. 21
      util/io_posix.cc

8
include/posix/io_posix.h
Unescape View File

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

2
util/env_test.cc
Unescape View File

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

21
util/io_posix.cc
Unescape View File

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

Write Preview
Loading…
Cancel
Save