|
|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
Index: Makefile
|
|
|
|
|
--- Makefile.orig 2017-06-30 00:26:52.000000000 +0200
|
|
|
|
|
+++ Makefile 2017-06-30 09:45:49.850241000 +0200
|
|
|
|
|
@@ -155,15 +155,7 @@
|
|
|
|
|
--- Makefile.orig 2017-08-30 23:26:12.000000000 +0200
|
|
|
|
|
+++ Makefile 2017-09-28 19:36:19.628152000 +0200
|
|
|
|
|
@@ -167,15 +167,7 @@
|
|
|
|
|
$(foreach path, $(missing_make_config_paths), \
|
|
|
|
|
$(warning Warning: $(path) dont exist))
|
|
|
|
|
|
|
|
|
|
@ -17,19 +17,19 @@ Index: Makefile
|
|
|
|
|
|
|
|
|
|
ifeq ($(PLATFORM), OS_AIX)
|
|
|
|
|
ARFLAGS = -X64 rs
|
|
|
|
|
@@ -572,7 +564,7 @@
|
|
|
|
|
@@ -589,7 +581,7 @@
|
|
|
|
|
analyze tools tools_lib
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-all: $(LIBRARY) $(BENCHMARKS) tools tools_lib test_libs $(TESTS)
|
|
|
|
|
+all: $(LIBRARY)
|
|
|
|
|
|
|
|
|
|
static_lib: $(LIBRARY)
|
|
|
|
|
all_but_some_tests: $(LIBRARY) $(BENCHMARKS) tools tools_lib test_libs $(SUBSET)
|
|
|
|
|
|
|
|
|
|
Index: build_tools/build_detect_platform
|
|
|
|
|
--- build_tools/build_detect_platform.orig 2017-06-30 00:26:52.000000000 +0200
|
|
|
|
|
+++ build_tools/build_detect_platform 2017-06-30 09:44:49.443925000 +0200
|
|
|
|
|
@@ -246,89 +246,6 @@
|
|
|
|
|
--- build_tools/build_detect_platform.orig 2017-08-30 23:26:12.000000000 +0200
|
|
|
|
|
+++ build_tools/build_detect_platform 2017-09-28 19:37:03.980596000 +0200
|
|
|
|
|
@@ -246,91 +246,6 @@
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
@ -104,9 +104,11 @@ Index: build_tools/build_detect_platform
|
|
|
|
|
- # Test whether jemalloc is available
|
|
|
|
|
- if echo 'int main() {}' | $CXX $CFLAGS -x c++ - -o /dev/null -ljemalloc \
|
|
|
|
|
- 2>/dev/null; then
|
|
|
|
|
- PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -ljemalloc"
|
|
|
|
|
- JAVA_LDFLAGS="$JAVA_LDFLAGS -ljemalloc"
|
|
|
|
|
- # This will enable some preprocessor identifiers in the Makefile
|
|
|
|
|
- JEMALLOC=1
|
|
|
|
|
- # JEMALLOC can be enabled either using the flag (like here) or by
|
|
|
|
|
- # providing direct link to the jemalloc library
|
|
|
|
|
- WITH_JEMALLOC_FLAG=1
|
|
|
|
|
- else
|
|
|
|
|
- # jemalloc is not available. Let's try tcmalloc
|
|
|
|
|
- if echo 'int main() {}' | $CXX $CFLAGS -x c++ - -o /dev/null \
|
|
|
|
|
@ -120,9 +122,9 @@ Index: build_tools/build_detect_platform
|
|
|
|
|
$CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null <<EOF
|
|
|
|
|
#include <malloc.h>
|
|
|
|
|
Index: env/env_posix.cc
|
|
|
|
|
--- env/env_posix.cc.orig 2017-06-30 00:26:52.000000000 +0200
|
|
|
|
|
+++ env/env_posix.cc 2017-06-30 09:44:49.444704000 +0200
|
|
|
|
|
@@ -57,6 +57,11 @@
|
|
|
|
|
--- env/env_posix.cc.orig 2017-08-30 23:26:12.000000000 +0200
|
|
|
|
|
+++ env/env_posix.cc 2017-09-28 19:36:20.390221000 +0200
|
|
|
|
|
@@ -55,6 +55,11 @@
|
|
|
|
|
#include "util/thread_local.h"
|
|
|
|
|
#include "util/threadpool_imp.h"
|
|
|
|
|
|
|
|
|
|
@ -135,9 +137,9 @@ Index: env/env_posix.cc
|
|
|
|
|
#define TMPFS_MAGIC 0x01021994
|
|
|
|
|
#endif
|
|
|
|
|
Index: port/port_posix.h
|
|
|
|
|
--- port/port_posix.h.orig 2017-06-30 00:26:52.000000000 +0200
|
|
|
|
|
+++ port/port_posix.h 2017-06-30 09:44:49.444070000 +0200
|
|
|
|
|
@@ -30,7 +30,7 @@
|
|
|
|
|
--- port/port_posix.h.orig 2017-08-30 23:26:12.000000000 +0200
|
|
|
|
|
+++ port/port_posix.h 2017-09-28 19:36:20.390363000 +0200
|
|
|
|
|
@@ -28,7 +28,7 @@
|
|
|
|
|
#define PLATFORM_IS_LITTLE_ENDIAN \
|
|
|
|
|
(__DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN)
|
|
|
|
|
#endif
|
|
|
|
|
@ -146,7 +148,7 @@ Index: port/port_posix.h
|
|
|
|
|
#include <sys/isa_defs.h>
|
|
|
|
|
#ifdef _LITTLE_ENDIAN
|
|
|
|
|
#define PLATFORM_IS_LITTLE_ENDIAN true
|
|
|
|
|
@@ -44,7 +44,7 @@
|
|
|
|
|
@@ -42,7 +42,7 @@
|
|
|
|
|
#define PLATFORM_IS_LITTLE_ENDIAN (BYTE_ORDER == LITTLE_ENDIAN)
|
|
|
|
|
#include <alloca.h>
|
|
|
|
|
#elif defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_NETBSD) || \
|
|
|
|
|
@ -156,9 +158,9 @@ Index: port/port_posix.h
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
#define PLATFORM_IS_LITTLE_ENDIAN (_BYTE_ORDER == _LITTLE_ENDIAN)
|
|
|
|
|
Index: tools/ldb_cmd.cc
|
|
|
|
|
--- tools/ldb_cmd.cc.orig 2017-06-30 00:26:52.000000000 +0200
|
|
|
|
|
+++ tools/ldb_cmd.cc 2017-06-30 09:44:49.444479000 +0200
|
|
|
|
|
@@ -465,7 +465,7 @@
|
|
|
|
|
--- tools/ldb_cmd.cc.orig 2017-08-30 23:26:12.000000000 +0200
|
|
|
|
|
+++ tools/ldb_cmd.cc 2017-09-28 19:36:20.390759000 +0200
|
|
|
|
|
@@ -464,7 +464,7 @@
|
|
|
|
|
option_map_.find(option);
|
|
|
|
|
if (itr != option_map_.end()) {
|
|
|
|
|
try {
|
|
|
|
|
@ -167,7 +169,7 @@ Index: tools/ldb_cmd.cc
|
|
|
|
|
value = strtol(itr->second.c_str(), 0, 10);
|
|
|
|
|
#else
|
|
|
|
|
value = std::stoi(itr->second);
|
|
|
|
|
@@ -1317,7 +1317,7 @@
|
|
|
|
|
@@ -1316,7 +1316,7 @@
|
|
|
|
|
itr = options.find(ARG_MAX_KEYS);
|
|
|
|
|
if (itr != options.end()) {
|
|
|
|
|
try {
|
|
|
|
|
@ -176,7 +178,7 @@ Index: tools/ldb_cmd.cc
|
|
|
|
|
max_keys_ = strtol(itr->second.c_str(), 0, 10);
|
|
|
|
|
#else
|
|
|
|
|
max_keys_ = std::stoi(itr->second);
|
|
|
|
|
@@ -2231,7 +2231,7 @@
|
|
|
|
|
@@ -2229,7 +2229,7 @@
|
|
|
|
|
itr = options.find(ARG_MAX_KEYS);
|
|
|
|
|
if (itr != options.end()) {
|
|
|
|
|
try {
|
|
|
|
|
@ -186,9 +188,9 @@ Index: tools/ldb_cmd.cc
|
|
|
|
|
#else
|
|
|
|
|
max_keys_scanned_ = std::stoi(itr->second);
|
|
|
|
|
Index: util/string_util.cc
|
|
|
|
|
--- util/string_util.cc.orig 2017-06-30 00:26:52.000000000 +0200
|
|
|
|
|
+++ util/string_util.cc 2017-06-30 09:44:49.444866000 +0200
|
|
|
|
|
@@ -282,7 +282,7 @@
|
|
|
|
|
--- util/string_util.cc.orig 2017-08-30 23:26:12.000000000 +0200
|
|
|
|
|
+++ util/string_util.cc 2017-09-28 19:36:20.390915000 +0200
|
|
|
|
|
@@ -280,7 +280,7 @@
|
|
|
|
|
|
|
|
|
|
uint64_t ParseUint64(const std::string& value) {
|
|
|
|
|
size_t endchar;
|
|
|
|
|
@ -197,7 +199,7 @@ Index: util/string_util.cc
|
|
|
|
|
uint64_t num = std::stoull(value.c_str(), &endchar);
|
|
|
|
|
#else
|
|
|
|
|
char* endptr;
|
|
|
|
|
@@ -307,7 +307,7 @@
|
|
|
|
|
@@ -305,7 +305,7 @@
|
|
|
|
|
|
|
|
|
|
int ParseInt(const std::string& value) {
|
|
|
|
|
size_t endchar;
|
|
|
|
|
@ -206,7 +208,7 @@ Index: util/string_util.cc
|
|
|
|
|
int num = std::stoi(value.c_str(), &endchar);
|
|
|
|
|
#else
|
|
|
|
|
char* endptr;
|
|
|
|
|
@@ -329,7 +329,7 @@
|
|
|
|
|
@@ -327,7 +327,7 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
double ParseDouble(const std::string& value) {
|
|
|
|
|
@ -216,9 +218,9 @@ Index: util/string_util.cc
|
|
|
|
|
#else
|
|
|
|
|
return std::strtod(value.c_str(), 0);
|
|
|
|
|
Index: util/transaction_test_util.cc
|
|
|
|
|
--- util/transaction_test_util.cc.orig 2017-06-30 00:26:52.000000000 +0200
|
|
|
|
|
+++ util/transaction_test_util.cc 2017-06-30 09:44:49.445018000 +0200
|
|
|
|
|
@@ -95,7 +95,7 @@
|
|
|
|
|
--- util/transaction_test_util.cc.orig 2017-08-30 23:26:12.000000000 +0200
|
|
|
|
|
+++ util/transaction_test_util.cc 2017-09-28 19:36:20.391040000 +0200
|
|
|
|
|
@@ -96,7 +96,7 @@
|
|
|
|
|
|
|
|
|
|
if (s.ok()) {
|
|
|
|
|
// Found key, parse its value
|
|
|
|
|
@ -227,7 +229,7 @@ Index: util/transaction_test_util.cc
|
|
|
|
|
|
|
|
|
|
if (int_value == 0 || int_value == ULONG_MAX) {
|
|
|
|
|
unexpected_error = true;
|
|
|
|
|
@@ -213,7 +213,7 @@
|
|
|
|
|
@@ -214,7 +214,7 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Slice value = iter->value();
|
|
|
|
|
@ -237,9 +239,9 @@ Index: util/transaction_test_util.cc
|
|
|
|
|
fprintf(stderr, "Iter returned unexpected value: %s\n",
|
|
|
|
|
value.ToString().c_str());
|
|
|
|
|
Index: utilities/persistent_cache/block_cache_tier_file.h
|
|
|
|
|
--- utilities/persistent_cache/block_cache_tier_file.h.orig 2017-06-30 00:26:52.000000000 +0200
|
|
|
|
|
+++ utilities/persistent_cache/block_cache_tier_file.h 2017-06-30 09:44:49.445182000 +0200
|
|
|
|
|
@@ -26,6 +26,14 @@
|
|
|
|
|
--- utilities/persistent_cache/block_cache_tier_file.h.orig 2017-08-30 23:26:12.000000000 +0200
|
|
|
|
|
+++ utilities/persistent_cache/block_cache_tier_file.h 2017-09-28 19:36:20.391181000 +0200
|
|
|
|
|
@@ -24,6 +24,14 @@
|
|
|
|
|
#include "util/file_reader_writer.h"
|
|
|
|
|
#include "util/mutexlock.h"
|
|
|
|
|
|
|
|
|
|
@ -254,7 +256,7 @@ Index: utilities/persistent_cache/block_cache_tier_file.h
|
|
|
|
|
// The io code path of persistent cache uses pipelined architecture
|
|
|
|
|
//
|
|
|
|
|
// client -> In Queue <-- BlockCacheTier --> Out Queue <-- Writer <--> Kernel
|
|
|
|
|
@@ -118,7 +126,7 @@
|
|
|
|
|
@@ -116,7 +124,7 @@
|
|
|
|
|
|
|
|
|
|
// get file path
|
|
|
|
|
std::string Path() const {
|
|
|
|
|
@ -264,11 +266,11 @@ Index: utilities/persistent_cache/block_cache_tier_file.h
|
|
|
|
|
// get cache ID
|
|
|
|
|
uint32_t cacheid() const { return cache_id_; }
|
|
|
|
|
Index: utilities/simulator_cache/sim_cache.cc
|
|
|
|
|
--- utilities/simulator_cache/sim_cache.cc.orig 2017-06-30 00:26:52.000000000 +0200
|
|
|
|
|
+++ utilities/simulator_cache/sim_cache.cc 2017-06-30 09:44:49.445337000 +0200
|
|
|
|
|
@@ -10,6 +10,14 @@
|
|
|
|
|
#include "monitoring/statistics.h"
|
|
|
|
|
#include "port/port.h"
|
|
|
|
|
--- utilities/simulator_cache/sim_cache.cc.orig 2017-08-30 23:26:12.000000000 +0200
|
|
|
|
|
+++ utilities/simulator_cache/sim_cache.cc 2017-09-28 19:36:20.391341000 +0200
|
|
|
|
|
@@ -12,6 +12,14 @@
|
|
|
|
|
#include "util/mutexlock.h"
|
|
|
|
|
#include "util/string_util.h"
|
|
|
|
|
|
|
|
|
|
+#include <sstream>
|
|
|
|
|
+
|
|
|
|
|
@ -281,7 +283,7 @@ Index: utilities/simulator_cache/sim_cache.cc
|
|
|
|
|
namespace rocksdb {
|
|
|
|
|
|
|
|
|
|
namespace {
|
|
|
|
|
@@ -140,8 +148,8 @@
|
|
|
|
|
@@ -278,8 +286,8 @@
|
|
|
|
|
|
|
|
|
|
virtual std::string ToString() const override {
|
|
|
|
|
std::string res;
|
|
|
|
|
|