dolysis/rocksdb
3
0
Fork 0
mirror of https://github.com/facebook/rocksdb.git synced 2024-11-29 18:33:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build failure caused by bad merge.

Browse source 
Summary: There was a bad merge during refresh.

Test Plan: make -j all; make check

Reviewers: sdong

Reviewed By: sdong

Subscribers: dhruba

Differential Revision: https://reviews.facebook.net/D45555
This commit is contained in:
Venkatesh Radhakrishnan 2015-08-25 14:02:03 -07:00
parent 4d28a7d8ab
commit bab9934d9e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
db/db_tailing_iter_test.cc
View file

@ -97,7 +97,6 @@ TEST_F(DBTestTailingIterator, TailingIteratorSeekToNext) {
} }
ASSERT_TRUE(itern->Valid()); ASSERT_TRUE(itern->Valid());
ASSERT_EQ(itern->key().compare(key), 0); ASSERT_EQ(itern->key().compare(key), 0);
file_iters_deleted = false;
} }
rocksdb::SyncPoint::GetInstance()->ClearAllCallBacks(); rocksdb::SyncPoint::GetInstance()->ClearAllCallBacks();
rocksdb::SyncPoint::GetInstance()->DisableProcessing(); rocksdb::SyncPoint::GetInstance()->DisableProcessing();
@ -192,6 +191,7 @@ TEST_F(DBTestTailingIterator, TailingIteratorTrimSeekToNext) {
} }
ASSERT_TRUE(itern->Valid()); ASSERT_TRUE(itern->Valid());
ASSERT_EQ(itern->key().compare(key), 0); ASSERT_EQ(itern->key().compare(key), 0);
file_iters_deleted = false;
} }
read_options.read_tier = kBlockCacheTier; read_options.read_tier = kBlockCacheTier;