Commit both PR and internal code review changes

CMakeLists.txt

@@ -1,8 +1,9 @@
 # This cmake build is for Windows only.
 #
 # Prerequisites:
-#     You must have Visual Studio 2013 installed. Start the Developer Command Prompt window that is a part of Visual Studio installation.
+#     You must have Visual Studio 2013 Update 4 installed. Start the Developer Command Prompt window that is a part of Visual Studio installation.
 #     Run the build commands from within the Developer Command Prompt window to have paths to the compiler and runtime libraries set.
+#     Make sure that Git is in your PATH
 #
 # To build Rocksdb for Windows is as easy as 1-2-3-4-5:
 # 

INSTALL.md

@@ -80,3 +80,6 @@ your make commands, like this: `PORTABLE=1 make static_lib`
 
 * **iOS**:
   * Run: `TARGET_OS=IOS make static_lib`. When building the project which uses rocksdb iOS library, make sure to define two important pre-processing macros: `ROCKSDB_LITE` and `IOS_CROSS_COMPILE`.
+
+* **Windows**:
+  * Read the follow the instructions at CMakeLists.txt

WINDOWS_PORT.md

@@ -15,7 +15,7 @@ These notes describe some decisions and changes we had to make with regards to p
 We are open for comments and improvements.
 
 ## OS specifics
-All of the porting, testing and benchmarking was done on Windows Server 2012 R2 Datacenter but to the best of our knowledge there is not a specific API we used during porting that is unsupported on other Windows OS after Vista.
+All of the porting, testing and benchmarking was done on Windows Server 2012 R2 Datacenter 64-bit but to the best of our knowledge there is not a specific API we used during porting that is unsupported on other Windows OS after Vista.
 
 ## Porting goals
 We strive to achieve the following goals:
@@ -34,6 +34,8 @@ At the same time it generates Visual Studio projects that are both usable from a
 The top-level CMakeLists.txt file contains description of all targets and build rules. It also provides brief instructions on how to build the software for Windows. One more build related file is thirdparty.inc that also resides on the top level. This file must be edited to point to actual third party libraries location.
 We think that it would be beneficial to merge the existing make-based build system and the new cmake-based build system into a single one to use on all platforms.
 
+All building and testing was done for 64-bit. We have not conducted any testing for 32-bit and early reports indicate that it will not run on 32-bit.
+
 ## C++ and STL notes
 We had to make some minimum changes within the portable files that either account for OS differences or the shortcomings of C++11 support in the current version of the MS compiler. Most or all of them are expected to be fixed in the upcoming compiler releases.
 

build_tools/build_detect_version.bat

@@ -1,24 +0,0 @@
-@echo off
-
-REM Record the version of the source that we are compiling.
-REM We keep a record of the git revision in util/version.cc. This source file
-REM is then built as a regular source file as part of the compilation process.
-REM One can run "strings executable_filename | grep _build_" to find the version of
-REM the source that we used to build the executable file.
-
-set CONFIGURATION=%1
-
-pushd "%~dp0"
-set "OUTFILE="..\util\build_version_%CONFIGURATION%.cc"
-
-REM GIT_SHA=""
-REM if command -v git >/dev/null 2>&1; then
-REM     GIT_SHA=$(git rev-parse HEAD 2>/dev/null)
-REM fi
-
-@echo #include "build_version.h" > %OUTFILE%
-@echo const char* rocksdb_build_git_sha = "rocksdb_build_git_sha:${GIT_SHA}"; >> %OUTFILE%
-@echo const char* rocksdb_build_git_datetime = "rocksdb_build_git_datetime:$(date)"; >> %OUTFILE%
-@echo const char* rocksdb_build_compile_date = __DATE__; >> %OUTFILE%
-
-@popd

build_tools/runall.bat

