andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1037 from SherlockNoMad/BuildFix

Browse Source 
Fix AppVeyor build error
This commit is contained in:
Igor Canadi 2016-03-15 11:15:56 -07:00
commit 17b879b91e
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -238,6 +238,7 @@ set(SOURCES
util/thread_status_updater.cc util/thread_status_updater.cc
util/thread_status_util.cc util/thread_status_util.cc
util/thread_status_util_debug.cc util/thread_status_util_debug.cc
util/transaction_test_util.cc
util/xfunc.cc util/xfunc.cc
util/xxhash.cc util/xxhash.cc
utilities/backupable/backupable_db.cc utilities/backupable/backupable_db.cc

5
tools/db_bench_tool.cc
View File

@ -3764,7 +3764,7 @@ class Benchmark {
ReadOptions options(FLAGS_verify_checksum, true); ReadOptions options(FLAGS_verify_checksum, true);
Duration duration(FLAGS_duration, readwrites_); Duration duration(FLAGS_duration, readwrites_);
ReadOptions read_options(FLAGS_verify_checksum, true); ReadOptions read_options(FLAGS_verify_checksum, true);
uint64_t num_prefix_ranges = FLAGS_transaction_sets; uint16_t num_prefix_ranges = static_cast<uint16_t>(FLAGS_transaction_sets);
uint64_t transactions_done = 0; uint64_t transactions_done = 0;
if (num_prefix_ranges == 0 || num_prefix_ranges > 9999) { if (num_prefix_ranges == 0 || num_prefix_ranges > 9999) {
@ -3836,7 +3836,8 @@ class Benchmark {
} }
Status s = Status s =
RandomTransactionInserter::Verify(db_.db, FLAGS_transaction_sets); RandomTransactionInserter::Verify(db_.db,
static_cast<uint16_t>(FLAGS_transaction_sets));
if (s.ok()) { if (s.ok()) {
fprintf(stdout, "RandomTransactionVerify Success.\n"); fprintf(stdout, "RandomTransactionVerify Success.\n");

1
util/transaction_test_util.h
View File

@ -8,6 +8,7 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#include "rocksdb/options.h" #include "rocksdb/options.h"
#include "port/port.h"
#include "rocksdb/utilities/optimistic_transaction_db.h" #include "rocksdb/utilities/optimistic_transaction_db.h"
#include "rocksdb/utilities/transaction_db.h" #include "rocksdb/utilities/transaction_db.h"

3
utilities/transactions/optimistic_transaction_test.cc
View File

@ -1284,7 +1284,8 @@ Status OptimisticTransactionStressTestInserter(OptimisticTransactionDB* db,
txn_options.set_snapshot = true; txn_options.set_snapshot = true;
RandomTransactionInserter inserter(&_rand, write_options, read_options, RandomTransactionInserter inserter(&_rand, write_options, read_options,
num_keys_per_set, num_sets); num_keys_per_set,
static_cast<uint16_t>(num_sets));
for (size_t t = 0; t < num_transactions; t++) { for (size_t t = 0; t < num_transactions; t++) {
bool success = inserter.OptimisticTransactionDBInsert(db, txn_options); bool success = inserter.OptimisticTransactionDBInsert(db, txn_options);

3
utilities/transactions/transaction_test.cc
View File

@ -2996,7 +2996,8 @@ Status TransactionStressTestInserter(TransactionDB* db,
txn_options.set_snapshot = true; txn_options.set_snapshot = true;
RandomTransactionInserter inserter(&_rand, write_options, read_options, RandomTransactionInserter inserter(&_rand, write_options, read_options,
num_keys_per_set, num_sets); num_keys_per_set,
static_cast<uint16_t>(num_sets));
for (size_t t = 0; t < num_transactions; t++) { for (size_t t = 0; t < num_transactions; t++) {
bool success = inserter.TransactionDBInsert(db, txn_options); bool success = inserter.TransactionDBInsert(db, txn_options);