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

Fix Windows broken build error due to non-const override (#4798)

Browse Source 
Summary:
1) `transaction_base.h` overrides from `transaction.h` with a `const boolean do_validate`.
The non-const base declaration, which I cannot see the need for, causes a compilation error on Microsoft Windows.

2) Implicit cast from `double` to `uint64_t` causes a compilation error on Microsoft Windows.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/4798

Differential Revision: D13519734

Pulled By: sagar0

fbshipit-source-id: 6e8cb80e9a589b1122e1500c21b8e3a3a472b459
This commit is contained in:
Adam Retter 2018-12-19 13:24:05 -08:00 committed by Facebook Github Bot
parent 257b458121
commit 1b0c9ce396
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/range_del_aggregator_bench.cc
View File

@ -197,7 +197,8 @@ int main(int argc, char** argv) {
// real workloads. // real workloads.
for (int j = 0; j < FLAGS_num_range_tombstones; j++) { for (int j = 0; j < FLAGS_num_range_tombstones; j++) {
uint64_t start = rnd.Uniform(FLAGS_tombstone_start_upper_bound); uint64_t start = rnd.Uniform(FLAGS_tombstone_start_upper_bound);
uint64_t end = start + std::max(1.0, normal_dist(random_gen)); uint64_t end = static_cast<uint64_t>(
std::round(start + std::max(1.0, normal_dist(random_gen))));
persistent_range_tombstones[j] = rocksdb::PersistentRangeTombstone( persistent_range_tombstones[j] = rocksdb::PersistentRangeTombstone(
rocksdb::Key(start), rocksdb::Key(end), j); rocksdb::Key(start), rocksdb::Key(end), j);
} }

2
include/rocksdb/utilities/transaction.h
View File

@ -237,7 +237,7 @@ class Transaction {
ColumnFamilyHandle* column_family, ColumnFamilyHandle* column_family,
const Slice& key, std::string* value, const Slice& key, std::string* value,
bool exclusive = true, bool exclusive = true,
bool do_validate = true) = 0; const bool do_validate = true) = 0;
// An overload of the above method that receives a PinnableSlice // An overload of the above method that receives a PinnableSlice
// For backward compatibility a default implementation is provided // For backward compatibility a default implementation is provided