From aeaba07b2a85771b8f3261eae984281516585abd Mon Sep 17 00:00:00 2001 From: Siying Dong Date: Mon, 1 May 2017 16:05:21 -0700 Subject: [PATCH] Remove an assert that causes TSAN failure. Summary: ColumnFamilyData::ConstructNewMemtable is called out of DB mutex, and it asserts current_ is not empty, but current_ should only be accessed inside DB mutex. Remove this assert to make TSAN happy. Closes https://github.com/facebook/rocksdb/pull/2235 Differential Revision: D4978531 Pulled By: siying fbshipit-source-id: 423685a7dae88ed3faaa9e1b9ccb3427ac704a4b --- db/column_family.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/db/column_family.cc b/db/column_family.cc index 6bb1c6bf4..54ddf4cb4 100644 --- a/db/column_family.cc +++ b/db/column_family.cc @@ -779,7 +779,6 @@ uint64_t ColumnFamilyData::GetTotalSstFilesSize() const { MemTable* ColumnFamilyData::ConstructNewMemtable( const MutableCFOptions& mutable_cf_options, SequenceNumber earliest_seq) { - assert(current_ != nullptr); return new MemTable(internal_comparator_, ioptions_, mutable_cf_options, write_buffer_manager_, earliest_seq); }