Revert "Fix bad merge of D16791 and D16767"

This reverts commit 839c8ecfcd.
This commit is contained in:
Igor Canadi
2014-03-12 09:37:43 -07:00
parent 5ba028c179
commit 2b95dc1542
5 changed files with 33 additions and 108 deletions

View File

@@ -4543,43 +4543,16 @@ TEST(DBTest, TransactionLogIterator) {
{
auto iter = OpenTransactionLogIter(0);
ExpectRecords(3, iter);
assert(!iter->IsObsolete());
iter->Next();
assert(!iter->Valid());
assert(!iter->IsObsolete());
assert(iter->status().ok());
Reopen(&options);
env_->SleepForMicroseconds(2 * 1000 * 1000);
}
Reopen(&options);
env_->SleepForMicroseconds(2 * 1000 * 1000);{
Put("key4", DummyString(1024));
Put("key5", DummyString(1024));
Put("key6", DummyString(1024));
iter->Next();
assert(!iter->Valid());
assert(iter->IsObsolete());
assert(iter->status().ok());
}
{
auto iter = OpenTransactionLogIter(0);
ExpectRecords(6, iter);
assert(!iter->IsObsolete());
iter->Next();
assert(!iter->Valid());
assert(!iter->IsObsolete());
assert(iter->status().ok());
Put("key7", DummyString(1024));
iter->Next();
assert(iter->Valid());
assert(iter->status().ok());
dbfull()->Flush(FlushOptions());
Put("key8", DummyString(1024));
iter->Next();
assert(!iter->Valid());
assert(iter->IsObsolete());
assert(iter->status().ok());
}
} while (ChangeCompactOptions());
}