fork of https://github.com/oxigraph/rocksdb and https://github.com/facebook/rocksdb for nextgraph and oxigraph

You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Igor Sugak 9fd6edf81c rocksdb: Replace ASSERT* with EXPECT* in functions that does not return void value ... Summary: gtest does not use exceptions to fail a unit test by design, and `ASSERT*`s are implemented using `return`. As a consequence we cannot use `ASSERT*` in a function that does not return `void` value ([[ https://code.google.com/p/googletest/wiki/AdvancedGuide#Assertion_Placement | 1]]), and have to fix our existing code. This diff does this in a generic way, with no manual changes. In order to detect all existing `ASSERT*` that are used in functions that doesn't return void value, I change the code to generate compile errors for such cases. In `util/testharness.h` I defined `EXPECT*` assertions, the same way as `ASSERT*`, and redefined `ASSERT*` to return `void`. Then executed: ```lang=bash % USE_CLANG=1 make all -j55 -k 2> build.log % perl -naF: -e 'print "-- -number=".$F[1]." ".$F[0]."\n" if /: error:/' \ build.log | xargs -L 1 perl -spi -e 's/ASSERT/EXPECT/g if $. == $number' % make format ``` After that I reverted back change to `ASSERT*` in `util/testharness.h`. But preserved introduced `EXPECT*`, which is the same as `ASSERT*`. This will be deleted once switched to gtest. This diff is independent and contains manual changes only in `util/testharness.h`. Test Plan: Make sure all tests are passing. ```lang=bash % USE_CLANG=1 make check ``` Reviewers: igor, lgalanis, sdong, yufei.zhu, rven, meyering Reviewed By: meyering Subscribers: dhruba, leveldb Differential Revision: https://reviews.facebook.net/D33333		10 years ago
..
builder.cc	Add columnfamily option optimize_filters_for_hits to optimize for key hits only	10 years ago
builder.h	Add columnfamily option optimize_filters_for_hits to optimize for key hits only	10 years ago
c.cc	rocksdb: Add missing override	10 years ago
c_test.c	rocksdb: Fixed 'Dead assignment' and 'Dead initialization' scan-build warnings	10 years ago
column_family.cc	Stop printing per-level stall times.	10 years ago
column_family.h	options.level_compaction_dynamic_level_bytes to allow RocksDB to pick size bases of levels dynamically.	10 years ago
column_family_test.cc	rocksdb: Replace ASSERT* with EXPECT* in functions that does not return void value	10 years ago
compact_files_test.cc	Fixed a bug where CompactFiles won't delete obsolete files until flush.	10 years ago
compaction.cc	options.level_compaction_dynamic_level_bytes to allow RocksDB to pick size bases of levels dynamically.	10 years ago
compaction.h	options.level_compaction_dynamic_level_bytes to allow RocksDB to pick size bases of levels dynamically.	10 years ago
compaction_job.cc	Fixed the unit-test issue in PreShutdownCompactionMiddle	10 years ago
compaction_job.h	Allow GetThreadList() to report operation stage.	10 years ago
compaction_job_test.cc	rocksdb: Replace ASSERT* with EXPECT* in functions that does not return void value	10 years ago
compaction_picker.cc	Change the way options.compression_per_level is used when options.level_compaction_dynamic_level_bytes=true	10 years ago
compaction_picker.h	options.level_compaction_dynamic_level_bytes to allow RocksDB to pick size bases of levels dynamically.	10 years ago
compaction_picker_test.cc	options.level_compaction_dynamic_level_bytes to allow RocksDB to pick size bases of levels dynamically.	10 years ago
comparator_db_test.cc	rocksdb: Replace ASSERT* with EXPECT* in functions that does not return void value	10 years ago
corruption_test.cc	Fail DB::Open() on WAL corruption	10 years ago
cuckoo_table_db_test.cc	rocksdb: Replace ASSERT* with EXPECT* in functions that does not return void value	10 years ago
db_bench.cc	Fix SIGSEGV when not using cache	10 years ago
db_filesnapshot.cc	Introduce job_id for flush and compaction	10 years ago
db_impl.cc	Speed up rocksDB close call.	10 years ago
db_impl.h	EventLogger	10 years ago
db_impl_debug.cc	Add a counter for collecting the wait time on db mutex.	10 years ago
db_impl_readonly.cc	Move GetThreadList() feature under Env.	10 years ago
db_impl_readonly.h	Block ReadOnlyDB in ROCKSDB_LITE	10 years ago
db_iter.cc	rocksdb: Add missing override	10 years ago
db_iter.h	reduce references to cfd->options() in DBImpl	10 years ago
db_iter_test.cc	Divide test DBIteratorTest.DBIterator to smaller tests	10 years ago
db_test.cc	rocksdb: Replace ASSERT* with EXPECT* in functions that does not return void value	10 years ago
dbformat.cc	Turn on -Wshorten-64-to-32 and fix all the errors	10 years ago
dbformat.h	rocksdb: Add missing override	10 years ago
dbformat_test.cc	Use IterKey instead of string in Block::Iter to reduce malloc	10 years ago
deletefile_test.cc	rocksdb: Replace ASSERT* with EXPECT* in functions that does not return void value	10 years ago
fault_injection_test.cc	rocksdb: Replace ASSERT* with EXPECT* in functions that does not return void value	10 years ago
file_indexer.cc	Turn on -Wshorten-64-to-32 and fix all the errors	10 years ago
file_indexer.h	Turn on -Wshorten-64-to-32 and fix all the errors	10 years ago
file_indexer_test.cc	rocksdb: Small refactoring before migrating to gtest	10 years ago
filename.cc	Sync manifest file when initializing it	10 years ago
filename.h	Sync manifest file when initializing it	10 years ago
filename_test.cc	Support purging logs from separate log directory	10 years ago
flush_job.cc	Allow GetThreadList() to report operation stage.	10 years ago
flush_job.h	Allow GetThreadList() to report operation stage.	10 years ago
flush_job_test.cc	rocksdb: Replace ASSERT* with EXPECT* in functions that does not return void value	10 years ago
flush_scheduler.cc	Don't return (or dereference) dangling pointer	10 years ago
flush_scheduler.h	Fix data race #1	10 years ago
forward_iterator.cc	rocksdb: Add missing override	10 years ago
forward_iterator.h	rocksdb: Add missing override	10 years ago
internal_stats.cc	Fix compaction IO stats to handle large file counts	10 years ago
internal_stats.h	Stop printing per-level stall times.	10 years ago
job_context.h	Introduce job_id for flush and compaction	10 years ago
listener_test.cc	rocksdb: Replace ASSERT* with EXPECT* in functions that does not return void value	10 years ago
log_and_apply_bench.cc	Add a counter for collecting the wait time on db mutex.	10 years ago
log_format.h	Some minor refactoring on the code	11 years ago
log_reader.cc	rocksdb: Fixed 'Dead assignment' and 'Dead initialization' scan-build warnings	10 years ago
log_reader.h	Fix UnmarkEOF for partial blocks	11 years ago
log_test.cc	rocksdb: Replace ASSERT* with EXPECT* in functions that does not return void value	10 years ago
log_writer.cc	fix erroneous assert: cast kBlockSize (of type unsigned int) to "int"	10 years ago
log_writer.h	Add appropriate LICENSE and Copyright message.	11 years ago
managed_iterator.cc	Fix compile error on MacOS.	10 years ago
managed_iterator.h	Managed iterator	10 years ago
memtable.cc	Instrument memtable seeks	10 years ago
memtable.h	rocksdb: Add missing override	10 years ago
memtable_allocator.cc	Enforce write buffer memory limit across column families	10 years ago
memtable_allocator.h	Enforce write buffer memory limit across column families	10 years ago
memtable_list.cc	Allow GetThreadList() to report operation stage.	10 years ago
memtable_list.h	Add a counter for collecting the wait time on db mutex.	10 years ago
memtablerep_bench.cc	Fix clang build	10 years ago
merge_context.h	Enhance partial merge to support multiple arguments	11 years ago
merge_helper.cc	Turn -Wshadow back on	10 years ago
merge_helper.h	Fixed the crash when merge_operator is not properly set after reopen.	10 years ago
merge_operator.cc	Some small cleaning up to make some compiling environment happy	11 years ago
merge_test.cc	rocksdb: Add missing override	10 years ago
perf_context_test.cc	rocksdb: Replace ASSERT* with EXPECT* in functions that does not return void value	10 years ago
plain_table_db_test.cc	rocksdb: Replace ASSERT* with EXPECT* in functions that does not return void value	10 years ago
prefix_test.cc	rocksdb: Replace ASSERT* with EXPECT* in functions that does not return void value	10 years ago
repair.cc	rocksdb: Add missing override	10 years ago
skiplist.h	Enforce write buffer memory limit across column families	10 years ago
skiplist_test.cc	Turn on -Wshorten-64-to-32 and fix all the errors	10 years ago
snapshot.h	rocksdb: Add missing override	10 years ago
table_cache.cc	TableMock + framework for mock classes	10 years ago
table_cache.h	use GetContext to replace callback function pointer	10 years ago
table_properties_collector.cc	Add rocksdb::ToString() to address cases where std::to_string is not available.	10 years ago
table_properties_collector.h	rocksdb: Add missing override	10 years ago
table_properties_collector_test.cc	rocksdb: Add missing override	10 years ago
transaction_log_impl.cc	Turn -Wshadow back on	10 years ago
transaction_log_impl.h	rocksdb: Add missing override	10 years ago
version_builder.cc	Fix deleting obsolete files	10 years ago
version_builder.h	Move VersionBuilder logic to a separate .cc file	10 years ago
version_builder_test.cc	options.level_compaction_dynamic_level_bytes to allow RocksDB to pick size bases of levels dynamically.	10 years ago
version_edit.cc	Turn on -Wshadow	10 years ago
version_edit.h	Fix deleting obsolete files	10 years ago
version_edit_test.cc	Turn on -Wshorten-64-to-32 and fix all the errors	10 years ago
version_set.cc	options.level_compaction_dynamic_level_bytes to allow RocksDB to pick size bases of levels dynamically.	10 years ago
version_set.h	options.level_compaction_dynamic_level_bytes to allow RocksDB to pick size bases of levels dynamically.	10 years ago
version_set_test.cc	options.level_compaction_dynamic_level_bytes to allow RocksDB to pick size bases of levels dynamically.	10 years ago
wal_manager.cc	rocksdb: Add missing override	10 years ago
wal_manager.h	Fix -Wnon-virtual-dtor errors	10 years ago
wal_manager_test.cc	rocksdb: Replace ASSERT* with EXPECT* in functions that does not return void value	10 years ago
write_batch.cc	rocksdb: Add missing override	10 years ago
write_batch_internal.h	remove all remaining references to cfd->options()	10 years ago
write_batch_test.cc	rocksdb: Replace ASSERT* with EXPECT* in functions that does not return void value	10 years ago
write_controller.cc	Push- instead of pull-model for managing Write stalls	10 years ago
write_controller.h	Fix #284	10 years ago
write_controller_test.cc	Push- instead of pull-model for managing Write stalls	10 years ago
write_thread.cc	WriteThread	10 years ago
write_thread.h	Add a counter for collecting the wait time on db mutex.	10 years ago
writebuffer.h	Enforce write buffer memory limit across column families	10 years ago