[feature] support define terark_namespace #34

CMakeLists.txt

@@ -49,6 +49,10 @@ if(WITH_TERARKDB_NAMESPACE)
 endif()
 
 #----------------------- Global Options
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR CMAKE_BUILD_TYPE STREQUAL "Release" OR WITH_JEMALLOC)
+  set(WITH_ASAN OFF)
+endif()
+
 if (WITH_WINDOWS_UTF8_FILENAMES)
   add_definitions(-DROCKSDB_WINDOWS_UTF8_FILENAMES)
 endif()

include/rocksdb/db_bench_tool.h

@@ -5,6 +5,7 @@
 #pragma once
 
 #include "rocksdb/terark_namespace.h"
+
 namespace TERARKDB_NAMESPACE {
 int db_bench_tool(int argc, char** argv);
 }  // namespace TERARKDB_NAMESPACE

port/win/port_win.h

@@ -33,6 +33,7 @@
 
 #include "port/win/win_thread.h"
 #include "rocksdb/options.h"
+#include "rocksdb/terark_namespace.h"
 
 #undef min
 #undef max
@@ -72,8 +73,6 @@ typedef SSIZE_T ssize_t;
 #define PLATFORM_IS_LITTLE_ENDIAN (__BYTE_ORDER == __LITTLE_ENDIAN)
 #endif
 
-#include "rocksdb/terark_namespace.h"
-
 namespace TERARKDB_NAMESPACE {
 
 #define PREFETCH(addr, rw, locality)

util/dynamic_bloom.cc

@@ -9,10 +9,10 @@
 
 #include "port/port.h"
 #include "rocksdb/slice.h"
+#include "rocksdb/terark_namespace.h"
 #include "util/allocator.h"
 #include "util/hash.h"
 
-#include "rocksdb/terark_namespace.h"
 namespace TERARKDB_NAMESPACE {
 
 namespace {
@@ -29,13 +29,12 @@ uint32_t GetTotalBitsForLocality(uint32_t total_bits) {
 
   return num_blocks * (CACHE_LINE_SIZE * 8);
 }
-}
+}  // namespace
 
 DynamicBloom::DynamicBloom(Allocator* allocator, uint32_t total_bits,
                            uint32_t locality, uint32_t num_probes,
                            uint32_t (*hash_func)(const Slice& key),
-                           size_t huge_page_tlb_size,
-                           Logger* logger)
+                           size_t huge_page_tlb_size, Logger* logger)
     : DynamicBloom(num_probes, hash_func) {
   SetTotalBits(allocator, total_bits, locality, huge_page_tlb_size, logger);
 }
@@ -55,9 +54,8 @@ void DynamicBloom::SetRawData(unsigned char* raw_data, uint32_t total_bits,
   kNumBlocks = num_blocks;
 }
 
-void DynamicBloom::SetTotalBits(Allocator* allocator,
-                                uint32_t total_bits, uint32_t locality,
-                                size_t huge_page_tlb_size,
+void DynamicBloom::SetTotalBits(Allocator* allocator, uint32_t total_bits,
+                                uint32_t locality, size_t huge_page_tlb_size,
                                 Logger* logger) {
   kTotalBits = (locality > 0) ? GetTotalBitsForLocality(total_bits)
                               : (total_bits + 7) / 8 * 8;
@@ -81,4 +79,4 @@ void DynamicBloom::SetTotalBits(Allocator* allocator,
   data_ = reinterpret_cast<std::atomic<uint8_t>*>(raw);
 }
 
-}  // rocksdb
+}  // namespace TERARKDB_NAMESPACE

util/repeatable_thread.h

@@ -13,6 +13,7 @@
 #include "rocksdb/terark_namespace.h"
 #include "util/mock_time_env.h"
 #include "util/mutexlock.h"
+
 namespace TERARKDB_NAMESPACE {
 
 class RepeatableThread {