From a99fb9928fefa030c187bbd0983eb00be3daf587 Mon Sep 17 00:00:00 2001 From: Andrew Kryczka Date: Wed, 24 May 2017 16:26:36 -0700 Subject: [PATCH] fix column_family_test asan Summary: stop calling Close() at the end of tests holding a compaction pressure token since it causes the write controller to be deleted while it's still needed. these calls were pointless anyways since Close() is already called in the test's destructor. Closes https://github.com/facebook/rocksdb/pull/2367 Differential Revision: D5125906 Pulled By: ajkr fbshipit-source-id: 6cad8673e5546a82ff602ac0ba59cc3f68dbde46 --- db/column_family_test.cc | 9 --------- 1 file changed, 9 deletions(-) diff --git a/db/column_family_test.cc b/db/column_family_test.cc index 718355d74..fbc05e347 100644 --- a/db/column_family_test.cc +++ b/db/column_family_test.cc @@ -1465,7 +1465,6 @@ TEST_F(ColumnFamilyTest, AutomaticAndManualCompactions) { ASSERT_NE("NOT_FOUND", Get(1, *key_iter)); key_iter++; } - Close(); } TEST_F(ColumnFamilyTest, ManualAndAutomaticCompactions) { @@ -1562,7 +1561,6 @@ TEST_F(ColumnFamilyTest, ManualAndAutomaticCompactions) { ASSERT_NE("NOT_FOUND", Get(1, *key_iter)); key_iter++; } - Close(); } TEST_F(ColumnFamilyTest, SameCFManualManualCompactions) { @@ -1662,7 +1660,6 @@ TEST_F(ColumnFamilyTest, SameCFManualManualCompactions) { ASSERT_NE("NOT_FOUND", Get(1, *key_iter)); key_iter++; } - Close(); } TEST_F(ColumnFamilyTest, SameCFManualAutomaticCompactions) { @@ -1753,7 +1750,6 @@ TEST_F(ColumnFamilyTest, SameCFManualAutomaticCompactions) { ASSERT_NE("NOT_FOUND", Get(1, *key_iter)); key_iter++; } - Close(); } TEST_F(ColumnFamilyTest, SameCFManualAutomaticCompactionsLevel) { @@ -1844,7 +1840,6 @@ TEST_F(ColumnFamilyTest, SameCFManualAutomaticCompactionsLevel) { ASSERT_NE("NOT_FOUND", Get(1, *key_iter)); key_iter++; } - Close(); } // This test checks for automatic getting a conflict if there is a @@ -1965,8 +1960,6 @@ TEST_F(ColumnFamilyTest, SameCFManualAutomaticConflict) { ASSERT_NE("NOT_FOUND", Get(1, *key_iter)); key_iter++; } - - Close(); } // In this test, we generate enough files to trigger automatic compactions. @@ -2056,8 +2049,6 @@ TEST_F(ColumnFamilyTest, SameCFAutomaticManualCompactions) { ASSERT_NE("NOT_FOUND", Get(1, *key_iter)); key_iter++; } - - Close(); } #endif // !ROCKSDB_LITE