@@ -1,99 +0,0 @@
-@echo off
-call :init
-call :runtest arena_test.exe
-call :runtest autovector_test.exe
-call :runtest auto_roll_logger_test.exe
-call :runtest backupable_db_test.exe
-rem call :runtest benchharness_test.exe
-call :runtest block_based_filter_block_test.exe
-call :runtest block_hash_index_test.exe
-call :runtest block_test.exe
-call :runtest bloom_test.exe
-call :runtest cache_test.exe
-call :runtest coding_test.exe
-call :runtest column_family_test.exe
-call :runtest compaction_job_test.exe
-call :runtest compaction_picker_test.exe
-call :runtest comparator_db_test.exe
-call :runtest corruption_test.exe
-call :runtest crc32c_test.exe
-call :runtest cuckoo_table_builder_test.exe
-call :runtest cuckoo_table_db_test.exe
-call :runtest cuckoo_table_reader_test.exe
-call :runtest dbformat_test.exe
-call :runtest db_iter_test.exe
-call :runtest db_test.exe
-call :runtest deletefile_test.exe
-call :runtest dynamic_bloom_test.exe
-call :runtest env_test.exe
-call :runtest fault_injection_test.exe
-call :runtest filelock_test.exe
-call :runtest filename_test.exe
-call :runtest file_indexer_test.exe
-call :runtest full_filter_block_test.exe
-call :runtest histogram_test.exe
-call :runtest listener_test.exe
-call :runtest log_test.exe
-call :runtest manual_compaction_test.exe
-call :runtest memenv_test.exe
-call :runtest merger_test.exe
-call :runtest merge_test.exe
-call :runtest mock_env_test.exe
-call :runtest options_test.exe
-call :runtest perf_context_test.exe
-call :runtest plain_table_db_test.exe
-call :runtest prefix_test.exe
-call :runtest rate_limiter_test.exe
-call :runtest redis_lists_test.exe
-rem call :runtest signal_test.exe
-call :runtest skiplist_test.exe
-call :runtest slice_transform_test.exe
-call :runtest sst_dump_test.exe
-call :runtest stringappend_test.exe
-call :runtest table_properties_collector_test.exe
-call :runtest table_test.exe
-call :runtest thread_list_test.exe
-call :runtest thread_local_test.exe
-call :runtest ttl_test.exe
-call :runtest version_builder_test.exe
-call :runtest version_edit_test.exe
-call :runtest version_set_test.exe
-call :runtest wal_manager_test.exe
-call :runtest write_batch_test.exe
-rem call :runtest write_batch_with_index_test.exe
-call :runtest write_controller_test.exe
-call :stat
-goto :eof
-
-:init
-set tests=0
-set passed=0
-set failed=0
-goto :eof
-
-:runtest
-set /A tests=%tests% + 1
-echo|set /p=Running %1... 
-%1 > %1.log 2>&1
-findstr /C:"PASSED" %1.log > nul 2>&1
-IF ERRORLEVEL 1 (
-    findstr /C:"Passed all tests" %1.log > nul 2>&1
-    IF ERRORLEVEL 1 (
-        echo ***FAILED***
-        set /A failed=%failed% + 1
-    ) ELSE (
-        echo OK
-        set /A passed=%passed% + 1
-    )
-) ELSE (
-    echo OK
-    set /A passed=%passed% + 1
-)
-goto :eof
-
-:stat
-echo =================
-echo Total tests : %tests%
-echo Passed      : %passed%
-echo Failed      : %failed%
-goto :eof

db/c.cc

@@ -484,7 +484,7 @@ static bool SaveError(char** errptr, const Status& s) {
     *errptr = strdup(s.ToString().c_str());
   } else {
     // TODO(sanjay): Merge with existing error?
-    // This is a bug if *errptr is not create by malloc()
+    // This is a bug if *errptr is not created by malloc()
     free(*errptr);
     *errptr = strdup(s.ToString().c_str());
   }

db/file_indexer.h

@@ -12,6 +12,7 @@
 #include <functional>
 #include <limits>
 #include <vector>
+#include "port/port.h"
 #include "util/arena.h"
 #include "util/autovector.h"
 
@@ -59,7 +60,7 @@ class FileIndexer {
 
   enum {
     // MSVC version 1800 still does not have constexpr for ::max()
-    kLevelMaxIndex = INT32_MAX
+    kLevelMaxIndex = rocksdb::port::LevelMaxIndex
   };
 
  private:

include/rocksdb/c.h

@@ -192,13 +192,13 @@ extern ROCKSDB_LIBRARY_API rocksdb_t* rocksdb_open_for_read_only_column_families
     unsigned char error_if_log_file_exist,
     char** errptr);
 
