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
..
adaptive_table_factory.cc	Add columnfamily option optimize_filters_for_hits to optimize for key hits only	10 years ago
adaptive_table_factory.h	Add columnfamily option optimize_filters_for_hits to optimize for key hits only	10 years ago
block.cc	Turn on -Wshorten-64-to-32 and fix all the errors	10 years ago
block.h	Turn on -Wshorten-64-to-32 and fix all the errors	10 years ago
block_based_filter_block.cc	Remember whole key/prefix filtering on/off in SST file	10 years ago
block_based_filter_block.h	Remember whole key/prefix filtering on/off in SST file	10 years ago
block_based_filter_block_test.cc	rocksdb: Add missing override	10 years ago
block_based_table_builder.cc	Add columnfamily option optimize_filters_for_hits to optimize for key hits only	10 years ago
block_based_table_builder.h	Add columnfamily option optimize_filters_for_hits to optimize for key hits only	10 years ago
block_based_table_factory.cc	Add columnfamily option optimize_filters_for_hits to optimize for key hits only	10 years ago
block_based_table_factory.h	Add columnfamily option optimize_filters_for_hits to optimize for key hits only	10 years ago
block_based_table_reader.cc	Add functionality to pre-fetch blocks specified by a key range to BlockBasedTable implementation.	10 years ago
block_based_table_reader.h	Add functionality to pre-fetch blocks specified by a key range to BlockBasedTable implementation.	10 years ago
block_builder.cc	Turn on -Wshorten-64-to-32 and fix all the errors	10 years ago
block_builder.h	delete unused Comparator	10 years ago
block_hash_index.cc	Turn on -Wshorten-64-to-32 and fix all the errors	10 years ago
block_hash_index.h	Turn on -Wshadow	10 years ago
block_hash_index_test.cc	rocksdb: Add missing override	10 years ago
block_prefix_index.cc	Turn on -Wshorten-64-to-32 and fix all the errors	10 years ago
block_prefix_index.h	fix a few compile warnings	10 years ago
block_test.cc	Turn on -Wshorten-64-to-32 and fix all the errors	10 years ago
bloom_block.cc	table/bloom_block.*: pass func parameter by reference	10 years ago
bloom_block.h	Enforce write buffer memory limit across column families	10 years ago
cuckoo_table_builder.cc	Support footer versions bigger than 1	10 years ago
cuckoo_table_builder.h	Turn on -Wshorten-64-to-32 and fix all the errors	10 years ago
cuckoo_table_builder_test.cc	Turn on -Wshorten-64-to-32 and fix all the errors	10 years ago
cuckoo_table_factory.cc	Add columnfamily option optimize_filters_for_hits to optimize for key hits only	10 years ago
cuckoo_table_factory.h	Add columnfamily option optimize_filters_for_hits to optimize for key hits only	10 years ago
cuckoo_table_reader.cc	Turn on -Wshorten-64-to-32 and fix all the errors	10 years ago
cuckoo_table_reader.h	use GetContext to replace callback function pointer	10 years ago
cuckoo_table_reader_test.cc	rocksdb: Small refactoring before migrating to gtest	10 years ago
filter_block.h	Dump routine to BlockBasedTableReader	10 years ago
flush_block_policy.cc	move block based table related options BlockBasedTableOptions	10 years ago
format.cc	New BlockBasedTable version -- better compressed block format	10 years ago
format.h	New BlockBasedTable version -- better compressed block format	10 years ago
full_filter_block.cc	Remember whole key/prefix filtering on/off in SST file	10 years ago
full_filter_block.h	Remember whole key/prefix filtering on/off in SST file	10 years ago
full_filter_block_test.cc	rocksdb: Add missing override	10 years ago
get_context.cc	use GetContext to replace callback function pointer	10 years ago
get_context.h	use GetContext to replace callback function pointer	10 years ago
iter_heap.h	Turn on -Wmissing-prototypes	11 years ago
iterator.cc	rocksdb: Add missing override	10 years ago
iterator_wrapper.h	Turn -Wshadow back on	10 years ago
merger.cc	rocksdb: Add missing override	10 years ago
merger.h	In DB::NewIterator(), try to allocate the whole iterator tree in an arena	11 years ago
merger_test.cc	rocksdb: Add missing override	10 years ago
meta_blocks.cc	Support footer versions bigger than 1	10 years ago
meta_blocks.h	Fix iOS compile with -Wshorten-64-to-32	10 years ago
mock_table.cc	Change the way options.compression_per_level is used when options.level_compaction_dynamic_level_bytes=true	10 years ago
mock_table.h	Change the way options.compression_per_level is used when options.level_compaction_dynamic_level_bytes=true	10 years ago
plain_table_builder.cc	Support footer versions bigger than 1	10 years ago
plain_table_builder.h	Turn on -Wshorten-64-to-32 and fix all the errors	10 years ago
plain_table_factory.cc	Add columnfamily option optimize_filters_for_hits to optimize for key hits only	10 years ago
plain_table_factory.h	Add columnfamily option optimize_filters_for_hits to optimize for key hits only	10 years ago
plain_table_index.cc	Block plain_table_index.cc in ROCKSDB_LITE	10 years ago
plain_table_index.h	Block plain_table_index.cc in ROCKSDB_LITE	10 years ago
plain_table_key_coding.cc	rocksdb: Fixed 'Dead assignment' and 'Dead initialization' scan-build warnings	10 years ago
plain_table_key_coding.h	typo improvement	10 years ago
plain_table_reader.cc	rocksdb: Add missing override	10 years ago
plain_table_reader.h	rocksdb: Add missing override	10 years ago
table_builder.h	First phase API clean up	11 years ago
table_properties.cc	Add rocksdb::ToString() to address cases where std::to_string is not available.	10 years ago
table_properties_internal.h	Fix iOS compile with -Wshorten-64-to-32	10 years ago
table_reader.h	Add functionality to pre-fetch blocks specified by a key range to BlockBasedTable implementation.	10 years ago
table_reader_bench.cc	Make db_stress built for ROCKSDB_LITE	10 years ago
table_test.cc	rocksdb: Replace ASSERT* with EXPECT* in functions that does not return void value	10 years ago
two_level_iterator.cc	rocksdb: Add missing override	10 years ago
two_level_iterator.h	Turn on -Wshadow	10 years ago