From bab9934d9e709fa1ac663d039cdc1b6463c3f842 Mon Sep 17 00:00:00 2001 From: Venkatesh Radhakrishnan Date: Tue, 25 Aug 2015 14:02:03 -0700 Subject: [PATCH] Fix build failure caused by bad merge. 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 --- db/db_tailing_iter_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/db_tailing_iter_test.cc b/db/db_tailing_iter_test.cc index 2d4953eb2..9bce29a43 100644 --- a/db/db_tailing_iter_test.cc +++ b/db/db_tailing_iter_test.cc @@ -97,7 +97,6 @@ TEST_F(DBTestTailingIterator, TailingIteratorSeekToNext) { } ASSERT_TRUE(itern->Valid()); ASSERT_EQ(itern->key().compare(key), 0); - file_iters_deleted = false; } rocksdb::SyncPoint::GetInstance()->ClearAllCallBacks(); rocksdb::SyncPoint::GetInstance()->DisableProcessing(); @@ -192,6 +191,7 @@ TEST_F(DBTestTailingIterator, TailingIteratorTrimSeekToNext) { } ASSERT_TRUE(itern->Valid()); ASSERT_EQ(itern->key().compare(key), 0); + file_iters_deleted = false; } read_options.read_tier = kBlockCacheTier;