-ROCKSDB_LIBRARY_API char** rocksdb_list_column_families(
+extern ROCKSDB_LIBRARY_API char** rocksdb_list_column_families(
     const rocksdb_options_t* options,
     const char* name,
     size_t* lencf,
     char** errptr);
 
-ROCKSDB_LIBRARY_API void rocksdb_list_column_families_destroy(char** list, size_t len);
+extern ROCKSDB_LIBRARY_API void rocksdb_list_column_families_destroy(char** list, size_t len);
 
 extern ROCKSDB_LIBRARY_API rocksdb_column_family_handle_t* rocksdb_create_column_family(
     rocksdb_t* db,
@@ -236,7 +236,7 @@ extern ROCKSDB_LIBRARY_API void rocksdb_delete(
     const char* key, size_t keylen,
     char** errptr);
 
-void ROCKSDB_LIBRARY_API rocksdb_delete_cf(
+extern ROCKSDB_LIBRARY_API void rocksdb_delete_cf(
     rocksdb_t* db,
     const rocksdb_writeoptions_t* options,
     rocksdb_column_family_handle_t* column_family,
@@ -467,16 +467,16 @@ extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_delete_cf(
     rocksdb_writebatch_t*,
     rocksdb_column_family_handle_t* column_family,
     const char* key, size_t klen);
-ROCKSDB_LIBRARY_API void rocksdb_writebatch_deletev(
+extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_deletev(
     rocksdb_writebatch_t* b,
     int num_keys, const char* const* keys_list,
     const size_t* keys_list_sizes);
-ROCKSDB_LIBRARY_API void rocksdb_writebatch_deletev_cf(
+extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_deletev_cf(
     rocksdb_writebatch_t* b,
     rocksdb_column_family_handle_t* column_family,
     int num_keys, const char* const* keys_list,
     const size_t* keys_list_sizes);
-ROCKSDB_LIBRARY_API extern void rocksdb_writebatch_put_log_data(
+extern  ROCKSDB_LIBRARY_API void rocksdb_writebatch_put_log_data(
     rocksdb_writebatch_t*,
     const char* blob, size_t len);
 extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_iterate(
@@ -986,7 +986,7 @@ extern ROCKSDB_LIBRARY_API void rocksdb_get_options_from_string(
     rocksdb_options_t* new_options,
     char** errptr);
 
-// refering to convention (3), this should be used by client 
+// referring to convention (3), this should be used by client 
 // to free memory that was malloc()ed
 extern ROCKSDB_LIBRARY_API void rocksdb_free(
     void* ptr);

include/rocksdb/slice.h

@@ -24,12 +24,6 @@
 #include <stddef.h>
 #include <string.h>
 #include <string>
-#include <stdio.h>
-
-// Do not want to include the whole /port/port.h here for one define
-#ifdef OS_WIN
-#  define snprintf _snprintf
-#endif
 
 namespace rocksdb {
 
@@ -80,19 +74,7 @@ class Slice {
   }
 
   // Return a string that contains the copy of the referenced data.
-  std::string ToString(bool hex = false) const {
+  std::string ToString(bool hex = false) const;
-    if (hex) {
-      std::string result;
-      char buf[10];
-      for (size_t i = 0; i < size_; i++) {
-        snprintf(buf, 10, "%02X", (unsigned char)data_[i]);
-        result += buf;
-      }
-      return result;
-    } else {
-      return std::string(data_, size_);
-    }
-  }
 
   // Three-way comparison.  Returns value:
   //   <  0 iff "*this" <  "b",

include/rocksdb/thread_status.h

@@ -32,15 +32,11 @@ namespace rocksdb {
 
 // TODO(yhchiang): remove this function once c++14 is available
 //                 as std::max will be able to cover this.
-#ifndef OS_WIN
-constexpr int constexpr_max(int a, int b) { return a > b ? a : b; }
-#else
 // Current MS compiler does not support constexpr
 template<int A, int B>
 struct constexpr_max {
   static const int result = (A > B) ? A : B;
 };
-#endif
 
 // A structure that describes the current status of a thread.
 // The status of active threads can be fetched using
@@ -100,11 +96,7 @@ struct ThreadStatus {
   // The maximum number of properties of an operation.
   // This number should be set to the biggest NUM_XXX_PROPERTIES.
   static const int kNumOperationProperties =
-#ifndef OS_WIN  
-      constexpr_max(NUM_COMPACTION_PROPERTIES, NUM_FLUSH_PROPERTIES);
-#else
       constexpr_max<NUM_COMPACTION_PROPERTIES, NUM_FLUSH_PROPERTIES>::result;
-#endif    
 
   // The type used to refer to a thread state.
   // A state describes lower-level action of a thread

include/rocksdb/utilities/spatial_db.h

@@ -80,7 +80,7 @@ struct Variant {
   const std::string& get_string() const { return *GetStringPtr(data_); }
 
   bool operator==(const Variant& other) const;
-  bool operator!=(const Variant& rhs)   const { return !(*this == rhs); }
+  bool operator!=(const Variant& other) const { return !(*this == other); }
 
  private:
 

include/utilities/document_db.h

@@ -4,5 +4,9 @@
 //  of patent rights can be found in the PATENTS file in the same directory.
 
 #pragma once
-#warning This file was moved to rocksdb/utilities/document_db.h
+
+#include "pragma_error.h"
+
+ROCKSDB_WARNING("This file was moved to rocksdb/utilities/document_db.h")
+
 #include "rocksdb/utilities/document_db.h"

include/utilities/geo_db.h

@@ -4,5 +4,9 @@
 //  of patent rights can be found in the PATENTS file in the same directory.
 
 #pragma once
-#warning This file was moved to rocksdb/utilities/geo_db.h
+
+#include "pragma_error.h"
+
+ROCKSDB_WARNING("This file was moved to rocksdb/utilities/geo_db.h")
+
 #include "rocksdb/utilities/geo_db.h"

include/utilities/json_document.h

@@ -3,5 +3,9 @@
 //  LICENSE file in the root directory of this source tree. An additional grant
 //  of patent rights can be found in the PATENTS file in the same directory.
 #pragma once
-#warning This file was moved to rocksdb/utilities/json_document.h
+
+#include "pragma_error.h"
+
+ROCKSDB_WARNING("This file was moved to rocksdb/utilities/json_document.h")
+
 #include "rocksdb/utilities/json_document.h"

include/utilities/stackable_db.h

@@ -3,5 +3,8 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
 #pragma once
-#warning This file was moved to rocksdb/utilities/stackable_db.h
+#include "pragma_error.h"
+
+ROCKSDB_WARNING("This file was moved to rocksdb/utilities/stackable_db.h")
+
 #include "rocksdb/utilities/stackable_db.h"

port/port_posix.h

@@ -71,9 +71,14 @@
 #define fdatasync fsync
 #endif
 
+#include <limits>
+
 namespace rocksdb {
 namespace port {
 
+// For use at db/file_indexer.h kLevelMaxIndex
+const int LevelMaxIndex = std::numeric_limits<int32_t>::max();
+
 static const bool kLittleEndian = PLATFORM_IS_LITTLE_ENDIAN;
 #undef PLATFORM_IS_LITTLE_ENDIAN
 

port/sys_time.h

@@ -12,7 +12,7 @@
 #ifndef STORAGE_LEVELDB_PORT_SYS_TIME_H_
 #define STORAGE_LEVELDB_PORT_SYS_TIME_H_
 
-#if defined(_WIN32) && defined(_MSC_VER)
+#if defined(OS_WIN) && defined(_MSC_VER)
 
 #include <time.h>
 

port/win/env_win.cc

@@ -229,10 +229,9 @@ size_t Roundup(size_t x, size_t y) {
 }
 
 
-// Can only truncate or reserve to a sector size aligned if
+// SetFileInformationByHandle() is capable of fast pre-allocates.
-// used on files that are opened with Unbuffered I/O
+// However, this does not change the file end position unless the file is
-// Normally it does not present a problem since in memory mapped files
+// truncated and the pre-allocated space is not considered filled with zeros.
-// we do not disable buffering
 inline
 Status fallocate(const std::string& filename, HANDLE hFile, uint64_t to_size) {
 
@@ -394,7 +393,7 @@ class WinMmapReadableFile : public RandomAccessFile {
   const size_t                         length_;
 
 public:
-  // base[0,length-1] contains the mmapped contents of the file.
+  // mapped_region_[0,length-1] contains the mmapped contents of the file.
   WinMmapReadableFile(const std::string &fileName, HANDLE hFile, HANDLE hMap, const void* mapped_region, size_t length)
       : fileName_(fileName), hFile_(hFile), hMap_(hMap), mapped_region_(mapped_region), length_(length) {
 
@@ -1523,7 +1522,7 @@ public:
         NULL);
     }
 
-    if (hFile == INVALID_HANDLE_VALUE) {
+    if (INVALID_HANDLE_VALUE == hFile) {
       auto lastError = GetLastError();
       s = IOErrorFromWindowsError("Failed to open NewSequentialFile" + fname, lastError);
     } else {
@@ -1565,7 +1564,7 @@ public:
 
     /// Shared access is necessary for corruption test to pass
     // almost all tests would work with a possible exception of fault_injection
-    HANDLE hFile;
+    HANDLE hFile = 0;
     {
       IOSTATS_TIMER_GUARD(open_nanos);
       hFile = CreateFileA(
@@ -1718,7 +1717,7 @@ public:
                                   NULL);
     }
 
-    if (hFile == INVALID_HANDLE_VALUE) {
+    if (INVALID_HANDLE_VALUE == hFile) {
       auto lastError = GetLastError();
       s = IOErrorFromWindowsError("Failed to Open/Create NewRandomRWFile" + fname, lastError);
     }
@@ -2018,7 +2017,7 @@ public:
         NULL);
     }
 
-    if (hFile == INVALID_HANDLE_VALUE) {
+    if (INVALID_HANDLE_VALUE == hFile) {
       auto lastError = GetLastError();
       s = IOErrorFromWindowsError("Failed to open LogFile" + fname, lastError);
     } else {

port/win/port_win.h

@@ -62,7 +62,7 @@ typedef SSIZE_T ssize_t;
 #endif
 
 #ifdef SNAPPY
-#include "snappy.h"
+#include <snappy.h>
 #endif
 
 // Thread local storage on Linux
@@ -80,6 +80,9 @@ namespace rocksdb {
 namespace port 
 {
 
+// For use at db/file_indexer.h kLevelMaxIndex
+const int LevelMaxIndex = INT32_MAX;
+
 const bool kLittleEndian = true;
 
 class CondVar;
@@ -87,8 +90,7 @@ class CondVar;
 class Mutex 
 {
 public:
-    /* implicit */ 
+    /* implicit */ Mutex(bool adaptive = false);
-    Mutex(bool adaptive = false);
     ~Mutex();
 
     void Lock();
@@ -97,8 +99,8 @@ public:
     // this will assert if the mutex is not locked
     // it does NOT verify that mutex is held by a calling thread
     void AssertHeld();
-    std::unique_lock<std::mutex>& getLock()
+
-    {
+    std::unique_lock<std::mutex>& getLock() {
         return lock;
     }
 
@@ -117,10 +119,8 @@ private:
 
 class RWMutex 
 {
-private:
-    SRWLOCK srwLock_;
 public:
-    RWMutex(){
+    RWMutex() {
       InitializeSRWLock(&srwLock_);
     }
 
@@ -140,12 +140,12 @@ public:
       ReleaseSRWLockExclusive(&srwLock_);
     }
 
-    void AssertHeld() {
+    // Empty as in POSIX
-        //TODO: psrao - should be implemented
+    void AssertHeld() { }
-    }
 
 private:
 
+  SRWLOCK srwLock_;
   // No copying allowed
   RWMutex(const RWMutex&);
   void operator=(const RWMutex&);
@@ -520,7 +520,7 @@ int pthread_key_create(pthread_key_t *key, void(*destructor)(void*)) {
     (void)destructor;
 
     pthread_key_t k = TlsAlloc();
-    if (k == TLS_OUT_OF_INDEXES) {
+    if (TLS_OUT_OF_INDEXES == k) {
         return ENOMEM;
     }
 
@@ -530,7 +530,7 @@ int pthread_key_create(pthread_key_t *key, void(*destructor)(void*)) {
 
 inline
 int pthread_key_delete(pthread_key_t key) {
-    if(!TlsFree(key)) {
+    if (!TlsFree(key)) {
         return EINVAL;
     }
     return 0;
@@ -538,7 +538,7 @@ int pthread_key_delete(pthread_key_t key) {
 
 inline
 int pthread_setspecific(pthread_key_t key, const void *value) {
-    if(!TlsSetValue(key, const_cast<void*>(value))) {
+    if (!TlsSetValue(key, const_cast<void*>(value))) {
         return ENOMEM;
     }
     return 0;
@@ -547,8 +547,8 @@ int pthread_setspecific(pthread_key_t key, const void *value) {
 inline
 void* pthread_getspecific(pthread_key_t key) {
     void* result = TlsGetValue(key);
-    if(!result) {
+    if (!result) {
-        if(GetLastError() != ERROR_SUCCESS) {
+        if (GetLastError() != ERROR_SUCCESS) {
             errno = EINVAL;
         } else {
             errno = NOERROR;

port/win/win_logger.cc

@@ -24,8 +24,6 @@
 
 namespace rocksdb {
 
-//const int kDebugLogChunkSize = 128 * 1024;
-
 WinLogger::WinLogger(uint64_t (*gettid)(), Env* env, FILE * file, const InfoLogLevel log_level)
             : Logger(log_level),
             gettid_(gettid),
@@ -61,9 +59,11 @@ void WinLogger::Flush() {
 }
 
 void WinLogger::Logv(const char* format, va_list ap) {
-    const uint64_t thread_id = (*gettid_)();
 
   IOSTATS_TIMER_GUARD(logger_nanos);
+
+  const uint64_t thread_id = (*gettid_)();
+
   // We try twice: the first time with a fixed-size stack allocated buffer,
   // and the second time with a much larger dynamically allocated buffer.
   char buffer[500];

port/win/win_logger.h

@@ -23,21 +23,16 @@ class Env;
 const int kDebugLogChunkSize = 128 * 1024;
 
 class WinLogger : public rocksdb::Logger {
-private:
-    FILE*                     file_;
-    uint64_t                  (*gettid_)();  // Return the thread id for the current thread
-    std::atomic_size_t        log_size_;
-    std::atomic_uint_fast64_t last_flush_micros_;
-    Env*                      env_;
-    bool                      flush_pending_;
-
-    const static uint64_t flush_every_seconds_ = 5;
-
 public:
-    WinLogger(uint64_t(*gettid)(), Env* env, FILE * file, const InfoLogLevel log_level = InfoLogLevel::ERROR_LEVEL);
+  WinLogger(uint64_t(*gettid)(), Env* env, FILE * file,
+            const InfoLogLevel log_level = InfoLogLevel::ERROR_LEVEL);
 
   virtual ~WinLogger();
 
+  WinLogger(const WinLogger&) = delete;
+
+  WinLogger& operator=(const WinLogger&) = delete;
+
   void close();
 
   void Flush() override;
@@ -47,6 +42,17 @@ public:
   size_t GetLogFileSize() const override;
 
   void DebugWriter(const char* str, int len);
+
+private:
+
+  FILE*                     file_;
+  uint64_t(*gettid_)();  // Return the thread id for the current thread
+  std::atomic_size_t        log_size_;
+  std::atomic_uint_fast64_t last_flush_micros_;
+  Env*                      env_;
+  bool                      flush_pending_;
+
+  const static uint64_t flush_every_seconds_ = 5;
 };
 
 }  // namespace rocksdb

table/block_based_table_builder.cc

@@ -374,7 +374,7 @@ Slice CompressBlock(const Slice& raw,
 // kBlockBasedTableMagicNumber was picked by running
 //    echo rocksdb.table.block_based | sha1sum
 // and taking the leading 64 bits.
-// Please note that kBlockBasedTableMagicNumber may also be accessed by
+// Please note that kBlockBasedTableMagicNumber may also be accessed by other .cc files
 // for that reason we declare it extern in the header but to get the space allocated
 // it must be not extern in one place.
 const uint64_t kBlockBasedTableMagicNumber = 0x88e241b785f4cff7ull;

third-party/fbson/FbsonStream.h

@@ -30,6 +30,11 @@
 #define __STDC_FORMAT_MACROS
 #endif
 
+#if defined OS_WIN && !defined snprintf
+#  define snprintf _snprintf
+#endif
+
+
 #include <inttypes.h>
 #include <iostream>
 

util/arena.cc

@@ -17,6 +17,11 @@
 
 namespace rocksdb {
 
+// MSVC complains that it is already defined since it is static in the header.
+#ifndef OS_WIN
+const size_t Arena::kInlineSize;
+#endif
+
 const size_t Arena::kMinBlockSize = 4096;
 const size_t Arena::kMaxBlockSize = 2 << 30;
 static const int kAlignUnit = sizeof(void*);
@@ -54,8 +59,8 @@ Arena::~Arena() {
   for (const auto& block : blocks_) {
     delete[] block;
   }
-// yuslepukhin: this needs to be addressed as it previously was under #ifdef
+
-#ifndef OS_WIN
+#ifdef MAP_HUGETLB
   for (const auto& mmap_info : huge_blocks_) {
     auto ret = munmap(mmap_info.addr_, mmap_info.length_);
     if (ret != 0) {

util/autovector.h

@@ -240,7 +240,6 @@ class autovector {
   }
 
   void push_back(const T& item) {
-    //psrao: causes infinite recursion with VC
     if (num_stack_items_ < kSize) {
       values_[num_stack_items_++] = item;
     }

util/dynamic_bloom.h

@@ -9,8 +9,7 @@
 
 #include "rocksdb/slice.h"
 
-
+#include "port/port.h"
-#include <port/port.h>
 
 #include <atomic>
 #include <memory>

util/env.cc

@@ -10,7 +10,7 @@
 #include "rocksdb/env.h"
 
 #include <thread>
-#include <port/sys_time.h>
+#include "port/sys_time.h"
 
 #include "rocksdb/options.h"
 #include "util/arena.h"

util/log_buffer.cc

@@ -5,8 +5,8 @@
 
 #include "util/log_buffer.h"
 
-#include <port/sys_time.h>
+#include "port/sys_time.h"
-#include <port/port.h>
+#include "port/port.h"
 
 namespace rocksdb {
 

util/options_helper.cc

@@ -417,6 +417,8 @@ bool ParseColumnFamilyOption(const std::string& name, const std::string& value,
       new_options->memtable_factory.reset(new_mem_factory);
     } else if (name == "min_write_buffer_number_to_merge") {
       new_options->min_write_buffer_number_to_merge = ParseInt(value);
+    } else if (name == "max_write_buffer_number_to_maintain") {
+      new_options->max_write_buffer_number_to_maintain = ParseInt(value);
     } else if (name == "compression") {
       new_options->compression = ParseCompressionType(value);
     } else if (name == "compression_per_level") {

util/posix_logger.h

@@ -13,7 +13,7 @@
 #pragma once
 #include <algorithm>
 #include <stdio.h>
-#include <port/sys_time.h>
+#include "port/sys_time.h"
 #include <time.h>
 #include <fcntl.h>
 #ifdef OS_LINUX

util/slice.cc

@@ -11,6 +11,7 @@
 #include "rocksdb/slice_transform.h"
 #include "rocksdb/slice.h"
 #include "util/string_util.h"
+#include <stdio.h>
 
 namespace rocksdb {
 
@@ -93,6 +94,28 @@ class NoopTransform : public SliceTransform {
 
 }
 
+// Do not want to include the whole /port/port.h here for one define
+#ifdef OS_WIN
+#  define snprintf _snprintf
+#endif
+
+// Return a string that contains the copy of the referenced data.
+std::string Slice::ToString(bool hex) const {
+  std::string result; // RVO/NRVO/move
+  if (hex) {
+    char buf[10];
+    for (size_t i = 0; i < size_; i++) {
+      snprintf(buf, 10, "%02X", (unsigned char)data_[i]);
+      result += buf;
+    }
+    return result;
+  } else {
+    result.assign(data_, size_);
+    return result;
+  }
+}
+
+
 const SliceTransform* NewFixedPrefixTransform(size_t prefix_len) {
   return new FixedPrefixTransform(prefix_len);
 }

utilities/checkpoint/checkpoint_test.cc

@@ -8,7 +8,7 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
 // Syncpoint prevents us building and running tests in release
-#if !defined( NDEBUG) || !defined (OS_WIN)
+#if !defined(NDEBUG) || !defined (OS_WIN)
 
 #ifndef OS_WIN
 # include <unistd.h>
@@ -351,7 +351,7 @@ TEST_F(DBTest, CheckpointCF) {
 #endif
 
 int main(int argc, char** argv) {
-#if !defined( NDEBUG) || !defined (OS_WIN)
+#if !defined(NDEBUG) || !defined (OS_WIN)
   rocksdb::port::InstallStackTraceHandler();
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();