From 09f853550c58e9efd1acfbec21a94bda1144d13a Mon Sep 17 00:00:00 2001 From: Dmitri Smirnov Date: Mon, 19 Oct 2015 11:28:22 -0700 Subject: [PATCH 1/3] uint is a not a datatype on windows. --- db/db_table_properties_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/db_table_properties_test.cc b/db/db_table_properties_test.cc index aff61baa8..fef81795b 100644 --- a/db/db_table_properties_test.cc +++ b/db/db_table_properties_test.cc @@ -188,7 +188,7 @@ TEST_F(DBTablePropertiesTest, GetPropertiesOfTablesInRange) { // create a bunch of ranges std::vector random_keys; auto n = 2 * rnd.Uniform(50); - for (uint i = 0; i < n; ++i) { + for (int i = 0; i < n; ++i) { random_keys.push_back(test::RandomKey(&rnd, 5)); } From 2f680ed094e6789a3903ab8b7deea41cb5a9fc76 Mon Sep 17 00:00:00 2001 From: Dmitri Smirnov Date: Mon, 19 Oct 2015 12:29:11 -0700 Subject: [PATCH 2/3] Make index same type as auto deduced uint32_t --- db/db_table_properties_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/db_table_properties_test.cc b/db/db_table_properties_test.cc index fef81795b..f1f4558c5 100644 --- a/db/db_table_properties_test.cc +++ b/db/db_table_properties_test.cc @@ -188,7 +188,7 @@ TEST_F(DBTablePropertiesTest, GetPropertiesOfTablesInRange) { // create a bunch of ranges std::vector random_keys; auto n = 2 * rnd.Uniform(50); - for (int i = 0; i < n; ++i) { + for (uint32_t i = 0; i < n; ++i) { random_keys.push_back(test::RandomKey(&rnd, 5)); } From cfaa33f9a5de1c1d80b213cfe8fffcc1dd50168a Mon Sep 17 00:00:00 2001 From: agiardullo Date: Mon, 19 Oct 2015 12:40:15 -0700 Subject: [PATCH 3/3] Update transaction iterator documentation Summary: Remove warning about an issue that was resolved. Turns out the issue was a false-alarm. Test Plan: n/a Reviewers: igor, yhchiang, rven, sdong Reviewed By: sdong Subscribers: dhruba, leveldb Differential Revision: https://reviews.facebook.net/D49011 --- include/rocksdb/utilities/transaction.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/rocksdb/utilities/transaction.h b/include/rocksdb/utilities/transaction.h index bd5589b73..cbeeceabc 100644 --- a/include/rocksdb/utilities/transaction.h +++ b/include/rocksdb/utilities/transaction.h @@ -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,