From 9bbba4fec16a1d32af44c4fa395b2b849f3eee08 Mon Sep 17 00:00:00 2001 From: Siying Dong Date: Thu, 18 May 2017 06:28:11 -0700 Subject: [PATCH] Remoe unused BlockBasedTable::compaction_optimized_ Summary: BlockBasedTable::compaction_optimized_ is never used but can cause TSAN warning. Remove it. Closes https://github.com/facebook/rocksdb/pull/2324 Differential Revision: D5085533 Pulled By: siying fbshipit-source-id: 2feefce6806d559dfb4ab2989aa3db36752fe25d --- table/block_based_table_reader.cc | 1 - table/block_based_table_reader.h | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/table/block_based_table_reader.cc b/table/block_based_table_reader.cc index ba9c9f3dd..a72aaeafb 100644 --- a/table/block_based_table_reader.cc +++ b/table/block_based_table_reader.cc @@ -797,7 +797,6 @@ void BlockBasedTable::SetupForCompaction() { default: assert(false); } - compaction_optimized_ = true; } std::shared_ptr BlockBasedTable::GetTableProperties() diff --git a/table/block_based_table_reader.h b/table/block_based_table_reader.h index c51d103d4..b9e900ac8 100644 --- a/table/block_based_table_reader.h +++ b/table/block_based_table_reader.h @@ -206,12 +206,9 @@ class BlockBasedTable : public TableReader { struct CachableEntry; struct Rep; Rep* rep_; - explicit BlockBasedTable(Rep* rep) - : rep_(rep), compaction_optimized_(false) {} + explicit BlockBasedTable(Rep* rep) : rep_(rep) {} private: - bool compaction_optimized_; - // input_iter: if it is not null, update this one and return it as Iterator static InternalIterator* NewDataBlockIterator(Rep* rep, const ReadOptions& ro, const Slice& index_value,