dolysis/rocksdb
3
0
Fork 0
mirror of https://github.com/facebook/rocksdb.git synced 2024-11-29 18:33:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bunch of mac compilation issues in performance branch

Browse source
This commit is contained in:
kailiu 2013-12-04 23:00:33 -08:00
parent 219b35be6a
commit e1d92dfd2e
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
table/plain_table_builder.cc
View file

@ -23,8 +23,7 @@ namespace rocksdb {
PlainTableBuilder::PlainTableBuilder(const Options& options, PlainTableBuilder::PlainTableBuilder(const Options& options,
WritableFile* file, WritableFile* file,
int user_key_size, int key_prefix_len) : int user_key_size, int key_prefix_len) :
options_(options), file_(file), user_key_size_(user_key_size), options_(options), file_(file), user_key_size_(user_key_size) {
key_prefix_len_(key_prefix_len) {
std::string version; std::string version;
PutFixed32(&version, 1 | 0x80000000); PutFixed32(&version, 1 | 0x80000000);
file_->Append(Slice(version)); file_->Append(Slice(version));

1
table/plain_table_builder.h
View file

@ -75,7 +75,6 @@ private:
uint64_t num_entries_ = 0; uint64_t num_entries_ = 0;
const size_t user_key_size_; const size_t user_key_size_;
const size_t key_prefix_len_;
bool closed_ = false; // Either Finish() or Abandon() has been called. bool closed_ = false; // Either Finish() or Abandon() has been called.
int GetInternalKeyLength() { int GetInternalKeyLength() {

3
table/plain_table_reader.cc
View file

@ -40,7 +40,8 @@ public:
class slice_comparator { class slice_comparator {
public: public:
bool operator()(rocksdb::Slice const& s1, rocksdb::Slice const& s2) { bool operator()(rocksdb::Slice const& s1,
rocksdb::Slice const& s2) const {
return s1.compare(s2) < 0; return s1.compare(s2) < 0;
} }
}; };

4
util/env_posix.cc
View file

@ -1404,11 +1404,13 @@ class PosixEnv : public Env {
(unsigned long)t); (unsigned long)t);
// Set the thread name to aid debugging // Set the thread name to aid debugging
#if defined(_GNU_SOURCE) && defined(__GLIBC_PREREQ) && (__GLIBC_PREREQ(2, 12)) #if defined(_GNU_SOURCE) && defined(__GLIBC_PREREQ)
#if __GLIBC_PREREQ(2, 12)
char name_buf[16]; char name_buf[16];
snprintf(name_buf, sizeof name_buf, "rocksdb:bg%zu", bgthreads_.size()); snprintf(name_buf, sizeof name_buf, "rocksdb:bg%zu", bgthreads_.size());
name_buf[sizeof name_buf - 1] = '\0'; name_buf[sizeof name_buf - 1] = '\0';
pthread_setname_np(t, name_buf); pthread_setname_np(t, name_buf);
#endif
#endif #endif
bgthreads_.push_back(t); bgthreads_.push_back(t);