Revert "Minor fixes found while trying to compile it using clang on Mac OS X"

This reverts commit 5f2c136c32.

db/builder.h

@@ -15,7 +15,7 @@ struct Options;
 struct FileMetaData;
 
 class Env;
-struct EnvOptions;
+class EnvOptions;
 class Iterator;
 class TableCache;
 class VersionEdit;

db/db_bench.cc

@@ -421,6 +421,18 @@ class RandomGenerator {
   }
 };
 
+static Slice TrimSpace(Slice s) {
+  unsigned int start = 0;
+  while (start < s.size() && isspace(s[start])) {
+    start++;
+  }
+  unsigned int limit = s.size();
+  while (limit > start && isspace(s[limit-1])) {
+    limit--;
+  }
+  return Slice(s.data() + start, limit - start);
+}
+
 static void AppendWithSpace(std::string* str, Slice msg) {
   if (msg.empty()) return;
   if (!str->empty()) {

db/merge_helper.h

@@ -83,6 +83,7 @@ class MergeHelper {
   const Comparator* user_comparator_;
   const MergeOperator* user_merge_operator_;
   Logger* logger_;
+  Iterator* iter_; // in: the internal iterator, positioned at the first merge entry
   bool assert_valid_internal_key_; // enforce no internal key corruption?
 
   // the scratch area that holds the result of MergeUntil

db/repair.cc

@@ -97,6 +97,7 @@ class Repairer {
   InternalKeyComparator const icmp_;
   InternalFilterPolicy const ipolicy_;
   Options const options_;
+  bool owns_cache_;
   TableCache* table_cache_;
   VersionEdit* edit_;
 

include/rocksdb/env.h

@@ -18,13 +18,8 @@
 #include <memory>
 #include <vector>
 #include <stdint.h>
-#include <sys/types.h>
 #include "rocksdb/status.h"
 
-#ifdef __APPLE__
-typedef off_t off64_t;
-#endif
-
 namespace leveldb {
 
 class FileLock;
@@ -33,7 +28,7 @@ class RandomAccessFile;
 class SequentialFile;
 class Slice;
 class WritableFile;
-struct Options;
+class Options;
 
 using std::unique_ptr;
 using std::shared_ptr;

util/cache.cc

@@ -159,6 +159,7 @@ class LRUCache {
   // mutex_ protects the following state.
   port::Mutex mutex_;
   size_t usage_;
+  uint64_t last_id_;
 
   // Dummy head of LRU list.
   // lru.prev is newest entry, lru.next is oldest entry.
@@ -168,7 +169,8 @@ class LRUCache {
 };
 
 LRUCache::LRUCache()
-    : usage_(0) {
+    : usage_(0),
+      last_id_(0) {
   // Make empty circular linked list
   lru_.next = &lru_;
   lru_.prev = &lru_;
@@ -331,7 +333,7 @@ class ShardedLRUCache : public Cache {
     MutexLock l(&id_mutex_);
     return ++(last_id_);
   }
-  virtual size_t GetCapacity() {
+  virtual uint64_t GetCapacity() {
     return capacity_;
   }
 };

util/env_posix.cc

@@ -14,15 +14,10 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
-#ifdef __APPLE__
-#include <sys/param.h>
-#include <sys/mount.h>
-#else
 #include <sys/statfs.h>
-#include <sys/vfs.h>
-#endif
 #include <sys/time.h>
 #include <sys/types.h>
+#include <sys/vfs.h>
 #include <time.h>
 #include <unistd.h>
 #if defined(OS_LINUX)
@@ -131,9 +126,7 @@ class PosixSequentialFile: public SequentialFile {
     if (!use_os_buffer_) {
       // we need to fadvise away the entire range of pages because
       // we do not want readahead pages to be cached.
-#ifndef __APPLE__
       posix_fadvise(fd_, 0, 0, POSIX_FADV_DONTNEED); // free OS pages
-#endif
     }
     return s;
   }
@@ -173,9 +166,7 @@ class PosixRandomAccessFile: public RandomAccessFile {
     if (!use_os_buffer_) {
       // we need to fadvise away the entire range of pages because
       // we do not want readahead pages to be cached.
-#ifndef __APPLE__
       posix_fadvise(fd_, 0, 0, POSIX_FADV_DONTNEED); // free OS pages
-#endif
     }
     return s;
   }
@@ -210,7 +201,6 @@ class PosixRandomAccessFile: public RandomAccessFile {
 #endif
 
   virtual void Hint(AccessPattern pattern) {
-#ifndef __APPLE__
     switch(pattern) {
       case NORMAL:
         posix_fadvise(fd_, 0, 0, POSIX_FADV_NORMAL);
@@ -231,7 +221,6 @@ class PosixRandomAccessFile: public RandomAccessFile {
         assert(false);
         break;
     }
-#endif
   }
 
 };

utilities/ttl/db_ttl.cc

@@ -16,7 +16,8 @@ DBWithTTL::DBWithTTL(const int32_t ttl,
                      const std::string& dbname,
                      Status& st,
                      bool read_only)
-    : StackableDB(nullptr) {
+    : StackableDB(nullptr),
+      ttl_(ttl) {
   Options options_to_open = options;
 
   if (options.compaction_filter) {

utilities/ttl/db_ttl.h

@@ -111,6 +111,7 @@ class DBWithTTL : public StackableDB {
 
  private:
   DB* db_;
+  int32_t ttl_;
   unique_ptr<CompactionFilter> ttl_comp_filter_;
 };