Date: Sun, 20 Sep 2015 20:14:45 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397396 - head/databases/rocksdb/files Message-ID: <201509202014.t8KKEjjc074576@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sun Sep 20 20:14:44 2015 New Revision: 397396 URL: https://svnweb.freebsd.org/changeset/ports/397396 Log: - Update i386 patches to upstream ones and rename them Obtained from: https://github.com/facebook/rocksdb/commit/4b0b0201c9abb7675413ce25e5044b1c9a8853c8 https://github.com/facebook/rocksdb/commit/90415cfebe90bda845b9ee3e5a00e86d4f80e02e https://github.com/facebook/rocksdb/commit/f171faa240ccd12ac05d54b7ea0a8c29d2f1d9d6 Added: head/databases/rocksdb/files/patch-tools-db_stress.cc - copied, changed from r397378, head/databases/rocksdb/files/patch-tools_db__stress.cc head/databases/rocksdb/files/patch-util-sst_dump_tool.cc - copied, changed from r397039, head/databases/rocksdb/files/patch-util_sst__dump_tool.cc head/databases/rocksdb/files/patch-utilities-checkpoint-checkpoint.cc - copied, changed from r397039, head/databases/rocksdb/files/patch-utilities_checkpoint_checkpoint.cc Deleted: head/databases/rocksdb/files/patch-tools_db__stress.cc head/databases/rocksdb/files/patch-util_sst__dump_tool.cc head/databases/rocksdb/files/patch-utilities_checkpoint_checkpoint.cc Copied and modified: head/databases/rocksdb/files/patch-tools-db_stress.cc (from r397378, head/databases/rocksdb/files/patch-tools_db__stress.cc) ============================================================================== --- head/databases/rocksdb/files/patch-tools_db__stress.cc Sun Sep 20 16:35:28 2015 (r397378, copy source) +++ head/databases/rocksdb/files/patch-tools-db_stress.cc Sun Sep 20 20:14:44 2015 (r397396) @@ -1,3 +1,5 @@ +Obtained from: https://github.com/facebook/rocksdb/commit/4b0b0201c9abb7675413ce25e5044b1c9a8853c8 + --- tools/db_stress.cc.orig 2015-08-31 18:23:39 UTC +++ tools/db_stress.cc @@ -222,7 +222,7 @@ DEFINE_int32(set_options_one_in, 0, Copied and modified: head/databases/rocksdb/files/patch-util-sst_dump_tool.cc (from r397039, head/databases/rocksdb/files/patch-util_sst__dump_tool.cc) ============================================================================== --- head/databases/rocksdb/files/patch-util_sst__dump_tool.cc Wed Sep 16 03:23:12 2015 (r397039, copy source) +++ head/databases/rocksdb/files/patch-util-sst_dump_tool.cc Sun Sep 20 20:14:44 2015 (r397396) @@ -1,11 +1,21 @@ +Obtained from: https://github.com/facebook/rocksdb/commit/90415cfebe90bda845b9ee3e5a00e86d4f80e02e + --- util/sst_dump_tool.cc.orig 2015-08-31 18:23:39 UTC +++ util/sst_dump_tool.cc -@@ -164,7 +164,7 @@ int SstFileReader::ShowAllCompressionSiz +@@ -12,6 +12,7 @@ + #endif + + #include <inttypes.h> ++#include "port/port.h" + + namespace rocksdb { + +@@ -164,7 +165,7 @@ int SstFileReader::ShowAllCompressionSiz compress_type.insert( std::make_pair(CompressionType::kLZ4HCCompression, "kLZ4HCCompression")); - fprintf(stdout, "Block Size: %lu\n", block_size); -+ fprintf(stdout, "Block Size: %zu\n", block_size); ++ fprintf(stdout, "Block Size: %" ROCKSDB_PRIszt "\n", block_size); for (CompressionType i = CompressionType::kNoCompression; i != CompressionType::kLZ4HCCompression; i = CompressionType(i + 1)) { Copied and modified: head/databases/rocksdb/files/patch-utilities-checkpoint-checkpoint.cc (from r397039, head/databases/rocksdb/files/patch-utilities_checkpoint_checkpoint.cc) ============================================================================== --- head/databases/rocksdb/files/patch-utilities_checkpoint_checkpoint.cc Wed Sep 16 03:23:12 2015 (r397039, copy source) +++ head/databases/rocksdb/files/patch-utilities-checkpoint-checkpoint.cc Sun Sep 20 20:14:44 2015 (r397396) @@ -1,11 +1,21 @@ +Obtained from: https://github.com/facebook/rocksdb/commit/f171faa240ccd12ac05d54b7ea0a8c29d2f1d9d6 + --- utilities/checkpoint/checkpoint.cc.orig 2015-08-31 18:23:39 UTC +++ utilities/checkpoint/checkpoint.cc -@@ -131,7 +131,7 @@ Status CheckpointImpl::CreateCheckpoint( +@@ -24,6 +24,7 @@ + #include "rocksdb/env.h" + #include "rocksdb/transaction_log.h" + #include "util/file_util.h" ++#include "port/port.h" + + namespace rocksdb { + +@@ -131,7 +132,7 @@ Status CheckpointImpl::CreateCheckpoint( (type == kDescriptorFile) ? manifest_file_size : 0); } } - Log(db_->GetOptions().info_log, "Number of log files %ld", -+ Log(db_->GetOptions().info_log, "Number of log files %zu", ++ Log(db_->GetOptions().info_log, "Number of log files %" ROCKSDB_PRIszt, live_wal_files.size()); // Link WAL files. Copy exact size of last one because it is the only one
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509202014.t8KKEjjc074576>