dolysis
/
rocksdb
mirror of https://github.com/facebook/rocksdb.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:facebook/rocksdb into T7916298

This commit is contained in:
Shusen Liu 2015-10-19 13:25:39 -07:00
parent 4575de5b9e 5c727de6a3
commit 32c291e3c9
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/db_table_properties_test.cc
View File

@ -188,7 +188,7 @@ TEST_F(DBTablePropertiesTest, GetPropertiesOfTablesInRange) {
// create a bunch of ranges
std::vector<std::string> random_keys;
auto n = 2 * rnd.Uniform(50);
for (uint i = 0; i < n; ++i) {
for (uint32_t i = 0; i < n; ++i) {
random_keys.push_back(test::RandomKey(&rnd, 5));
}

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

@ -214,10 +214,6 @@ class Transaction {
//
// The returned iterator is only valid until Commit(), Rollback(), or
// RollbackToSavePoint() is called.
// NOTE: Transaction::Put/Merge/Delete will currently invalidate this iterator
// until
// the following issue is fixed:
// https://github.com/facebook/rocksdb/issues/616
virtual Iterator* GetIterator(const ReadOptions& read_options) = 0;
virtual Iterator* GetIterator(const ReadOptions& read_options,