Skip to content

Commit f813279

Browse files
committed
Remove TransactionLogIteratorRace when -DNDEBUG
1 parent 11e8525 commit f813279

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

db/db_test.cc

+2
Original file line numberDiff line numberDiff line change
@@ -5441,6 +5441,7 @@ TEST(DBTest, TransactionLogIterator) {
54415441
} while (ChangeCompactOptions());
54425442
}
54435443

5444+
#ifndef NDEBUG // sync point is not included with DNDEBUG build
54445445
TEST(DBTest, TransactionLogIteratorRace) {
54455446
// Setup sync point dependency to reproduce the race condition of
54465447
// a log file moved to archived dir, in the middle of GetSortedWalFiles
@@ -5485,6 +5486,7 @@ TEST(DBTest, TransactionLogIteratorRace) {
54855486
}
54865487
} while (ChangeCompactOptions());
54875488
}
5489+
#endif
54885490

54895491
TEST(DBTest, TransactionLogIteratorMoveOverZeroFiles) {
54905492
do {

db/file_indexer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
namespace rocksdb {
1717

1818
class Comparator;
19-
class FileMetaData;
19+
struct FileMetaData;
2020

2121
// The file tree structure in Version is prebuilt and the range of each file
2222
// is known. On Version::Get(), it uses binary search to find a potential file

0 commit comments

Comments
 (0)